diff options
| author | ache <ache@FreeBSD.org> | 1999-02-12 20:39:06 +0000 |
|---|---|---|
| committer | ache <ache@FreeBSD.org> | 1999-02-12 20:39:06 +0000 |
| commit | 1c697612c00b349f6ef445f24c8384238ed2c2f5 (patch) | |
| tree | da35e051ce812e7145f2b54134cf39ed3873cffb /usr.bin/colldef/parse.y | |
| parent | 35ae892d35e97cc238430bf3e32169128149f546 (diff) | |
| download | FreeBSD-src-1c697612c00b349f6ef445f24c8384238ed2c2f5.zip FreeBSD-src-1c697612c00b349f6ef445f24c8384238ed2c2f5.tar.gz | |
fix English
detect recursive substitutions
allow substituted character not present in the order
Diffstat (limited to 'usr.bin/colldef/parse.y')
| -rw-r--r-- | usr.bin/colldef/parse.y | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/usr.bin/colldef/parse.y b/usr.bin/colldef/parse.y index cfc5642..ca37743 100644 --- a/usr.bin/colldef/parse.y +++ b/usr.bin/colldef/parse.y @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: parse.y,v 1.10 1997/06/30 11:24:18 charnier Exp $ + * $Id: parse.y,v 1.11 1998/12/06 22:58:17 archie Exp $ */ #include <err.h> @@ -84,7 +84,11 @@ charmap : DEFN CHAR { } ; substitute : SUBSTITUTE STRING WITH STRING { - strcpy(__collate_substitute_table[$2[0]], $4); + u_char ch = $2[0]; + + if (strchr($4, ch) != NULL) + yyerror("Char 0x%02x substitution is recursive", ch); + strcpy(__collate_substitute_table[ch], $4); } ; order : ORDER order_list { @@ -92,8 +96,11 @@ order : ORDER order_list { int ch; for (ch = 0; ch < UCHAR_MAX + 1; ch++) - if (!__collate_char_pri_table[ch].prim) - yyerror("Char 0x%02x not present", ch); + if ( !__collate_char_pri_table[ch].prim + && __collate_substitute_table[ch][0] == ch + && __collate_substitute_table[ch][1] == '\0' + ) + yyerror("Char 0x%02x not found", ch); fp = fopen(out_file, "w"); if(!fp) |
