X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/77315a51c1fb97dc07e1de1105551f8250cdde31..40a1cd37f31500bec5ddd05692141afca31b176a:/src/parse-gram.c diff --git a/src/parse-gram.c b/src/parse-gram.c index c64e637d..148ef761 100644 --- a/src/parse-gram.c +++ b/src/parse-gram.c @@ -1,8 +1,8 @@ -/* A Bison parser, made by GNU Bison 2.4.1.302-e8fa. */ +/* A Bison parser, made by GNU Bison 2.6.3.3-b10d3. */ /* Bison implementation for Yacc-like parsers in C - Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2012 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 @@ -44,7 +44,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.4.1.302-e8fa" +#define YYBISON_VERSION "2.6.3.3-b10d3" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -58,8 +58,6 @@ /* Pull parsers. */ #define YYPULL 1 -/* Using locations. */ -#define YYLSP_NEEDED 1 /* Substitute the variable and function names. */ #define yyparse gram_parse @@ -72,8 +70,7 @@ #define yylloc gram_lloc /* Copy the first part of user declarations. */ - -/* Line 268 of yacc.c */ +/* Line 358 of yacc.c */ #line 1 "parse-gram.y" /* Bison Grammar Parser -*- C -*- @@ -97,6 +94,7 @@ #include #include "system.h" +#include "c-ctype.h" #include "complain.h" #include "conflicts.h" #include "files.h" @@ -109,6 +107,7 @@ #include "symlist.h" #include "scan-gram.h" #include "scan-code.h" +#include "xmemdup0.h" #define YYLLOC_DEFAULT(Current, Rhs, N) (Current) = lloc_default (Rhs, N) static YYLTYPE lloc_default (YYLTYPE const *, int); @@ -167,14 +166,16 @@ current_lhs(symbol *sym, location loc, named_ref *ref) #define YYTYPE_UINT16 uint_fast16_t #define YYTYPE_UINT8 uint_fast8_t +/* Line 358 of yacc.c */ +#line 171 "parse-gram.c" -/* Line 268 of yacc.c */ -#line 173 "parse-gram.c" - -/* Enabling traces. */ -#ifndef YYDEBUG -# define YYDEBUG 1 -#endif +# ifndef YY_NULL +# if defined __cplusplus && 201103L <= __cplusplus +# define YY_NULL nullptr +# else +# define YY_NULL 0 +# endif +# endif /* Enabling verbose error messages. */ #ifdef YYERROR_VERBOSE @@ -184,11 +185,17 @@ current_lhs(symbol *sym, location loc, named_ref *ref) # define YYERROR_VERBOSE 1 #endif -/* Enabling the token table. */ -#ifndef YYTOKEN_TABLE -# define YYTOKEN_TABLE 0 +/* In a future release of Bison, this section will be replaced + by #include "parse-gram.h". */ +#ifndef YY_GRAM_Y_TAB_H_INCLUDED +# define YY_GRAM_Y_TAB_H_INCLUDED +/* Enabling traces. */ +#ifndef YYDEBUG +# define YYDEBUG 1 +#endif +#if YYDEBUG +extern int gram_debug; #endif - /* Tokens. */ #ifndef YYTOKENTYPE @@ -314,13 +321,11 @@ current_lhs(symbol *sym, location loc, named_ref *ref) - #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE { - -/* Line 293 of yacc.c */ -#line 113 "parse-gram.y" +/* Line 374 of yacc.c */ +#line 115 "parse-gram.y" symbol *symbol; symbol_list *list; @@ -333,9 +338,8 @@ typedef union YYSTYPE named_ref *named_ref; - -/* Line 293 of yacc.c */ -#line 339 "parse-gram.c" +/* Line 374 of yacc.c */ +#line 343 "parse-gram.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -356,11 +360,26 @@ typedef struct YYLTYPE #endif -/* Copy the second part of user declarations. */ +#ifdef YYPARSE_PARAM +#if defined __STDC__ || defined __cplusplus +int gram_parse (void *YYPARSE_PARAM); +#else +int gram_parse (); +#endif +#else /* ! YYPARSE_PARAM */ +#if defined __STDC__ || defined __cplusplus +int gram_parse (void); +#else +int gram_parse (); +#endif +#endif /* ! YYPARSE_PARAM */ + +#endif /* !YY_GRAM_Y_TAB_H_INCLUDED */ +/* Copy the second part of user declarations. */ -/* Line 343 of yacc.c */ -#line 364 "parse-gram.c" +/* Line 377 of yacc.c */ +#line 383 "parse-gram.c" #ifdef short # undef short @@ -413,24 +432,24 @@ typedef short int yytype_int16; # if defined YYENABLE_NLS && YYENABLE_NLS # if ENABLE_NLS # include /* INFRINGES ON USER NAME SPACE */ -# define YY_(msgid) dgettext ("bison-runtime", msgid) +# define YY_(Msgid) dgettext ("bison-runtime", Msgid) # endif # endif # ifndef YY_ -# define YY_(msgid) msgid +# define YY_(Msgid) Msgid # endif #endif /* Suppress unused-variable warnings by "using" E. */ #if ! defined lint || defined __GNUC__ -# define YYUSE(e) ((void) (e)) +# define YYUSE(E) ((void) (E)) #else -# define YYUSE(e) /* empty */ +# define YYUSE(E) /* empty */ #endif /* Identity function, used to suppress warnings about constant conditions. */ #ifndef lint -# define YYID(n) (n) +# define YYID(N) (N) #else #if (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) @@ -536,20 +555,20 @@ union yyalloc #endif #if defined YYCOPY_NEEDED && YYCOPY_NEEDED -/* Copy COUNT objects from FROM to TO. The source and destination do +/* Copy COUNT objects from SRC to DST. The source and destination do not overlap. */ # ifndef YYCOPY # if defined __GNUC__ && 1 < __GNUC__ -# define YYCOPY(To, From, Count) \ - __builtin_memcpy (To, From, (Count) * sizeof (*(From))) +# define YYCOPY(Dst, Src, Count) \ + __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src))) # else -# define YYCOPY(To, From, Count) \ - do \ - { \ - YYSIZE_T yyi; \ - for (yyi = 0; yyi < (Count); yyi++) \ - (To)[yyi] = (From)[yyi]; \ - } \ +# define YYCOPY(Dst, Src, Count) \ + do \ + { \ + YYSIZE_T yyi; \ + for (yyi = 0; yyi < (Count); yyi++) \ + (Dst)[yyi] = (Src)[yyi]; \ + } \ while (YYID (0)) # endif # endif @@ -667,21 +686,21 @@ static const yytype_int8 yyrhs[] = /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 228, 228, 236, 238, 242, 243, 253, 254, 259, - 260, 265, 266, 267, 268, 269, 270, 275, 284, 285, - 286, 287, 288, 289, 290, 291, 292, 293, 294, 309, - 310, 334, 335, 336, 337, 341, 342, 343, 347, 354, - 361, 365, 369, 376, 391, 392, 396, 408, 408, 413, - 413, 418, 429, 444, 445, 446, 450, 451, 456, 458, - 463, 464, 469, 471, 476, 477, 481, 482, 483, 484, - 489, 494, 499, 505, 511, 522, 523, 532, 533, 539, - 540, 541, 548, 548, 556, 557, 558, 563, 565, 567, - 569, 571, 573, 578, 580, 591, 592, 597, 598, 599, - 608, 628, 630, 639, 644, 645, 650, 657, 659 + 0, 230, 230, 238, 240, 244, 245, 255, 256, 261, + 262, 267, 268, 269, 270, 271, 272, 277, 286, 287, + 288, 289, 290, 291, 292, 293, 294, 295, 296, 311, + 312, 336, 337, 338, 339, 343, 344, 345, 349, 361, + 373, 377, 381, 388, 403, 404, 408, 420, 420, 425, + 425, 430, 441, 456, 457, 458, 462, 463, 468, 470, + 475, 476, 481, 483, 488, 489, 493, 494, 495, 496, + 501, 506, 511, 517, 523, 534, 535, 544, 545, 551, + 552, 553, 560, 560, 568, 569, 570, 575, 577, 579, + 581, 583, 585, 590, 592, 603, 604, 609, 610, 611, + 620, 640, 642, 651, 656, 657, 662, 669, 671 }; #endif -#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE +#if YYDEBUG || YYERROR_VERBOSE || 1 /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. First, the terminals, then, starting at YYNTOKENS, nonterminals. */ static const char *const yytname[] = @@ -707,7 +726,7 @@ static const char *const yytname[] = "generic_symlist_item", "symbol_def", "symbol_defs.1", "grammar", "rules_or_grammar_declaration", "rules", "$@3", "rhses.1", "rhs", "named_ref.opt", "variable", "content.opt", "braceless", "id", - "id_colon", "symbol", "string_as_id", "epilogue.opt", 0 + "id_colon", "symbol", "string_as_id", "epilogue.opt", YY_NULL }; #endif @@ -844,10 +863,10 @@ static const yytype_int16 yytable[] = 42 }; -#define yypact_value_is_default(yystate) \ - ((yystate) == (-91)) +#define yypact_value_is_default(Yystate) \ + (!!((Yystate) == (-91))) -#define yytable_value_is_error(yytable_value) \ +#define yytable_value_is_error(Yytable_value) \ YYID (0) static const yytype_uint8 yycheck[] = @@ -919,18 +938,19 @@ static const yytype_uint8 yystos[] = #define YYRECOVERING() (!!yyerrstatus) -#define YYBACKUP(Token, Value) \ -do \ - if (yychar == YYEMPTY && yylen == 1) \ - { \ - yychar = (Token); \ - yylval = (Value); \ - YYPOPSTACK (1); \ - YY_LAC_DISCARD ("YYBACKUP"); \ - goto yybackup; \ - } \ - else \ - { \ +#define YYBACKUP(Token, Value) \ +do \ + if (yychar == YYEMPTY) \ + { \ + yychar = (Token); \ + yylval = (Value); \ + YYPOPSTACK (yylen); \ + yystate = *yyssp; \ + YY_LAC_DISCARD ("YYBACKUP"); \ + goto yybackup; \ + } \ + else \ + { \ yyerror (YY_("syntax error: cannot back up")); \ YYERROR; \ } \ @@ -940,32 +960,33 @@ while (YYID (0)) #define YYTERROR 1 #define YYERRCODE 256 - /* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. If N is 0, then set CURRENT to the empty location which ends the previous symbol: RHS[0] (always defined). */ -#define YYRHSLOC(Rhs, K) ((Rhs)[K]) #ifndef YYLLOC_DEFAULT -# define YYLLOC_DEFAULT(Current, Rhs, N) \ - do \ - if (YYID (N)) \ - { \ - (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ - (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ - (Current).last_line = YYRHSLOC (Rhs, N).last_line; \ - (Current).last_column = YYRHSLOC (Rhs, N).last_column; \ - } \ - else \ - { \ - (Current).first_line = (Current).last_line = \ - YYRHSLOC (Rhs, 0).last_line; \ - (Current).first_column = (Current).last_column = \ - YYRHSLOC (Rhs, 0).last_column; \ - } \ +# define YYLLOC_DEFAULT(Current, Rhs, N) \ + do \ + if (YYID (N)) \ + { \ + (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ + (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ + (Current).last_line = YYRHSLOC (Rhs, N).last_line; \ + (Current).last_column = YYRHSLOC (Rhs, N).last_column; \ + } \ + else \ + { \ + (Current).first_line = (Current).last_line = \ + YYRHSLOC (Rhs, 0).last_line; \ + (Current).first_column = (Current).last_column = \ + YYRHSLOC (Rhs, 0).last_column; \ + } \ while (YYID (0)) #endif +#define YYRHSLOC(Rhs, K) ((Rhs)[K]) + + /* YY_LOCATION_PRINT -- Print the location on the stream. This macro was not mandated originally: define only if we know @@ -1035,6 +1056,8 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp) YYLTYPE const * const yylocationp; #endif { + FILE *yyo = yyoutput; + YYUSE (yyo); if (!yyvaluep) return; YYUSE (yylocationp); @@ -1046,167 +1069,131 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp) # endif switch (yytype) { - case 3: /* "\"string\"" */ - -/* Line 819 of yacc.c */ -#line 203 "parse-gram.y" - { fputs (quotearg_style (c_quoting_style, (yyvaluep->chars)), stderr); }; - -/* Line 819 of yacc.c */ -#line 1057 "parse-gram.c" - break; - case 4: /* "\"integer\"" */ - -/* Line 819 of yacc.c */ -#line 215 "parse-gram.y" - { fprintf (stderr, "%d", (yyvaluep->integer)); }; - -/* Line 819 of yacc.c */ -#line 1066 "parse-gram.c" - break; - case 43: /* "\"{...}\"" */ - -/* Line 819 of yacc.c */ + case 3: /* "string" */ +/* Line 833 of yacc.c */ #line 205 "parse-gram.y" - { fprintf (stderr, "{\n%s\n}", (yyvaluep->code)); }; - -/* Line 819 of yacc.c */ -#line 1075 "parse-gram.c" + { fputs (quotearg_style (c_quoting_style, ((*yyvaluep).chars)), stderr); }; +/* Line 833 of yacc.c */ +#line 1078 "parse-gram.c" break; - case 44: /* "\"[identifier]\"" */ - -/* Line 819 of yacc.c */ -#line 210 "parse-gram.y" - { fprintf (stderr, "[%s]", (yyvaluep->uniqstr)); }; - -/* Line 819 of yacc.c */ -#line 1084 "parse-gram.c" + case 4: /* "integer" */ +/* Line 833 of yacc.c */ +#line 217 "parse-gram.y" + { fprintf (stderr, "%d", ((*yyvaluep).integer)); }; +/* Line 833 of yacc.c */ +#line 1085 "parse-gram.c" break; - case 45: /* "\"char\"" */ - -/* Line 819 of yacc.c */ -#line 197 "parse-gram.y" - { fputs (char_name ((yyvaluep->character)), stderr); }; - -/* Line 819 of yacc.c */ -#line 1093 "parse-gram.c" + case 43: /* "{...}" */ +/* Line 833 of yacc.c */ +#line 207 "parse-gram.y" + { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).code)); }; +/* Line 833 of yacc.c */ +#line 1092 "parse-gram.c" break; - case 46: /* "\"epilogue\"" */ - -/* Line 819 of yacc.c */ -#line 205 "parse-gram.y" - { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; - -/* Line 819 of yacc.c */ -#line 1102 "parse-gram.c" + case 44: /* "[identifier]" */ +/* Line 833 of yacc.c */ +#line 212 "parse-gram.y" + { fprintf (stderr, "[%s]", ((*yyvaluep).uniqstr)); }; +/* Line 833 of yacc.c */ +#line 1099 "parse-gram.c" break; - case 48: /* "\"identifier\"" */ - -/* Line 819 of yacc.c */ -#line 209 "parse-gram.y" - { fputs ((yyvaluep->uniqstr), stderr); }; - -/* Line 819 of yacc.c */ -#line 1111 "parse-gram.c" + case 45: /* "char" */ +/* Line 833 of yacc.c */ +#line 199 "parse-gram.y" + { fputs (char_name (((*yyvaluep).character)), stderr); }; +/* Line 833 of yacc.c */ +#line 1106 "parse-gram.c" break; - case 49: /* "\"identifier:\"" */ - -/* Line 819 of yacc.c */ + case 46: /* "epilogue" */ +/* Line 833 of yacc.c */ +#line 207 "parse-gram.y" + { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }; +/* Line 833 of yacc.c */ +#line 1113 "parse-gram.c" + break; + case 48: /* "identifier" */ +/* Line 833 of yacc.c */ #line 211 "parse-gram.y" - { fprintf (stderr, "%s:", (yyvaluep->uniqstr)); }; - -/* Line 819 of yacc.c */ + { fputs (((*yyvaluep).uniqstr), stderr); }; +/* Line 833 of yacc.c */ #line 1120 "parse-gram.c" break; - case 52: /* "\"%{...%}\"" */ - -/* Line 819 of yacc.c */ -#line 205 "parse-gram.y" - { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; - -/* Line 819 of yacc.c */ -#line 1129 "parse-gram.c" + case 49: /* "identifier:" */ +/* Line 833 of yacc.c */ +#line 213 "parse-gram.y" + { fprintf (stderr, "%s:", ((*yyvaluep).uniqstr)); }; +/* Line 833 of yacc.c */ +#line 1127 "parse-gram.c" break; - case 54: /* "\"type\"" */ - -/* Line 819 of yacc.c */ -#line 212 "parse-gram.y" - { fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); }; - -/* Line 819 of yacc.c */ -#line 1138 "parse-gram.c" + case 52: /* "%{...%}" */ +/* Line 833 of yacc.c */ +#line 207 "parse-gram.y" + { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }; +/* Line 833 of yacc.c */ +#line 1134 "parse-gram.c" break; - case 71: /* "symbol.prec" */ - -/* Line 819 of yacc.c */ -#line 218 "parse-gram.y" - { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; - -/* Line 819 of yacc.c */ -#line 1147 "parse-gram.c" + case 54: /* "type" */ +/* Line 833 of yacc.c */ +#line 214 "parse-gram.y" + { fprintf (stderr, "<%s>", ((*yyvaluep).uniqstr)); }; +/* Line 833 of yacc.c */ +#line 1141 "parse-gram.c" break; - case 84: /* "variable" */ - -/* Line 819 of yacc.c */ -#line 209 "parse-gram.y" - { fputs ((yyvaluep->uniqstr), stderr); }; - -/* Line 819 of yacc.c */ -#line 1156 "parse-gram.c" + case 71: /* symbol.prec */ +/* Line 833 of yacc.c */ +#line 220 "parse-gram.y" + { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }; +/* Line 833 of yacc.c */ +#line 1148 "parse-gram.c" break; - case 85: /* "content.opt" */ - -/* Line 819 of yacc.c */ -#line 205 "parse-gram.y" - { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; - -/* Line 819 of yacc.c */ -#line 1165 "parse-gram.c" + case 84: /* variable */ +/* Line 833 of yacc.c */ +#line 211 "parse-gram.y" + { fputs (((*yyvaluep).uniqstr), stderr); }; +/* Line 833 of yacc.c */ +#line 1155 "parse-gram.c" break; - case 86: /* "braceless" */ - -/* Line 819 of yacc.c */ -#line 205 "parse-gram.y" - { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; - -/* Line 819 of yacc.c */ -#line 1174 "parse-gram.c" + case 85: /* content.opt */ +/* Line 833 of yacc.c */ +#line 207 "parse-gram.y" + { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }; +/* Line 833 of yacc.c */ +#line 1162 "parse-gram.c" break; - case 87: /* "id" */ - -/* Line 819 of yacc.c */ -#line 218 "parse-gram.y" - { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; - -/* Line 819 of yacc.c */ -#line 1183 "parse-gram.c" + case 86: /* braceless */ +/* Line 833 of yacc.c */ +#line 207 "parse-gram.y" + { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }; +/* Line 833 of yacc.c */ +#line 1169 "parse-gram.c" break; - case 88: /* "id_colon" */ - -/* Line 819 of yacc.c */ -#line 219 "parse-gram.y" - { fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); }; - -/* Line 819 of yacc.c */ -#line 1192 "parse-gram.c" + case 87: /* id */ +/* Line 833 of yacc.c */ +#line 220 "parse-gram.y" + { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }; +/* Line 833 of yacc.c */ +#line 1176 "parse-gram.c" break; - case 89: /* "symbol" */ - -/* Line 819 of yacc.c */ -#line 218 "parse-gram.y" - { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; - -/* Line 819 of yacc.c */ -#line 1201 "parse-gram.c" + case 88: /* id_colon */ +/* Line 833 of yacc.c */ +#line 221 "parse-gram.y" + { fprintf (stderr, "%s:", ((*yyvaluep).symbol)->tag); }; +/* Line 833 of yacc.c */ +#line 1183 "parse-gram.c" break; - case 90: /* "string_as_id" */ - -/* Line 819 of yacc.c */ -#line 218 "parse-gram.y" - { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; - -/* Line 819 of yacc.c */ -#line 1210 "parse-gram.c" + case 89: /* symbol */ +/* Line 833 of yacc.c */ +#line 220 "parse-gram.y" + { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }; +/* Line 833 of yacc.c */ +#line 1190 "parse-gram.c" + break; + case 90: /* string_as_id */ +/* Line 833 of yacc.c */ +#line 220 "parse-gram.y" + { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }; +/* Line 833 of yacc.c */ +#line 1197 "parse-gram.c" break; default: break; @@ -1689,12 +1676,12 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, yytype_int16 *yyesa, yytype_int16 **yyes, YYSIZE_T *yyes_capacity, yytype_int16 *yyssp, int yytoken) { - YYSIZE_T yysize0 = yytnamerr (0, yytname[yytoken]); + YYSIZE_T yysize0 = yytnamerr (YY_NULL, yytname[yytoken]); YYSIZE_T yysize = yysize0; YYSIZE_T yysize1; enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; /* Internationalized format string. */ - const char *yyformat = 0; + const char *yyformat = YY_NULL; /* Arguments of yyformat. */ char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; /* Number of reported tokens (one for the "unexpected", one per @@ -1752,7 +1739,7 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, break; } yyarg[yycount++] = yytname[yyx]; - yysize1 = yysize + yytnamerr (0, yytname[yyx]); + yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]); if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) return 2; @@ -1850,20 +1837,6 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp) } -/* Prevent warnings from -Wmissing-prototypes. */ -#ifdef YYPARSE_PARAM -#if defined __STDC__ || defined __cplusplus -int yyparse (void *YYPARSE_PARAM); -#else -int yyparse (); -#endif -#else /* ! YYPARSE_PARAM */ -#if defined __STDC__ || defined __cplusplus -int yyparse (void); -#else -int yyparse (); -#endif -#endif /* ! YYPARSE_PARAM */ /*----------. @@ -1895,6 +1868,28 @@ yyparse () /* The lookahead symbol. */ int yychar; + +#if defined __GNUC__ && (4 < __GNUC__ + (6 <= __GNUC_MINOR__)) +/* Suppress an incorrect diagnostic about yylval being uninitialized. */ +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"") +# define YY_IGNORE_MAYBE_UNINITIALIZED_END \ + _Pragma ("GCC diagnostic pop") +#else +/* Default value used for initialization, for pacifying older GCCs + or non-GCC compilers. */ +static YYSTYPE yyval_default; +# define YYLVAL_INITIALIZE() (yylval = yyval_default) +#endif +#ifndef YYLVAL_INITIALIZE +# define YYLVAL_INITIALIZE() +#endif +#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +# define YY_IGNORE_MAYBE_UNINITIALIZED_END +#endif + /* The semantic value of the lookahead symbol. */ YYSTYPE yylval; @@ -1913,7 +1908,7 @@ YYLTYPE yylloc; `yyvs': related to semantic values. `yyls': related to locations. - Refer to the stacks thru separate pointers, to allow yyoverflow + Refer to the stacks through separate pointers, to allow yyoverflow to reallocate them elsewhere. */ /* The state stack. */ @@ -1944,7 +1939,7 @@ YYLTYPE yylloc; int yyn; int yyresult; /* Lookahead token as an internal (translated) token number. */ - int yytoken; + int yytoken = 0; /* The variables used to return semantic value and location from the action routines. */ YYSTYPE yyval; @@ -1963,7 +1958,6 @@ YYLTYPE yylloc; Keep to zero when no symbol should be popped. */ int yylen = 0; - yytoken = 0; yyss = yyssa; yyvs = yyvsa; yyls = yylsa; @@ -1989,6 +1983,7 @@ YYLTYPE yylloc; yyvsp = yyvs; yylsp = yyls; + YYLVAL_INITIALIZE (); #if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL /* Initialize the default location before parsing starts. */ yylloc.first_line = yylloc.last_line = 1; @@ -1996,20 +1991,17 @@ YYLTYPE yylloc; #endif /* User initialization code. */ - -/* Line 1590 of yacc.c */ -#line 105 "parse-gram.y" +/* Line 1596 of yacc.c */ +#line 107 "parse-gram.y" { /* Bison's grammar can initial empty locations, hence a default location is needed. */ boundary_set (&yylloc.start, current_file, 1, 1); boundary_set (&yylloc.end, current_file, 1, 1); } - -/* Line 1590 of yacc.c */ -#line 2011 "parse-gram.c" +/* Line 1596 of yacc.c */ +#line 2004 "parse-gram.c" yylsp[0] = yylloc; - goto yysetstate; /*------------------------------------------------------------. @@ -2160,7 +2152,9 @@ yybackup: YY_LAC_DISCARD ("shift"); yystate = yyn; + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN *++yyvsp = yylval; + YY_IGNORE_MAYBE_UNINITIALIZED_END *++yylsp = yylloc; goto yynewstate; @@ -2200,9 +2194,8 @@ yyreduce: switch (yyn) { case 6: - -/* Line 1806 of yacc.c */ -#line 244 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 246 "parse-gram.y" { code_props plain_code; code_props_plain_init (&plain_code, (yyvsp[(1) - (1)].chars), (yylsp[(1) - (1)])); @@ -2215,16 +2208,14 @@ yyreduce: break; case 7: - -/* Line 1806 of yacc.c */ -#line 253 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 255 "parse-gram.y" { debug_flag = true; } break; case 8: - -/* Line 1806 of yacc.c */ -#line 255 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 257 "parse-gram.y" { muscle_percent_define_insert ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars), MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE); @@ -2232,16 +2223,14 @@ yyreduce: break; case 9: - -/* Line 1806 of yacc.c */ -#line 259 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 261 "parse-gram.y" { defines_flag = true; } break; case 10: - -/* Line 1806 of yacc.c */ -#line 261 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 263 "parse-gram.y" { defines_flag = true; spec_defines_file = xstrdup ((yyvsp[(2) - (2)].chars)); @@ -2249,44 +2238,38 @@ yyreduce: break; case 11: - -/* Line 1806 of yacc.c */ -#line 265 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 267 "parse-gram.y" { error_verbose = true; } break; case 12: - -/* Line 1806 of yacc.c */ -#line 266 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 268 "parse-gram.y" { expected_sr_conflicts = (yyvsp[(2) - (2)].integer); } break; case 13: - -/* Line 1806 of yacc.c */ -#line 267 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 269 "parse-gram.y" { expected_rr_conflicts = (yyvsp[(2) - (2)].integer); } break; case 14: - -/* Line 1806 of yacc.c */ -#line 268 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 270 "parse-gram.y" { spec_file_prefix = (yyvsp[(2) - (2)].chars); } break; case 15: - -/* Line 1806 of yacc.c */ -#line 269 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 271 "parse-gram.y" { spec_file_prefix = (yyvsp[(3) - (3)].chars); } break; case 16: - -/* Line 1806 of yacc.c */ -#line 271 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 273 "parse-gram.y" { nondeterministic_parser = true; glr_parser = true; @@ -2294,9 +2277,8 @@ yyreduce: break; case 17: - -/* Line 1806 of yacc.c */ -#line 276 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 278 "parse-gram.y" { code_props action; code_props_symbol_action_init (&action, (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); @@ -2308,79 +2290,68 @@ yyreduce: break; case 18: - -/* Line 1806 of yacc.c */ -#line 284 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 286 "parse-gram.y" { language_argmatch ((yyvsp[(2) - (2)].chars), grammar_prio, (yylsp[(1) - (2)])); } break; case 19: - -/* Line 1806 of yacc.c */ -#line 285 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 287 "parse-gram.y" { add_param ("lex_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); } break; case 20: - -/* Line 1806 of yacc.c */ -#line 286 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 288 "parse-gram.y" { locations_flag = true; } break; case 21: - -/* Line 1806 of yacc.c */ -#line 287 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 289 "parse-gram.y" { spec_name_prefix = (yyvsp[(2) - (2)].chars); } break; case 22: - -/* Line 1806 of yacc.c */ -#line 288 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 290 "parse-gram.y" { spec_name_prefix = (yyvsp[(3) - (3)].chars); } break; case 23: - -/* Line 1806 of yacc.c */ -#line 289 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 291 "parse-gram.y" { no_lines_flag = true; } break; case 24: - -/* Line 1806 of yacc.c */ -#line 290 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 292 "parse-gram.y" { nondeterministic_parser = true; } break; case 25: - -/* Line 1806 of yacc.c */ -#line 291 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 293 "parse-gram.y" { spec_outfile = (yyvsp[(2) - (2)].chars); } break; case 26: - -/* Line 1806 of yacc.c */ -#line 292 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 294 "parse-gram.y" { spec_outfile = (yyvsp[(3) - (3)].chars); } break; case 27: - -/* Line 1806 of yacc.c */ -#line 293 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 295 "parse-gram.y" { add_param ("parse_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); } break; case 28: - -/* Line 1806 of yacc.c */ -#line 295 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 297 "parse-gram.y" { /* %pure-parser is deprecated in favor of `%define api.pure', so use `%define api.pure' in a backward-compatible manner here. First, don't @@ -2398,16 +2369,14 @@ yyreduce: break; case 29: - -/* Line 1806 of yacc.c */ -#line 309 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 311 "parse-gram.y" { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); } break; case 30: - -/* Line 1806 of yacc.c */ -#line 311 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 313 "parse-gram.y" { char const *skeleton_user = (yyvsp[(2) - (2)].chars); if (mbschr (skeleton_user, '/')) @@ -2422,7 +2391,7 @@ yyreduce: xmalloc (dir_length + 1 + strlen (skeleton_user) + 1); if (dir_length > 0) { - strncpy (skeleton_build, current_file, dir_length); + memcpy (skeleton_build, current_file, dir_length); skeleton_build[dir_length++] = '/'; } strcpy (skeleton_build + dir_length, skeleton_user); @@ -2434,81 +2403,82 @@ yyreduce: break; case 31: - -/* Line 1806 of yacc.c */ -#line 334 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 336 "parse-gram.y" { token_table_flag = true; } break; case 32: - -/* Line 1806 of yacc.c */ -#line 335 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 337 "parse-gram.y" { report_flag |= report_states; } break; case 33: - -/* Line 1806 of yacc.c */ -#line 336 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 338 "parse-gram.y" { yacc_flag = true; } break; case 37: - -/* Line 1806 of yacc.c */ -#line 344 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 346 "parse-gram.y" { grammar_start_symbol_set ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); } break; case 38: - -/* Line 1806 of yacc.c */ -#line 348 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 350 "parse-gram.y" { - symbol_list *list; - for (list = (yyvsp[(3) - (3)].list); list; list = list->next) - symbol_list_destructor_set (list, (yyvsp[(2) - (3)].code), (yylsp[(2) - (3)])); - symbol_list_free ((yyvsp[(3) - (3)].list)); + code_props code; + code_props_symbol_action_init (&code, (yyvsp[(2) - (3)].code), (yylsp[(2) - (3)])); + code_props_translate_code (&code); + { + symbol_list *list; + for (list = (yyvsp[(3) - (3)].list); list; list = list->next) + symbol_list_destructor_set (list, &code); + symbol_list_free ((yyvsp[(3) - (3)].list)); + } } break; case 39: - -/* Line 1806 of yacc.c */ -#line 355 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 362 "parse-gram.y" { - symbol_list *list; - for (list = (yyvsp[(3) - (3)].list); list; list = list->next) - symbol_list_printer_set (list, (yyvsp[(2) - (3)].code), (yylsp[(2) - (3)])); - symbol_list_free ((yyvsp[(3) - (3)].list)); + code_props code; + code_props_symbol_action_init (&code, (yyvsp[(2) - (3)].code), (yylsp[(2) - (3)])); + code_props_translate_code (&code); + { + symbol_list *list; + for (list = (yyvsp[(3) - (3)].list); list; list = list->next) + symbol_list_printer_set (list, &code); + symbol_list_free ((yyvsp[(3) - (3)].list)); + } } break; case 40: - -/* Line 1806 of yacc.c */ -#line 362 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 374 "parse-gram.y" { default_prec = true; } break; case 41: - -/* Line 1806 of yacc.c */ -#line 366 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 378 "parse-gram.y" { default_prec = false; } break; case 42: - -/* Line 1806 of yacc.c */ -#line 370 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 382 "parse-gram.y" { /* Do not invoke muscle_percent_code_grow here since it invokes muscle_user_name_list_grow. */ @@ -2518,9 +2488,8 @@ yyreduce: break; case 43: - -/* Line 1806 of yacc.c */ -#line 377 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 389 "parse-gram.y" { muscle_percent_code_grow ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)])); code_scanner_last_string_free (); @@ -2528,23 +2497,20 @@ yyreduce: break; case 44: - -/* Line 1806 of yacc.c */ -#line 391 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 403 "parse-gram.y" {} break; case 45: - -/* Line 1806 of yacc.c */ -#line 392 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 404 "parse-gram.y" { muscle_code_grow ("union_name", (yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; case 46: - -/* Line 1806 of yacc.c */ -#line 397 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 409 "parse-gram.y" { union_seen = true; muscle_code_grow ("stype", (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)])); @@ -2553,16 +2519,14 @@ yyreduce: break; case 47: - -/* Line 1806 of yacc.c */ -#line 408 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 420 "parse-gram.y" { current_class = nterm_sym; } break; case 48: - -/* Line 1806 of yacc.c */ -#line 409 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 421 "parse-gram.y" { current_class = unknown_sym; current_type = NULL; @@ -2570,16 +2534,14 @@ yyreduce: break; case 49: - -/* Line 1806 of yacc.c */ -#line 413 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 425 "parse-gram.y" { current_class = token_sym; } break; case 50: - -/* Line 1806 of yacc.c */ -#line 414 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 426 "parse-gram.y" { current_class = unknown_sym; current_type = NULL; @@ -2587,9 +2549,8 @@ yyreduce: break; case 51: - -/* Line 1806 of yacc.c */ -#line 419 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 431 "parse-gram.y" { symbol_list *list; tag_seen = true; @@ -2600,9 +2561,8 @@ yyreduce: break; case 52: - -/* Line 1806 of yacc.c */ -#line 430 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 442 "parse-gram.y" { symbol_list *list; ++current_prec; @@ -2617,128 +2577,110 @@ yyreduce: break; case 53: - -/* Line 1806 of yacc.c */ -#line 444 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 456 "parse-gram.y" { (yyval.assoc) = left_assoc; } break; case 54: - -/* Line 1806 of yacc.c */ -#line 445 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 457 "parse-gram.y" { (yyval.assoc) = right_assoc; } break; case 55: - -/* Line 1806 of yacc.c */ -#line 446 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 458 "parse-gram.y" { (yyval.assoc) = non_assoc; } break; case 56: - -/* Line 1806 of yacc.c */ -#line 450 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 462 "parse-gram.y" { current_type = NULL; } break; case 57: - -/* Line 1806 of yacc.c */ -#line 451 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 463 "parse-gram.y" { current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; } break; case 58: - -/* Line 1806 of yacc.c */ -#line 457 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 469 "parse-gram.y" { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); } break; case 59: - -/* Line 1806 of yacc.c */ -#line 459 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 471 "parse-gram.y" { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); } break; case 60: - -/* Line 1806 of yacc.c */ -#line 463 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 475 "parse-gram.y" { (yyval.symbol) = (yyvsp[(1) - (1)].symbol); } break; case 61: - -/* Line 1806 of yacc.c */ -#line 464 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 476 "parse-gram.y" { (yyval.symbol) = (yyvsp[(1) - (2)].symbol); symbol_user_token_number_set ((yyvsp[(1) - (2)].symbol), (yyvsp[(2) - (2)].integer), (yylsp[(2) - (2)])); } break; case 62: - -/* Line 1806 of yacc.c */ -#line 470 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 482 "parse-gram.y" { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); } break; case 63: - -/* Line 1806 of yacc.c */ -#line 472 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 484 "parse-gram.y" { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); } break; case 64: - -/* Line 1806 of yacc.c */ -#line 476 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 488 "parse-gram.y" { (yyval.list) = (yyvsp[(1) - (1)].list); } break; case 65: - -/* Line 1806 of yacc.c */ -#line 477 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 489 "parse-gram.y" { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); } break; case 66: - -/* Line 1806 of yacc.c */ -#line 481 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 493 "parse-gram.y" { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); } break; case 67: - -/* Line 1806 of yacc.c */ -#line 482 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 494 "parse-gram.y" { (yyval.list) = symbol_list_type_new ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; case 68: - -/* Line 1806 of yacc.c */ -#line 483 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 495 "parse-gram.y" { (yyval.list) = symbol_list_default_tagged_new ((yylsp[(1) - (1)])); } break; case 69: - -/* Line 1806 of yacc.c */ -#line 484 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 496 "parse-gram.y" { (yyval.list) = symbol_list_default_tagless_new ((yylsp[(1) - (1)])); } break; case 70: - -/* Line 1806 of yacc.c */ -#line 490 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 502 "parse-gram.y" { current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; @@ -2746,9 +2688,8 @@ yyreduce: break; case 71: - -/* Line 1806 of yacc.c */ -#line 495 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 507 "parse-gram.y" { symbol_class_set ((yyvsp[(1) - (1)].symbol), current_class, (yylsp[(1) - (1)]), true); symbol_type_set ((yyvsp[(1) - (1)].symbol), current_type, (yylsp[(1) - (1)])); @@ -2756,9 +2697,8 @@ yyreduce: break; case 72: - -/* Line 1806 of yacc.c */ -#line 500 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 512 "parse-gram.y" { symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true); symbol_type_set ((yyvsp[(1) - (2)].symbol), current_type, (yylsp[(1) - (2)])); @@ -2767,9 +2707,8 @@ yyreduce: break; case 73: - -/* Line 1806 of yacc.c */ -#line 506 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 518 "parse-gram.y" { symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true); symbol_type_set ((yyvsp[(1) - (2)].symbol), current_type, (yylsp[(1) - (2)])); @@ -2778,9 +2717,8 @@ yyreduce: break; case 74: - -/* Line 1806 of yacc.c */ -#line 512 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 524 "parse-gram.y" { symbol_class_set ((yyvsp[(1) - (3)].symbol), current_class, (yylsp[(1) - (3)]), true); symbol_type_set ((yyvsp[(1) - (3)].symbol), current_type, (yylsp[(1) - (3)])); @@ -2790,25 +2728,22 @@ yyreduce: break; case 81: - -/* Line 1806 of yacc.c */ -#line 542 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 554 "parse-gram.y" { yyerrok; } break; case 82: - -/* Line 1806 of yacc.c */ -#line 548 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 560 "parse-gram.y" { current_lhs ((yyvsp[(1) - (2)].symbol), (yylsp[(1) - (2)]), (yyvsp[(2) - (2)].named_ref)); } break; case 83: - -/* Line 1806 of yacc.c */ -#line 549 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 561 "parse-gram.y" { /* Free the current lhs. */ current_lhs (0, (yylsp[(1) - (4)]), 0); @@ -2816,101 +2751,87 @@ yyreduce: break; case 84: - -/* Line 1806 of yacc.c */ -#line 556 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 568 "parse-gram.y" { grammar_current_rule_end ((yylsp[(1) - (1)])); } break; case 85: - -/* Line 1806 of yacc.c */ -#line 557 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 569 "parse-gram.y" { grammar_current_rule_end ((yylsp[(3) - (3)])); } break; case 87: - -/* Line 1806 of yacc.c */ -#line 563 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 575 "parse-gram.y" { grammar_current_rule_begin (current_lhs_symbol, current_lhs_location, current_lhs_named_ref); } break; case 88: - -/* Line 1806 of yacc.c */ -#line 566 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 578 "parse-gram.y" { grammar_current_rule_symbol_append ((yyvsp[(2) - (3)].symbol), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].named_ref)); } break; case 89: - -/* Line 1806 of yacc.c */ -#line 568 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 580 "parse-gram.y" { grammar_current_rule_action_append ((yyvsp[(2) - (3)].code), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].named_ref)); } break; case 90: - -/* Line 1806 of yacc.c */ -#line 570 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 582 "parse-gram.y" { grammar_current_rule_prec_set ((yyvsp[(3) - (3)].symbol), (yylsp[(3) - (3)])); } break; case 91: - -/* Line 1806 of yacc.c */ -#line 572 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 584 "parse-gram.y" { grammar_current_rule_dprec_set ((yyvsp[(3) - (3)].integer), (yylsp[(3) - (3)])); } break; case 92: - -/* Line 1806 of yacc.c */ -#line 574 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 586 "parse-gram.y" { grammar_current_rule_merge_set ((yyvsp[(3) - (3)].uniqstr), (yylsp[(3) - (3)])); } break; case 93: - -/* Line 1806 of yacc.c */ -#line 578 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 590 "parse-gram.y" { (yyval.named_ref) = 0; } break; case 94: - -/* Line 1806 of yacc.c */ -#line 580 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 592 "parse-gram.y" { (yyval.named_ref) = named_ref_new((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; case 96: - -/* Line 1806 of yacc.c */ -#line 592 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 604 "parse-gram.y" { (yyval.uniqstr) = uniqstr_new ((yyvsp[(1) - (1)].chars)); } break; case 97: - -/* Line 1806 of yacc.c */ -#line 597 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 609 "parse-gram.y" { (yyval.chars) = ""; } break; case 98: - -/* Line 1806 of yacc.c */ -#line 598 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 610 "parse-gram.y" { (yyval.chars) = (yyvsp[(1) - (1)].uniqstr); } break; case 100: - -/* Line 1806 of yacc.c */ -#line 609 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 621 "parse-gram.y" { code_props plain_code; (yyvsp[(1) - (1)].code)[strlen ((yyvsp[(1) - (1)].code)) - 1] = '\n'; @@ -2922,16 +2843,14 @@ yyreduce: break; case 101: - -/* Line 1806 of yacc.c */ -#line 629 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 641 "parse-gram.y" { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; case 102: - -/* Line 1806 of yacc.c */ -#line 631 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 643 "parse-gram.y" { (yyval.symbol) = symbol_get (char_name ((yyvsp[(1) - (1)].character)), (yylsp[(1) - (1)])); symbol_class_set ((yyval.symbol), token_sym, (yylsp[(1) - (1)]), false); @@ -2940,16 +2859,14 @@ yyreduce: break; case 103: - -/* Line 1806 of yacc.c */ -#line 639 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 651 "parse-gram.y" { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; case 106: - -/* Line 1806 of yacc.c */ -#line 651 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 663 "parse-gram.y" { (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)]), false); @@ -2957,9 +2874,8 @@ yyreduce: break; case 108: - -/* Line 1806 of yacc.c */ -#line 660 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 672 "parse-gram.y" { code_props plain_code; code_props_plain_init (&plain_code, (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); @@ -2971,9 +2887,8 @@ yyreduce: break; - -/* Line 1806 of yacc.c */ -#line 2977 "parse-gram.c" +/* Line 1813 of yacc.c */ +#line 2892 "parse-gram.c" default: break; } if (yychar_backup != yychar) @@ -3148,7 +3063,9 @@ yyerrlab1: current lookahead token, the shift below will for sure. */ YY_LAC_DISCARD ("error recovery"); + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN *++yyvsp = yylval; + YY_IGNORE_MAYBE_UNINITIALIZED_END yyerror_range[2] = yylloc; /* Using YYLLOC is tempting, but would change the location of @@ -3221,9 +3138,8 @@ yyreturn: } - -/* Line 2067 of yacc.c */ -#line 670 "parse-gram.y" +/* Line 2076 of yacc.c */ +#line 682 "parse-gram.y" @@ -3280,27 +3196,19 @@ add_param (char const *type, char *decl, location loc) /* Strip the surrounding '{' and '}', and any blanks just inside the braces. */ - while (*--p == ' ' || *p == '\t') - continue; + --p; + while (c_isspace ((unsigned char) *p)) + --p; p[1] = '\0'; - while (*++decl == ' ' || *decl == '\t') - continue; + ++decl; + while (c_isspace ((unsigned char) *decl)) + ++decl; if (! name_start) complain_at (loc, _("missing identifier in parameter declaration")); else { - char *name; - size_t name_len; - - for (name_len = 1; - memchr (alphanum, name_start[name_len], sizeof alphanum); - name_len++) - continue; - - name = xmalloc (name_len + 1); - memcpy (name, name_start, name_len); - name[name_len] = '\0'; + char *name = xmemdup0 (name_start, strspn (name_start, alphanum)); muscle_pair_list_grow (type, decl, name); free (name); } @@ -3315,8 +3223,8 @@ version_check (location const *loc, char const *version) if (strverscmp (version, PACKAGE_VERSION) > 0) { complain_at (*loc, "require bison %s, but have %s", - version, PACKAGE_VERSION); - exit (63); + version, PACKAGE_VERSION); + exit (EX_MISMATCH); } } @@ -3344,4 +3252,3 @@ char_name (char c) return quotearg_style (escape_quoting_style, buf); } } -