X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/723fe7d18a058e8764beb0c50fbcfa554ee5f6c4..faff3bef5b72ac85093799f997596631c3202c12:/src/parse-gram.c?ds=inline diff --git a/src/parse-gram.c b/src/parse-gram.c index 9bb1a0c5..31d20854 100644 --- a/src/parse-gram.c +++ b/src/parse-gram.c @@ -1,9 +1,8 @@ -/* A Bison parser, made by GNU Bison 2.4.1.252-dcd39. */ +/* A Bison parser, made by GNU Bison 2.5.1.19-ced26-dirty. */ -/* Skeleton implementation for Bison's Yacc-like parsers in C +/* Bison implementation for Yacc-like parsers in C - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006, - 2007, 2008, 2009, 2010 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 @@ -45,7 +44,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.4.1.252-dcd39" +#define YYBISON_VERSION "2.5.1.19-ced26-dirty" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -74,12 +73,11 @@ /* Copy the first part of user declarations. */ -/* Line 268 of yacc.c */ +/* Line 323 of yacc.c */ #line 1 "parse-gram.y" /* Bison Grammar Parser -*- C -*- - Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 - Free Software Foundation, Inc. + Copyright (C) 2002-2012 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -111,6 +109,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); @@ -140,24 +139,46 @@ static void add_param (char const *type, char *decl, location loc); static symbol_class current_class = unknown_sym; static uniqstr current_type = NULL; -static symbol *current_lhs; +static symbol *current_lhs_symbol; static location current_lhs_location; static named_ref *current_lhs_named_ref; static int current_prec = 0; +/** Set the new current left-hand side symbol, possibly common + * to several right-hand side parts of rule. + */ +static +void +current_lhs(symbol *sym, location loc, named_ref *ref) +{ + current_lhs_symbol = sym; + current_lhs_location = loc; + /* In order to simplify memory management, named references for lhs + are always assigned by deep copy into the current symbol_list + node. This is because a single named-ref in the grammar may + result in several uses when the user factors lhs between several + rules using "|". Therefore free the parser's original copy. */ + free (current_lhs_named_ref); + current_lhs_named_ref = ref; +} + + #define YYTYPE_INT16 int_fast16_t #define YYTYPE_INT8 int_fast8_t #define YYTYPE_UINT16 uint_fast16_t #define YYTYPE_UINT8 uint_fast8_t -/* Line 268 of yacc.c */ -#line 156 "parse-gram.c" +/* Line 323 of yacc.c */ +#line 174 "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 @@ -172,178 +193,13 @@ static int current_prec = 0; # define YYTOKEN_TABLE 0 #endif - -/* Tokens. */ -#ifndef YYTOKENTYPE -# define YYTOKENTYPE - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ - enum yytokentype { - GRAM_EOF = 0, - STRING = 258, - INT = 259, - PERCENT_TOKEN = 260, - PERCENT_NTERM = 261, - PERCENT_TYPE = 262, - PERCENT_DESTRUCTOR = 263, - PERCENT_PRINTER = 264, - PERCENT_LEFT = 265, - PERCENT_RIGHT = 266, - PERCENT_NONASSOC = 267, - PERCENT_PREC = 268, - PERCENT_DPREC = 269, - PERCENT_MERGE = 270, - PERCENT_CODE = 271, - PERCENT_DEBUG = 272, - PERCENT_DEFAULT_PREC = 273, - PERCENT_DEFINE = 274, - PERCENT_DEFINES = 275, - PERCENT_ERROR_VERBOSE = 276, - PERCENT_EXPECT = 277, - PERCENT_EXPECT_RR = 278, - PERCENT_FILE_PREFIX = 279, - PERCENT_GLR_PARSER = 280, - PERCENT_INITIAL_ACTION = 281, - PERCENT_LANGUAGE = 282, - PERCENT_LEX_PARAM = 283, - PERCENT_LOCATIONS = 284, - PERCENT_NAME_PREFIX = 285, - PERCENT_NO_DEFAULT_PREC = 286, - PERCENT_NO_LINES = 287, - PERCENT_NONDETERMINISTIC_PARSER = 288, - PERCENT_OUTPUT = 289, - PERCENT_PARSE_PARAM = 290, - PERCENT_PURE_PARSER = 291, - PERCENT_REQUIRE = 292, - PERCENT_SKELETON = 293, - PERCENT_START = 294, - PERCENT_TOKEN_TABLE = 295, - PERCENT_VERBOSE = 296, - PERCENT_YACC = 297, - BRACED_CODE = 298, - BRACKETED_ID = 299, - CHAR = 300, - EPILOGUE = 301, - EQUAL = 302, - ID = 303, - ID_COLON = 304, - PERCENT_PERCENT = 305, - PIPE = 306, - PROLOGUE = 307, - SEMICOLON = 308, - TYPE = 309, - TYPE_TAG_ANY = 310, - TYPE_TAG_NONE = 311, - PERCENT_UNION = 312 - }; -#endif -/* Tokens. */ -#define GRAM_EOF 0 -#define STRING 258 -#define INT 259 -#define PERCENT_TOKEN 260 -#define PERCENT_NTERM 261 -#define PERCENT_TYPE 262 -#define PERCENT_DESTRUCTOR 263 -#define PERCENT_PRINTER 264 -#define PERCENT_LEFT 265 -#define PERCENT_RIGHT 266 -#define PERCENT_NONASSOC 267 -#define PERCENT_PREC 268 -#define PERCENT_DPREC 269 -#define PERCENT_MERGE 270 -#define PERCENT_CODE 271 -#define PERCENT_DEBUG 272 -#define PERCENT_DEFAULT_PREC 273 -#define PERCENT_DEFINE 274 -#define PERCENT_DEFINES 275 -#define PERCENT_ERROR_VERBOSE 276 -#define PERCENT_EXPECT 277 -#define PERCENT_EXPECT_RR 278 -#define PERCENT_FILE_PREFIX 279 -#define PERCENT_GLR_PARSER 280 -#define PERCENT_INITIAL_ACTION 281 -#define PERCENT_LANGUAGE 282 -#define PERCENT_LEX_PARAM 283 -#define PERCENT_LOCATIONS 284 -#define PERCENT_NAME_PREFIX 285 -#define PERCENT_NO_DEFAULT_PREC 286 -#define PERCENT_NO_LINES 287 -#define PERCENT_NONDETERMINISTIC_PARSER 288 -#define PERCENT_OUTPUT 289 -#define PERCENT_PARSE_PARAM 290 -#define PERCENT_PURE_PARSER 291 -#define PERCENT_REQUIRE 292 -#define PERCENT_SKELETON 293 -#define PERCENT_START 294 -#define PERCENT_TOKEN_TABLE 295 -#define PERCENT_VERBOSE 296 -#define PERCENT_YACC 297 -#define BRACED_CODE 298 -#define BRACKETED_ID 299 -#define CHAR 300 -#define EPILOGUE 301 -#define EQUAL 302 -#define ID 303 -#define ID_COLON 304 -#define PERCENT_PERCENT 305 -#define PIPE 306 -#define PROLOGUE 307 -#define SEMICOLON 308 -#define TYPE 309 -#define TYPE_TAG_ANY 310 -#define TYPE_TAG_NONE 311 -#define PERCENT_UNION 312 - - - - -#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED -typedef union YYSTYPE -{ - -/* Line 293 of yacc.c */ -#line 95 "parse-gram.y" - - symbol *symbol; - symbol_list *list; - int integer; - char const *chars; - char *code; - assoc assoc; - uniqstr uniqstr; - unsigned char character; - named_ref *named_ref; - - - -/* Line 293 of yacc.c */ -#line 322 "parse-gram.c" -} YYSTYPE; -# define YYSTYPE_IS_TRIVIAL 1 -# define yystype YYSTYPE /* obsolescent; will be withdrawn */ -# define YYSTYPE_IS_DECLARED 1 -#endif - -#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED -typedef struct YYLTYPE -{ - int first_line; - int first_column; - 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 - +#include "parse-gram.h" /* Copy the second part of user declarations. */ -/* Line 343 of yacc.c */ -#line 347 "parse-gram.c" +/* Line 344 of yacc.c */ +#line 203 "parse-gram.c" #ifdef short # undef short @@ -519,20 +375,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 @@ -650,17 +506,17 @@ static const yytype_int8 yyrhs[] = /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 210, 210, 218, 220, 224, 225, 235, 236, 241, - 242, 247, 248, 249, 250, 251, 252, 257, 266, 267, - 268, 269, 270, 271, 272, 273, 274, 275, 276, 291, - 292, 316, 317, 318, 319, 323, 324, 325, 329, 336, - 343, 347, 351, 358, 373, 374, 378, 390, 390, 395, - 395, 400, 411, 426, 427, 428, 432, 433, 438, 440, - 445, 446, 451, 453, 458, 459, 463, 464, 465, 466, - 471, 476, 481, 487, 493, 504, 505, 514, 515, 521, - 522, 523, 530, 530, 535, 536, 537, 542, 544, 546, - 548, 550, 552, 557, 559, 570, 571, 576, 577, 578, - 587, 607, 609, 618, 623, 624, 629, 636, 638 + 0, 229, 229, 237, 239, 243, 244, 254, 255, 260, + 261, 266, 267, 268, 269, 270, 271, 276, 285, 286, + 287, 288, 289, 290, 291, 292, 293, 294, 295, 310, + 311, 335, 336, 337, 338, 342, 343, 344, 348, 355, + 362, 366, 370, 377, 392, 393, 397, 409, 409, 414, + 414, 419, 430, 445, 446, 447, 451, 452, 457, 459, + 464, 465, 470, 472, 477, 478, 482, 483, 484, 485, + 490, 495, 500, 506, 512, 523, 524, 533, 534, 540, + 541, 542, 549, 549, 557, 558, 559, 564, 566, 568, + 570, 572, 574, 579, 581, 592, 593, 598, 599, 600, + 609, 629, 631, 640, 645, 646, 651, 658, 660 }; #endif @@ -690,7 +546,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 @@ -902,18 +758,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; \ } \ @@ -1018,6 +875,8 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp) YYLTYPE const * const yylocationp; #endif { + FILE *yyo = yyoutput; + YYUSE (yyo); if (!yyvaluep) return; YYUSE (yylocationp); @@ -1031,165 +890,165 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp) { case 3: /* "\"string\"" */ -/* Line 819 of yacc.c */ -#line 185 "parse-gram.y" +/* Line 822 of yacc.c */ +#line 204 "parse-gram.y" { fputs (quotearg_style (c_quoting_style, (yyvaluep->chars)), stderr); }; -/* Line 819 of yacc.c */ -#line 1040 "parse-gram.c" +/* Line 822 of yacc.c */ +#line 899 "parse-gram.c" break; case 4: /* "\"integer\"" */ -/* Line 819 of yacc.c */ -#line 197 "parse-gram.y" +/* Line 822 of yacc.c */ +#line 216 "parse-gram.y" { fprintf (stderr, "%d", (yyvaluep->integer)); }; -/* Line 819 of yacc.c */ -#line 1049 "parse-gram.c" +/* Line 822 of yacc.c */ +#line 908 "parse-gram.c" break; case 43: /* "\"{...}\"" */ -/* Line 819 of yacc.c */ -#line 187 "parse-gram.y" +/* Line 822 of yacc.c */ +#line 206 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->code)); }; -/* Line 819 of yacc.c */ -#line 1058 "parse-gram.c" +/* Line 822 of yacc.c */ +#line 917 "parse-gram.c" break; case 44: /* "\"[identifier]\"" */ -/* Line 819 of yacc.c */ -#line 192 "parse-gram.y" +/* Line 822 of yacc.c */ +#line 211 "parse-gram.y" { fprintf (stderr, "[%s]", (yyvaluep->uniqstr)); }; -/* Line 819 of yacc.c */ -#line 1067 "parse-gram.c" +/* Line 822 of yacc.c */ +#line 926 "parse-gram.c" break; case 45: /* "\"char\"" */ -/* Line 819 of yacc.c */ -#line 179 "parse-gram.y" +/* Line 822 of yacc.c */ +#line 198 "parse-gram.y" { fputs (char_name ((yyvaluep->character)), stderr); }; -/* Line 819 of yacc.c */ -#line 1076 "parse-gram.c" +/* Line 822 of yacc.c */ +#line 935 "parse-gram.c" break; case 46: /* "\"epilogue\"" */ -/* Line 819 of yacc.c */ -#line 187 "parse-gram.y" +/* Line 822 of yacc.c */ +#line 206 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -/* Line 819 of yacc.c */ -#line 1085 "parse-gram.c" +/* Line 822 of yacc.c */ +#line 944 "parse-gram.c" break; case 48: /* "\"identifier\"" */ -/* Line 819 of yacc.c */ -#line 191 "parse-gram.y" +/* Line 822 of yacc.c */ +#line 210 "parse-gram.y" { fputs ((yyvaluep->uniqstr), stderr); }; -/* Line 819 of yacc.c */ -#line 1094 "parse-gram.c" +/* Line 822 of yacc.c */ +#line 953 "parse-gram.c" break; case 49: /* "\"identifier:\"" */ -/* Line 819 of yacc.c */ -#line 193 "parse-gram.y" +/* Line 822 of yacc.c */ +#line 212 "parse-gram.y" { fprintf (stderr, "%s:", (yyvaluep->uniqstr)); }; -/* Line 819 of yacc.c */ -#line 1103 "parse-gram.c" +/* Line 822 of yacc.c */ +#line 962 "parse-gram.c" break; case 52: /* "\"%{...%}\"" */ -/* Line 819 of yacc.c */ -#line 187 "parse-gram.y" +/* Line 822 of yacc.c */ +#line 206 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -/* Line 819 of yacc.c */ -#line 1112 "parse-gram.c" +/* Line 822 of yacc.c */ +#line 971 "parse-gram.c" break; case 54: /* "\"type\"" */ -/* Line 819 of yacc.c */ -#line 194 "parse-gram.y" +/* Line 822 of yacc.c */ +#line 213 "parse-gram.y" { fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); }; -/* Line 819 of yacc.c */ -#line 1121 "parse-gram.c" +/* Line 822 of yacc.c */ +#line 980 "parse-gram.c" break; case 71: /* "symbol.prec" */ -/* Line 819 of yacc.c */ -#line 200 "parse-gram.y" +/* Line 822 of yacc.c */ +#line 219 "parse-gram.y" { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; -/* Line 819 of yacc.c */ -#line 1130 "parse-gram.c" +/* Line 822 of yacc.c */ +#line 989 "parse-gram.c" break; case 84: /* "variable" */ -/* Line 819 of yacc.c */ -#line 191 "parse-gram.y" +/* Line 822 of yacc.c */ +#line 210 "parse-gram.y" { fputs ((yyvaluep->uniqstr), stderr); }; -/* Line 819 of yacc.c */ -#line 1139 "parse-gram.c" +/* Line 822 of yacc.c */ +#line 998 "parse-gram.c" break; case 85: /* "content.opt" */ -/* Line 819 of yacc.c */ -#line 187 "parse-gram.y" +/* Line 822 of yacc.c */ +#line 206 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -/* Line 819 of yacc.c */ -#line 1148 "parse-gram.c" +/* Line 822 of yacc.c */ +#line 1007 "parse-gram.c" break; case 86: /* "braceless" */ -/* Line 819 of yacc.c */ -#line 187 "parse-gram.y" +/* Line 822 of yacc.c */ +#line 206 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -/* Line 819 of yacc.c */ -#line 1157 "parse-gram.c" +/* Line 822 of yacc.c */ +#line 1016 "parse-gram.c" break; case 87: /* "id" */ -/* Line 819 of yacc.c */ -#line 200 "parse-gram.y" +/* Line 822 of yacc.c */ +#line 219 "parse-gram.y" { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; -/* Line 819 of yacc.c */ -#line 1166 "parse-gram.c" +/* Line 822 of yacc.c */ +#line 1025 "parse-gram.c" break; case 88: /* "id_colon" */ -/* Line 819 of yacc.c */ -#line 201 "parse-gram.y" +/* Line 822 of yacc.c */ +#line 220 "parse-gram.y" { fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); }; -/* Line 819 of yacc.c */ -#line 1175 "parse-gram.c" +/* Line 822 of yacc.c */ +#line 1034 "parse-gram.c" break; case 89: /* "symbol" */ -/* Line 819 of yacc.c */ -#line 200 "parse-gram.y" +/* Line 822 of yacc.c */ +#line 219 "parse-gram.y" { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; -/* Line 819 of yacc.c */ -#line 1184 "parse-gram.c" +/* Line 822 of yacc.c */ +#line 1043 "parse-gram.c" break; case 90: /* "string_as_id" */ -/* Line 819 of yacc.c */ -#line 200 "parse-gram.y" +/* Line 822 of yacc.c */ +#line 219 "parse-gram.y" { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; -/* Line 819 of yacc.c */ -#line 1193 "parse-gram.c" +/* Line 822 of yacc.c */ +#line 1052 "parse-gram.c" break; default: break; @@ -1550,7 +1409,7 @@ yy_lac (yytype_int16 *yyesa, yytype_int16 **yyes, } *++yyesp = yystate; } - YYDPRINTF ((stderr, " G%d", *yyesp)); + YYDPRINTF ((stderr, " G%d", yystate)); } } } @@ -1672,12 +1531,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 @@ -1735,7 +1594,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; @@ -1833,20 +1692,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 */ /*----------. @@ -1896,7 +1741,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. */ @@ -1980,8 +1825,8 @@ YYLTYPE yylloc; /* User initialization code. */ -/* Line 1590 of yacc.c */ -#line 87 "parse-gram.y" +/* Line 1585 of yacc.c */ +#line 106 "parse-gram.y" { /* Bison's grammar can initial empty locations, hence a default location is needed. */ @@ -1989,8 +1834,8 @@ YYLTYPE yylloc; boundary_set (&yylloc.end, current_file, 1, 1); } -/* Line 1590 of yacc.c */ -#line 1994 "parse-gram.c" +/* Line 1585 of yacc.c */ +#line 1839 "parse-gram.c" yylsp[0] = yylloc; goto yysetstate; @@ -2184,8 +2029,8 @@ yyreduce: { case 6: -/* Line 1806 of yacc.c */ -#line 226 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 245 "parse-gram.y" { code_props plain_code; code_props_plain_init (&plain_code, (yyvsp[(1) - (1)].chars), (yylsp[(1) - (1)])); @@ -2199,15 +2044,15 @@ yyreduce: case 7: -/* Line 1806 of yacc.c */ -#line 235 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 254 "parse-gram.y" { debug_flag = true; } break; case 8: -/* Line 1806 of yacc.c */ -#line 237 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 256 "parse-gram.y" { muscle_percent_define_insert ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars), MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE); @@ -2216,15 +2061,15 @@ yyreduce: case 9: -/* Line 1806 of yacc.c */ -#line 241 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 260 "parse-gram.y" { defines_flag = true; } break; case 10: -/* Line 1806 of yacc.c */ -#line 243 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 262 "parse-gram.y" { defines_flag = true; spec_defines_file = xstrdup ((yyvsp[(2) - (2)].chars)); @@ -2233,43 +2078,43 @@ yyreduce: case 11: -/* Line 1806 of yacc.c */ -#line 247 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 266 "parse-gram.y" { error_verbose = true; } break; case 12: -/* Line 1806 of yacc.c */ -#line 248 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 267 "parse-gram.y" { expected_sr_conflicts = (yyvsp[(2) - (2)].integer); } break; case 13: -/* Line 1806 of yacc.c */ -#line 249 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 268 "parse-gram.y" { expected_rr_conflicts = (yyvsp[(2) - (2)].integer); } break; case 14: -/* Line 1806 of yacc.c */ -#line 250 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 269 "parse-gram.y" { spec_file_prefix = (yyvsp[(2) - (2)].chars); } break; case 15: -/* Line 1806 of yacc.c */ -#line 251 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 270 "parse-gram.y" { spec_file_prefix = (yyvsp[(3) - (3)].chars); } break; case 16: -/* Line 1806 of yacc.c */ -#line 253 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 272 "parse-gram.y" { nondeterministic_parser = true; glr_parser = true; @@ -2278,8 +2123,8 @@ yyreduce: case 17: -/* Line 1806 of yacc.c */ -#line 258 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 277 "parse-gram.y" { code_props action; code_props_symbol_action_init (&action, (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); @@ -2292,78 +2137,78 @@ yyreduce: case 18: -/* Line 1806 of yacc.c */ -#line 266 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 285 "parse-gram.y" { language_argmatch ((yyvsp[(2) - (2)].chars), grammar_prio, (yylsp[(1) - (2)])); } break; case 19: -/* Line 1806 of yacc.c */ -#line 267 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 286 "parse-gram.y" { add_param ("lex_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); } break; case 20: -/* Line 1806 of yacc.c */ -#line 268 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 287 "parse-gram.y" { locations_flag = true; } break; case 21: -/* Line 1806 of yacc.c */ -#line 269 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 288 "parse-gram.y" { spec_name_prefix = (yyvsp[(2) - (2)].chars); } break; case 22: -/* Line 1806 of yacc.c */ -#line 270 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 289 "parse-gram.y" { spec_name_prefix = (yyvsp[(3) - (3)].chars); } break; case 23: -/* Line 1806 of yacc.c */ -#line 271 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 290 "parse-gram.y" { no_lines_flag = true; } break; case 24: -/* Line 1806 of yacc.c */ -#line 272 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 291 "parse-gram.y" { nondeterministic_parser = true; } break; case 25: -/* Line 1806 of yacc.c */ -#line 273 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 292 "parse-gram.y" { spec_outfile = (yyvsp[(2) - (2)].chars); } break; case 26: -/* Line 1806 of yacc.c */ -#line 274 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 293 "parse-gram.y" { spec_outfile = (yyvsp[(3) - (3)].chars); } break; case 27: -/* Line 1806 of yacc.c */ -#line 275 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 294 "parse-gram.y" { add_param ("parse_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); } break; case 28: -/* Line 1806 of yacc.c */ -#line 277 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 296 "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 @@ -2382,18 +2227,18 @@ yyreduce: case 29: -/* Line 1806 of yacc.c */ -#line 291 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 310 "parse-gram.y" { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); } break; case 30: -/* Line 1806 of yacc.c */ -#line 293 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 312 "parse-gram.y" { char const *skeleton_user = (yyvsp[(2) - (2)].chars); - if (strchr (skeleton_user, '/')) + if (mbschr (skeleton_user, '/')) { size_t dir_length = strlen (current_file); char *skeleton_build; @@ -2405,7 +2250,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); @@ -2418,29 +2263,29 @@ yyreduce: case 31: -/* Line 1806 of yacc.c */ -#line 316 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 335 "parse-gram.y" { token_table_flag = true; } break; case 32: -/* Line 1806 of yacc.c */ -#line 317 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 336 "parse-gram.y" { report_flag |= report_states; } break; case 33: -/* Line 1806 of yacc.c */ -#line 318 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 337 "parse-gram.y" { yacc_flag = true; } break; case 37: -/* Line 1806 of yacc.c */ -#line 326 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 345 "parse-gram.y" { grammar_start_symbol_set ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); } @@ -2448,8 +2293,8 @@ yyreduce: case 38: -/* Line 1806 of yacc.c */ -#line 330 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 349 "parse-gram.y" { symbol_list *list; for (list = (yyvsp[(3) - (3)].list); list; list = list->next) @@ -2460,8 +2305,8 @@ yyreduce: case 39: -/* Line 1806 of yacc.c */ -#line 337 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 356 "parse-gram.y" { symbol_list *list; for (list = (yyvsp[(3) - (3)].list); list; list = list->next) @@ -2472,8 +2317,8 @@ yyreduce: case 40: -/* Line 1806 of yacc.c */ -#line 344 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 363 "parse-gram.y" { default_prec = true; } @@ -2481,8 +2326,8 @@ yyreduce: case 41: -/* Line 1806 of yacc.c */ -#line 348 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 367 "parse-gram.y" { default_prec = false; } @@ -2490,8 +2335,8 @@ yyreduce: case 42: -/* Line 1806 of yacc.c */ -#line 352 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 371 "parse-gram.y" { /* Do not invoke muscle_percent_code_grow here since it invokes muscle_user_name_list_grow. */ @@ -2502,8 +2347,8 @@ yyreduce: case 43: -/* Line 1806 of yacc.c */ -#line 359 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 378 "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 (); @@ -2512,22 +2357,22 @@ yyreduce: case 44: -/* Line 1806 of yacc.c */ -#line 373 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 392 "parse-gram.y" {} break; case 45: -/* Line 1806 of yacc.c */ -#line 374 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 393 "parse-gram.y" { muscle_code_grow ("union_name", (yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; case 46: -/* Line 1806 of yacc.c */ -#line 379 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 398 "parse-gram.y" { union_seen = true; muscle_code_grow ("stype", (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)])); @@ -2537,15 +2382,15 @@ yyreduce: case 47: -/* Line 1806 of yacc.c */ -#line 390 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 409 "parse-gram.y" { current_class = nterm_sym; } break; case 48: -/* Line 1806 of yacc.c */ -#line 391 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 410 "parse-gram.y" { current_class = unknown_sym; current_type = NULL; @@ -2554,15 +2399,15 @@ yyreduce: case 49: -/* Line 1806 of yacc.c */ -#line 395 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 414 "parse-gram.y" { current_class = token_sym; } break; case 50: -/* Line 1806 of yacc.c */ -#line 396 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 415 "parse-gram.y" { current_class = unknown_sym; current_type = NULL; @@ -2571,8 +2416,8 @@ yyreduce: case 51: -/* Line 1806 of yacc.c */ -#line 401 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 420 "parse-gram.y" { symbol_list *list; tag_seen = true; @@ -2584,8 +2429,8 @@ yyreduce: case 52: -/* Line 1806 of yacc.c */ -#line 412 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 431 "parse-gram.y" { symbol_list *list; ++current_prec; @@ -2601,127 +2446,127 @@ yyreduce: case 53: -/* Line 1806 of yacc.c */ -#line 426 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 445 "parse-gram.y" { (yyval.assoc) = left_assoc; } break; case 54: -/* Line 1806 of yacc.c */ -#line 427 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 446 "parse-gram.y" { (yyval.assoc) = right_assoc; } break; case 55: -/* Line 1806 of yacc.c */ -#line 428 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 447 "parse-gram.y" { (yyval.assoc) = non_assoc; } break; case 56: -/* Line 1806 of yacc.c */ -#line 432 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 451 "parse-gram.y" { current_type = NULL; } break; case 57: -/* Line 1806 of yacc.c */ -#line 433 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 452 "parse-gram.y" { current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; } break; case 58: -/* Line 1806 of yacc.c */ -#line 439 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 458 "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 441 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 460 "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 445 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 464 "parse-gram.y" { (yyval.symbol) = (yyvsp[(1) - (1)].symbol); } break; case 61: -/* Line 1806 of yacc.c */ -#line 446 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 465 "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 452 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 471 "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 454 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 473 "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 458 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 477 "parse-gram.y" { (yyval.list) = (yyvsp[(1) - (1)].list); } break; case 65: -/* Line 1806 of yacc.c */ -#line 459 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 478 "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 463 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 482 "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 464 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 483 "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 465 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 484 "parse-gram.y" { (yyval.list) = symbol_list_default_tagged_new ((yylsp[(1) - (1)])); } break; case 69: -/* Line 1806 of yacc.c */ -#line 466 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 485 "parse-gram.y" { (yyval.list) = symbol_list_default_tagless_new ((yylsp[(1) - (1)])); } break; case 70: -/* Line 1806 of yacc.c */ -#line 472 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 491 "parse-gram.y" { current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; @@ -2730,8 +2575,8 @@ yyreduce: case 71: -/* Line 1806 of yacc.c */ -#line 477 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 496 "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)])); @@ -2740,8 +2585,8 @@ yyreduce: case 72: -/* Line 1806 of yacc.c */ -#line 482 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 501 "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)])); @@ -2751,8 +2596,8 @@ yyreduce: case 73: -/* Line 1806 of yacc.c */ -#line 488 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 507 "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)])); @@ -2762,8 +2607,8 @@ yyreduce: case 74: -/* Line 1806 of yacc.c */ -#line 494 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 513 "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)])); @@ -2774,8 +2619,8 @@ yyreduce: case 81: -/* Line 1806 of yacc.c */ -#line 524 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 543 "parse-gram.y" { yyerrok; } @@ -2783,108 +2628,117 @@ yyreduce: case 82: -/* Line 1806 of yacc.c */ -#line 530 "parse-gram.y" - { current_lhs = (yyvsp[(1) - (2)].symbol); current_lhs_location = (yylsp[(1) - (2)]); - current_lhs_named_ref = (yyvsp[(2) - (2)].named_ref); } +/* Line 1801 of yacc.c */ +#line 549 "parse-gram.y" + { current_lhs ((yyvsp[(1) - (2)].symbol), (yylsp[(1) - (2)]), (yyvsp[(2) - (2)].named_ref)); } + break; + + case 83: + +/* Line 1801 of yacc.c */ +#line 550 "parse-gram.y" + { + /* Free the current lhs. */ + current_lhs (0, (yylsp[(1) - (4)]), 0); + } break; case 84: -/* Line 1806 of yacc.c */ -#line 535 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 557 "parse-gram.y" { grammar_current_rule_end ((yylsp[(1) - (1)])); } break; case 85: -/* Line 1806 of yacc.c */ -#line 536 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 558 "parse-gram.y" { grammar_current_rule_end ((yylsp[(3) - (3)])); } break; case 87: -/* Line 1806 of yacc.c */ -#line 542 "parse-gram.y" - { grammar_current_rule_begin (current_lhs, current_lhs_location, +/* Line 1801 of yacc.c */ +#line 564 "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 545 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 567 "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 547 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 569 "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 549 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 571 "parse-gram.y" { grammar_current_rule_prec_set ((yyvsp[(3) - (3)].symbol), (yylsp[(3) - (3)])); } break; case 91: -/* Line 1806 of yacc.c */ -#line 551 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 573 "parse-gram.y" { grammar_current_rule_dprec_set ((yyvsp[(3) - (3)].integer), (yylsp[(3) - (3)])); } break; case 92: -/* Line 1806 of yacc.c */ -#line 553 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 575 "parse-gram.y" { grammar_current_rule_merge_set ((yyvsp[(3) - (3)].uniqstr), (yylsp[(3) - (3)])); } break; case 93: -/* Line 1806 of yacc.c */ -#line 557 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 579 "parse-gram.y" { (yyval.named_ref) = 0; } break; case 94: -/* Line 1806 of yacc.c */ -#line 559 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 581 "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 571 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 593 "parse-gram.y" { (yyval.uniqstr) = uniqstr_new ((yyvsp[(1) - (1)].chars)); } break; case 97: -/* Line 1806 of yacc.c */ -#line 576 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 598 "parse-gram.y" { (yyval.chars) = ""; } break; case 98: -/* Line 1806 of yacc.c */ -#line 577 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 599 "parse-gram.y" { (yyval.chars) = (yyvsp[(1) - (1)].uniqstr); } break; case 100: -/* Line 1806 of yacc.c */ -#line 588 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 610 "parse-gram.y" { code_props plain_code; (yyvsp[(1) - (1)].code)[strlen ((yyvsp[(1) - (1)].code)) - 1] = '\n'; @@ -2897,15 +2751,15 @@ yyreduce: case 101: -/* Line 1806 of yacc.c */ -#line 608 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 630 "parse-gram.y" { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; case 102: -/* Line 1806 of yacc.c */ -#line 610 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 632 "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); @@ -2915,15 +2769,15 @@ yyreduce: case 103: -/* Line 1806 of yacc.c */ -#line 618 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 640 "parse-gram.y" { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; case 106: -/* Line 1806 of yacc.c */ -#line 630 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 652 "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); @@ -2932,8 +2786,8 @@ yyreduce: case 108: -/* Line 1806 of yacc.c */ -#line 639 "parse-gram.y" +/* Line 1801 of yacc.c */ +#line 661 "parse-gram.y" { code_props plain_code; code_props_plain_init (&plain_code, (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); @@ -2946,8 +2800,8 @@ yyreduce: -/* Line 1806 of yacc.c */ -#line 2951 "parse-gram.c" +/* Line 1801 of yacc.c */ +#line 2805 "parse-gram.c" default: break; } if (yychar_backup != yychar) @@ -3196,8 +3050,8 @@ yyreturn: -/* Line 2067 of yacc.c */ -#line 649 "parse-gram.y" +/* Line 2062 of yacc.c */ +#line 671 "parse-gram.y" @@ -3217,7 +3071,7 @@ lloc_default (YYLTYPE const *rhs, int n) loc.start = rhs[n].end; loc.end = rhs[n].end; - /* Ignore empty nonterminals the start of the the right-hand side. + /* Ignore empty nonterminals the start of the right-hand side. Do not bother to ignore them at the end of the right-hand side, since empty nonterminals have the same end as their predecessors. */ for (i = 1; i <= n; i++) @@ -3264,17 +3118,7 @@ add_param (char const *type, char *decl, location loc) 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); } @@ -3289,8 +3133,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); } }