X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/0294b13074674d33f3e8d8f57091b526b1693cbd..595284e9d0277517bac8f3fc7bcdd529d97aa6f9:/src/parse-gram.c diff --git a/src/parse-gram.c b/src/parse-gram.c index 8e8fc6c3..92bb62cf 100644 --- a/src/parse-gram.c +++ b/src/parse-gram.c @@ -1,4 +1,4 @@ -/* A Bison parser, made by GNU Bison 2.5.1.885-485b-dirty. */ +/* A Bison parser, made by GNU Bison 2.6.2.873-d87e-dirty. */ /* Bison implementation for Yacc-like parsers in C @@ -44,7 +44,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.5.1.885-485b-dirty" +#define YYBISON_VERSION "2.6.2.873-d87e-dirty" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -70,7 +70,7 @@ #define yylloc gram_lloc /* Copy the first part of user declarations. */ -/* Line 337 of yacc.c */ +/* Line 331 of yacc.c */ #line 1 "src/parse-gram.y" /* Bison Grammar Parser -*- C -*- @@ -94,6 +94,7 @@ #include #include "system.h" +#include "c-ctype.h" #include "complain.h" #include "conflicts.h" #include "files.h" @@ -126,8 +127,8 @@ static void gram_error (location const *, char const *); static char const *char_name (char); -/* Line 337 of yacc.c */ -#line 131 "src/parse-gram.c" +/* Line 331 of yacc.c */ +#line 132 "src/parse-gram.c" # ifndef YY_NULL # if defined __cplusplus && 201103L <= __cplusplus @@ -157,8 +158,8 @@ static char const *char_name (char); extern int gram_debug; #endif /* "%code requires" blocks. */ -/* Line 351 of yacc.c */ -#line 222 "src/parse-gram.y" +/* Line 347 of yacc.c */ +#line 223 "src/parse-gram.y" # ifndef PARAM_TYPE # define PARAM_TYPE @@ -172,8 +173,8 @@ extern int gram_debug; # endif -/* Line 351 of yacc.c */ -#line 177 "src/parse-gram.c" +/* Line 347 of yacc.c */ +#line 178 "src/parse-gram.c" /* Tokens. */ #ifndef YYTOKENTYPE @@ -299,8 +300,8 @@ extern int gram_debug; #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE { -/* Line 351 of yacc.c */ -#line 108 "src/parse-gram.y" +/* Line 347 of yacc.c */ +#line 109 "src/parse-gram.y" assoc assoc; char *code; @@ -312,20 +313,19 @@ typedef union YYSTYPE uniqstr uniqstr; unsigned char character; -/* Line 351 of yacc.c */ -#line 246 "src/parse-gram.y" +/* Line 347 of yacc.c */ +#line 247 "src/parse-gram.y" param_type param; -/* Line 351 of yacc.c */ -#line 420 "src/parse-gram.y" +/* Line 347 of yacc.c */ +#line 426 "src/parse-gram.y" code_props_type code_type; -/* Line 351 of yacc.c */ -#line 326 "src/parse-gram.c" +/* Line 347 of yacc.c */ +#line 327 "src/parse-gram.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 -# define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 #endif @@ -337,37 +337,22 @@ typedef struct YYLTYPE int last_line; int last_column; } YYLTYPE; -# define yyltype YYLTYPE /* obsolescent; will be withdrawn */ # define YYLTYPE_IS_DECLARED 1 # define YYLTYPE_IS_TRIVIAL 1 #endif -#ifdef YYPARSE_PARAM -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -int gram_parse (void *YYPARSE_PARAM); -#else -int gram_parse (); -#endif -#else /* ! YYPARSE_PARAM */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) int gram_parse (void); -#else -int gram_parse (); -#endif -#endif /* ! YYPARSE_PARAM */ #endif /* !GRAM_SRC_PARSE_GRAM_H */ /* Copy the second part of user declarations. */ -/* Line 354 of yacc.c */ -#line 368 "src/parse-gram.c" +/* Line 350 of yacc.c */ +#line 353 "src/parse-gram.c" /* Unqualified %code blocks. */ -/* Line 355 of yacc.c */ -#line 57 "src/parse-gram.y" +/* Line 351 of yacc.c */ +#line 58 "src/parse-gram.y" static int current_prec = 0; static location current_lhs_location; @@ -399,8 +384,8 @@ int gram_parse (); #define YYTYPE_UINT16 uint_fast16_t #define YYTYPE_UINT8 uint_fast8_t -/* Line 355 of yacc.c */ -#line 235 "src/parse-gram.y" +/* Line 351 of yacc.c */ +#line 236 "src/parse-gram.y" /** Add a lex-param and/or a parse-param. * @@ -412,8 +397,8 @@ int gram_parse (); static param_type current_param = param_none; -/* Line 355 of yacc.c */ -#line 417 "src/parse-gram.c" +/* Line 351 of yacc.c */ +#line 402 "src/parse-gram.c" #ifdef short # undef short @@ -427,11 +412,8 @@ typedef unsigned char yytype_uint8; #ifdef YYTYPE_INT8 typedef YYTYPE_INT8 yytype_int8; -#elif (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -typedef signed char yytype_int8; #else -typedef short int yytype_int8; +typedef signed char yytype_int8; #endif #ifdef YYTYPE_UINT16 @@ -451,8 +433,7 @@ typedef short int yytype_int16; # define YYSIZE_T __SIZE_TYPE__ # elif defined size_t # define YYSIZE_T size_t -# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# elif ! defined YYSIZE_T # include /* INFRINGES ON USER NAME SPACE */ # define YYSIZE_T size_t # else @@ -475,37 +456,19 @@ typedef short int yytype_int16; #endif /* Suppress unused-variable warnings by "using" E. */ -#if ! defined lint || defined __GNUC__ +#ifdef __GNUC__ # define YYUSE(e) ((void) (e)) #else # define YYUSE(e) /* empty */ #endif -/* Identity function, used to suppress warnings about constant conditions. */ -#ifndef lint -# define YYID(n) (n) -#else -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static int -YYID (int yyi) -#else -static int -YYID (yyi) - int yyi; -#endif -{ - return yyi; -} -#endif - #if 1 /* The parser invokes alloca or malloc; define the necessary symbols. */ # ifdef YYSTACK_ALLOC /* Pacify GCC's `empty if-body' warning. */ -# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0)) +# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0) # ifndef YYSTACK_ALLOC_MAXIMUM /* The OS might guarantee only one guard page at the bottom of the stack, and a page size can be as small as 4096 bytes. So we cannot safely @@ -529,15 +492,13 @@ YYID (yyi) # endif # ifndef YYMALLOC # define YYMALLOC malloc -# if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# if ! defined malloc && ! defined EXIT_SUCCESS void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ # endif # endif # ifndef YYFREE # define YYFREE free -# if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# if ! defined free && ! defined EXIT_SUCCESS void free (void *); /* INFRINGES ON USER NAME SPACE */ # endif # endif @@ -584,7 +545,7 @@ union yyalloc yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ yyptr += yynewbytes / sizeof (*yyptr); \ } \ - while (YYID (0)) + while (0) #endif @@ -603,7 +564,7 @@ union yyalloc for (yyi = 0; yyi < (Count); yyi++) \ (Dst)[yyi] = (Src)[yyi]; \ } \ - while (YYID (0)) + while (0) # endif # endif #endif /* !YYCOPY_NEEDED */ @@ -672,18 +633,18 @@ static const yytype_uint8 yytranslate[] = /* YYRLINEYYN -- Source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 271, 271, 279, 281, 285, 286, 296, 300, 305, - 306, 311, 316, 317, 318, 319, 320, 325, 334, 335, - 336, 337, 338, 339, 340, 341, 341, 342, 343, 367, - 368, 369, 370, 374, 375, 384, 385, 386, 390, 397, - 401, 405, 412, 423, 424, 434, 435, 439, 451, 451, - 456, 456, 461, 472, 487, 488, 489, 490, 494, 495, - 500, 502, 507, 508, 513, 515, 520, 521, 525, 526, - 530, 531, 532, 537, 542, 547, 553, 559, 570, 571, - 580, 581, 587, 588, 589, 596, 596, 604, 605, 606, - 611, 613, 615, 617, 619, 621, 623, 628, 630, 640, - 641, 646, 647, 648, 657, 677, 679, 688, 693, 694, - 699, 706, 708 + 0, 272, 272, 280, 282, 286, 287, 297, 301, 306, + 307, 312, 317, 318, 319, 320, 321, 326, 335, 336, + 337, 338, 339, 340, 341, 342, 342, 343, 344, 368, + 369, 370, 371, 375, 376, 385, 386, 387, 391, 403, + 407, 411, 418, 429, 430, 440, 441, 445, 457, 457, + 462, 462, 467, 478, 493, 494, 495, 496, 500, 501, + 506, 508, 513, 514, 519, 521, 526, 527, 531, 532, + 536, 537, 538, 543, 548, 553, 559, 565, 576, 577, + 586, 587, 593, 594, 595, 602, 602, 610, 611, 612, + 617, 619, 621, 623, 625, 627, 629, 634, 636, 646, + 647, 652, 653, 654, 663, 683, 685, 694, 699, 700, + 705, 712, 714 }; #endif @@ -739,7 +700,7 @@ static const yytype_uint16 yytoknum[] = #define YYTABLE_NINF -112 #define yytable_value_is_error(yytable_value) \ - YYID (0) + 0 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ @@ -913,21 +874,6 @@ static const yytype_uint8 yyr2[] = #define YYERROR goto yyerrorlab -/* Like YYERROR except do call yyerror. This remains here temporarily - to ease the transition to the new meaning of YYERROR, for GCC. - Once GCC version 2 has supplanted version 1, this can go. However, - YYFAIL appears to be in use. Nevertheless, it is formally deprecated - in Bison 2.4.2's NEWS entry, where a plan to phase it out is - discussed. */ - -#define YYFAIL goto yyerrlab -#if defined YYFAIL - /* This is here to suppress warnings from the GCC cpp's - -Wunused-macros. Normally we don't worry about that warning, but - some users do, and we want to make it easy for users to remove - YYFAIL uses, which will produce warnings from Bison 2.5. */ -#endif - #define YYRECOVERING() (!!yyerrstatus) #define YYBACKUP(Token, Value) \ @@ -946,7 +892,7 @@ do \ yyerror (YY_("syntax error: cannot back up")); \ YYERROR; \ } \ -while (YYID (0)) +while (0) #define YYTERROR 1 @@ -960,7 +906,7 @@ while (YYID (0)) #ifndef YYLLOC_DEFAULT # define YYLLOC_DEFAULT(Current, Rhs, N) \ do \ - if (YYID (N)) \ + if (N) \ { \ (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ @@ -974,7 +920,7 @@ while (YYID (0)) (Current).first_column = (Current).last_column = \ YYRHSLOC (Rhs, 0).last_column; \ } \ - while (YYID (0)) + while (0) #endif #define YYRHSLOC(Rhs, K) ((Rhs)[K]) @@ -1015,7 +961,7 @@ while (YYID (0)) do { \ if (yydebug) \ YYFPRINTF Args; \ -} while (YYID (0)) +} while (0) # define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ do { \ @@ -1026,26 +972,15 @@ do { \ Type, Value, Location); \ YYFPRINTF (stderr, "\n"); \ } \ -} while (YYID (0)) +} while (0) /*--------------------------------. | Print this symbol on YYOUTPUT. | `--------------------------------*/ -/*ARGSUSED*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static void yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp) -#else -static void -yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp) - FILE *yyoutput; - int yytype; - YYSTYPE const * const yyvaluep; - YYLTYPE const * const yylocationp; -#endif { FILE *yyo = yyoutput; YYUSE(yyo); @@ -1059,96 +994,96 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp) switch (yytype) { case 3: // "string" -/* Line 740 of yacc.c */ -#line 195 "src/parse-gram.y" +/* Line 709 of yacc.c */ +#line 196 "src/parse-gram.y" { fputs (quotearg_style (c_quoting_style, ((*yyvaluep).chars)), yyo); } -/* Line 740 of yacc.c */ -#line 1067 "src/parse-gram.c" +/* Line 709 of yacc.c */ +#line 1002 "src/parse-gram.c" break; case 4: // "integer" -/* Line 740 of yacc.c */ -#line 208 "src/parse-gram.y" +/* Line 709 of yacc.c */ +#line 209 "src/parse-gram.y" { fprintf (yyo, "%d", ((*yyvaluep).integer)); } -/* Line 740 of yacc.c */ -#line 1075 "src/parse-gram.c" +/* Line 709 of yacc.c */ +#line 1010 "src/parse-gram.c" break; case 24: // "%" -/* Line 740 of yacc.c */ -#line 204 "src/parse-gram.y" +/* Line 709 of yacc.c */ +#line 205 "src/parse-gram.y" { fprintf (yyo, "%%%s", ((*yyvaluep).uniqstr)); } -/* Line 740 of yacc.c */ -#line 1083 "src/parse-gram.c" +/* Line 709 of yacc.c */ +#line 1018 "src/parse-gram.c" break; case 40: // "{...}" -/* Line 740 of yacc.c */ -#line 197 "src/parse-gram.y" +/* Line 709 of yacc.c */ +#line 198 "src/parse-gram.y" { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).code)); } -/* Line 740 of yacc.c */ -#line 1091 "src/parse-gram.c" +/* Line 709 of yacc.c */ +#line 1026 "src/parse-gram.c" break; case 42: // "[identifier]" -/* Line 740 of yacc.c */ -#line 202 "src/parse-gram.y" +/* Line 709 of yacc.c */ +#line 203 "src/parse-gram.y" { fprintf (yyo, "[%s]", ((*yyvaluep).uniqstr)); } -/* Line 740 of yacc.c */ -#line 1099 "src/parse-gram.c" +/* Line 709 of yacc.c */ +#line 1034 "src/parse-gram.c" break; case 43: // "char" -/* Line 740 of yacc.c */ -#line 189 "src/parse-gram.y" +/* Line 709 of yacc.c */ +#line 190 "src/parse-gram.y" { fputs (char_name (((*yyvaluep).character)), yyo); } -/* Line 740 of yacc.c */ -#line 1107 "src/parse-gram.c" +/* Line 709 of yacc.c */ +#line 1042 "src/parse-gram.c" break; case 44: // "epilogue" -/* Line 740 of yacc.c */ -#line 197 "src/parse-gram.y" +/* Line 709 of yacc.c */ +#line 198 "src/parse-gram.y" { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); } -/* Line 740 of yacc.c */ -#line 1115 "src/parse-gram.c" +/* Line 709 of yacc.c */ +#line 1050 "src/parse-gram.c" break; case 46: // "identifier" -/* Line 740 of yacc.c */ -#line 201 "src/parse-gram.y" +/* Line 709 of yacc.c */ +#line 202 "src/parse-gram.y" { fputs (((*yyvaluep).uniqstr), yyo); } -/* Line 740 of yacc.c */ -#line 1123 "src/parse-gram.c" +/* Line 709 of yacc.c */ +#line 1058 "src/parse-gram.c" break; case 47: // "identifier:" -/* Line 740 of yacc.c */ -#line 203 "src/parse-gram.y" +/* Line 709 of yacc.c */ +#line 204 "src/parse-gram.y" { fprintf (yyo, "%s:", ((*yyvaluep).uniqstr)); } -/* Line 740 of yacc.c */ -#line 1131 "src/parse-gram.c" +/* Line 709 of yacc.c */ +#line 1066 "src/parse-gram.c" break; case 50: // "%{...%}" -/* Line 740 of yacc.c */ -#line 197 "src/parse-gram.y" +/* Line 709 of yacc.c */ +#line 198 "src/parse-gram.y" { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); } -/* Line 740 of yacc.c */ -#line 1139 "src/parse-gram.c" +/* Line 709 of yacc.c */ +#line 1074 "src/parse-gram.c" break; case 52: // "" -/* Line 740 of yacc.c */ -#line 205 "src/parse-gram.y" +/* Line 709 of yacc.c */ +#line 206 "src/parse-gram.y" { fprintf (yyo, "<%s>", ((*yyvaluep).uniqstr)); } -/* Line 740 of yacc.c */ -#line 1147 "src/parse-gram.c" +/* Line 709 of yacc.c */ +#line 1082 "src/parse-gram.c" break; case 55: // "%param" -/* Line 740 of yacc.c */ -#line 251 "src/parse-gram.y" +/* Line 709 of yacc.c */ +#line 252 "src/parse-gram.y" { switch (((*yyvaluep).param)) { @@ -1161,88 +1096,88 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp) case param_none: aver (false); break; } } -/* Line 740 of yacc.c */ -#line 1166 "src/parse-gram.c" +/* Line 709 of yacc.c */ +#line 1101 "src/parse-gram.c" break; case 64: // code_props_type -/* Line 740 of yacc.c */ -#line 421 "src/parse-gram.y" +/* Line 709 of yacc.c */ +#line 427 "src/parse-gram.y" { fprintf (yyo, "%s", code_props_type_string (((*yyvaluep).code_type))); } -/* Line 740 of yacc.c */ -#line 1174 "src/parse-gram.c" +/* Line 709 of yacc.c */ +#line 1109 "src/parse-gram.c" break; case 73: // symbol.prec -/* Line 740 of yacc.c */ -#line 211 "src/parse-gram.y" +/* Line 709 of yacc.c */ +#line 212 "src/parse-gram.y" { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); } -/* Line 740 of yacc.c */ -#line 1182 "src/parse-gram.c" +/* Line 709 of yacc.c */ +#line 1117 "src/parse-gram.c" break; case 77: // tag -/* Line 740 of yacc.c */ -#line 205 "src/parse-gram.y" +/* Line 709 of yacc.c */ +#line 206 "src/parse-gram.y" { fprintf (yyo, "<%s>", ((*yyvaluep).uniqstr)); } -/* Line 740 of yacc.c */ -#line 1190 "src/parse-gram.c" +/* Line 709 of yacc.c */ +#line 1125 "src/parse-gram.c" break; case 87: // variable -/* Line 740 of yacc.c */ -#line 201 "src/parse-gram.y" +/* Line 709 of yacc.c */ +#line 202 "src/parse-gram.y" { fputs (((*yyvaluep).uniqstr), yyo); } -/* Line 740 of yacc.c */ -#line 1198 "src/parse-gram.c" +/* Line 709 of yacc.c */ +#line 1133 "src/parse-gram.c" break; case 88: // content.opt -/* Line 740 of yacc.c */ -#line 197 "src/parse-gram.y" +/* Line 709 of yacc.c */ +#line 198 "src/parse-gram.y" { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); } -/* Line 740 of yacc.c */ -#line 1206 "src/parse-gram.c" +/* Line 709 of yacc.c */ +#line 1141 "src/parse-gram.c" break; case 89: // braceless -/* Line 740 of yacc.c */ -#line 197 "src/parse-gram.y" +/* Line 709 of yacc.c */ +#line 198 "src/parse-gram.y" { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); } -/* Line 740 of yacc.c */ -#line 1214 "src/parse-gram.c" +/* Line 709 of yacc.c */ +#line 1149 "src/parse-gram.c" break; case 90: // id -/* Line 740 of yacc.c */ -#line 211 "src/parse-gram.y" +/* Line 709 of yacc.c */ +#line 212 "src/parse-gram.y" { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); } -/* Line 740 of yacc.c */ -#line 1222 "src/parse-gram.c" +/* Line 709 of yacc.c */ +#line 1157 "src/parse-gram.c" break; case 91: // id_colon -/* Line 740 of yacc.c */ -#line 212 "src/parse-gram.y" +/* Line 709 of yacc.c */ +#line 213 "src/parse-gram.y" { fprintf (yyo, "%s:", ((*yyvaluep).symbol)->tag); } -/* Line 740 of yacc.c */ -#line 1230 "src/parse-gram.c" +/* Line 709 of yacc.c */ +#line 1165 "src/parse-gram.c" break; case 92: // symbol -/* Line 740 of yacc.c */ -#line 211 "src/parse-gram.y" +/* Line 709 of yacc.c */ +#line 212 "src/parse-gram.y" { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); } -/* Line 740 of yacc.c */ -#line 1238 "src/parse-gram.c" +/* Line 709 of yacc.c */ +#line 1173 "src/parse-gram.c" break; case 93: // string_as_id -/* Line 740 of yacc.c */ -#line 211 "src/parse-gram.y" +/* Line 709 of yacc.c */ +#line 212 "src/parse-gram.y" { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); } -/* Line 740 of yacc.c */ -#line 1246 "src/parse-gram.c" +/* Line 709 of yacc.c */ +#line 1181 "src/parse-gram.c" break; default: @@ -1255,18 +1190,8 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp) | Print this symbol on YYOUTPUT. | `--------------------------------*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static void yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp) -#else -static void -yy_symbol_print (yyoutput, yytype, yyvaluep, yylocationp) - FILE *yyoutput; - int yytype; - YYSTYPE const * const yyvaluep; - YYLTYPE const * const yylocationp; -#endif { if (yytype < YYNTOKENS) YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); @@ -1284,16 +1209,8 @@ yy_symbol_print (yyoutput, yytype, yyvaluep, yylocationp) | TOP (included). | `------------------------------------------------------------------*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static void yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop) -#else -static void -yy_stack_print (yybottom, yytop) - yytype_int16 *yybottom; - yytype_int16 *yytop; -#endif { YYFPRINTF (stderr, "Stack now"); for (; yybottom <= yytop; yybottom++) @@ -1308,25 +1225,15 @@ yy_stack_print (yybottom, yytop) do { \ if (yydebug) \ yy_stack_print ((Bottom), (Top)); \ -} while (YYID (0)) +} while (0) /*------------------------------------------------. | Report that the YYRULE is going to be reduced. | `------------------------------------------------*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static void yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, YYLTYPE *yylsp, int yyrule) -#else -static void -yy_reduce_print (yyssp, yyvsp, yylsp, yyrule) - yytype_int16 *yyssp; - YYSTYPE *yyvsp; - YYLTYPE *yylsp; - int yyrule; -#endif { unsigned long int yylno = yyrline[yyrule]; int yynrhs = yyr2[yyrule]; @@ -1349,7 +1256,7 @@ yy_reduce_print (yyssp, yyvsp, yylsp, yyrule) do { \ if (yydebug) \ yy_reduce_print (yyssp, yyvsp, yylsp, Rule); \ -} while (YYID (0)) +} while (0) /* Nonzero means print parse trace. It is left uninitialized so that multiple parsers can coexist. */ @@ -1480,7 +1387,7 @@ do { \ goto yyerrlab; \ } \ } \ -} while (YYID (0)) +} while (0) /* Discard any previous initial lookahead context because of Event, which may be a lookahead change or an invalidation of the currently @@ -1503,7 +1410,7 @@ do { \ Event "\n"); \ yy_lac_established = 0; \ } \ -} while (YYID (0)) +} while (0) #else # define YY_LAC_DISCARD(Event) yy_lac_established = 0 #endif @@ -1619,15 +1526,8 @@ yy_lac (yytype_int16 *yyesa, yytype_int16 **yyes, # define yystrlen strlen # else /* Return the length of YYSTR. */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static YYSIZE_T yystrlen (const char *yystr) -#else -static YYSIZE_T -yystrlen (yystr) - const char *yystr; -#endif { YYSIZE_T yylen; for (yylen = 0; yystr[yylen]; yylen++) @@ -1643,16 +1543,8 @@ yystrlen (yystr) # else /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in YYDEST. */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static char * yystpcpy (char *yydest, const char *yysrc) -#else -static char * -yystpcpy (yydest, yysrc) - char *yydest; - const char *yysrc; -#endif { char *yyd = yydest; const char *yys = yysrc; @@ -1741,10 +1633,6 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, int yycount = 0; /* There are many possibilities here to consider: - - Assume YYFAIL is not used. It's too flawed to consider. See - - for details. YYERROR is fine as it does not invoke this - function. - If this state is a consistent state with a default action, then the only way this function was invoked is if the default action is an error action. In that case, don't check for expected @@ -1859,19 +1747,8 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, | Release the memory associated to this symbol. | `-----------------------------------------------*/ -/*ARGSUSED*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static void yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocationp) -#else -static void -yydestruct (yymsg, yytype, yyvaluep, yylocationp) - const char *yymsg; - int yytype; - YYSTYPE *yyvaluep; - YYLTYPE *yylocationp; -#endif { YYUSE(yyvaluep); YYUSE (yylocationp); @@ -1893,27 +1770,8 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp) | yyparse. | `----------*/ -#ifdef YYPARSE_PARAM -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -int -yyparse (void *YYPARSE_PARAM) -#else -int -yyparse (YYPARSE_PARAM) - void *YYPARSE_PARAM; -#endif -#else /* ! YYPARSE_PARAM */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) int yyparse (void) -#else -int -yyparse () - -#endif -#endif { /* The lookahead symbol. */ int yychar; @@ -1967,7 +1825,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; @@ -1986,7 +1844,6 @@ YYLTYPE yylloc; Keep to zero when no symbol should be popped. */ int yylen = 0; - yytoken = 0; yyss = yyssa; yyvs = yyvsa; yyls = yylsa; @@ -2019,18 +1876,17 @@ YYLTYPE yylloc; #endif /* User initialization code. */ -/* Line 1505 of yacc.c */ -#line 100 "src/parse-gram.y" +/* Line 1464 of yacc.c */ +#line 101 "src/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 1505 of yacc.c */ -#line 2032 "src/parse-gram.c" +/* Line 1464 of yacc.c */ +#line 1889 "src/parse-gram.c" yylsp[0] = yylloc; - goto yysetstate; /*------------------------------------------------------------. @@ -2221,8 +2077,8 @@ yyreduce: switch (yyn) { case 6: -/* Line 1721 of yacc.c */ -#line 287 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 288 "src/parse-gram.y" { code_props plain_code; code_props_plain_init (&plain_code, (yyvsp[0].chars), (yylsp[0])); @@ -2232,107 +2088,107 @@ yyreduce: plain_code.code, (yylsp[0])); code_scanner_last_string_free (); } -/* Line 1721 of yacc.c */ -#line 2237 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2093 "src/parse-gram.c" break; case 7: -/* Line 1721 of yacc.c */ -#line 297 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 298 "src/parse-gram.y" { muscle_percent_define_ensure ((yyvsp[0].uniqstr), (yylsp[0]), true); } -/* Line 1721 of yacc.c */ -#line 2247 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2103 "src/parse-gram.c" break; case 8: -/* Line 1721 of yacc.c */ -#line 301 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 302 "src/parse-gram.y" { muscle_percent_define_insert ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].chars), MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE); } -/* Line 1721 of yacc.c */ -#line 2258 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2114 "src/parse-gram.c" break; case 9: -/* Line 1721 of yacc.c */ -#line 305 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 306 "src/parse-gram.y" { defines_flag = true; } -/* Line 1721 of yacc.c */ -#line 2266 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2122 "src/parse-gram.c" break; case 10: -/* Line 1721 of yacc.c */ -#line 307 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 308 "src/parse-gram.y" { defines_flag = true; spec_defines_file = xstrdup ((yyvsp[0].chars)); } -/* Line 1721 of yacc.c */ -#line 2277 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2133 "src/parse-gram.c" break; case 11: -/* Line 1721 of yacc.c */ -#line 312 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 313 "src/parse-gram.y" { muscle_percent_define_insert ("parse.error", (yylsp[0]), "verbose", MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE); } -/* Line 1721 of yacc.c */ -#line 2288 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2144 "src/parse-gram.c" break; case 12: -/* Line 1721 of yacc.c */ -#line 316 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 317 "src/parse-gram.y" { expected_sr_conflicts = (yyvsp[0].integer); } -/* Line 1721 of yacc.c */ -#line 2296 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2152 "src/parse-gram.c" break; case 13: -/* Line 1721 of yacc.c */ -#line 317 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 318 "src/parse-gram.y" { expected_rr_conflicts = (yyvsp[0].integer); } -/* Line 1721 of yacc.c */ -#line 2304 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2160 "src/parse-gram.c" break; case 14: -/* Line 1721 of yacc.c */ -#line 318 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 319 "src/parse-gram.y" { spec_file_prefix = (yyvsp[0].chars); } -/* Line 1721 of yacc.c */ -#line 2312 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2168 "src/parse-gram.c" break; case 15: -/* Line 1721 of yacc.c */ -#line 319 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 320 "src/parse-gram.y" { spec_file_prefix = (yyvsp[0].chars); } -/* Line 1721 of yacc.c */ -#line 2320 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2176 "src/parse-gram.c" break; case 16: -/* Line 1721 of yacc.c */ -#line 321 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 322 "src/parse-gram.y" { nondeterministic_parser = true; glr_parser = true; } -/* Line 1721 of yacc.c */ -#line 2331 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2187 "src/parse-gram.c" break; case 17: -/* Line 1721 of yacc.c */ -#line 326 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 327 "src/parse-gram.y" { code_props action; code_props_symbol_action_init (&action, (yyvsp[0].code), (yylsp[0])); @@ -2341,93 +2197,93 @@ yyreduce: muscle_code_grow ("initial_action", action.code, (yylsp[0])); code_scanner_last_string_free (); } -/* Line 1721 of yacc.c */ -#line 2346 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2202 "src/parse-gram.c" break; case 18: -/* Line 1721 of yacc.c */ -#line 334 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 335 "src/parse-gram.y" { language_argmatch ((yyvsp[0].chars), grammar_prio, (yylsp[-1])); } -/* Line 1721 of yacc.c */ -#line 2354 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2210 "src/parse-gram.c" break; case 19: -/* Line 1721 of yacc.c */ -#line 335 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 336 "src/parse-gram.y" { spec_name_prefix = (yyvsp[0].chars); } -/* Line 1721 of yacc.c */ -#line 2362 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2218 "src/parse-gram.c" break; case 20: -/* Line 1721 of yacc.c */ -#line 336 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 337 "src/parse-gram.y" { spec_name_prefix = (yyvsp[0].chars); } -/* Line 1721 of yacc.c */ -#line 2370 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2226 "src/parse-gram.c" break; case 21: -/* Line 1721 of yacc.c */ -#line 337 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 338 "src/parse-gram.y" { no_lines_flag = true; } -/* Line 1721 of yacc.c */ -#line 2378 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2234 "src/parse-gram.c" break; case 22: -/* Line 1721 of yacc.c */ -#line 338 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 339 "src/parse-gram.y" { nondeterministic_parser = true; } -/* Line 1721 of yacc.c */ -#line 2386 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2242 "src/parse-gram.c" break; case 23: -/* Line 1721 of yacc.c */ -#line 339 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 340 "src/parse-gram.y" { spec_outfile = (yyvsp[0].chars); } -/* Line 1721 of yacc.c */ -#line 2394 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2250 "src/parse-gram.c" break; case 24: -/* Line 1721 of yacc.c */ -#line 340 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 341 "src/parse-gram.y" { spec_outfile = (yyvsp[0].chars); } -/* Line 1721 of yacc.c */ -#line 2402 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2258 "src/parse-gram.c" break; case 25: -/* Line 1721 of yacc.c */ -#line 341 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 342 "src/parse-gram.y" { current_param = (yyvsp[0].param); } -/* Line 1721 of yacc.c */ -#line 2410 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2266 "src/parse-gram.c" break; case 26: -/* Line 1721 of yacc.c */ -#line 341 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 342 "src/parse-gram.y" { current_param = param_none; } -/* Line 1721 of yacc.c */ -#line 2418 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2274 "src/parse-gram.c" break; case 27: -/* Line 1721 of yacc.c */ -#line 342 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 343 "src/parse-gram.y" { version_check (&(yylsp[0]), (yyvsp[0].chars)); } -/* Line 1721 of yacc.c */ -#line 2426 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2282 "src/parse-gram.c" break; case 28: -/* Line 1721 of yacc.c */ -#line 344 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 345 "src/parse-gram.y" { char const *skeleton_user = (yyvsp[0].chars); if (strchr (skeleton_user, '/')) @@ -2451,202 +2307,207 @@ yyreduce: } skeleton_arg (skeleton_user, grammar_prio, (yylsp[-1])); } -/* Line 1721 of yacc.c */ -#line 2456 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2312 "src/parse-gram.c" break; case 29: -/* Line 1721 of yacc.c */ -#line 367 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 368 "src/parse-gram.y" { token_table_flag = true; } -/* Line 1721 of yacc.c */ -#line 2464 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2320 "src/parse-gram.c" break; case 30: -/* Line 1721 of yacc.c */ -#line 368 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 369 "src/parse-gram.y" { report_flag |= report_states; } -/* Line 1721 of yacc.c */ -#line 2472 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2328 "src/parse-gram.c" break; case 31: -/* Line 1721 of yacc.c */ -#line 369 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 370 "src/parse-gram.y" { yacc_flag = true; } -/* Line 1721 of yacc.c */ -#line 2480 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2336 "src/parse-gram.c" break; case 33: -/* Line 1721 of yacc.c */ -#line 374 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 375 "src/parse-gram.y" { add_param (current_param, (yyvsp[0].code), (yylsp[0])); } -/* Line 1721 of yacc.c */ -#line 2488 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2344 "src/parse-gram.c" break; case 34: -/* Line 1721 of yacc.c */ -#line 375 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 376 "src/parse-gram.y" { add_param (current_param, (yyvsp[0].code), (yylsp[0])); } -/* Line 1721 of yacc.c */ -#line 2496 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2352 "src/parse-gram.c" break; case 37: -/* Line 1721 of yacc.c */ -#line 387 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 388 "src/parse-gram.y" { grammar_start_symbol_set ((yyvsp[0].symbol), (yylsp[0])); } -/* Line 1721 of yacc.c */ -#line 2506 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2362 "src/parse-gram.c" break; case 38: -/* Line 1721 of yacc.c */ -#line 391 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 392 "src/parse-gram.y" { - symbol_list *list; - for (list = (yyvsp[0].list); list; list = list->next) - symbol_list_code_props_set (list, (yyvsp[-2].code_type), (yylsp[-1]), (yyvsp[-1].code)); - symbol_list_free ((yyvsp[0].list)); + code_props code; + code_props_symbol_action_init (&code, (yyvsp[-1].code), (yylsp[-1])); + code_props_translate_code (&code); + { + symbol_list *list; + for (list = (yyvsp[0].list); list; list = list->next) + symbol_list_code_props_set (list, (yyvsp[-2].code_type), &code); + symbol_list_free ((yyvsp[0].list)); + } } -/* Line 1721 of yacc.c */ -#line 2519 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2380 "src/parse-gram.c" break; case 39: -/* Line 1721 of yacc.c */ -#line 398 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 404 "src/parse-gram.y" { default_prec = true; } -/* Line 1721 of yacc.c */ -#line 2529 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2390 "src/parse-gram.c" break; case 40: -/* Line 1721 of yacc.c */ -#line 402 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 408 "src/parse-gram.y" { default_prec = false; } -/* Line 1721 of yacc.c */ -#line 2539 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2400 "src/parse-gram.c" break; case 41: -/* Line 1721 of yacc.c */ -#line 406 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 412 "src/parse-gram.y" { /* Do not invoke muscle_percent_code_grow here since it invokes muscle_user_name_list_grow. */ muscle_code_grow ("percent_code()", (yyvsp[0].chars), (yylsp[0])); code_scanner_last_string_free (); } -/* Line 1721 of yacc.c */ -#line 2552 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2413 "src/parse-gram.c" break; case 42: -/* Line 1721 of yacc.c */ -#line 413 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 419 "src/parse-gram.y" { muscle_percent_code_grow ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].chars), (yylsp[0])); code_scanner_last_string_free (); } -/* Line 1721 of yacc.c */ -#line 2563 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2424 "src/parse-gram.c" break; case 43: -/* Line 1721 of yacc.c */ -#line 423 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 429 "src/parse-gram.y" { (yyval.code_type) = destructor; } -/* Line 1721 of yacc.c */ -#line 2571 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2432 "src/parse-gram.c" break; case 44: -/* Line 1721 of yacc.c */ -#line 424 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 430 "src/parse-gram.y" { (yyval.code_type) = printer; } -/* Line 1721 of yacc.c */ -#line 2579 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2440 "src/parse-gram.c" break; case 45: -/* Line 1721 of yacc.c */ -#line 434 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 440 "src/parse-gram.y" {} -/* Line 1721 of yacc.c */ -#line 2587 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2448 "src/parse-gram.c" break; case 46: -/* Line 1721 of yacc.c */ -#line 435 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 441 "src/parse-gram.y" { muscle_code_grow ("union_name", (yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1721 of yacc.c */ -#line 2595 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2456 "src/parse-gram.c" break; case 47: -/* Line 1721 of yacc.c */ -#line 440 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 446 "src/parse-gram.y" { union_seen = true; muscle_code_grow ("stype", (yyvsp[0].chars), (yylsp[0])); code_scanner_last_string_free (); } -/* Line 1721 of yacc.c */ -#line 2607 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2468 "src/parse-gram.c" break; case 48: -/* Line 1721 of yacc.c */ -#line 451 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 457 "src/parse-gram.y" { current_class = nterm_sym; } -/* Line 1721 of yacc.c */ -#line 2615 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2476 "src/parse-gram.c" break; case 49: -/* Line 1721 of yacc.c */ -#line 452 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 458 "src/parse-gram.y" { current_class = unknown_sym; current_type = NULL; } -/* Line 1721 of yacc.c */ -#line 2626 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2487 "src/parse-gram.c" break; case 50: -/* Line 1721 of yacc.c */ -#line 456 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 462 "src/parse-gram.y" { current_class = token_sym; } -/* Line 1721 of yacc.c */ -#line 2634 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2495 "src/parse-gram.c" break; case 51: -/* Line 1721 of yacc.c */ -#line 457 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 463 "src/parse-gram.y" { current_class = unknown_sym; current_type = NULL; } -/* Line 1721 of yacc.c */ -#line 2645 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2506 "src/parse-gram.c" break; case 52: -/* Line 1721 of yacc.c */ -#line 462 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 468 "src/parse-gram.y" { symbol_list *list; tag_seen = true; @@ -2654,13 +2515,13 @@ yyreduce: symbol_type_set (list->content.sym, (yyvsp[-1].uniqstr), (yylsp[-1])); symbol_list_free ((yyvsp[0].list)); } -/* Line 1721 of yacc.c */ -#line 2659 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2520 "src/parse-gram.c" break; case 53: -/* Line 1721 of yacc.c */ -#line 473 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 479 "src/parse-gram.y" { symbol_list *list; ++current_prec; @@ -2672,358 +2533,358 @@ yyreduce: symbol_list_free ((yyvsp[0].list)); current_type = NULL; } -/* Line 1721 of yacc.c */ -#line 2677 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2538 "src/parse-gram.c" break; case 54: -/* Line 1721 of yacc.c */ -#line 487 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 493 "src/parse-gram.y" { (yyval.assoc) = left_assoc; } -/* Line 1721 of yacc.c */ -#line 2685 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2546 "src/parse-gram.c" break; case 55: -/* Line 1721 of yacc.c */ -#line 488 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 494 "src/parse-gram.y" { (yyval.assoc) = right_assoc; } -/* Line 1721 of yacc.c */ -#line 2693 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2554 "src/parse-gram.c" break; case 56: -/* Line 1721 of yacc.c */ -#line 489 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 495 "src/parse-gram.y" { (yyval.assoc) = non_assoc; } -/* Line 1721 of yacc.c */ -#line 2701 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2562 "src/parse-gram.c" break; case 57: -/* Line 1721 of yacc.c */ -#line 490 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 496 "src/parse-gram.y" { (yyval.assoc) = precedence_assoc; } -/* Line 1721 of yacc.c */ -#line 2709 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2570 "src/parse-gram.c" break; case 58: -/* Line 1721 of yacc.c */ -#line 494 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 500 "src/parse-gram.y" { current_type = NULL; } -/* Line 1721 of yacc.c */ -#line 2717 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2578 "src/parse-gram.c" break; case 59: -/* Line 1721 of yacc.c */ -#line 495 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 501 "src/parse-gram.y" { current_type = (yyvsp[0].uniqstr); tag_seen = true; } -/* Line 1721 of yacc.c */ -#line 2725 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2586 "src/parse-gram.c" break; case 60: -/* Line 1721 of yacc.c */ -#line 501 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 507 "src/parse-gram.y" { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); } -/* Line 1721 of yacc.c */ -#line 2733 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2594 "src/parse-gram.c" break; case 61: -/* Line 1721 of yacc.c */ -#line 503 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 509 "src/parse-gram.y" { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); } -/* Line 1721 of yacc.c */ -#line 2741 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2602 "src/parse-gram.c" break; case 62: -/* Line 1721 of yacc.c */ -#line 507 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 513 "src/parse-gram.y" { (yyval.symbol) = (yyvsp[0].symbol); } -/* Line 1721 of yacc.c */ -#line 2749 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2610 "src/parse-gram.c" break; case 63: -/* Line 1721 of yacc.c */ -#line 508 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 514 "src/parse-gram.y" { (yyval.symbol) = (yyvsp[-1].symbol); symbol_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer), (yylsp[0])); } -/* Line 1721 of yacc.c */ -#line 2757 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2618 "src/parse-gram.c" break; case 64: -/* Line 1721 of yacc.c */ -#line 514 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 520 "src/parse-gram.y" { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); } -/* Line 1721 of yacc.c */ -#line 2765 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2626 "src/parse-gram.c" break; case 65: -/* Line 1721 of yacc.c */ -#line 516 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 522 "src/parse-gram.y" { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); } -/* Line 1721 of yacc.c */ -#line 2773 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2634 "src/parse-gram.c" break; case 66: -/* Line 1721 of yacc.c */ -#line 520 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 526 "src/parse-gram.y" { (yyval.list) = (yyvsp[0].list); } -/* Line 1721 of yacc.c */ -#line 2781 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2642 "src/parse-gram.c" break; case 67: -/* Line 1721 of yacc.c */ -#line 521 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 527 "src/parse-gram.y" { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), (yyvsp[0].list)); } -/* Line 1721 of yacc.c */ -#line 2789 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2650 "src/parse-gram.c" break; case 68: -/* Line 1721 of yacc.c */ -#line 525 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 531 "src/parse-gram.y" { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); } -/* Line 1721 of yacc.c */ -#line 2797 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2658 "src/parse-gram.c" break; case 69: -/* Line 1721 of yacc.c */ -#line 526 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 532 "src/parse-gram.y" { (yyval.list) = symbol_list_type_new ((yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1721 of yacc.c */ -#line 2805 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2666 "src/parse-gram.c" break; case 71: -/* Line 1721 of yacc.c */ -#line 531 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 537 "src/parse-gram.y" { (yyval.uniqstr) = uniqstr_new ("*"); } -/* Line 1721 of yacc.c */ -#line 2813 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2674 "src/parse-gram.c" break; case 72: -/* Line 1721 of yacc.c */ -#line 532 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 538 "src/parse-gram.y" { (yyval.uniqstr) = uniqstr_new (""); } -/* Line 1721 of yacc.c */ -#line 2821 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2682 "src/parse-gram.c" break; case 73: -/* Line 1721 of yacc.c */ -#line 538 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 544 "src/parse-gram.y" { current_type = (yyvsp[0].uniqstr); tag_seen = true; } -/* Line 1721 of yacc.c */ -#line 2832 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2693 "src/parse-gram.c" break; case 74: -/* Line 1721 of yacc.c */ -#line 543 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 549 "src/parse-gram.y" { symbol_class_set ((yyvsp[0].symbol), current_class, (yylsp[0]), true); symbol_type_set ((yyvsp[0].symbol), current_type, (yylsp[0])); } -/* Line 1721 of yacc.c */ -#line 2843 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2704 "src/parse-gram.c" break; case 75: -/* Line 1721 of yacc.c */ -#line 548 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 554 "src/parse-gram.y" { symbol_class_set ((yyvsp[-1].symbol), current_class, (yylsp[-1]), true); symbol_type_set ((yyvsp[-1].symbol), current_type, (yylsp[-1])); symbol_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer), (yylsp[0])); } -/* Line 1721 of yacc.c */ -#line 2855 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2716 "src/parse-gram.c" break; case 76: -/* Line 1721 of yacc.c */ -#line 554 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 560 "src/parse-gram.y" { symbol_class_set ((yyvsp[-1].symbol), current_class, (yylsp[-1]), true); symbol_type_set ((yyvsp[-1].symbol), current_type, (yylsp[-1])); symbol_make_alias ((yyvsp[-1].symbol), (yyvsp[0].symbol), (yyloc)); } -/* Line 1721 of yacc.c */ -#line 2867 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2728 "src/parse-gram.c" break; case 77: -/* Line 1721 of yacc.c */ -#line 560 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 566 "src/parse-gram.y" { symbol_class_set ((yyvsp[-2].symbol), current_class, (yylsp[-2]), true); 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)); } -/* Line 1721 of yacc.c */ -#line 2880 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2741 "src/parse-gram.c" break; case 84: -/* Line 1721 of yacc.c */ -#line 590 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 596 "src/parse-gram.y" { yyerrok; } -/* Line 1721 of yacc.c */ -#line 2890 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2751 "src/parse-gram.c" break; case 85: -/* Line 1721 of yacc.c */ -#line 596 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 602 "src/parse-gram.y" { current_lhs ((yyvsp[-1].symbol), (yylsp[-1]), (yyvsp[0].named_ref)); } -/* Line 1721 of yacc.c */ -#line 2898 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2759 "src/parse-gram.c" break; case 86: -/* Line 1721 of yacc.c */ -#line 597 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 603 "src/parse-gram.y" { /* Free the current lhs. */ current_lhs (0, (yylsp[-3]), 0); } -/* Line 1721 of yacc.c */ -#line 2909 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2770 "src/parse-gram.c" break; case 87: -/* Line 1721 of yacc.c */ -#line 604 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 610 "src/parse-gram.y" { grammar_current_rule_end ((yylsp[0])); } -/* Line 1721 of yacc.c */ -#line 2917 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2778 "src/parse-gram.c" break; case 88: -/* Line 1721 of yacc.c */ -#line 605 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 611 "src/parse-gram.y" { grammar_current_rule_end ((yylsp[0])); } -/* Line 1721 of yacc.c */ -#line 2925 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2786 "src/parse-gram.c" break; case 90: -/* Line 1721 of yacc.c */ -#line 611 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 617 "src/parse-gram.y" { grammar_current_rule_begin (current_lhs_symbol, current_lhs_location, current_lhs_named_ref); } -/* Line 1721 of yacc.c */ -#line 2934 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2795 "src/parse-gram.c" break; case 91: -/* Line 1721 of yacc.c */ -#line 614 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 620 "src/parse-gram.y" { grammar_current_rule_symbol_append ((yyvsp[-1].symbol), (yylsp[-1]), (yyvsp[0].named_ref)); } -/* Line 1721 of yacc.c */ -#line 2942 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2803 "src/parse-gram.c" break; case 92: -/* Line 1721 of yacc.c */ -#line 616 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 622 "src/parse-gram.y" { grammar_current_rule_action_append ((yyvsp[-1].code), (yylsp[-1]), (yyvsp[0].named_ref), false); } -/* Line 1721 of yacc.c */ -#line 2950 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2811 "src/parse-gram.c" break; case 93: -/* Line 1721 of yacc.c */ -#line 618 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 624 "src/parse-gram.y" { grammar_current_rule_action_append ((yyvsp[0].code), (yylsp[0]), NULL, true); } -/* Line 1721 of yacc.c */ -#line 2958 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2819 "src/parse-gram.c" break; case 94: -/* Line 1721 of yacc.c */ -#line 620 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 626 "src/parse-gram.y" { grammar_current_rule_prec_set ((yyvsp[0].symbol), (yylsp[0])); } -/* Line 1721 of yacc.c */ -#line 2966 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2827 "src/parse-gram.c" break; case 95: -/* Line 1721 of yacc.c */ -#line 622 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 628 "src/parse-gram.y" { grammar_current_rule_dprec_set ((yyvsp[0].integer), (yylsp[0])); } -/* Line 1721 of yacc.c */ -#line 2974 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2835 "src/parse-gram.c" break; case 96: -/* Line 1721 of yacc.c */ -#line 624 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 630 "src/parse-gram.y" { grammar_current_rule_merge_set ((yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1721 of yacc.c */ -#line 2982 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2843 "src/parse-gram.c" break; case 97: -/* Line 1721 of yacc.c */ -#line 628 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 634 "src/parse-gram.y" { (yyval.named_ref) = 0; } -/* Line 1721 of yacc.c */ -#line 2990 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2851 "src/parse-gram.c" break; case 98: -/* Line 1721 of yacc.c */ -#line 630 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 636 "src/parse-gram.y" { (yyval.named_ref) = named_ref_new((yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1721 of yacc.c */ -#line 2998 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2859 "src/parse-gram.c" break; case 100: -/* Line 1721 of yacc.c */ -#line 641 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 647 "src/parse-gram.y" { (yyval.uniqstr) = uniqstr_new ((yyvsp[0].chars)); } -/* Line 1721 of yacc.c */ -#line 3006 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2867 "src/parse-gram.c" break; case 101: -/* Line 1721 of yacc.c */ -#line 646 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 652 "src/parse-gram.y" { (yyval.chars) = ""; } -/* Line 1721 of yacc.c */ -#line 3014 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2875 "src/parse-gram.c" break; case 102: -/* Line 1721 of yacc.c */ -#line 647 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 653 "src/parse-gram.y" { (yyval.chars) = (yyvsp[0].uniqstr); } -/* Line 1721 of yacc.c */ -#line 3022 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2883 "src/parse-gram.c" break; case 104: -/* Line 1721 of yacc.c */ -#line 658 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 664 "src/parse-gram.y" { code_props plain_code; (yyvsp[0].code)[strlen ((yyvsp[0].code)) - 1] = '\n'; @@ -3032,52 +2893,52 @@ yyreduce: gram_scanner_last_string_free (); (yyval.chars) = plain_code.code; } -/* Line 1721 of yacc.c */ -#line 3037 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2898 "src/parse-gram.c" break; case 105: -/* Line 1721 of yacc.c */ -#line 678 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 684 "src/parse-gram.y" { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1721 of yacc.c */ -#line 3045 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2906 "src/parse-gram.c" break; case 106: -/* Line 1721 of yacc.c */ -#line 680 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 686 "src/parse-gram.y" { (yyval.symbol) = symbol_get (char_name ((yyvsp[0].character)), (yylsp[0])); symbol_class_set ((yyval.symbol), token_sym, (yylsp[0]), false); symbol_user_token_number_set ((yyval.symbol), (yyvsp[0].character), (yylsp[0])); } -/* Line 1721 of yacc.c */ -#line 3057 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2918 "src/parse-gram.c" break; case 107: -/* Line 1721 of yacc.c */ -#line 688 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 694 "src/parse-gram.y" { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1721 of yacc.c */ -#line 3065 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2926 "src/parse-gram.c" break; case 110: -/* Line 1721 of yacc.c */ -#line 700 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 706 "src/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]), false); } -/* Line 1721 of yacc.c */ -#line 3076 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2937 "src/parse-gram.c" break; case 112: -/* Line 1721 of yacc.c */ -#line 709 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 715 "src/parse-gram.y" { code_props plain_code; code_props_plain_init (&plain_code, (yyvsp[0].chars), (yylsp[0])); @@ -3086,13 +2947,13 @@ yyreduce: muscle_code_grow ("epilogue", plain_code.code, (yylsp[0])); code_scanner_last_string_free (); } -/* Line 1721 of yacc.c */ -#line 3091 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2952 "src/parse-gram.c" break; -/* Line 1721 of yacc.c */ -#line 3096 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2957 "src/parse-gram.c" default: break; } if (yychar_backup != yychar) @@ -3133,9 +2994,9 @@ yyreduce: goto yynewstate; -/*------------------------------------. -| yyerrlab -- here on detecting error | -`------------------------------------*/ +/*--------------------------------------. +| yyerrlab -- here on detecting error. | +`--------------------------------------*/ yyerrlab: /* Make sure we have latest lookahead translation. See comments at user semantic actions for why this is necessary. */ @@ -3335,12 +3196,10 @@ yyreturn: if (yymsg != yymsgbuf) YYSTACK_FREE (yymsg); #endif - /* Make sure YYID is used. */ - return YYID (yyresult); + return yyresult; } - -/* Line 1981 of yacc.c */ -#line 719 "src/parse-gram.y" +/* Line 1937 of yacc.c */ +#line 725 "src/parse-gram.y" @@ -3395,11 +3254,13 @@ add_param (param_type 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)