X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/0fb669f9d648dfdd7a39478a6b658511455ae966..5f3df3960e71e210c190001d2a34b2a73ea01d6a:/src/parse-gram.c diff --git a/src/parse-gram.c b/src/parse-gram.c index 0527917f..ba5b09bc 100644 --- a/src/parse-gram.c +++ b/src/parse-gram.c @@ -1,7 +1,7 @@ -/* A Bison parser, made by GNU Bison 2.0a. */ +/* A Bison parser, made by GNU Bison 2.0b. */ /* Skeleton parser for Yacc-like parsing with Bison, - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -215,18 +215,14 @@ static YYLTYPE lloc_default (YYLTYPE const *, int); gram_error (&yylloc, Msg) static void gram_error (location const *, char const *); -#define YYPRINT(File, Type, Value) \ - print_token_value (File, Type, &Value) -static void print_token_value (FILE *, int, YYSTYPE const *); - static void add_param (char const *, char *, location); -symbol_class current_class = unknown_sym; -uniqstr current_type = 0; +static symbol_class current_class = unknown_sym; +static uniqstr current_type = 0; symbol *current_lhs; location current_lhs_location; assoc current_assoc; -int current_prec = 0; +static int current_prec = 0; /* Enabling traces. */ @@ -242,8 +238,13 @@ int current_prec = 0; # define YYERROR_VERBOSE 1 #endif +/* Enabling the token table. */ +#ifndef YYTOKEN_TABLE +# define YYTOKEN_TABLE 0 +#endif + #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) -#line 82 "parse-gram.y" +#line 79 "parse-gram.y" typedef union YYSTYPE { symbol *symbol; symbol_list *list; @@ -252,8 +253,8 @@ typedef union YYSTYPE { assoc assoc; uniqstr uniqstr; } YYSTYPE; -/* Line 191 of yacc.c. */ -#line 257 "parse-gram.c" +/* Line 196 of yacc.c. */ +#line 258 "parse-gram.c" # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 # define YYSTYPE_IS_TRIVIAL 1 @@ -276,17 +277,36 @@ typedef struct YYLTYPE /* Copy the second part of user declarations. */ -/* Line 214 of yacc.c. */ -#line 281 "parse-gram.c" +/* Line 219 of yacc.c. */ +#line 282 "parse-gram.c" -#if ! defined (yyoverflow) || YYERROR_VERBOSE +#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) +# define YYSIZE_T __SIZE_TYPE__ +#endif +#if ! defined (YYSIZE_T) && defined (size_t) +# define YYSIZE_T size_t +#endif +#if ! defined (YYSIZE_T) && (defined (__STDC__) || defined (__cplusplus)) +# include /* INFRINGES ON USER NAME SPACE */ +# define YYSIZE_T size_t +#endif +#if ! defined (YYSIZE_T) +# define YYSIZE_T unsigned int +#endif -# ifndef YYFREE -# define YYFREE free +#ifndef YY_ +# if YYENABLE_NLS +# if ENABLE_NLS +# include /* INFRINGES ON USER NAME SPACE */ +# define YY_(msgid) dgettext ("bison-runtime", msgid) +# endif # endif -# ifndef YYMALLOC -# define YYMALLOC malloc +# ifndef YY_ +# define YY_(msgid) msgid # endif +#endif + +#if ! defined (yyoverflow) || YYERROR_VERBOSE /* The parser invokes alloca or malloc; define the necessary symbols. */ @@ -296,6 +316,10 @@ typedef struct YYLTYPE # define YYSTACK_ALLOC __builtin_alloca # else # define YYSTACK_ALLOC alloca +# if defined (__STDC__) || defined (__cplusplus) +# include /* INFRINGES ON USER NAME SPACE */ +# define YYINCLUDED_STDLIB_H +# endif # endif # endif # endif @@ -311,17 +335,31 @@ typedef struct YYLTYPE # define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2005 */ # endif # else -# if defined (__STDC__) || defined (__cplusplus) -# include /* INFRINGES ON USER NAME SPACE */ -# define YYSIZE_T size_t -# else -# define YYSIZE_T unsigned long int -# endif # define YYSTACK_ALLOC YYMALLOC # define YYSTACK_FREE YYFREE # ifndef YYSTACK_ALLOC_MAXIMUM # define YYSTACK_ALLOC_MAXIMUM ((YYSIZE_T) -1) # endif +# ifdef __cplusplus +extern "C" { +# endif +# ifndef YYMALLOC +# define YYMALLOC malloc +# if (! defined (malloc) && ! defined (YYINCLUDED_STDLIB_H) \ + && (defined (__STDC__) || defined (__cplusplus))) +void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ +# endif +# endif +# ifndef YYFREE +# define YYFREE free +# if (! defined (free) && ! defined (YYINCLUDED_STDLIB_H) \ + && (defined (__STDC__) || defined (__cplusplus))) +void free (void *); /* INFRINGES ON USER NAME SPACE */ +# endif +# endif +# ifdef __cplusplus +} +# endif # endif #endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */ @@ -408,7 +446,7 @@ union yyalloc #define YYUNDEFTOK 2 #define YYMAXUTOK 305 -#define YYTRANSLATE(YYX) \ +#define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) /* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */ @@ -491,32 +529,35 @@ static const yysigned_char yyrhs[] = /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const unsigned short int yyrline[] = { - 0, 175, 175, 183, 185, 189, 190, 191, 192, 193, - 194, 195, 196, 197, 198, 203, 207, 208, 209, 210, - 211, 212, 213, 214, 215, 216, 217, 218, 219, 223, - 224, 225, 229, 235, 242, 249, 253, 260, 260, 265, - 265, 270, 280, 295, 296, 297, 301, 302, 308, 309, - 314, 318, 323, 329, 335, 346, 347, 356, 357, 363, - 364, 369, 376, 376, 380, 381, 382, 387, 388, 390, - 392, 394, 396, 401, 402, 406, 412, 421, 426, 428 + 0, 188, 188, 196, 198, 202, 203, 204, 205, 206, + 207, 208, 209, 210, 211, 216, 220, 221, 222, 223, + 224, 225, 226, 227, 228, 229, 230, 231, 232, 236, + 237, 238, 242, 248, 255, 262, 266, 273, 273, 278, + 278, 283, 293, 308, 309, 310, 314, 315, 321, 322, + 327, 331, 336, 342, 348, 359, 360, 369, 370, 376, + 377, 382, 389, 389, 393, 394, 395, 400, 401, 403, + 405, 407, 409, 414, 415, 419, 425, 434, 439, 441 }; #endif -#if YYDEBUG || YYERROR_VERBOSE -/* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. +#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE +/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. First, the terminals, then, starting at YYNTOKENS, nonterminals. */ static const char *const yytname[] = { - "end of file", "error", "$undefined", "string", "integer", "%token", - "%nterm", "%type", "%destructor {...}", "%printer {...}", "%union {...}", - "%left", "%right", "%nonassoc", "%prec", "%dprec", "%merge", "%debug", - "%default-prec", "%define", "%defines", "%error-verbose", "%expect", - "%expect-rr", "%file-prefix", "%glr-parser", "%initial-action {...}", - "%lex-param {...}", "%locations", "%name-prefix", "%no-default-prec", - "%no-lines", "%nondeterministic-parser", "%output", "%parse-param {...}", - "%pure-parser", "%skeleton", "%start", "%token-table", "%verbose", - "%yacc", "type", "=", ";", "|", "identifier", "identifier:", "%%", - "%{...%}", "epilogue", "{...}", "$accept", "input", "declarations", + "\"end of file\"", "error", "$undefined", "\"string\"", "\"integer\"", + "\"%token\"", "\"%nterm\"", "\"%type\"", "\"%destructor {...}\"", + "\"%printer {...}\"", "\"%union {...}\"", "\"%left\"", "\"%right\"", + "\"%nonassoc\"", "\"%prec\"", "\"%dprec\"", "\"%merge\"", "\"%debug\"", + "\"%default-prec\"", "\"%define\"", "\"%defines\"", "\"%error-verbose\"", + "\"%expect\"", "\"%expect-rr\"", "\"%file-prefix\"", "\"%glr-parser\"", + "\"%initial-action {...}\"", "\"%lex-param {...}\"", "\"%locations\"", + "\"%name-prefix\"", "\"%no-default-prec\"", "\"%no-lines\"", + "\"%nondeterministic-parser\"", "\"%output\"", "\"%parse-param {...}\"", + "\"%pure-parser\"", "\"%skeleton\"", "\"%start\"", "\"%token-table\"", + "\"%verbose\"", "\"%yacc\"", "\"type\"", "\"=\"", "\";\"", "\"|\"", + "\"identifier\"", "\"identifier:\"", "\"%%\"", "\"%{...%}\"", + "\"epilogue\"", "\"{...}\"", "$accept", "input", "declarations", "declaration", "grammar_declaration", "symbol_declaration", "@1", "@2", "precedence_declaration", "precedence_declarator", "type.opt", "symbols.1", "symbol_def", "symbol_defs.1", "grammar", @@ -525,11 +566,6 @@ static const char *const yytname[] = }; #endif -/* INFRINGES ON USER NAME SPACE */ -#ifndef _ -# define _(msgid) msgid -#endif - # ifdef YYPRINT /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to token YYLEX-NUM. */ @@ -684,22 +720,6 @@ static const unsigned char yystos[] = 16, 50, 71, 72, 70, 71, 4, 41 }; -#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) -# define YYSIZE_T __SIZE_TYPE__ -#endif -#if ! defined (YYSIZE_T) && defined (size_t) -# define YYSIZE_T size_t -#endif -#if ! defined (YYSIZE_T) -# if defined (__STDC__) || defined (__cplusplus) -# include /* INFRINGES ON USER NAME SPACE */ -# define YYSIZE_T size_t -# endif -#endif -#if ! defined (YYSIZE_T) -# define YYSIZE_T unsigned int -#endif - #define yyerrok (yyerrstatus = 0) #define yyclearin (yychar = YYEMPTY) #define YYEMPTY (-2) @@ -729,8 +749,8 @@ do \ goto yybackup; \ } \ else \ - { \ - yyerror (_("syntax error: cannot back up")); \ + { \ + yyerror (YY_("syntax error: cannot back up")); \ YYERROR; \ } \ while (0) @@ -809,7 +829,7 @@ do { \ if (yydebug) \ { \ YYFPRINTF (stderr, "%s ", Title); \ - yysymprint (stderr, \ + yysymprint (stderr, \ Type, Value, Location); \ YYFPRINTF (stderr, "\n"); \ } \ @@ -830,7 +850,7 @@ yy_stack_print (bottom, top) short int *top; #endif { - YYFPRINTF (stderr, _("Stack now")); + YYFPRINTF (stderr, "Stack now"); for (/* Nothing. */; bottom <= top; ++bottom) YYFPRINTF (stderr, " %d", *bottom); YYFPRINTF (stderr, "\n"); @@ -857,13 +877,13 @@ yy_reduce_print (yyrule) #endif { int yyi; - unsigned int yylno = yyrline[yyrule]; - YYFPRINTF (stderr, _("Reducing stack by rule %d (line %u), "), + unsigned long int yylno = yyrline[yyrule]; + YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu), ", yyrule - 1, yylno); /* Print the symbols being reduced, and their result. */ for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++) - YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]); - YYFPRINTF (stderr, "-> %s\n", yytname [yyr1[yyrule]]); + YYFPRINTF (stderr, "%s ", yytname[yyrhs[yyi]]); + YYFPRINTF (stderr, "-> %s\n", yytname[yyr1[yyrule]]); } # define YY_REDUCE_PRINT(Rule) \ @@ -952,7 +972,55 @@ yystpcpy (yydest, yysrc) # endif # endif -#endif /* !YYERROR_VERBOSE */ +# ifndef yytnamerr +/* Copy to YYRES the contents of YYSTR after stripping away unnecessary + quotes and backslashes, so that it's suitable for yyerror. The + heuristic is that double-quoting is unnecessary unless the string + contains an apostrophe, a comma, or backslash (other than + backslash-backslash). YYSTR is taken from yytname. If YYRES is + null, do not copy; instead, return the length of what the result + would have been. */ +static YYSIZE_T +yytnamerr (char *yyres, const char *yystr) +{ + if (*yystr == '"') + { + size_t yyn = 0; + char const *yyp = yystr; + + for (;;) + switch (*++yyp) + { + case '\'': + case ',': + goto do_not_strip_quotes; + + case '\\': + if (*++yyp != '\\') + goto do_not_strip_quotes; + /* Fall through. */ + default: + if (yyres) + yyres[yyn] = *yyp; + yyn++; + break; + + case '"': + if (yyres) + yyres[yyn] = '\0'; + return yyn; + } + do_not_strip_quotes: ; + } + + if (! yyres) + return yystrlen (yystr); + + return yystpcpy (yyres, yystr) - yyres; +} +# endif + +#endif /* YYERROR_VERBOSE */ @@ -983,7 +1051,7 @@ yysymprint (yyoutput, yytype, yyvaluep, yylocationp) YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); YY_LOCATION_PRINT (yyoutput, *yylocationp); - fprintf (yyoutput, ": "); + YYFPRINTF (yyoutput, ": "); # ifdef YYPRINT if (yytype < YYNTOKENS) @@ -991,6 +1059,96 @@ yysymprint (yyoutput, yytype, yyvaluep, yylocationp) # endif switch (yytype) { + case 3: /* "\"string\"" */ +#line 165 "parse-gram.y" + { fprintf (stderr, "\"%s\"", (yyvaluep->chars)); }; +#line 1066 "parse-gram.c" + break; + case 4: /* "\"integer\"" */ +#line 178 "parse-gram.y" + { fprintf (stderr, "%d", (yyvaluep->integer)); }; +#line 1071 "parse-gram.c" + break; + case 8: /* "\"%destructor {...}\"" */ +#line 167 "parse-gram.y" + { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; +#line 1076 "parse-gram.c" + break; + case 9: /* "\"%printer {...}\"" */ +#line 171 "parse-gram.y" + { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; +#line 1081 "parse-gram.c" + break; + case 10: /* "\"%union {...}\"" */ +#line 172 "parse-gram.y" + { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; +#line 1086 "parse-gram.c" + break; + case 26: /* "\"%initial-action {...}\"" */ +#line 168 "parse-gram.y" + { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; +#line 1091 "parse-gram.c" + break; + case 27: /* "\"%lex-param {...}\"" */ +#line 169 "parse-gram.y" + { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; +#line 1096 "parse-gram.c" + break; + case 34: /* "\"%parse-param {...}\"" */ +#line 170 "parse-gram.y" + { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; +#line 1101 "parse-gram.c" + break; + case 41: /* "\"type\"" */ +#line 176 "parse-gram.y" + { fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); }; +#line 1106 "parse-gram.c" + break; + case 45: /* "\"identifier\"" */ +#line 180 "parse-gram.y" + { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; +#line 1111 "parse-gram.c" + break; + case 46: /* "\"identifier:\"" */ +#line 182 "parse-gram.y" + { fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); }; +#line 1116 "parse-gram.c" + break; + case 48: /* "\"%{...%}\"" */ +#line 174 "parse-gram.y" + { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; +#line 1121 "parse-gram.c" + break; + case 49: /* "\"epilogue\"" */ +#line 174 "parse-gram.y" + { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; +#line 1126 "parse-gram.c" + break; + case 50: /* "\"{...}\"" */ +#line 173 "parse-gram.y" + { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; +#line 1131 "parse-gram.c" + break; + case 71: /* "symbol" */ +#line 180 "parse-gram.y" + { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; +#line 1136 "parse-gram.c" + break; + case 72: /* "action" */ +#line 173 "parse-gram.y" + { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; +#line 1141 "parse-gram.c" + break; + case 73: /* "string_as_id" */ +#line 180 "parse-gram.y" + { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; +#line 1146 "parse-gram.c" + break; + case 74: /* "string_content" */ +#line 165 "parse-gram.y" + { fprintf (stderr, "\"%s\"", (yyvaluep->chars)); }; +#line 1151 "parse-gram.c" + break; default: break; } @@ -1070,7 +1228,7 @@ yyparse (void) #else int yyparse () - + ; #endif #endif { @@ -1154,7 +1312,7 @@ YYLTYPE yylloc; /* User initialization code. */ -#line 72 "parse-gram.y" +#line 69 "parse-gram.y" { /* Bison's grammar can initial empty locations, hence a default location is needed. */ @@ -1162,11 +1320,9 @@ YYLTYPE yylloc; yylloc.start.line = yylloc.end.line = 1; yylloc.start.column = yylloc.end.column = 0; } -/* Line 860 of yacc.c. */ -#line 1167 "parse-gram.c" - yyvsp[0] = yylval; - yylsp[0] = yylloc; - +/* Line 930 of yacc.c. */ +#line 1325 "parse-gram.c" + yylsp[0] = yylloc; goto yysetstate; /*------------------------------------------------------------. @@ -1199,7 +1355,7 @@ YYLTYPE yylloc; data in use in that stack, in bytes. This used to be a conditional around just the two extra args, but that might be undefined if yyoverflow is a macro. */ - yyoverflow (_("parser stack overflow"), + yyoverflow (YY_("memory exhausted"), &yyss1, yysize * sizeof (*yyssp), &yyvs1, yysize * sizeof (*yyvsp), &yyls1, yysize * sizeof (*yylsp), @@ -1210,11 +1366,11 @@ YYLTYPE yylloc; } #else /* no yyoverflow */ # ifndef YYSTACK_RELOCATE - goto yyoverflowlab; + goto yyexhaustedlab; # else /* Extend the stack our own way. */ if (YYMAXDEPTH <= yystacksize) - goto yyoverflowlab; + goto yyexhaustedlab; yystacksize *= 2; if (YYMAXDEPTH < yystacksize) yystacksize = YYMAXDEPTH; @@ -1224,7 +1380,7 @@ YYLTYPE yylloc; union yyalloc *yyptr = (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); if (! yyptr) - goto yyoverflowlab; + goto yyexhaustedlab; YYSTACK_RELOCATE (yyss); YYSTACK_RELOCATE (yyvs); YYSTACK_RELOCATE (yyls); @@ -1239,14 +1395,14 @@ YYLTYPE yylloc; yyvsp = yyvs + yysize - 1; yylsp = yyls + yysize - 1; - YYDPRINTF ((stderr, _("Stack size increased to %lu\n"), + YYDPRINTF ((stderr, "Stack size increased to %lu\n", (unsigned long int) yystacksize)); if (yyss + yystacksize - 1 <= yyssp) YYABORT; } - YYDPRINTF ((stderr, _("Entering state %d\n"), yystate)); + YYDPRINTF ((stderr, "Entering state %d\n", yystate)); goto yybackup; @@ -1270,19 +1426,19 @@ yybackup: /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */ if (yychar == YYEMPTY) { - YYDPRINTF ((stderr, _("Reading a token: "))); + YYDPRINTF ((stderr, "Reading a token: ")); yychar = YYLEX; } if (yychar <= YYEOF) { yychar = yytoken = YYEOF; - YYDPRINTF ((stderr, _("Now at end of input.\n"))); + YYDPRINTF ((stderr, "Now at end of input.\n")); } else { yytoken = YYTRANSLATE (yychar); - YY_SYMBOL_PRINT (_("Next token is"), yytoken, &yylval, &yylloc); + YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc); } /* If the proper action on seeing token YYTOKEN is to reduce or to @@ -1303,7 +1459,7 @@ yybackup: YYACCEPT; /* Shift the look-ahead token. */ - YY_SYMBOL_PRINT (_("Shifting"), yytoken, &yylval, &yylloc); + YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); /* Discard the token being shifted unless it is eof. */ if (yychar != YYEOF) @@ -1354,47 +1510,47 @@ yyreduce: switch (yyn) { case 6: -#line 190 "parse-gram.y" +#line 203 "parse-gram.y" { prologue_augment ((yyvsp[0].chars), (yylsp[0])); } break; case 7: -#line 191 "parse-gram.y" +#line 204 "parse-gram.y" { debug_flag = true; } break; case 8: -#line 192 "parse-gram.y" +#line 205 "parse-gram.y" { muscle_insert ((yyvsp[-1].chars), (yyvsp[0].chars)); } break; case 9: -#line 193 "parse-gram.y" +#line 206 "parse-gram.y" { defines_flag = true; } break; case 10: -#line 194 "parse-gram.y" +#line 207 "parse-gram.y" { error_verbose = true; } break; case 11: -#line 195 "parse-gram.y" +#line 208 "parse-gram.y" { expected_sr_conflicts = (yyvsp[0].integer); } break; case 12: -#line 196 "parse-gram.y" +#line 209 "parse-gram.y" { expected_rr_conflicts = (yyvsp[0].integer); } break; case 13: -#line 197 "parse-gram.y" +#line 210 "parse-gram.y" { spec_file_prefix = (yyvsp[0].chars); } break; case 14: -#line 199 "parse-gram.y" +#line 212 "parse-gram.y" { nondeterministic_parser = true; glr_parser = true; @@ -1402,81 +1558,81 @@ yyreduce: break; case 15: -#line 204 "parse-gram.y" +#line 217 "parse-gram.y" { muscle_code_grow ("initial_action", (yyvsp[0].chars), (yylsp[0])); } break; case 16: -#line 207 "parse-gram.y" +#line 220 "parse-gram.y" { add_param ("lex_param", (yyvsp[0].chars), (yylsp[0])); } break; case 17: -#line 208 "parse-gram.y" +#line 221 "parse-gram.y" { locations_flag = true; } break; case 18: -#line 209 "parse-gram.y" +#line 222 "parse-gram.y" { spec_name_prefix = (yyvsp[0].chars); } break; case 19: -#line 210 "parse-gram.y" +#line 223 "parse-gram.y" { no_lines_flag = true; } break; case 20: -#line 211 "parse-gram.y" +#line 224 "parse-gram.y" { nondeterministic_parser = true; } break; case 21: -#line 212 "parse-gram.y" +#line 225 "parse-gram.y" { spec_outfile = (yyvsp[0].chars); } break; case 22: -#line 213 "parse-gram.y" +#line 226 "parse-gram.y" { add_param ("parse_param", (yyvsp[0].chars), (yylsp[0])); } break; case 23: -#line 214 "parse-gram.y" +#line 227 "parse-gram.y" { pure_parser = true; } break; case 24: -#line 215 "parse-gram.y" +#line 228 "parse-gram.y" { skeleton = (yyvsp[0].chars); } break; case 25: -#line 216 "parse-gram.y" +#line 229 "parse-gram.y" { token_table_flag = true; } break; case 26: -#line 217 "parse-gram.y" +#line 230 "parse-gram.y" { report_flag = report_states; } break; case 27: -#line 218 "parse-gram.y" +#line 231 "parse-gram.y" { yacc_flag = true; } break; case 31: -#line 226 "parse-gram.y" +#line 239 "parse-gram.y" { grammar_start_symbol_set ((yyvsp[0].symbol), (yylsp[0])); } break; case 32: -#line 230 "parse-gram.y" +#line 243 "parse-gram.y" { typed = true; MUSCLE_INSERT_INT ("stype_line", (yylsp[0]).start.line); @@ -1485,7 +1641,7 @@ yyreduce: break; case 33: -#line 236 "parse-gram.y" +#line 249 "parse-gram.y" { symbol_list *list; for (list = (yyvsp[0].list); list; list = list->next) @@ -1495,7 +1651,7 @@ yyreduce: break; case 34: -#line 243 "parse-gram.y" +#line 256 "parse-gram.y" { symbol_list *list; for (list = (yyvsp[0].list); list; list = list->next) @@ -1505,26 +1661,26 @@ yyreduce: break; case 35: -#line 250 "parse-gram.y" +#line 263 "parse-gram.y" { default_prec = true; } break; case 36: -#line 254 "parse-gram.y" +#line 267 "parse-gram.y" { default_prec = false; } break; case 37: -#line 260 "parse-gram.y" +#line 273 "parse-gram.y" { current_class = nterm_sym; } break; case 38: -#line 261 "parse-gram.y" +#line 274 "parse-gram.y" { current_class = unknown_sym; current_type = NULL; @@ -1532,12 +1688,12 @@ yyreduce: break; case 39: -#line 265 "parse-gram.y" +#line 278 "parse-gram.y" { current_class = token_sym; } break; case 40: -#line 266 "parse-gram.y" +#line 279 "parse-gram.y" { current_class = unknown_sym; current_type = NULL; @@ -1545,7 +1701,7 @@ yyreduce: break; case 41: -#line 271 "parse-gram.y" +#line 284 "parse-gram.y" { symbol_list *list; for (list = (yyvsp[0].list); list; list = list->next) @@ -1555,7 +1711,7 @@ yyreduce: break; case 42: -#line 281 "parse-gram.y" +#line 294 "parse-gram.y" { symbol_list *list; ++current_prec; @@ -1570,49 +1726,49 @@ yyreduce: break; case 43: -#line 295 "parse-gram.y" +#line 308 "parse-gram.y" { (yyval.assoc) = left_assoc; } break; case 44: -#line 296 "parse-gram.y" +#line 309 "parse-gram.y" { (yyval.assoc) = right_assoc; } break; case 45: -#line 297 "parse-gram.y" +#line 310 "parse-gram.y" { (yyval.assoc) = non_assoc; } break; case 46: -#line 301 "parse-gram.y" +#line 314 "parse-gram.y" { current_type = NULL; } break; case 47: -#line 302 "parse-gram.y" +#line 315 "parse-gram.y" { current_type = (yyvsp[0].uniqstr); } break; case 48: -#line 308 "parse-gram.y" +#line 321 "parse-gram.y" { (yyval.list) = symbol_list_new ((yyvsp[0].symbol), (yylsp[0])); } break; case 49: -#line 309 "parse-gram.y" +#line 322 "parse-gram.y" { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), (yyvsp[0].symbol), (yylsp[0])); } break; case 50: -#line 315 "parse-gram.y" +#line 328 "parse-gram.y" { current_type = (yyvsp[0].uniqstr); } break; case 51: -#line 319 "parse-gram.y" +#line 332 "parse-gram.y" { symbol_class_set ((yyvsp[0].symbol), current_class, (yylsp[0])); symbol_type_set ((yyvsp[0].symbol), current_type, (yylsp[0])); @@ -1620,7 +1776,7 @@ yyreduce: break; case 52: -#line 324 "parse-gram.y" +#line 337 "parse-gram.y" { symbol_class_set ((yyvsp[-1].symbol), current_class, (yylsp[-1])); symbol_type_set ((yyvsp[-1].symbol), current_type, (yylsp[-1])); @@ -1629,7 +1785,7 @@ yyreduce: break; case 53: -#line 330 "parse-gram.y" +#line 343 "parse-gram.y" { symbol_class_set ((yyvsp[-1].symbol), current_class, (yylsp[-1])); symbol_type_set ((yyvsp[-1].symbol), current_type, (yylsp[-1])); @@ -1638,7 +1794,7 @@ yyreduce: break; case 54: -#line 336 "parse-gram.y" +#line 349 "parse-gram.y" { symbol_class_set ((yyvsp[-2].symbol), current_class, (yylsp[-2])); symbol_type_set ((yyvsp[-2].symbol), current_type, (yylsp[-2])); @@ -1648,7 +1804,7 @@ yyreduce: break; case 60: -#line 365 "parse-gram.y" +#line 378 "parse-gram.y" { if (yacc_flag) complain_at ((yyloc), _("POSIX forbids declarations in the grammar")); @@ -1656,74 +1812,74 @@ yyreduce: break; case 61: -#line 370 "parse-gram.y" +#line 383 "parse-gram.y" { yyerrok; } break; case 62: -#line 376 "parse-gram.y" +#line 389 "parse-gram.y" { current_lhs = (yyvsp[0].symbol); current_lhs_location = (yylsp[0]); } break; case 64: -#line 380 "parse-gram.y" +#line 393 "parse-gram.y" { grammar_rule_end ((yylsp[0])); } break; case 65: -#line 381 "parse-gram.y" +#line 394 "parse-gram.y" { grammar_rule_end ((yylsp[0])); } break; case 67: -#line 387 "parse-gram.y" +#line 400 "parse-gram.y" { grammar_rule_begin (current_lhs, current_lhs_location); } break; case 68: -#line 389 "parse-gram.y" +#line 402 "parse-gram.y" { grammar_current_rule_symbol_append ((yyvsp[0].symbol), (yylsp[0])); } break; case 69: -#line 391 "parse-gram.y" +#line 404 "parse-gram.y" { grammar_current_rule_action_append ((yyvsp[0].chars), (yylsp[0])); } break; case 70: -#line 393 "parse-gram.y" +#line 406 "parse-gram.y" { grammar_current_rule_prec_set ((yyvsp[0].symbol), (yylsp[0])); } break; case 71: -#line 395 "parse-gram.y" +#line 408 "parse-gram.y" { grammar_current_rule_dprec_set ((yyvsp[0].integer), (yylsp[0])); } break; case 72: -#line 397 "parse-gram.y" +#line 410 "parse-gram.y" { grammar_current_rule_merge_set ((yyvsp[0].uniqstr), (yylsp[0])); } break; case 73: -#line 401 "parse-gram.y" +#line 414 "parse-gram.y" { (yyval.symbol) = (yyvsp[0].symbol); } break; case 74: -#line 402 "parse-gram.y" +#line 415 "parse-gram.y" { (yyval.symbol) = (yyvsp[0].symbol); } break; case 75: -#line 407 "parse-gram.y" +#line 420 "parse-gram.y" { (yyval.chars) = (yyvsp[0].chars); } break; case 76: -#line 413 "parse-gram.y" +#line 426 "parse-gram.y" { (yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[0].chars)), (yylsp[0])); symbol_class_set ((yyval.symbol), token_sym, (yylsp[0])); @@ -1731,12 +1887,12 @@ yyreduce: break; case 77: -#line 422 "parse-gram.y" +#line 435 "parse-gram.y" { (yyval.chars) = (yyvsp[0].chars); } break; case 79: -#line 429 "parse-gram.y" +#line 442 "parse-gram.y" { muscle_code_grow ("epilogue", (yyvsp[0].chars), (yylsp[0])); scanner_last_string_free (); @@ -1747,8 +1903,8 @@ yyreduce: default: break; } -/* Line 1056 of yacc.c. */ -#line 1752 "parse-gram.c" +/* Line 1126 of yacc.c. */ +#line 1908 "parse-gram.c" yyvsp -= yylen; yyssp -= yylen; @@ -1788,7 +1944,7 @@ yyerrlab: if (YYPACT_NINF < yyn && yyn < YYLAST) { int yytype = YYTRANSLATE (yychar); - YYSIZE_T yysize0 = yystrlen (yytname[yytype]); + YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]); YYSIZE_T yysize = yysize0; YYSIZE_T yysize1; int yysize_overflow = 0; @@ -1800,11 +1956,11 @@ yyerrlab: #if 0 /* This is so xgettext sees the translatable formats that are constructed on the fly. */ - _("syntax error, unexpected %s"); - _("syntax error, unexpected %s, expecting %s"); - _("syntax error, unexpected %s, expecting %s or %s"); - _("syntax error, unexpected %s, expecting %s or %s or %s"); - _("syntax error, unexpected %s, expecting %s or %s or %s or %s"); + YY_("syntax error, unexpected %s"); + YY_("syntax error, unexpected %s, expecting %s"); + YY_("syntax error, unexpected %s, expecting %s or %s"); + YY_("syntax error, unexpected %s, expecting %s or %s or %s"); + YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"); #endif char *yyfmt; char const *yyf; @@ -1840,15 +1996,15 @@ yyerrlab: break; } yyarg[yycount++] = yytname[yyx]; - yysize1 = yysize + yystrlen (yytname[yyx]); + yysize1 = yysize + yytnamerr (0, yytname[yyx]); yysize_overflow |= yysize1 < yysize; yysize = yysize1; yyfmt = yystpcpy (yyfmt, yyprefix); yyprefix = yyor; } - yyf = _(yyformat); - yysize1 = yysize + strlen (yyf); + yyf = YY_(yyformat); + yysize1 = yysize + yystrlen (yyf); yysize_overflow |= yysize1 < yysize; yysize = yysize1; @@ -1865,7 +2021,7 @@ yyerrlab: { if (*yyp == '%' && yyf[1] == 's' && yyi < yycount) { - yyp = yystpcpy (yyp, yyarg[yyi++]); + yyp += yytnamerr (yyp, yyarg[yyi++]); yyf += 2; } else @@ -1878,11 +2034,14 @@ yyerrlab: YYSTACK_FREE (yymsg); } else - yyerror (_("syntax error; also memory exhausted")); + { + yyerror (YY_("syntax error")); + goto yyexhaustedlab; + } } else #endif /* YYERROR_VERBOSE */ - yyerror (_("syntax error")); + yyerror (YY_("syntax error")); } yyerror_range[0] = yylloc; @@ -1894,14 +2053,13 @@ yyerrlab: if (yychar <= YYEOF) { - /* If at end of input, pop the error token, - then the rest of the stack, then return failure. */ + /* Return failure if at end of input. */ if (yychar == YYEOF) YYABORT; } else { - yydestruct (_("Error: discarding"), yytoken, &yylval, &yylloc); + yydestruct ("Error: discarding", yytoken, &yylval, &yylloc); yychar = YYEMPTY; } } @@ -1955,7 +2113,7 @@ yyerrlab1: YYABORT; yyerror_range[0] = *yylsp; - yydestruct (_("Error: popping"), yystos[yystate], yyvsp, yylsp); + yydestruct ("Error: popping", yystos[yystate], yyvsp, yylsp); YYPOPSTACK; yystate = *yyssp; YY_STACK_PRINT (yyss, yyssp); @@ -1973,7 +2131,7 @@ yyerrlab1: *++yylsp = yyloc; /* Shift the error token. */ - YY_SYMBOL_PRINT (_("Shifting"), yystos[yyn], yyvsp, yylsp); + YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp); yystate = yyn; goto yynewstate; @@ -1990,35 +2148,29 @@ yyacceptlab: | yyabortlab -- YYABORT comes here. | `-----------------------------------*/ yyabortlab: - yydestruct (_("Error: discarding lookahead"), - yytoken, &yylval, &yylloc); - yychar = YYEMPTY; yyresult = 1; goto yyreturn; #ifndef yyoverflow -/*----------------------------------------------. -| yyoverflowlab -- parser overflow comes here. | -`----------------------------------------------*/ -yyoverflowlab: - yyerror (_("parser stack overflow")); - yydestruct (_("Error: discarding lookahead"), - yytoken, &yylval, &yylloc); +/*-------------------------------------------------. +| yyexhaustedlab -- memory exhaustion comes here. | +`-------------------------------------------------*/ +yyexhaustedlab: + yyerror (YY_("memory exhausted")); yyresult = 2; /* Fall through. */ #endif yyreturn: - if (yyssp != yyss) - for (;;) - { - yyerror_range[0] = *yylsp; - YYPOPSTACK; - if (yyssp == yyss) - break; - yydestruct (_("Error: popping"), - yystos[*yyssp], yyvsp, yylsp); - } + if (yychar != YYEOF && yychar != YYEMPTY) + yydestruct ("Error: discarding lookahead", + yytoken, &yylval, &yylloc); + while (yyssp != yyss) + { + yydestruct ("Error: popping", + yystos[*yyssp], yyvsp, yylsp); + YYPOPSTACK; + } #ifndef yyoverflow if (yyss != yyssa) YYSTACK_FREE (yyss); @@ -2027,7 +2179,7 @@ yyreturn: } -#line 435 "parse-gram.y" +#line 448 "parse-gram.y" @@ -2112,49 +2264,6 @@ add_param (char const *type, char *decl, location loc) scanner_last_string_free (); } -/*----------------------------------------------------. -| When debugging the parser, display tokens' values. | -`----------------------------------------------------*/ - -static void -print_token_value (FILE *file, int type, YYSTYPE const *value) -{ - fputc (' ', file); - switch (type) - { - case ID: - fprintf (file, " = %s", value->symbol->tag); - break; - - case INT: - fprintf (file, " = %d", value->integer); - break; - - case STRING: - fprintf (file, " = \"%s\"", value->chars); - break; - - case TYPE: - fprintf (file, " = <%s>", value->uniqstr); - break; - - case BRACED_CODE: - case PERCENT_DESTRUCTOR: - case PERCENT_LEX_PARAM: - case PERCENT_PARSE_PARAM: - case PERCENT_PRINTER: - case PERCENT_UNION: - case PROLOGUE: - case EPILOGUE: - fprintf (file, " = {{ %s }}", value->chars); - break; - - default: - fprintf (file, "unknown token type"); - break; - } -} - static void gram_error (location const *loc, char const *msg) {