From: Paul Eggert Date: Thu, 1 Dec 2005 20:04:06 +0000 (+0000) Subject: Regenerate. X-Git-Tag: v2.3b~565 X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/66809587a752c08659929fc639d3582cd7d5762d Regenerate. --- diff --git a/src/parse-gram.c b/src/parse-gram.c index b62ba6bb..454fb3c7 100644 --- a/src/parse-gram.c +++ b/src/parse-gram.c @@ -18,13 +18,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* As a special exception, when this file is copied by Bison into a - Bison output file, you may use that output file without restriction. - This special exception was added by the Free Software Foundation - in version 1.24 of Bison. */ +/* As a special exception, when this parser skeleton is copied by + Bison into a Bison output file, you may use that output file + without restriction. This special exception was added by the Free + Software Foundation for C LALR(1) parsers in version 1.24 of + Bison. */ -/* Written by Richard Stallman by simplifying the original so called - ``semantic'' parser. */ +/* C LALR(1) parser skeleton written by Richard Stallman, by + simplifying the original so-called "semantic" parser. */ /* All symbols defined below should begin with yy or YY, to avoid infringing on user name space. This should be done even for local @@ -172,7 +173,7 @@ /* Copy the first part of user declarations. */ -#line 1 "../../src/parse-gram.y" +#line 1 "parse-gram.y" /* Bison Grammar Parser -*- C -*- Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. @@ -253,7 +254,7 @@ static int current_prec = 0; #endif #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) -#line 82 "../../src/parse-gram.y" +#line 82 "parse-gram.y" typedef union YYSTYPE { symbol *symbol; symbol_list *list; @@ -262,8 +263,8 @@ typedef union YYSTYPE { assoc assoc; uniqstr uniqstr; } YYSTYPE; -/* Line 196 of yacc.c. */ -#line 267 "../../src/parse-gram.c" +/* Line 197 of yacc.c. */ +#line 268 "parse-gram.c" # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 # define YYSTYPE_IS_TRIVIAL 1 @@ -286,8 +287,8 @@ typedef struct YYLTYPE /* Copy the second part of user declarations. */ -/* Line 219 of yacc.c. */ -#line 291 "../../src/parse-gram.c" +/* Line 220 of yacc.c. */ +#line 292 "parse-gram.c" /* Define YYMODERN_C if this compiler supports C89 or better. If __STDC__ is defined, the compiler is modern. IBM xlc 7.0 when run @@ -875,6 +876,134 @@ do { \ } \ } while (/*CONSTCOND*/ 0) +/*--------------------------------. +| Print this symbol on YYOUTPUT. | +`--------------------------------*/ + +#if defined (__STDC__) || defined (__C99__FUNC__) || defined (__cplusplus) +static void +yysymprint (FILE *yyoutput, int yytype, const YYSTYPE * const yyvaluep, const YYLTYPE * const yylocationp) +#else +static void +yysymprint (yyoutput, yytype, yyvaluep, yylocationp) + FILE *yyoutput; + int yytype; + const YYSTYPE * const yyvaluep; + const YYLTYPE * const yylocationp; +#endif +{ + YYUSE (yyvaluep); + YYUSE (yylocationp); + if (yytype < YYNTOKENS) + YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); + else + YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); + + YY_LOCATION_PRINT (yyoutput, *yylocationp); + YYFPRINTF (yyoutput, ": "); + +# ifdef YYPRINT + if (yytype < YYNTOKENS) + YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); +# endif + switch (yytype) + { + case 3: /* "\"string\"" */ +#line 169 "parse-gram.y" + { fprintf (stderr, "\"%s\"", (yyvaluep->chars)); }; +#line 915 "parse-gram.c" + break; + case 4: /* "\"integer\"" */ +#line 182 "parse-gram.y" + { fprintf (stderr, "%d", (yyvaluep->integer)); }; +#line 920 "parse-gram.c" + break; + case 8: /* "\"%destructor {...}\"" */ +#line 171 "parse-gram.y" + { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; +#line 925 "parse-gram.c" + break; + case 9: /* "\"%printer {...}\"" */ +#line 175 "parse-gram.y" + { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; +#line 930 "parse-gram.c" + break; + case 10: /* "\"%union {...}\"" */ +#line 176 "parse-gram.y" + { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; +#line 935 "parse-gram.c" + break; + case 26: /* "\"%initial-action {...}\"" */ +#line 172 "parse-gram.y" + { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; +#line 940 "parse-gram.c" + break; + case 27: /* "\"%lex-param {...}\"" */ +#line 173 "parse-gram.y" + { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; +#line 945 "parse-gram.c" + break; + case 34: /* "\"%parse-param {...}\"" */ +#line 174 "parse-gram.y" + { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; +#line 950 "parse-gram.c" + break; + case 42: /* "\"type\"" */ +#line 180 "parse-gram.y" + { fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); }; +#line 955 "parse-gram.c" + break; + case 46: /* "\"identifier\"" */ +#line 184 "parse-gram.y" + { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; +#line 960 "parse-gram.c" + break; + case 47: /* "\"identifier:\"" */ +#line 186 "parse-gram.y" + { fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); }; +#line 965 "parse-gram.c" + break; + case 49: /* "\"%{...%}\"" */ +#line 178 "parse-gram.y" + { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; +#line 970 "parse-gram.c" + break; + case 50: /* "\"epilogue\"" */ +#line 178 "parse-gram.y" + { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; +#line 975 "parse-gram.c" + break; + case 51: /* "\"{...}\"" */ +#line 177 "parse-gram.y" + { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; +#line 980 "parse-gram.c" + break; + case 72: /* "symbol" */ +#line 184 "parse-gram.y" + { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; +#line 985 "parse-gram.c" + break; + case 73: /* "action" */ +#line 177 "parse-gram.y" + { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; +#line 990 "parse-gram.c" + break; + case 74: /* "string_as_id" */ +#line 184 "parse-gram.y" + { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; +#line 995 "parse-gram.c" + break; + case 75: /* "string_content" */ +#line 169 "parse-gram.y" + { fprintf (stderr, "\"%s\"", (yyvaluep->chars)); }; +#line 1000 "parse-gram.c" + break; + default: + break; + } + YYFPRINTF (yyoutput, ")"); +} + /*------------------------------------------------------------------. | yy_stack_print -- Print the state stack from its BOTTOM up to its | | TOP (included). | @@ -909,27 +1038,36 @@ do { \ #if defined (__STDC__) || defined (__C99__FUNC__) || defined (__cplusplus) static void -yy_reduce_print (int yyrule) +yy_reduce_print (YYSTYPE *yyvsp, YYLTYPE *yylsp, int yyrule) #else static void -yy_reduce_print (yyrule) +yy_reduce_print (yyvsp, yylsp, yyrule + ) + YYSTYPE *yyvsp; + YYLTYPE *yylsp; int yyrule; #endif { + int yynrhs = yyr2[yyrule]; int yyi; unsigned long int yylno = yyrline[yyrule]; - YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu), ", + YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n", 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]]); + /* The symbols being reduced. */ + for (yyi = 0; yyi < yynrhs; yyi++) + { + fprintf (stderr, " $%d = ", yyi + 1); + yysymprint (stderr, yyrhs[yyprhs[yyrule] + yyi], + &(yyvsp[(yyi + 1) - (yynrhs)]) + , &(yylsp[(yyi + 1) - (yynrhs)]) ); + fprintf (stderr, "\n"); + } } # define YY_REDUCE_PRINT(Rule) \ do { \ if (yydebug) \ - yy_reduce_print (Rule); \ + yy_reduce_print (yyvsp, yylsp, Rule); \ } while (/*CONSTCOND*/ 0) /* Nonzero means print parse trace. It is left uninitialized so that @@ -1170,136 +1308,6 @@ yysyntax_error (char *yyresult, int yystate, int yychar) #endif /* YYERROR_VERBOSE */ -#if YYDEBUG -/*--------------------------------. -| Print this symbol on YYOUTPUT. | -`--------------------------------*/ - -#if defined (__STDC__) || defined (__C99__FUNC__) || defined (__cplusplus) -static void -yysymprint (FILE *yyoutput, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocationp) -#else -static void -yysymprint (yyoutput, yytype, yyvaluep, yylocationp) - FILE *yyoutput; - int yytype; - YYSTYPE *yyvaluep; - YYLTYPE *yylocationp; -#endif -{ - YYUSE (yyvaluep); - YYUSE (yylocationp); - - if (yytype < YYNTOKENS) - YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); - else - YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); - - YY_LOCATION_PRINT (yyoutput, *yylocationp); - YYFPRINTF (yyoutput, ": "); - -# ifdef YYPRINT - if (yytype < YYNTOKENS) - YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); -# endif - switch (yytype) - { - case 3: /* "\"string\"" */ -#line 169 "../../src/parse-gram.y" - { fprintf (stderr, "\"%s\"", (yyvaluep->chars)); }; -#line 1211 "../../src/parse-gram.c" - break; - case 4: /* "\"integer\"" */ -#line 182 "../../src/parse-gram.y" - { fprintf (stderr, "%d", (yyvaluep->integer)); }; -#line 1216 "../../src/parse-gram.c" - break; - case 8: /* "\"%destructor {...}\"" */ -#line 171 "../../src/parse-gram.y" - { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -#line 1221 "../../src/parse-gram.c" - break; - case 9: /* "\"%printer {...}\"" */ -#line 175 "../../src/parse-gram.y" - { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -#line 1226 "../../src/parse-gram.c" - break; - case 10: /* "\"%union {...}\"" */ -#line 176 "../../src/parse-gram.y" - { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -#line 1231 "../../src/parse-gram.c" - break; - case 26: /* "\"%initial-action {...}\"" */ -#line 172 "../../src/parse-gram.y" - { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -#line 1236 "../../src/parse-gram.c" - break; - case 27: /* "\"%lex-param {...}\"" */ -#line 173 "../../src/parse-gram.y" - { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -#line 1241 "../../src/parse-gram.c" - break; - case 34: /* "\"%parse-param {...}\"" */ -#line 174 "../../src/parse-gram.y" - { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -#line 1246 "../../src/parse-gram.c" - break; - case 42: /* "\"type\"" */ -#line 180 "../../src/parse-gram.y" - { fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); }; -#line 1251 "../../src/parse-gram.c" - break; - case 46: /* "\"identifier\"" */ -#line 184 "../../src/parse-gram.y" - { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; -#line 1256 "../../src/parse-gram.c" - break; - case 47: /* "\"identifier:\"" */ -#line 186 "../../src/parse-gram.y" - { fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); }; -#line 1261 "../../src/parse-gram.c" - break; - case 49: /* "\"%{...%}\"" */ -#line 178 "../../src/parse-gram.y" - { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -#line 1266 "../../src/parse-gram.c" - break; - case 50: /* "\"epilogue\"" */ -#line 178 "../../src/parse-gram.y" - { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -#line 1271 "../../src/parse-gram.c" - break; - case 51: /* "\"{...}\"" */ -#line 177 "../../src/parse-gram.y" - { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -#line 1276 "../../src/parse-gram.c" - break; - case 72: /* "symbol" */ -#line 184 "../../src/parse-gram.y" - { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; -#line 1281 "../../src/parse-gram.c" - break; - case 73: /* "action" */ -#line 177 "../../src/parse-gram.y" - { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -#line 1286 "../../src/parse-gram.c" - break; - case 74: /* "string_as_id" */ -#line 184 "../../src/parse-gram.y" - { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; -#line 1291 "../../src/parse-gram.c" - break; - case 75: /* "string_content" */ -#line 169 "../../src/parse-gram.y" - { fprintf (stderr, "\"%s\"", (yyvaluep->chars)); }; -#line 1296 "../../src/parse-gram.c" - break; - default: - break; - } - YYFPRINTF (yyoutput, ")"); -} -#endif /* ! YYDEBUG */ /*-----------------------------------------------. | Release the memory associated to this symbol. | `-----------------------------------------------*/ @@ -1461,7 +1469,7 @@ YYLTYPE yylloc; /* User initialization code. */ -#line 72 "../../src/parse-gram.y" +#line 72 "parse-gram.y" { /* Bison's grammar can initial empty locations, hence a default location is needed. */ @@ -1469,8 +1477,8 @@ YYLTYPE yylloc; yylloc.start.line = yylloc.end.line = 1; yylloc.start.column = yylloc.end.column = 0; } -/* Line 1066 of yacc.c. */ -#line 1474 "../../src/parse-gram.c" +/* Line 1076 of yacc.c. */ +#line 1482 "parse-gram.c" yylsp[0] = yylloc; goto yysetstate; @@ -1659,52 +1667,52 @@ yyreduce: switch (yyn) { case 6: -#line 207 "../../src/parse-gram.y" - { prologue_augment ((yyvsp[0].chars), (yylsp[0])); } +#line 207 "parse-gram.y" + { prologue_augment ((yyvsp[(1) - (1)].chars), (yylsp[(1) - (1)])); } break; case 7: -#line 208 "../../src/parse-gram.y" +#line 208 "parse-gram.y" { debug_flag = true; } break; case 8: -#line 209 "../../src/parse-gram.y" - { muscle_insert ((yyvsp[0].chars), "1"); } +#line 209 "parse-gram.y" + { muscle_insert ((yyvsp[(2) - (2)].chars), "1"); } break; case 9: -#line 210 "../../src/parse-gram.y" - { muscle_insert ((yyvsp[-1].chars), (yyvsp[0].chars)); } +#line 210 "parse-gram.y" + { muscle_insert ((yyvsp[(2) - (3)].chars), (yyvsp[(3) - (3)].chars)); } break; case 10: -#line 211 "../../src/parse-gram.y" +#line 211 "parse-gram.y" { defines_flag = true; } break; case 11: -#line 212 "../../src/parse-gram.y" +#line 212 "parse-gram.y" { error_verbose = true; } break; case 12: -#line 213 "../../src/parse-gram.y" - { expected_sr_conflicts = (yyvsp[0].integer); } +#line 213 "parse-gram.y" + { expected_sr_conflicts = (yyvsp[(2) - (2)].integer); } break; case 13: -#line 214 "../../src/parse-gram.y" - { expected_rr_conflicts = (yyvsp[0].integer); } +#line 214 "parse-gram.y" + { expected_rr_conflicts = (yyvsp[(2) - (2)].integer); } break; case 14: -#line 215 "../../src/parse-gram.y" - { spec_file_prefix = (yyvsp[0].chars); } +#line 215 "parse-gram.y" + { spec_file_prefix = (yyvsp[(3) - (3)].chars); } break; case 15: -#line 217 "../../src/parse-gram.y" +#line 217 "parse-gram.y" { nondeterministic_parser = true; glr_parser = true; @@ -1712,134 +1720,134 @@ yyreduce: break; case 16: -#line 222 "../../src/parse-gram.y" +#line 222 "parse-gram.y" { - muscle_code_grow ("initial_action", (yyvsp[0].chars), (yylsp[0])); + muscle_code_grow ("initial_action", (yyvsp[(1) - (1)].chars), (yylsp[(1) - (1)])); } break; case 17: -#line 225 "../../src/parse-gram.y" - { add_param ("lex_param", (yyvsp[0].chars), (yylsp[0])); } +#line 225 "parse-gram.y" + { add_param ("lex_param", (yyvsp[(1) - (1)].chars), (yylsp[(1) - (1)])); } break; case 18: -#line 226 "../../src/parse-gram.y" +#line 226 "parse-gram.y" { locations_flag = true; } break; case 19: -#line 227 "../../src/parse-gram.y" - { spec_name_prefix = (yyvsp[0].chars); } +#line 227 "parse-gram.y" + { spec_name_prefix = (yyvsp[(3) - (3)].chars); } break; case 20: -#line 228 "../../src/parse-gram.y" +#line 228 "parse-gram.y" { no_lines_flag = true; } break; case 21: -#line 229 "../../src/parse-gram.y" +#line 229 "parse-gram.y" { nondeterministic_parser = true; } break; case 22: -#line 230 "../../src/parse-gram.y" - { spec_outfile = (yyvsp[0].chars); } +#line 230 "parse-gram.y" + { spec_outfile = (yyvsp[(3) - (3)].chars); } break; case 23: -#line 231 "../../src/parse-gram.y" - { add_param ("parse_param", (yyvsp[0].chars), (yylsp[0])); } +#line 231 "parse-gram.y" + { add_param ("parse_param", (yyvsp[(1) - (1)].chars), (yylsp[(1) - (1)])); } break; case 24: -#line 232 "../../src/parse-gram.y" +#line 232 "parse-gram.y" { pure_parser = true; } break; case 25: -#line 233 "../../src/parse-gram.y" - { version_check (&(yylsp[0]), (yyvsp[0].chars)); } +#line 233 "parse-gram.y" + { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); } break; case 26: -#line 234 "../../src/parse-gram.y" - { skeleton = (yyvsp[0].chars); } +#line 234 "parse-gram.y" + { skeleton = (yyvsp[(2) - (2)].chars); } break; case 27: -#line 235 "../../src/parse-gram.y" +#line 235 "parse-gram.y" { token_table_flag = true; } break; case 28: -#line 236 "../../src/parse-gram.y" +#line 236 "parse-gram.y" { report_flag = report_states; } break; case 29: -#line 237 "../../src/parse-gram.y" +#line 237 "parse-gram.y" { yacc_flag = true; } break; case 33: -#line 245 "../../src/parse-gram.y" +#line 245 "parse-gram.y" { - grammar_start_symbol_set ((yyvsp[0].symbol), (yylsp[0])); + grammar_start_symbol_set ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); } break; case 34: -#line 249 "../../src/parse-gram.y" +#line 249 "parse-gram.y" { typed = true; - MUSCLE_INSERT_INT ("stype_line", (yylsp[0]).start.line); - muscle_insert ("stype", (yyvsp[0].chars)); + MUSCLE_INSERT_INT ("stype_line", (yylsp[(1) - (1)]).start.line); + muscle_insert ("stype", (yyvsp[(1) - (1)].chars)); } break; case 35: -#line 255 "../../src/parse-gram.y" +#line 255 "parse-gram.y" { symbol_list *list; - for (list = (yyvsp[0].list); list; list = list->next) - symbol_destructor_set (list->sym, (yyvsp[-1].chars), (yylsp[-1])); - symbol_list_free ((yyvsp[0].list)); + for (list = (yyvsp[(2) - (2)].list); list; list = list->next) + symbol_destructor_set (list->sym, (yyvsp[(1) - (2)].chars), (yylsp[(1) - (2)])); + symbol_list_free ((yyvsp[(2) - (2)].list)); } break; case 36: -#line 262 "../../src/parse-gram.y" +#line 262 "parse-gram.y" { symbol_list *list; - for (list = (yyvsp[0].list); list; list = list->next) - symbol_printer_set (list->sym, (yyvsp[-1].chars), list->location); - symbol_list_free ((yyvsp[0].list)); + for (list = (yyvsp[(2) - (2)].list); list; list = list->next) + symbol_printer_set (list->sym, (yyvsp[(1) - (2)].chars), list->location); + symbol_list_free ((yyvsp[(2) - (2)].list)); } break; case 37: -#line 269 "../../src/parse-gram.y" +#line 269 "parse-gram.y" { default_prec = true; } break; case 38: -#line 273 "../../src/parse-gram.y" +#line 273 "parse-gram.y" { default_prec = false; } break; case 39: -#line 279 "../../src/parse-gram.y" +#line 279 "parse-gram.y" { current_class = nterm_sym; } break; case 40: -#line 280 "../../src/parse-gram.y" +#line 280 "parse-gram.y" { current_class = unknown_sym; current_type = NULL; @@ -1847,12 +1855,12 @@ yyreduce: break; case 41: -#line 284 "../../src/parse-gram.y" +#line 284 "parse-gram.y" { current_class = token_sym; } break; case 42: -#line 285 "../../src/parse-gram.y" +#line 285 "parse-gram.y" { current_class = unknown_sym; current_type = NULL; @@ -1860,110 +1868,110 @@ yyreduce: break; case 43: -#line 290 "../../src/parse-gram.y" +#line 290 "parse-gram.y" { symbol_list *list; - for (list = (yyvsp[0].list); list; list = list->next) - symbol_type_set (list->sym, (yyvsp[-1].uniqstr), (yylsp[-1])); - symbol_list_free ((yyvsp[0].list)); + for (list = (yyvsp[(3) - (3)].list); list; list = list->next) + symbol_type_set (list->sym, (yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)])); + symbol_list_free ((yyvsp[(3) - (3)].list)); } break; case 44: -#line 300 "../../src/parse-gram.y" +#line 300 "parse-gram.y" { symbol_list *list; ++current_prec; - for (list = (yyvsp[0].list); list; list = list->next) + for (list = (yyvsp[(3) - (3)].list); list; list = list->next) { - symbol_type_set (list->sym, current_type, (yylsp[-1])); - symbol_precedence_set (list->sym, current_prec, (yyvsp[-2].assoc), (yylsp[-2])); + symbol_type_set (list->sym, current_type, (yylsp[(2) - (3)])); + symbol_precedence_set (list->sym, current_prec, (yyvsp[(1) - (3)].assoc), (yylsp[(1) - (3)])); } - symbol_list_free ((yyvsp[0].list)); + symbol_list_free ((yyvsp[(3) - (3)].list)); current_type = NULL; } break; case 45: -#line 314 "../../src/parse-gram.y" +#line 314 "parse-gram.y" { (yyval.assoc) = left_assoc; } break; case 46: -#line 315 "../../src/parse-gram.y" +#line 315 "parse-gram.y" { (yyval.assoc) = right_assoc; } break; case 47: -#line 316 "../../src/parse-gram.y" +#line 316 "parse-gram.y" { (yyval.assoc) = non_assoc; } break; case 48: -#line 320 "../../src/parse-gram.y" +#line 320 "parse-gram.y" { current_type = NULL; } break; case 49: -#line 321 "../../src/parse-gram.y" - { current_type = (yyvsp[0].uniqstr); } +#line 321 "parse-gram.y" + { current_type = (yyvsp[(1) - (1)].uniqstr); } break; case 50: -#line 327 "../../src/parse-gram.y" - { (yyval.list) = symbol_list_new ((yyvsp[0].symbol), (yylsp[0])); } +#line 327 "parse-gram.y" + { (yyval.list) = symbol_list_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); } break; case 51: -#line 328 "../../src/parse-gram.y" - { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), (yyvsp[0].symbol), (yylsp[0])); } +#line 328 "parse-gram.y" + { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); } break; case 52: -#line 334 "../../src/parse-gram.y" +#line 334 "parse-gram.y" { - current_type = (yyvsp[0].uniqstr); + current_type = (yyvsp[(1) - (1)].uniqstr); } break; case 53: -#line 338 "../../src/parse-gram.y" +#line 338 "parse-gram.y" { - symbol_class_set ((yyvsp[0].symbol), current_class, (yylsp[0])); - symbol_type_set ((yyvsp[0].symbol), current_type, (yylsp[0])); + symbol_class_set ((yyvsp[(1) - (1)].symbol), current_class, (yylsp[(1) - (1)])); + symbol_type_set ((yyvsp[(1) - (1)].symbol), current_type, (yylsp[(1) - (1)])); } break; case 54: -#line 343 "../../src/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])); - symbol_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer), (yylsp[0])); + symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)])); + symbol_type_set ((yyvsp[(1) - (2)].symbol), current_type, (yylsp[(1) - (2)])); + symbol_user_token_number_set ((yyvsp[(1) - (2)].symbol), (yyvsp[(2) - (2)].integer), (yylsp[(2) - (2)])); } break; case 55: -#line 349 "../../src/parse-gram.y" +#line 349 "parse-gram.y" { - symbol_class_set ((yyvsp[-1].symbol), current_class, (yylsp[-1])); - symbol_type_set ((yyvsp[-1].symbol), current_type, (yylsp[-1])); - symbol_make_alias ((yyvsp[-1].symbol), (yyvsp[0].symbol), (yyloc)); + symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)])); + symbol_type_set ((yyvsp[(1) - (2)].symbol), current_type, (yylsp[(1) - (2)])); + symbol_make_alias ((yyvsp[(1) - (2)].symbol), (yyvsp[(2) - (2)].symbol), (yyloc)); } break; case 56: -#line 355 "../../src/parse-gram.y" +#line 355 "parse-gram.y" { - symbol_class_set ((yyvsp[-2].symbol), current_class, (yylsp[-2])); - symbol_type_set ((yyvsp[-2].symbol), current_type, (yylsp[-2])); - symbol_user_token_number_set ((yyvsp[-2].symbol), (yyvsp[-1].integer), (yylsp[-1])); - symbol_make_alias ((yyvsp[-2].symbol), (yyvsp[0].symbol), (yyloc)); + symbol_class_set ((yyvsp[(1) - (3)].symbol), current_class, (yylsp[(1) - (3)])); + symbol_type_set ((yyvsp[(1) - (3)].symbol), current_type, (yylsp[(1) - (3)])); + symbol_user_token_number_set ((yyvsp[(1) - (3)].symbol), (yyvsp[(2) - (3)].integer), (yylsp[(2) - (3)])); + symbol_make_alias ((yyvsp[(1) - (3)].symbol), (yyvsp[(3) - (3)].symbol), (yyloc)); } break; case 62: -#line 384 "../../src/parse-gram.y" +#line 384 "parse-gram.y" { if (yacc_flag) complain_at ((yyloc), _("POSIX forbids declarations in the grammar")); @@ -1971,89 +1979,89 @@ yyreduce: break; case 63: -#line 389 "../../src/parse-gram.y" +#line 389 "parse-gram.y" { yyerrok; } break; case 64: -#line 395 "../../src/parse-gram.y" - { current_lhs = (yyvsp[0].symbol); current_lhs_location = (yylsp[0]); } +#line 395 "parse-gram.y" + { current_lhs = (yyvsp[(1) - (1)].symbol); current_lhs_location = (yylsp[(1) - (1)]); } break; case 66: -#line 399 "../../src/parse-gram.y" - { grammar_rule_end ((yylsp[0])); } +#line 399 "parse-gram.y" + { grammar_rule_end ((yylsp[(1) - (1)])); } break; case 67: -#line 400 "../../src/parse-gram.y" - { grammar_rule_end ((yylsp[0])); } +#line 400 "parse-gram.y" + { grammar_rule_end ((yylsp[(3) - (3)])); } break; case 69: -#line 406 "../../src/parse-gram.y" +#line 406 "parse-gram.y" { grammar_rule_begin (current_lhs, current_lhs_location); } break; case 70: -#line 408 "../../src/parse-gram.y" - { grammar_current_rule_symbol_append ((yyvsp[0].symbol), (yylsp[0])); } +#line 408 "parse-gram.y" + { grammar_current_rule_symbol_append ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); } break; case 71: -#line 410 "../../src/parse-gram.y" - { grammar_current_rule_action_append ((yyvsp[0].chars), (yylsp[0])); } +#line 410 "parse-gram.y" + { grammar_current_rule_action_append ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); } break; case 72: -#line 412 "../../src/parse-gram.y" - { grammar_current_rule_prec_set ((yyvsp[0].symbol), (yylsp[0])); } +#line 412 "parse-gram.y" + { grammar_current_rule_prec_set ((yyvsp[(3) - (3)].symbol), (yylsp[(3) - (3)])); } break; case 73: -#line 414 "../../src/parse-gram.y" - { grammar_current_rule_dprec_set ((yyvsp[0].integer), (yylsp[0])); } +#line 414 "parse-gram.y" + { grammar_current_rule_dprec_set ((yyvsp[(3) - (3)].integer), (yylsp[(3) - (3)])); } break; case 74: -#line 416 "../../src/parse-gram.y" - { grammar_current_rule_merge_set ((yyvsp[0].uniqstr), (yylsp[0])); } +#line 416 "parse-gram.y" + { grammar_current_rule_merge_set ((yyvsp[(3) - (3)].uniqstr), (yylsp[(3) - (3)])); } break; case 75: -#line 420 "../../src/parse-gram.y" - { (yyval.symbol) = (yyvsp[0].symbol); } +#line 420 "parse-gram.y" + { (yyval.symbol) = (yyvsp[(1) - (1)].symbol); } break; case 76: -#line 421 "../../src/parse-gram.y" - { (yyval.symbol) = (yyvsp[0].symbol); } +#line 421 "parse-gram.y" + { (yyval.symbol) = (yyvsp[(1) - (1)].symbol); } break; case 77: -#line 426 "../../src/parse-gram.y" - { (yyval.chars) = (yyvsp[0].chars); } +#line 426 "parse-gram.y" + { (yyval.chars) = (yyvsp[(1) - (1)].chars); } break; case 78: -#line 432 "../../src/parse-gram.y" +#line 432 "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])); + (yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[(1) - (1)].chars)), (yylsp[(1) - (1)])); + symbol_class_set ((yyval.symbol), token_sym, (yylsp[(1) - (1)])); } break; case 79: -#line 441 "../../src/parse-gram.y" - { (yyval.chars) = (yyvsp[0].chars); } +#line 441 "parse-gram.y" + { (yyval.chars) = (yyvsp[(1) - (1)].chars); } break; case 81: -#line 448 "../../src/parse-gram.y" +#line 448 "parse-gram.y" { - muscle_code_grow ("epilogue", (yyvsp[0].chars), (yylsp[0])); + muscle_code_grow ("epilogue", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); scanner_last_string_free (); } break; @@ -2061,9 +2069,10 @@ yyreduce: default: break; } + YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); -/* Line 1262 of yacc.c. */ -#line 2067 "../../src/parse-gram.c" +/* Line __line__ of yacc.c. */ +#line 2076 "parse-gram.c" yyvsp -= yylen; yyssp -= yylen; @@ -2275,7 +2284,7 @@ yyreturn: } -#line 454 "../../src/parse-gram.y" +#line 454 "parse-gram.y" diff --git a/src/parse-gram.h b/src/parse-gram.h index 97e038c6..f568bdfa 100644 --- a/src/parse-gram.h +++ b/src/parse-gram.h @@ -137,7 +137,7 @@ #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) -#line 82 "../../src/parse-gram.y" +#line 82 "parse-gram.y" typedef union YYSTYPE { symbol *symbol; symbol_list *list; @@ -146,8 +146,8 @@ typedef union YYSTYPE { assoc assoc; uniqstr uniqstr; } YYSTYPE; -/* Line 1520 of yacc.c. */ -#line 151 "../../src/parse-gram.h" +/* Line 1531 of yacc.c. */ +#line 151 "parse-gram.h" # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 # define YYSTYPE_IS_TRIVIAL 1