X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/943819bf464c934abcaf219bf0578b393685c620..41aca2e038810d45e67d0348f3ca91ac6e0f0ff3:/src/reader.c diff --git a/src/reader.c b/src/reader.c index 662353b3..36af4646 100644 --- a/src/reader.c +++ b/src/reader.c @@ -1,35 +1,36 @@ /* Input parser for bison - Copyright (C) 1984, 1986, 1989, 1992 Free Software Foundation, Inc. + Copyright (C) 1984, 86, 89, 92, 98, 2000 Free Software Foundation, Inc. -This file is part of Bison, the GNU Compiler Compiler. + This file is part of Bison, the GNU Compiler Compiler. -Bison is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. + Bison is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. -Bison is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. + Bison is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with Bison; see the file COPYING. If not, write to -the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ + You should have received a copy of the GNU General Public License + along with Bison; see the file COPYING. If not, write to + the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ -/* read in the grammar specification and record it in the format described in gram.h. - All guards are copied into the fguard file and all actions into faction, - in each case forming the body of a C function (yyguard or yyaction) - which contains a switch statement to decide which guard or action to execute. +/* Read in the grammar specification and record it in the format + described in gram.h. All guards are copied into the fguard file + and all actions into faction, in each case forming the body of a C + function (yyguard or yyaction) which contains a switch statement to + decide which guard or action to execute. -The entry point is reader(). */ + The entry point is reader (). */ #include -#include #include "system.h" #include "files.h" -#include "new.h" +#include "alloc.h" #include "symtab.h" #include "lex.h" #include "gram.h" @@ -52,46 +53,30 @@ extern bucket *symval; extern int numval; extern int expected_conflicts; extern char *token_buffer; - -extern void init_lex(); -extern void tabinit(); -extern void output_headers(); -extern void output_trailers(); -extern void free_symtab(); -extern void open_extra_files(); -extern char *int_to_string(); -extern void fatal(); -extern void fatals(); -extern void warn(); -extern void warni(); -extern void warns(); -extern void warnss(); -extern void warnsss(); -extern void unlex(); -extern void done(); - -extern int skip_white_space(); -extern int parse_percent_token(); -extern int lex(); - -void reader_output_yylsp(); -void read_declarations(); -void copy_definition(); -void parse_token_decl(); -void parse_start_decl(); -void parse_type_decl(); -void parse_assoc_decl(); -void parse_union_decl(); -void parse_expect_decl(); -void parse_thong_decl(); -void copy_action(); -void readgram(); -void record_rule_line(); -void packsymbols(); -void output_token_defines(); -void packgram(); -int read_signed_integer(); -static int get_type(); +extern int maxtoken; + +extern void init_lex PARAMS((void)); +extern char *grow_token_buffer PARAMS((char *)); +extern void tabinit PARAMS((void)); +extern void output_headers PARAMS((void)); +extern void output_trailers PARAMS((void)); +extern void free_symtab PARAMS((void)); +extern void open_extra_files PARAMS((void)); +extern char *int_to_string PARAMS((int)); +extern char *printable_version PARAMS((int)); +extern void fatal PARAMS((char *)); +extern void fatals PARAMS((char *, char *)); +extern void warn PARAMS((char *)); +extern void warni PARAMS((char *, int)); +extern void warns PARAMS((char *, char *)); +extern void warnss PARAMS((char *, char *, char *)); +extern void warnsss PARAMS((char *, char *, char *, char *)); +extern void unlex PARAMS((int)); +extern void done PARAMS((int)); + +extern int skip_white_space PARAMS((void)); +extern int parse_percent_token PARAMS((void)); +extern int lex PARAMS((void)); typedef struct symbol_list @@ -103,6 +88,31 @@ typedef symbol_list; +void reader PARAMS((void)); +void reader_output_yylsp PARAMS((FILE *)); +void read_declarations PARAMS((void)); +void copy_definition PARAMS((void)); +void parse_token_decl PARAMS((int, int)); +void parse_start_decl PARAMS((void)); +void parse_type_decl PARAMS((void)); +void parse_assoc_decl PARAMS((int)); +void parse_union_decl PARAMS((void)); +void parse_expect_decl PARAMS((void)); +char *get_type_name PARAMS((int, symbol_list *)); +void copy_guard PARAMS((symbol_list *, int)); +void parse_thong_decl PARAMS((void)); +void copy_action PARAMS((symbol_list *, int)); +bucket *gensym PARAMS((void)); +void readgram PARAMS((void)); +void record_rule_line PARAMS((void)); +void packsymbols PARAMS((void)); +void output_token_defines PARAMS((FILE *)); +void packgram PARAMS((void)); +int read_signed_integer PARAMS((FILE *)); + +#if 0 +static int get_type PARAMS((void)); +#endif int lineno; symbol_list *grammar; @@ -122,33 +132,31 @@ static int lastprec; /* incremented for each %left, %right or %nonassoc seen */ static int gensym_count; /* incremented for each generated symbol */ static bucket *errtoken; +static bucket *undeftoken; /* Nonzero if any action or guard uses the @n construct. */ static int yylsp_needed; -extern char *version_string; - static void -skip_to_char(target) - int target; +skip_to_char (int target) { int c; if (target == '\n') - warn(" Skipping to next \\n"); + warn(_(" Skipping to next \\n")); else - warni(" Skipping to next %c", target); + warni(_(" Skipping to next %c"), target); do c = skip_white_space(); while (c != target && c != EOF); - if (c != EOF) + if (c != EOF) ungetc(c, finput); } void -reader() +reader (void) { start_flag = 0; startval = NULL; /* start symbol not specified yet. */ @@ -190,15 +198,17 @@ reader() errtoken->user_token_number = 256; /* Value specified by posix. */ /* construct a token that represents all undefined literal tokens. */ /* it is always token number 2. */ - getsym("$undefined.")->class = STOKEN; + undeftoken = getsym("$undefined."); + undeftoken->class = STOKEN; + undeftoken->user_token_number = 2; /* Read the declaration section. Copy %{ ... %} groups to ftable and fdefines file. Also notice any %token, %left, etc. found there. */ - if (noparserflag) + if (noparserflag) fprintf(ftable, "\n/* Bison-generated parse tables, made from %s\n", infile); else fprintf(ftable, "\n/* A Bison parser, made from %s\n", infile); - fprintf(ftable, " by %s */\n\n", version_string); + fprintf(ftable, " by %s */\n\n", VERSION_STRING); fprintf(ftable, "#define YYBISON 1 /* Identify Bison output. */\n\n"); read_declarations(); /* start writing the guard and action files, if they are needed. */ @@ -224,19 +234,18 @@ reader() } void -reader_output_yylsp(f) - FILE *f; +reader_output_yylsp (FILE *f) { if (yylsp_needed) fprintf(f, LTYPESTR); } -/* read from finput until %% is seen. Discard the %%. -Handle any % declarations, -and copy the contents of any %{ ... %} groups to fattrs. */ +/* Read from finput until `%%' is seen. Discard the `%%'. Handle any + `%' declarations, and copy the contents of any `%{ ... %}' groups + to fattrs. */ void -read_declarations () +read_declarations (void) { register int c; register int tok; @@ -261,23 +270,23 @@ read_declarations () case TOKEN: parse_token_decl (STOKEN, SNTERM); break; - + case NTERM: parse_token_decl (SNTERM, STOKEN); break; - + case TYPE: parse_type_decl(); break; - + case START: parse_start_decl(); break; - + case UNION: parse_union_decl(); break; - + case EXPECT: parse_expect_decl(); break; @@ -312,16 +321,16 @@ read_declarations () break; default: - warns("unrecognized: %s", token_buffer); + warns(_("unrecognized: %s"), token_buffer); skip_to_char('%'); } } else if (c == EOF) - fatal("no input grammar"); + fatal(_("no input grammar")); else { char buff[100]; - sprintf(buff, "unknown character: %s", printable_version(c)); + sprintf(buff, _("unknown character: %s"), printable_version(c)); warn(buff); skip_to_char('%'); } @@ -333,7 +342,7 @@ read_declarations () The %{ has already been read. Return after reading the %}. */ void -copy_definition () +copy_definition (void) { register int c; register int match; @@ -360,7 +369,7 @@ copy_definition () case '%': after_percent = -1; break; - + case '\'': case '"': match = c; @@ -370,22 +379,22 @@ copy_definition () while (c != match) { if (c == EOF) - fatal("unterminated string at end of file"); + fatal(_("unterminated string at end of file")); if (c == '\n') { - warn("unterminated string"); + warn(_("unterminated string")); ungetc(c, finput); c = match; continue; } putc(c, fattrs); - + if (c == '\\') { c = getc(finput); if (c == EOF) - fatal("unterminated string at end of file"); + fatal(_("unterminated string at end of file")); putc(c, fattrs); if (c == '\n') lineno++; @@ -434,7 +443,7 @@ copy_definition () c = getc(finput); } else if (c == EOF) - fatal("unterminated comment in `%{' definition"); + fatal(_("unterminated comment in `%{' definition")); else { putc(c, fattrs); @@ -445,7 +454,7 @@ copy_definition () break; case EOF: - fatal("unterminated `%{' definition"); + fatal(_("unterminated `%{' definition")); default: putc(c, fattrs); @@ -472,8 +481,7 @@ For %token, what_is is STOKEN and what_is_not is SNTERM. For %nterm, the arguments are reversed. */ void -parse_token_decl (what_is, what_is_not) - int what_is, what_is_not; +parse_token_decl (int what_is, int what_is_not) { register int token = 0; register char *typename = 0; @@ -482,8 +490,13 @@ parse_token_decl (what_is, what_is_not) for (;;) { - if(ungetc(skip_white_space(), finput) == '%') + int tmp_char = ungetc (skip_white_space (), finput); + + if (tmp_char == '%') return; + if (tmp_char == EOF) + fatals ("Premature EOF after %s", token_buffer); + token = lex(); if (token == COMMA) { @@ -499,7 +512,7 @@ parse_token_decl (what_is, what_is_not) symbol = NULL; } else if (token == IDENTIFIER && *symval->tag == '\"' - && symbol) + && symbol) { translations = 1; symval->class = STOKEN; @@ -507,8 +520,8 @@ parse_token_decl (what_is, what_is_not) symval->user_token_number = symbol->user_token_number; symbol->user_token_number = SALIAS; - symval->alias = symbol; - symbol->alias = symval; + symval->alias = symbol; + symbol->alias = symval; symbol = NULL; nsyms--; /* symbol and symval combined are only one symbol */ @@ -519,7 +532,7 @@ parse_token_decl (what_is, what_is_not) symbol = symval; if (symbol->class == what_is_not) - warns("symbol %s redefined", symbol->tag); + warns(_("symbol %s redefined"), symbol->tag); symbol->class = what_is; if (what_is == SNTERM && oldclass != SNTERM) symbol->value = nvars++; @@ -529,7 +542,7 @@ parse_token_decl (what_is, what_is_not) if (symbol->type_name == NULL) symbol->type_name = typename; else if (strcmp(typename, symbol->type_name) != 0) - warns("type redeclaration for %s", symbol->tag); + warns(_("type redeclaration for %s"), symbol->tag); } } else if (symbol && token == NUMBER) @@ -539,8 +552,8 @@ parse_token_decl (what_is, what_is_not) } else { - warnss("`%s' is invalid in %s", - token_buffer, + warnss(_("`%s' is invalid in %s"), + token_buffer, (what_is == STOKEN) ? "%token" : "%nterm"); skip_to_char('%'); } @@ -548,7 +561,7 @@ parse_token_decl (what_is, what_is_not) } -/* parse what comes after %thong +/* parse what comes after %thong the full syntax is %thong token number literal the or number may be omitted. The number specifies the @@ -559,14 +572,14 @@ parse_token_decl (what_is, what_is_not) The ->user_token_number of the first is SALIAS and the ->user_token_number of the second is set to the number, if any, from the declaration. The two symbols are linked via pointers in their ->alias fields. - + during output_defines_table, the symbol is reported thereafter, only the literal string is retained it is the literal string that is output to yytname */ void -parse_thong_decl () +parse_thong_decl (void) { register int token; register struct bucket *symbol; @@ -585,9 +598,9 @@ parse_thong_decl () /* process first token */ - if (token != IDENTIFIER) + if (token != IDENTIFIER) { - warns("unrecognized item %s, expected an identifier", + warns(_("unrecognized item %s, expected an identifier"), token_buffer); skip_to_char('%'); return; @@ -598,7 +611,7 @@ parse_thong_decl () symbol = symval; token = lex(); /* get number or literal string */ - + if (token == NUMBER) { usrtoknum = numval; token = lex(); /* okay, did number, now get literal */ @@ -607,9 +620,9 @@ parse_thong_decl () /* process literal string token */ - if (token != IDENTIFIER || *symval->tag != '\"') + if (token != IDENTIFIER || *symval->tag != '\"') { - warns("expected string constant instead of %s", + warns(_("expected string constant instead of %s"), token_buffer); skip_to_char('%'); return; @@ -618,8 +631,8 @@ parse_thong_decl () symval->type_name = typename; symval->user_token_number = usrtoknum; - symval->alias = symbol; - symbol->alias = symval; + symval->alias = symbol; + symbol->alias = symval; nsyms--; /* symbol and symval combined are only one symbol */ } @@ -628,12 +641,12 @@ parse_thong_decl () /* parse what comes after %start */ void -parse_start_decl () +parse_start_decl (void) { if (start_flag) - warn("multiple %start declarations"); + warn(_("multiple %start declarations")); if (lex() != IDENTIFIER) - warn("invalid %start declaration"); + warn(_("invalid %start declaration")); else { start_flag = 1; @@ -646,14 +659,14 @@ parse_start_decl () /* read in a %type declaration and record its information for get_type_name to access */ void -parse_type_decl () +parse_type_decl (void) { register int k; register char *name; if (lex() != TYPENAME) { - warn("%type declaration has no "); + warn(_("%type declaration has no ")); skip_to_char('%'); return; } @@ -665,9 +678,12 @@ parse_type_decl () for (;;) { register int t; + int tmp_char = ungetc (skip_white_space (), finput); - if(ungetc(skip_white_space(), finput) == '%') + if (tmp_char == '%') return; + if (tmp_char == EOF) + fatals ("Premature EOF after %s", token_buffer); t = lex(); @@ -682,12 +698,12 @@ parse_type_decl () if (symval->type_name == NULL) symval->type_name = name; else if (strcmp(name, symval->type_name) != 0) - warns("type redeclaration for %s", symval->tag); + warns(_("type redeclaration for %s"), symval->tag); break; default: - warns("invalid %%type declaration due to item: `%s'", token_buffer); + warns(_("invalid %%type declaration due to item: `%s'"), token_buffer); skip_to_char('%'); } } @@ -699,8 +715,7 @@ parse_type_decl () /* assoc is either LEFT_ASSOC, RIGHT_ASSOC or NON_ASSOC. */ void -parse_assoc_decl (assoc) -int assoc; +parse_assoc_decl (int assoc) { register int k; register char *name = NULL; @@ -711,9 +726,12 @@ int assoc; for (;;) { register int t; + int tmp_char = ungetc (skip_white_space (), finput); - if(ungetc(skip_white_space(), finput) == '%') + if (tmp_char == '%') return; + if (tmp_char == EOF) + fatals ("Premature EOF after %s", token_buffer); t = lex(); @@ -731,18 +749,18 @@ int assoc; case IDENTIFIER: if (symval->prec != 0) - warns("redefining precedence of %s", symval->tag); + warns(_("redefining precedence of %s"), symval->tag); symval->prec = lastprec; symval->assoc = assoc; if (symval->class == SNTERM) - warns("symbol %s redefined", symval->tag); + warns(_("symbol %s redefined"), symval->tag); symval->class = STOKEN; if (name) { /* record the type, if one is specified */ if (symval->type_name == NULL) symval->type_name = name; else if (strcmp(name, symval->type_name) != 0) - warns("type redeclaration for %s", symval->tag); + warns(_("type redeclaration for %s"), symval->tag); } break; @@ -752,9 +770,9 @@ int assoc; symval->user_token_number = numval; translations = 1; } - else + else { - warns("invalid text (%s) - number should be after identifier", + warns(_("invalid text (%s) - number should be after identifier"), token_buffer); skip_to_char('%'); } @@ -764,7 +782,7 @@ int assoc; return; default: - warns("unexpected item: %s", token_buffer); + warns(_("unexpected item: %s"), token_buffer); skip_to_char('%'); } @@ -780,7 +798,7 @@ int assoc; definition of YYSTYPE, the type of elements of the parser value stack. */ void -parse_union_decl() +parse_union_decl (void) { register int c; register int count; @@ -788,7 +806,7 @@ parse_union_decl() int cplus_comment; if (typed) - warn("multiple %union declarations"); + warn(_("multiple %union declarations")); typed = 1; @@ -846,7 +864,7 @@ parse_union_decl() } } if (c == EOF) - fatal("unterminated comment at end of file"); + fatal(_("unterminated comment at end of file")); if (!cplus_comment && c == '*') { @@ -872,7 +890,7 @@ parse_union_decl() case '}': if (count == 0) - warn ("unmatched close-brace (`}')"); + warn (_("unmatched close-brace (`}')")); count--; if (count <= 0) { @@ -894,7 +912,7 @@ parse_union_decl() shift-reduce conflicts. */ void -parse_expect_decl() +parse_expect_decl (void) { register int c; register int count; @@ -916,7 +934,7 @@ parse_expect_decl() ungetc (c, finput); if (count <= 0 || count > 10) - warn("argument of %expect is not an integer"); + warn(_("argument of %expect is not an integer")); expected_conflicts = atoi (buffer); } @@ -925,18 +943,16 @@ parse_expect_decl() /* Get the data type (alternative in the union) of the value for symbol n in rule rule. */ char * -get_type_name(n, rule) -int n; -symbol_list *rule; +get_type_name (int n, symbol_list *rule) { - static char *msg = "invalid $ value"; + static char *msg = N_("invalid $ value"); register int i; register symbol_list *rp; if (n < 0) { - warn(msg); + warn(_(msg)); return NULL; } @@ -948,7 +964,7 @@ symbol_list *rule; rp = rp->next; if (rp == NULL || rp->sym == NULL) { - warn(msg); + warn(_(msg)); return NULL; } i++; @@ -958,17 +974,15 @@ symbol_list *rule; } -/* after %guard is seen in the input file, -copy the actual guard into the guards file. -If the guard is followed by an action, copy that into the actions file. -stack_offset is the number of values in the current rule so far, -which says where to find $0 with respect to the top of the stack, -for the simple parser in which the stack is not popped until after the guard is run. */ +/* After `%guard' is seen in the input file, copy the actual guard + into the guards file. If the guard is followed by an action, copy + that into the actions file. STACK_OFFSET is the number of values + in the current rule so far, which says where to find `$0' with + respect to the top of the stack, for the simple parser in which the + stack is not popped until after the guard is run. */ void -copy_guard(rule, stack_offset) -symbol_list *rule; -int stack_offset; +copy_guard (symbol_list *rule, int stack_offset) { register int c; register int n; @@ -984,7 +998,7 @@ int stack_offset; fprintf(fguard, "\ncase %d:\n", nrules); if (!nolinesflag) - fprintf(fguard, "#line %d \"%s\"\n", lineno, infile); + fprintf (fguard, "#line %d \"%s\"\n", lineno, infile); putc('{', fguard); count = 0; @@ -1009,9 +1023,9 @@ int stack_offset; putc(c, fguard); if (count > 0) count--; - else + else { - warn("unmatched right brace (`}')"); + warn(_("unmatched right brace (`}')")); c = getc(finput); /* skip it */ } break; @@ -1025,22 +1039,22 @@ int stack_offset; while (c != match) { if (c == EOF) - fatal("unterminated string at end of file"); - if (c == '\n') + fatal(_("unterminated string at end of file")); + if (c == '\n') { - warn("unterminated string"); + warn(_("unterminated string")); ungetc(c, finput); c = match; /* invent terminator */ continue; } putc(c, fguard); - + if (c == '\\') { c = getc(finput); if (c == EOF) - fatal("unterminated string"); + fatal(_("unterminated string")); putc(c, fguard); if (c == '\n') lineno++; @@ -1089,7 +1103,7 @@ int stack_offset; c = getc(finput); } else if (c == EOF) - fatal("unterminated comment"); + fatal(_("unterminated comment")); else { putc(c, fguard); @@ -1108,7 +1122,12 @@ int stack_offset; register char *cp = token_buffer; while ((c = getc(finput)) != '>' && c > 0) - *cp++ = c; + { + if (cp == token_buffer + maxtoken) + cp = grow_token_buffer(cp); + + *cp++ = c; + } *cp = 0; type_name = token_buffer; @@ -1118,18 +1137,18 @@ int stack_offset; if (c == '$') { fprintf(fguard, "yyval"); - if (!type_name) type_name = rule->sym->type_name; + if (!type_name) + type_name = rule->sym->type_name; if (type_name) fprintf(fguard, ".%s", type_name); if(!type_name && typed) - warns("$$ of `%s' has no declared type", rule->sym->tag); + warns(_("$$ of `%s' has no declared type"), rule->sym->tag); } - else if (isdigit(c) || c == '-') { ungetc (c, finput); - n = read_signed_integer(finput); - c = getc(finput); + n = read_signed_integer (finput); + c = getc (finput); if (!type_name && n > 0) type_name = get_type_name(n, rule); @@ -1138,11 +1157,11 @@ int stack_offset; if (type_name) fprintf(fguard, ".%s", type_name); if(!type_name && typed) - warnss("$%s of `%s' has no declared type", int_to_string(n), rule->sym->tag); + warnss(_("$%s of `%s' has no declared type"), int_to_string(n), rule->sym->tag); continue; } else - warni("$%s is invalid", printable_version(c)); + warns(_("$%s is invalid"), printable_version(c)); break; @@ -1156,7 +1175,7 @@ int stack_offset; } else { - warni("@%s is invalid", printable_version(c)); + warns(_("@%s is invalid"), printable_version(c)); n = 1; } @@ -1166,7 +1185,7 @@ int stack_offset; continue; case EOF: - fatal("unterminated %%guard clause"); + fatal(_("unterminated %%guard clause")); default: putc(c, fguard); @@ -1193,15 +1212,13 @@ int stack_offset; -/* Assuming that a { has just been seen, copy everything up to the matching } -into the actions file. -stack_offset is the number of values in the current rule so far, -which says where to find $0 with respect to the top of the stack. */ +/* Assuming that a `{' has just been seen, copy everything up to the + matching `}' into the actions file. STACK_OFFSET is the number of + values in the current rule so far, which says where to find `$0' + with respect to the top of the stack. */ void -copy_action(rule, stack_offset) -symbol_list *rule; -int stack_offset; +copy_action (symbol_list *rule, int stack_offset) { register int c; register int n; @@ -1212,12 +1229,13 @@ int stack_offset; int cplus_comment; /* offset is always 0 if parser has already popped the stack pointer */ - if (semantic_parser) stack_offset = 0; + if (semantic_parser) + stack_offset = 0; - fprintf(faction, "\ncase %d:\n", nrules); + fprintf (faction, "\ncase %d:\n", nrules); if (!nolinesflag) - fprintf(faction, "#line %d \"%s\"\n", lineno, infile); - putc('{', faction); + fprintf (faction, "#line %d \"%s\"\n", lineno, infile); + putc ('{', faction); count = 1; c = getc(finput); @@ -1248,13 +1266,13 @@ int stack_offset; { if (c == '\n') { - warn("unterminated string"); + warn(_("unterminated string")); ungetc(c, finput); c = match; continue; } else if (c == EOF) - fatal("unterminated string at end of file"); + fatal(_("unterminated string at end of file")); putc(c, faction); @@ -1262,7 +1280,7 @@ int stack_offset; { c = getc(finput); if (c == EOF) - fatal("unterminated string"); + fatal(_("unterminated string")); putc(c, faction); if (c == '\n') lineno++; @@ -1311,7 +1329,7 @@ int stack_offset; c = getc(finput); } else if (c == EOF) - fatal("unterminated comment"); + fatal(_("unterminated comment")); else { putc(c, faction); @@ -1330,7 +1348,12 @@ int stack_offset; register char *cp = token_buffer; while ((c = getc(finput)) != '>' && c > 0) - *cp++ = c; + { + if (cp == token_buffer + maxtoken) + cp = grow_token_buffer(cp); + + *cp++ = c; + } *cp = 0; type_name = token_buffer; value_components_used = 1; @@ -1340,11 +1363,13 @@ int stack_offset; if (c == '$') { fprintf(faction, "yyval"); - if (!type_name) type_name = get_type_name(0, rule); + if (!type_name) + type_name = get_type_name(0, rule); if (type_name) fprintf(faction, ".%s", type_name); - if(!type_name && typed) - warns("$$ of `%s' has no declared type", rule->sym->tag); + if(!type_name && typed) + warns(_("$$ of `%s' has no declared type"), + rule->sym->tag); } else if (isdigit(c) || c == '-') { @@ -1358,13 +1383,13 @@ int stack_offset; fprintf(faction, "yyvsp[%d]", n - stack_offset); if (type_name) fprintf(faction, ".%s", type_name); - if(!type_name && typed) - warnss("$%s of `%s' has no declared type", + if(!type_name && typed) + warnss(_("$%s of `%s' has no declared type"), int_to_string(n), rule->sym->tag); continue; } else - warni("$%s is invalid", printable_version(c)); + warns(_("$%s is invalid"), printable_version(c)); break; @@ -1378,7 +1403,7 @@ int stack_offset; } else { - warn("invalid @-construct"); + warn(_("invalid @-construct")); n = 1; } @@ -1388,7 +1413,7 @@ int stack_offset; continue; case EOF: - fatal("unmatched `{'"); + fatal(_("unmatched `{'")); default: putc(c, faction); @@ -1415,7 +1440,7 @@ int stack_offset; whose name cannot conflict with the user's names. */ bucket * -gensym() +gensym (void) { register bucket *sym; @@ -1436,10 +1461,10 @@ All guards and actions are copied out to the appropriate files, labelled by the rule number they apply to. */ void -readgram() +readgram (void) { register int t; - register bucket *lhs; + register bucket *lhs = NULL; register symbol_list *p; register symbol_list *p1; register bucket *bp; @@ -1470,18 +1495,18 @@ readgram() startval = lhs; start_flag = 1; } - + t = lex(); if (t != COLON) { - warn("ill-formed rule: initial symbol not followed by colon"); + warn(_("ill-formed rule: initial symbol not followed by colon")); unlex(t); } } if (nrules == 0 && t == BAR) { - warn("grammar starts with vertical bar"); + warn(_("grammar starts with vertical bar")); lhs = symval; /* BOGUS: use a random symval */ } /* start a new rule and record its lhs. */ @@ -1512,7 +1537,7 @@ readgram() nvars++; } else if (lhs->class == STOKEN) - warns("rule given for %s, which is a token", lhs->tag); + warns(_("rule given for %s, which is a token"), lhs->tag); /* read the rhs of the rule. */ @@ -1610,7 +1635,7 @@ readgram() if (t == PREC) { - warn("two @prec's in a row"); + warn(_("two @prec's in a row")); t = lex(); crule->ruleprec = symval; t = lex(); @@ -1618,7 +1643,7 @@ readgram() if (t == GUARD) { if (! semantic_parser) - warn("%%guard present but %%semantic_parser not specified"); + warn(_("%%guard present but %%semantic_parser not specified")); copy_guard(crule, rulelength); t = lex(); @@ -1626,7 +1651,7 @@ readgram() else if (t == LEFT_CURLY) { /* This case never occurs -wjh */ - if (actionflag) warn("two actions at end of one rule"); + if (actionflag) warn(_("two actions at end of one rule")); copy_action(crule, rulelength); actionflag = 1; xactions++; /* -wjh */ @@ -1638,16 +1663,16 @@ readgram() { if (lhs->type_name == 0 || first_rhs->type_name == 0 || strcmp(lhs->type_name,first_rhs->type_name)) - warnss("type clash (`%s' `%s') on default action", + warnss(_("type clash (`%s' `%s') on default action"), lhs->type_name ? lhs->type_name : "", first_rhs->type_name ? first_rhs->type_name : ""); } /* Warn if there is no default for $$ but we need one. */ else if (!xactions && !first_rhs && lhs->type_name != 0) - warn("empty rule for typed nonterminal, and no action"); + warn(_("empty rule for typed nonterminal, and no action")); if (t == SEMICOLON) t = lex(); - } + } #if 0 /* these things can appear as alternatives to rules. */ /* NO, they cannot. @@ -1688,7 +1713,7 @@ readgram() else { - warns("invalid input: %s", token_buffer); + warns(_("invalid input: %s"), token_buffer); t = lex(); } } @@ -1696,10 +1721,10 @@ readgram() /* grammar has been read. Do some checking */ if (nsyms > MAXSHORT) - fatals("too many symbols (tokens plus nonterminals); maximum %s", + fatals(_("too many symbols (tokens plus nonterminals); maximum %s"), int_to_string(MAXSHORT)); if (nrules == 0) - fatal("no rules in the input grammar"); + fatal(_("no rules in the input grammar")); if (typed == 0 /* JF put out same default YYSTYPE as YACC does */ && !value_components_used) @@ -1717,7 +1742,7 @@ readgram() for (bp = firstsymbol; bp; bp = bp->next) if (bp->class == SUNKNOWN) { - warns("symbol %s is used, but is not defined as a token and has no rules", + warns(_("symbol %s is used, but is not defined as a token and has no rules"), bp->tag); bp->class = SNTERM; bp->value = nvars++; @@ -1728,24 +1753,25 @@ readgram() void -record_rule_line () +record_rule_line (void) { /* Record each rule's source line number in rline table. */ if (nrules >= rline_allocated) { rline_allocated = nrules * 2; - rline = (short *) xrealloc (rline, - rline_allocated * sizeof (short)); + rline = (short *) xrealloc ((char *) rline, + rline_allocated * sizeof (short)); } rline[nrules] = lineno; } +#if 0 /* read in a %type declaration and record its information for get_type_name to access */ /* this is unused. it is only called from the #if 0 part of readgram */ static int -get_type() +get_type (void) { register int k; register int t; @@ -1753,9 +1779,9 @@ get_type() t = lex(); - if (t != TYPENAME) + if (t != TYPENAME) { - warn("ill-formed %type declaration"); + warn(_("ill-formed %type declaration")); return t; } @@ -1779,7 +1805,7 @@ get_type() if (symval->type_name == NULL) symval->type_name = name; else if (strcmp(name, symval->type_name) != 0) - warns("type redeclaration for %s", symval->tag); + warns(_("type redeclaration for %s"), symval->tag); break; @@ -1788,14 +1814,14 @@ get_type() } } } - +#endif /* assign symbol numbers, and write definition of token names into fdefines. Set up vectors tags and sprec of names and precedences of symbols. */ void -packsymbols() +packsymbols (void) { register bucket *bp; register int tokno = 1; @@ -1825,7 +1851,7 @@ packsymbols() { /* this symbol and its alias are a single token defn. allocate a tokno, and assign to both - check agreement of ->prec and ->assoc fields + check agreement of ->prec and ->assoc fields and make both the same */ if (bp->value == 0) @@ -1834,7 +1860,7 @@ packsymbols() if (bp->prec != bp->alias->prec) { if (bp->prec != 0 && bp->alias->prec != 0 && bp->user_token_number == SALIAS) - warnss("conflicting precedences for %s and %s", + warnss(_("conflicting precedences for %s and %s"), bp->tag, bp->alias->tag); if (bp->prec != 0) bp->alias->prec = bp->prec; else bp->prec = bp->alias->prec; @@ -1843,7 +1869,7 @@ packsymbols() if (bp->assoc != bp->alias->assoc) { if (bp->assoc != 0 && bp->alias->assoc != 0 && bp->user_token_number == SALIAS) - warnss("conflicting assoc values for %s and %s", + warnss(_("conflicting assoc values for %s and %s"), bp->tag, bp->alias->tag); if (bp->assoc != 0) bp->alias->assoc = bp->assoc; else bp->assoc = bp->alias->assoc; @@ -1883,14 +1909,14 @@ packsymbols() the internal token number for $undefined., which represents all invalid inputs. */ for (i = 0; i <= max_user_token_number; i++) - token_translations[i] = 2; + token_translations[i] = 2; for (bp = firstsymbol; bp; bp = bp->next) { if (bp->value >= ntokens) continue; /* non-terminal */ - if (bp->user_token_number == SALIAS) continue; + if (bp->user_token_number == SALIAS) continue; if (token_translations[bp->user_token_number] != 2) - warnsss("tokens %s and %s both assigned number %s", + warnsss(_("tokens %s and %s both assigned number %s"), tags[token_translations[bp->user_token_number]], bp->tag, int_to_string(bp->user_token_number)); @@ -1904,9 +1930,9 @@ packsymbols() output_token_defines(ftable); if (startval->class == SUNKNOWN) - fatals("the start symbol %s is undefined", startval->tag); + fatals(_("the start symbol %s is undefined"), startval->tag); else if (startval->class == STOKEN) - fatals("the start symbol %s is a token", startval->tag); + fatals(_("the start symbol %s is a token"), startval->tag); start_symbol = startval->value; @@ -1937,13 +1963,12 @@ packsymbols() #endif } } - -/* For named tokens, but not literal ones, define the name. - The value is the user token number. + +/* For named tokens, but not literal ones, define the name. + The value is the user token number. */ void -output_token_defines(file) -FILE *file; +output_token_defines (FILE *file) { bucket *bp; register char *cp, *symbol; @@ -1957,7 +1982,7 @@ FILE *file; if (bp->user_token_number == SALIAS) continue; if ('\'' == *symbol) continue; /* skip literal character */ if (bp == errtoken) continue; /* skip error token */ - if ('\"' == *symbol) + if ('\"' == *symbol) { /* use literal string only if given a symbol with an alias */ if (bp->alias) @@ -1972,8 +1997,8 @@ FILE *file; if (c != '\0') continue; fprintf(file, "#define\t%s\t%d\n", symbol, - ((translations && ! rawtoknumflag) - ? bp->user_token_number + ((translations && ! rawtoknumflag) + ? bp->user_token_number : bp->value)); if (semantic_parser) fprintf(file, "#define\tT%s\t%d\n", symbol, bp->value); @@ -1987,7 +2012,7 @@ FILE *file; /* convert the rules into the representation using rrhs, rlhs and ritems. */ void -packgram() +packgram (void) { register int itemno; register int ruleno; @@ -2048,8 +2073,7 @@ packgram() /* Read a signed integer from STREAM and return its value. */ int -read_signed_integer (stream) - FILE *stream; +read_signed_integer (FILE *stream) { register int c = getc(stream); register int sign = 1;