X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/d9b968d8d6d5502122f7b64116c8647c7525d346..2b45240d6c1b9177533aa5d83ac1c879198111c5:/src/parse-gram.c diff --git a/src/parse-gram.c b/src/parse-gram.c index a6cbca8c..3101c7ee 100644 --- a/src/parse-gram.c +++ b/src/parse-gram.c @@ -1,4 +1,4 @@ -/* A Bison parser, made by GNU Bison 2.4.676-eff9-dirty. */ +/* A Bison parser, made by GNU Bison 2.6.2.891-3f15-dirty. */ /* Bison implementation for Yacc-like parsers in C @@ -44,7 +44,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.4.676-eff9-dirty" +#define YYBISON_VERSION "2.6.2.891-3f15-dirty" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -58,8 +58,6 @@ /* Pull parsers. */ #define YYPULL 1 -/* Using locations. */ -#define YYLSP_NEEDED 1 /* Substitute the variable and function names. */ #define yyparse gram_parse @@ -72,7 +70,7 @@ #define yylloc gram_lloc /* Copy the first part of user declarations. */ -/* Line 269 of yacc.c */ +/* Line 331 of yacc.c */ #line 1 "src/parse-gram.y" /* Bison Grammar Parser -*- C -*- @@ -96,6 +94,7 @@ #include #include "system.h" +#include "c-ctype.h" #include "complain.h" #include "conflicts.h" #include "files.h" @@ -106,8 +105,10 @@ #include "quotearg.h" #include "reader.h" #include "symlist.h" +#include "symtab.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); @@ -126,13 +127,16 @@ static void gram_error (location const *, char const *); static char const *char_name (char); -/* Line 269 of yacc.c */ -#line 131 "src/parse-gram.c" +/* Line 331 of yacc.c */ +#line 132 "src/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 @@ -142,14 +146,20 @@ static char const *char_name (char); # define YYERROR_VERBOSE 1 #endif -/* Enabling the token table. */ -#ifndef YYTOKEN_TABLE -# define YYTOKEN_TABLE 0 +/* In a future release of Bison, this section will be replaced + by #include "src/parse-gram.h". */ +#ifndef YY_GRAM_SRC_PARSE_GRAM_H_INCLUDED +# define YY_GRAM_SRC_PARSE_GRAM_H_INCLUDED +/* Enabling traces. */ +#ifndef YYDEBUG +# define YYDEBUG 1 +#endif +#if YYDEBUG +extern int gram_debug; #endif - /* "%code requires" blocks. */ -/* Line 289 of yacc.c */ -#line 220 "src/parse-gram.y" +/* Line 347 of yacc.c */ +#line 223 "src/parse-gram.y" # ifndef PARAM_TYPE # define PARAM_TYPE @@ -163,71 +173,72 @@ static char const *char_name (char); # endif -/* Line 289 of yacc.c */ -#line 168 "src/parse-gram.c" +/* Line 347 of yacc.c */ +#line 178 "src/parse-gram.c" /* 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_PRECEDENCE = 268, - PERCENT_PREC = 269, - PERCENT_DPREC = 270, - PERCENT_MERGE = 271, - PERCENT_CODE = 272, - PERCENT_DEFAULT_PREC = 273, - PERCENT_DEFINE = 274, - PERCENT_DEFINES = 275, - PERCENT_ERROR_VERBOSE = 276, - PERCENT_EXPECT = 277, - PERCENT_EXPECT_RR = 278, - PERCENT_FLAG = 279, - PERCENT_FILE_PREFIX = 280, - PERCENT_GLR_PARSER = 281, - PERCENT_INITIAL_ACTION = 282, - PERCENT_LANGUAGE = 283, - PERCENT_NAME_PREFIX = 284, - PERCENT_NO_DEFAULT_PREC = 285, - PERCENT_NO_LINES = 286, - PERCENT_NONDETERMINISTIC_PARSER = 287, - PERCENT_OUTPUT = 288, - PERCENT_REQUIRE = 289, - PERCENT_SKELETON = 290, - PERCENT_START = 291, - PERCENT_TOKEN_TABLE = 292, - PERCENT_VERBOSE = 293, - PERCENT_YACC = 294, - BRACED_CODE = 295, - BRACED_PREDICATE = 296, - BRACKETED_ID = 297, - CHAR = 298, - EPILOGUE = 299, - EQUAL = 300, - ID = 301, - ID_COLON = 302, - PERCENT_PERCENT = 303, - PIPE = 304, - PROLOGUE = 305, - SEMICOLON = 306, - TAG = 307, - TAG_ANY = 308, - TAG_NONE = 309, - PERCENT_PARAM = 310, - PERCENT_UNION = 311 - }; + /* 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_PRECEDENCE = 268, + PERCENT_PREC = 269, + PERCENT_DPREC = 270, + PERCENT_MERGE = 271, + PERCENT_CODE = 272, + PERCENT_DEFAULT_PREC = 273, + PERCENT_DEFINE = 274, + PERCENT_DEFINES = 275, + PERCENT_ERROR_VERBOSE = 276, + PERCENT_EXPECT = 277, + PERCENT_EXPECT_RR = 278, + PERCENT_FLAG = 279, + PERCENT_FILE_PREFIX = 280, + PERCENT_GLR_PARSER = 281, + PERCENT_INITIAL_ACTION = 282, + PERCENT_LANGUAGE = 283, + PERCENT_NAME_PREFIX = 284, + PERCENT_NO_DEFAULT_PREC = 285, + PERCENT_NO_LINES = 286, + PERCENT_NONDETERMINISTIC_PARSER = 287, + PERCENT_OUTPUT = 288, + PERCENT_REQUIRE = 289, + PERCENT_SKELETON = 290, + PERCENT_START = 291, + PERCENT_TOKEN_TABLE = 292, + PERCENT_VERBOSE = 293, + PERCENT_YACC = 294, + BRACED_CODE = 295, + BRACED_PREDICATE = 296, + BRACKETED_ID = 297, + CHAR = 298, + EPILOGUE = 299, + EQUAL = 300, + ID = 301, + ID_COLON = 302, + PERCENT_PERCENT = 303, + PIPE = 304, + PROLOGUE = 305, + SEMICOLON = 306, + TAG = 307, + TAG_ANY = 308, + TAG_NONE = 309, + PERCENT_PARAM = 310, + PERCENT_UNION = 311 + }; #endif /* Tokens. */ #define GRAM_EOF 0 @@ -286,14 +297,11 @@ static char const *char_name (char); #define PERCENT_PARAM 310 #define PERCENT_UNION 311 - - - #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE { -/* Line 294 of yacc.c */ -#line 106 "src/parse-gram.y" +/* Line 347 of yacc.c */ +#line 109 "src/parse-gram.y" assoc assoc; char *code; @@ -305,17 +313,19 @@ typedef union YYSTYPE uniqstr uniqstr; unsigned char character; -/* Line 294 of yacc.c */ -#line 244 "src/parse-gram.y" +/* Line 347 of yacc.c */ +#line 247 "src/parse-gram.y" param_type param; +/* Line 347 of yacc.c */ +#line 426 "src/parse-gram.y" +code_props_type code_type; -/* Line 294 of yacc.c */ -#line 316 "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 @@ -327,19 +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 +int gram_parse (void); + +#endif /* !YY_GRAM_SRC_PARSE_GRAM_H_INCLUDED */ + /* Copy the second part of user declarations. */ -/* Line 344 of yacc.c */ -#line 340 "src/parse-gram.c" +/* Line 350 of yacc.c */ +#line 353 "src/parse-gram.c" /* Unqualified %code blocks. */ -/* Line 345 of yacc.c */ -#line 55 "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; @@ -371,8 +384,8 @@ typedef struct YYLTYPE #define YYTYPE_UINT16 uint_fast16_t #define YYTYPE_UINT8 uint_fast8_t -/* Line 345 of yacc.c */ -#line 233 "src/parse-gram.y" +/* Line 351 of yacc.c */ +#line 236 "src/parse-gram.y" /** Add a lex-param and/or a parse-param. * @@ -384,8 +397,8 @@ typedef struct YYLTYPE static param_type current_param = param_none; -/* Line 345 of yacc.c */ -#line 389 "src/parse-gram.c" +/* Line 351 of yacc.c */ +#line 402 "src/parse-gram.c" #ifdef short # undef short @@ -399,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 @@ -423,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 @@ -447,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 @@ -501,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 @@ -556,26 +545,26 @@ union yyalloc yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ yyptr += yynewbytes / sizeof (*yyptr); \ } \ - while (YYID (0)) + while (0) #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) \ +# define YYCOPY(Dst, Src, Count) \ do \ { \ YYSIZE_T yyi; \ for (yyi = 0; yyi < (Count); yyi++) \ - (To)[yyi] = (From)[yyi]; \ + (Dst)[yyi] = (Src)[yyi]; \ } \ - while (YYID (0)) + while (0) # endif # endif #endif /* !YYCOPY_NEEDED */ @@ -588,9 +577,9 @@ union yyalloc /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 57 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 36 +#define YYNNTS 38 /* YYNRULES -- Number of rules. */ -#define YYNRULES 110 +#define YYNRULES 112 /* YYNSTATES -- Number of states. */ #define YYNSTATES 149 @@ -644,22 +633,22 @@ static const yytype_uint8 yytranslate[] = /* YYRLINEYYN -- Source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 269, 269, 277, 279, 283, 284, 294, 298, 303, - 304, 309, 314, 315, 316, 317, 318, 323, 332, 333, - 334, 335, 336, 337, 338, 339, 339, 340, 341, 365, - 366, 367, 368, 372, 373, 382, 383, 384, 388, 395, - 402, 406, 410, 417, 432, 433, 437, 449, 449, 454, - 454, 459, 470, 485, 486, 487, 488, 492, 493, 498, - 500, 505, 506, 511, 513, 518, 519, 523, 524, 525, - 526, 531, 536, 541, 547, 553, 564, 565, 574, 575, - 581, 582, 583, 590, 590, 598, 599, 600, 605, 607, - 609, 611, 613, 615, 617, 622, 624, 634, 635, 640, - 641, 642, 651, 671, 673, 682, 687, 688, 693, 700, - 702 + 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 -#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE +#if YYDEBUG || YYERROR_VERBOSE || 1 /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. First, the terminals, then, starting at YYNTOKENS, nonterminals. */ static const char *const yytname[] = @@ -679,13 +668,13 @@ static const char *const yytname[] = "\"|\"", "\"%{...%}\"", "\";\"", "\"\"", "\"<*>\"", "\"<>\"", "\"%param\"", "\"%union\"", "$accept", "input", "prologue_declarations", "prologue_declaration", "$@1", "params", "grammar_declaration", - "union_name", "symbol_declaration", "$@2", "$@3", + "code_props_type", "union_name", "symbol_declaration", "$@2", "$@3", "precedence_declaration", "precedence_declarator", "tag.opt", "symbols.prec", "symbol.prec", "symbols.1", "generic_symlist", - "generic_symlist_item", "symbol_def", "symbol_defs.1", "grammar", + "generic_symlist_item", "tag", "symbol_def", "symbol_defs.1", "grammar", "rules_or_grammar_declaration", "rules", "$@4", "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 @@ -703,35 +692,35 @@ static const yytype_uint16 yytoknum[] = }; # endif -#define YYPACT_NINF -50 +#define YYPACT_NINF -88 #define yypact_value_is_default(yystate) \ - ((yystate) == (-50)) + ((yystate) == (-88)) -#define YYTABLE_NINF -110 +#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. */ static const yytype_int16 yypact[] = { - -50, 4, 107, -50, -50, -50, -20, 3, 11, -50, - -50, -50, -50, 14, -50, 12, 68, -50, 72, 73, - -50, 0, -50, 45, 86, 2, -50, -50, -50, 17, - 95, 96, 32, -50, -50, -50, 16, -50, -50, -50, - 54, -50, -50, -50, -50, 49, -2, -2, 32, 27, - 27, -50, 63, -50, -50, -50, 37, -50, -50, -50, - -50, 101, -50, -50, -50, 103, -50, 104, -50, -50, - -50, -50, -50, -50, -50, -50, 57, -50, 58, 1, - -50, -50, 79, 70, -50, 63, -50, 32, -50, -50, - -2, 64, -2, 32, -50, -50, -50, -50, 27, -50, - -50, 27, -50, -50, -50, -50, -50, -50, -50, -50, - -50, 78, -50, -50, -50, -50, -50, 83, -50, 32, - -50, 143, -50, 145, -50, -50, -50, -50, -50, -50, - -50, -50, -50, 43, 50, -50, -50, 32, 146, 97, - 79, -50, 79, 50, -50, -50, -50, -50, -50 + -88, 42, 107, -88, -88, -88, 8, -88, -88, -88, + -88, -88, -88, 19, -88, 12, 60, -88, 66, 72, + -88, 2, -88, 39, 83, 35, -88, -88, -88, 36, + 87, 88, 32, -88, -88, -88, 15, -88, -88, -88, + 46, -88, -88, 55, -88, -88, 45, -2, -2, 32, + -88, 58, -88, -88, -88, 31, -88, -88, -88, -88, + 97, -88, -88, -88, 98, -88, 100, -88, -88, -88, + -88, -88, -88, -88, -88, 56, -88, 57, 1, -88, + -88, 62, 69, -88, 58, 0, -88, 32, -88, -88, + -2, 85, -2, 32, -88, -88, -88, -88, -88, -88, + -88, -88, -88, -88, 77, -88, -88, -88, -88, -88, + 70, -88, -88, -88, -88, 0, -88, -88, -88, 32, + -88, 102, -88, 119, -88, -88, -88, -88, -88, -88, + -88, -88, -88, 33, 53, -88, -88, 32, 143, 71, + 62, -88, 62, 53, -88, -88, -88, -88, -88 }; /* YYDEFACT[S] -- default reduction number in state S. Performed when @@ -739,39 +728,39 @@ static const yytype_int16 yypact[] = is an error. */ static const yytype_uint8 yydefact[] = { - 3, 0, 0, 1, 49, 47, 0, 0, 0, 53, - 54, 55, 56, 0, 40, 0, 9, 11, 0, 0, - 7, 0, 16, 0, 0, 0, 41, 21, 22, 0, + 3, 0, 0, 1, 50, 48, 0, 43, 44, 54, + 55, 56, 57, 0, 39, 0, 9, 11, 0, 0, + 7, 0, 16, 0, 0, 0, 40, 21, 22, 0, 0, 0, 0, 29, 30, 31, 0, 6, 32, 25, - 44, 4, 5, 36, 35, 57, 0, 0, 0, 0, - 0, 102, 0, 42, 98, 97, 99, 10, 12, 13, - 14, 0, 17, 18, 19, 0, 23, 0, 27, 28, - 108, 104, 103, 106, 37, 107, 0, 105, 0, 0, - 78, 80, 95, 0, 45, 0, 58, 0, 71, 76, - 50, 72, 48, 51, 63, 68, 69, 70, 38, 65, - 67, 39, 43, 101, 100, 8, 15, 20, 24, 82, - 81, 0, 79, 2, 96, 83, 34, 26, 46, 52, - 59, 61, 77, 73, 74, 64, 66, 110, 88, 33, - 60, 62, 75, 84, 85, 88, 87, 0, 0, 0, - 95, 91, 95, 86, 92, 93, 94, 90, 89 + 45, 4, 5, 0, 36, 35, 58, 0, 0, 0, + 104, 0, 41, 100, 99, 101, 10, 12, 13, 14, + 0, 17, 18, 19, 0, 23, 0, 27, 28, 110, + 106, 105, 108, 37, 109, 0, 107, 0, 0, 80, + 82, 97, 0, 46, 0, 0, 59, 0, 73, 78, + 51, 74, 49, 52, 64, 42, 103, 102, 8, 15, + 20, 24, 84, 83, 0, 81, 2, 98, 85, 34, + 26, 47, 70, 71, 72, 38, 66, 69, 68, 53, + 60, 62, 79, 75, 76, 65, 112, 90, 33, 67, + 61, 63, 77, 86, 87, 90, 89, 0, 0, 0, + 97, 93, 97, 88, 94, 95, 96, 92, 91 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -50, -50, -50, -50, -50, -50, 149, -50, -50, -50, - -50, -50, -50, -50, -50, 33, -50, 106, -42, -4, - 112, -50, 74, -50, -50, -50, 19, -45, -50, -50, - -16, -8, -50, -32, -49, -50 + -88, -88, -88, -88, -88, -88, 146, -88, -88, -88, + -88, -88, -88, -88, -88, -88, 30, -88, -88, 37, + -88, -26, 103, -88, 75, -88, -88, -88, 21, -57, + -88, -88, -11, -18, -88, -32, -87, -88 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 1, 2, 41, 83, 117, 78, 85, 43, 47, - 46, 44, 45, 87, 119, 120, 93, 98, 99, 89, - 90, 79, 80, 81, 128, 133, 134, 115, 56, 105, - 53, 73, 82, 100, 75, 113 + -1, 1, 2, 41, 82, 110, 77, 43, 84, 44, + 48, 47, 45, 46, 87, 119, 120, 93, 115, 116, + 117, 89, 90, 78, 79, 80, 127, 133, 134, 108, + 55, 98, 52, 72, 81, 118, 74, 106 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -779,43 +768,43 @@ static const yytype_int16 yydefgoto[] = number is the opposite. If YYTABLE_NINF, syntax error. */ static const yytype_int16 yytable[] = { - 74, -109, 76, 60, 3, 64, 4, 5, 6, 7, - 8, 9, 10, 11, 12, 54, 94, 76, 13, 14, - 66, 4, 5, 6, 7, 8, 9, 10, 11, 12, - 70, 26, 48, 13, 14, 70, 102, 32, 91, 91, - 103, 71, 124, 49, 72, 61, 26, 65, 77, 111, - 88, 50, 32, 70, 51, 121, 126, 40, 55, 126, - 52, 125, 67, 77, 137, 138, 139, 70, 123, 118, - 71, 57, 40, 72, 132, 71, 58, 59, 72, 95, - 96, 97, 91, 104, 91, 62, 122, 121, 122, 63, - 140, 141, 135, 71, 136, 147, 72, 148, 68, 69, - 84, 86, 142, 51, 106, 144, 107, 108, 109, 110, - 116, 142, 4, 5, 6, 7, 8, 9, 10, 11, - 12, 114, 127, 129, 13, 14, 15, 16, 17, 18, + 73, -111, 75, 69, 124, 59, 4, 5, 6, 7, + 8, 9, 10, 11, 12, 53, 75, 94, 13, 14, + 4, 5, 6, 7, 8, 9, 10, 11, 12, 91, + 91, 26, 13, 14, 96, 69, 132, 32, 63, 65, + 95, 70, 3, 70, 71, 26, 71, 60, 76, 104, + 88, 32, 112, 113, 114, 121, 69, 40, 54, 50, + 49, 125, 76, 56, 122, 51, 122, 137, 138, 139, + 57, 40, 91, 111, 91, 70, 58, 97, 71, 61, + 64, 66, 135, 147, 136, 148, 62, 121, 69, 123, + 67, 68, 83, 140, 141, 85, 70, 86, 50, 71, + 99, 100, 142, 101, 107, 144, 131, 102, 103, 109, + 128, 142, 4, 5, 6, 7, 8, 9, 10, 11, + 12, 126, 69, 146, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, - 29, 30, 31, 32, 33, 34, 35, 131, 70, 146, - 145, 42, 130, 112, 143, 36, 101, 37, 38, 92, + 29, 30, 31, 32, 33, 34, 35, 145, 42, 130, + 0, 92, 129, 105, 0, 36, 143, 37, 38, 0, 0, 0, 39, 40 }; static const yytype_int16 yycheck[] = { - 32, 0, 1, 3, 0, 3, 5, 6, 7, 8, - 9, 10, 11, 12, 13, 3, 48, 1, 17, 18, - 3, 5, 6, 7, 8, 9, 10, 11, 12, 13, - 3, 30, 52, 17, 18, 3, 52, 36, 46, 47, - 3, 43, 91, 40, 46, 45, 30, 45, 47, 48, - 52, 40, 36, 3, 40, 87, 98, 56, 46, 101, - 46, 93, 45, 47, 14, 15, 16, 3, 4, 85, - 43, 3, 56, 46, 123, 43, 4, 4, 46, 52, - 53, 54, 90, 46, 92, 40, 90, 119, 92, 3, - 40, 41, 49, 43, 51, 140, 46, 142, 3, 3, - 46, 52, 134, 40, 3, 137, 3, 3, 51, 51, + 32, 0, 1, 3, 91, 3, 5, 6, 7, 8, + 9, 10, 11, 12, 13, 3, 1, 49, 17, 18, + 5, 6, 7, 8, 9, 10, 11, 12, 13, 47, + 48, 30, 17, 18, 3, 3, 123, 36, 3, 3, + 51, 43, 0, 43, 46, 30, 46, 45, 47, 48, + 52, 36, 52, 53, 54, 87, 3, 56, 46, 40, + 52, 93, 47, 3, 90, 46, 92, 14, 15, 16, + 4, 56, 90, 84, 92, 43, 4, 46, 46, 40, + 45, 45, 49, 140, 51, 142, 3, 119, 3, 4, + 3, 3, 46, 40, 41, 40, 43, 52, 40, 46, + 3, 3, 134, 3, 42, 137, 4, 51, 51, 40, 40, 143, 5, 6, 7, 8, 9, 10, 11, 12, - 13, 42, 44, 40, 17, 18, 19, 20, 21, 22, + 13, 44, 3, 52, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, - 33, 34, 35, 36, 37, 38, 39, 4, 3, 52, - 4, 2, 119, 79, 135, 48, 50, 50, 51, 47, + 33, 34, 35, 36, 37, 38, 39, 4, 2, 119, + -1, 48, 115, 78, -1, 48, 135, 50, 51, -1, -1, -1, 55, 56 }; @@ -827,17 +816,17 @@ static const yytype_uint8 yystos[] = 11, 12, 13, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 48, 50, 51, 55, - 56, 60, 63, 65, 68, 69, 67, 66, 52, 40, - 40, 40, 46, 87, 3, 46, 85, 3, 4, 4, - 3, 45, 40, 3, 3, 45, 3, 45, 3, 3, - 3, 43, 46, 88, 90, 91, 1, 47, 63, 78, - 79, 80, 89, 61, 46, 64, 52, 70, 52, 76, - 77, 88, 77, 73, 90, 52, 53, 54, 74, 75, - 90, 74, 87, 3, 46, 86, 3, 3, 3, 51, - 51, 48, 79, 92, 42, 84, 40, 62, 87, 71, - 72, 90, 76, 4, 91, 90, 75, 44, 81, 40, - 72, 4, 91, 82, 83, 49, 51, 14, 15, 16, - 40, 41, 90, 83, 90, 4, 52, 84, 84 + 56, 60, 63, 64, 66, 69, 70, 68, 67, 52, + 40, 46, 89, 3, 46, 87, 3, 4, 4, 3, + 45, 40, 3, 3, 45, 3, 45, 3, 3, 3, + 43, 46, 90, 92, 93, 1, 47, 63, 80, 81, + 82, 91, 61, 46, 65, 40, 52, 71, 52, 78, + 79, 90, 79, 74, 92, 89, 3, 46, 88, 3, + 3, 3, 51, 51, 48, 81, 94, 42, 86, 40, + 62, 89, 52, 53, 54, 75, 76, 77, 92, 72, + 73, 92, 78, 4, 93, 92, 44, 83, 40, 76, + 73, 4, 93, 84, 85, 49, 51, 14, 15, 16, + 40, 41, 92, 85, 92, 4, 52, 86, 86 }; /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ @@ -847,14 +836,14 @@ static const yytype_uint8 yyr1[] = 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 61, 60, 60, 60, 60, 60, 60, 60, 62, 62, 63, 63, 63, 63, 63, - 63, 63, 63, 63, 64, 64, 63, 66, 65, 67, - 65, 65, 68, 69, 69, 69, 69, 70, 70, 71, - 71, 72, 72, 73, 73, 74, 74, 75, 75, 75, - 75, 76, 76, 76, 76, 76, 77, 77, 78, 78, - 79, 79, 79, 81, 80, 82, 82, 82, 83, 83, - 83, 83, 83, 83, 83, 84, 84, 85, 85, 86, - 86, 86, 87, 88, 88, 89, 90, 90, 91, 92, - 92 + 63, 63, 63, 64, 64, 65, 65, 63, 67, 66, + 68, 66, 66, 69, 70, 70, 70, 70, 71, 71, + 72, 72, 73, 73, 74, 74, 75, 75, 76, 76, + 77, 77, 77, 78, 78, 78, 78, 78, 79, 79, + 80, 80, 81, 81, 81, 83, 82, 84, 84, 84, + 85, 85, 85, 85, 85, 85, 85, 86, 86, 87, + 87, 88, 88, 88, 89, 90, 90, 91, 92, 92, + 93, 94, 94 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -863,15 +852,15 @@ static const yytype_uint8 yyr2[] = 0, 2, 4, 0, 2, 1, 1, 1, 3, 1, 2, 1, 2, 2, 2, 3, 1, 2, 2, 2, 3, 1, 1, 2, 3, 0, 3, 2, 2, 1, - 1, 1, 1, 2, 1, 1, 1, 2, 3, 3, - 1, 1, 2, 3, 0, 1, 3, 0, 3, 0, - 3, 3, 3, 1, 1, 1, 1, 0, 1, 1, - 2, 1, 2, 1, 2, 1, 2, 1, 1, 1, - 1, 1, 1, 2, 2, 3, 1, 2, 1, 2, - 1, 2, 2, 0, 4, 1, 3, 2, 0, 3, - 3, 2, 3, 3, 3, 0, 1, 1, 1, 0, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, - 2 + 1, 1, 1, 2, 1, 1, 1, 2, 3, 1, + 1, 2, 3, 1, 1, 0, 1, 3, 0, 3, + 0, 3, 3, 3, 1, 1, 1, 1, 0, 1, + 1, 2, 1, 2, 1, 2, 1, 2, 1, 1, + 1, 1, 1, 1, 1, 2, 2, 3, 1, 2, + 1, 2, 1, 2, 2, 0, 4, 1, 3, 2, + 0, 3, 3, 2, 3, 3, 3, 0, 1, 1, + 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 0, 2 }; @@ -885,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) \ @@ -918,7 +892,7 @@ do \ yyerror (YY_("syntax error: cannot back up")); \ YYERROR; \ } \ -while (YYID (0)) +while (0) #define YYTERROR 1 @@ -929,11 +903,10 @@ while (YYID (0)) If N is 0, then set CURRENT to the empty location which ends the previous symbol: RHS[0] (always defined). */ -#define YYRHSLOC(Rhs, K) ((Rhs)[K]) #ifndef YYLLOC_DEFAULT # define YYLLOC_DEFAULT(Current, Rhs, N) \ do \ - if (YYID (N)) \ + if (N) \ { \ (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ @@ -947,9 +920,10 @@ 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]) /* YY_LOCATION_PRINT -- Print the location on the stream. This macro was not mandated originally: define only if we know @@ -987,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 { \ @@ -998,30 +972,19 @@ 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 { - YYUSE(yyoutput); + FILE *yyo = yyoutput; + YYUSE(yyo); YYUSE (yylocationp); - if (!yyvaluep) return; # ifdef YYPRINT @@ -1031,108 +994,96 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp) switch (yytype) { case 3: // "string" - -/* Line 752 of yacc.c */ -#line 193 "src/parse-gram.y" - { fputs (quotearg_style (c_quoting_style, ((*yyvaluep).chars)), stderr); } -/* Line 752 of yacc.c */ -#line 1040 "src/parse-gram.c" +/* Line 709 of yacc.c */ +#line 196 "src/parse-gram.y" + { fputs (quotearg_style (c_quoting_style, ((*yyvaluep).chars)), yyo); } +/* Line 709 of yacc.c */ +#line 1002 "src/parse-gram.c" break; case 4: // "integer" - -/* Line 752 of yacc.c */ -#line 206 "src/parse-gram.y" - { fprintf (stderr, "%d", ((*yyvaluep).integer)); } -/* Line 752 of yacc.c */ -#line 1049 "src/parse-gram.c" +/* Line 709 of yacc.c */ +#line 209 "src/parse-gram.y" + { fprintf (yyo, "%d", ((*yyvaluep).integer)); } +/* Line 709 of yacc.c */ +#line 1010 "src/parse-gram.c" break; case 24: // "%" - -/* Line 752 of yacc.c */ -#line 202 "src/parse-gram.y" - { fprintf (stderr, "%%%s", ((*yyvaluep).uniqstr)); } -/* Line 752 of yacc.c */ -#line 1058 "src/parse-gram.c" +/* Line 709 of yacc.c */ +#line 205 "src/parse-gram.y" + { fprintf (yyo, "%%%s", ((*yyvaluep).uniqstr)); } +/* Line 709 of yacc.c */ +#line 1018 "src/parse-gram.c" break; case 40: // "{...}" - -/* Line 752 of yacc.c */ -#line 195 "src/parse-gram.y" - { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).code)); } -/* Line 752 of yacc.c */ -#line 1067 "src/parse-gram.c" +/* Line 709 of yacc.c */ +#line 198 "src/parse-gram.y" + { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).code)); } +/* Line 709 of yacc.c */ +#line 1026 "src/parse-gram.c" break; case 42: // "[identifier]" - -/* Line 752 of yacc.c */ -#line 200 "src/parse-gram.y" - { fprintf (stderr, "[%s]", ((*yyvaluep).uniqstr)); } -/* Line 752 of yacc.c */ -#line 1076 "src/parse-gram.c" +/* Line 709 of yacc.c */ +#line 203 "src/parse-gram.y" + { fprintf (yyo, "[%s]", ((*yyvaluep).uniqstr)); } +/* Line 709 of yacc.c */ +#line 1034 "src/parse-gram.c" break; case 43: // "char" - -/* Line 752 of yacc.c */ -#line 187 "src/parse-gram.y" - { fputs (char_name (((*yyvaluep).character)), stderr); } -/* Line 752 of yacc.c */ -#line 1085 "src/parse-gram.c" +/* Line 709 of yacc.c */ +#line 190 "src/parse-gram.y" + { fputs (char_name (((*yyvaluep).character)), yyo); } +/* Line 709 of yacc.c */ +#line 1042 "src/parse-gram.c" break; case 44: // "epilogue" - -/* Line 752 of yacc.c */ -#line 195 "src/parse-gram.y" - { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); } -/* Line 752 of yacc.c */ -#line 1094 "src/parse-gram.c" +/* Line 709 of yacc.c */ +#line 198 "src/parse-gram.y" + { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); } +/* Line 709 of yacc.c */ +#line 1050 "src/parse-gram.c" break; case 46: // "identifier" - -/* Line 752 of yacc.c */ -#line 199 "src/parse-gram.y" - { fputs (((*yyvaluep).uniqstr), stderr); } -/* Line 752 of yacc.c */ -#line 1103 "src/parse-gram.c" +/* Line 709 of yacc.c */ +#line 202 "src/parse-gram.y" + { fputs (((*yyvaluep).uniqstr), yyo); } +/* Line 709 of yacc.c */ +#line 1058 "src/parse-gram.c" break; case 47: // "identifier:" - -/* Line 752 of yacc.c */ -#line 201 "src/parse-gram.y" - { fprintf (stderr, "%s:", ((*yyvaluep).uniqstr)); } -/* Line 752 of yacc.c */ -#line 1112 "src/parse-gram.c" +/* Line 709 of yacc.c */ +#line 204 "src/parse-gram.y" + { fprintf (yyo, "%s:", ((*yyvaluep).uniqstr)); } +/* Line 709 of yacc.c */ +#line 1066 "src/parse-gram.c" break; case 50: // "%{...%}" - -/* Line 752 of yacc.c */ -#line 195 "src/parse-gram.y" - { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); } -/* Line 752 of yacc.c */ -#line 1121 "src/parse-gram.c" +/* Line 709 of yacc.c */ +#line 198 "src/parse-gram.y" + { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); } +/* Line 709 of yacc.c */ +#line 1074 "src/parse-gram.c" break; case 52: // "" - -/* Line 752 of yacc.c */ -#line 203 "src/parse-gram.y" - { fprintf (stderr, "<%s>", ((*yyvaluep).uniqstr)); } -/* Line 752 of yacc.c */ -#line 1130 "src/parse-gram.c" +/* Line 709 of yacc.c */ +#line 206 "src/parse-gram.y" + { fprintf (yyo, "<%s>", ((*yyvaluep).uniqstr)); } +/* Line 709 of yacc.c */ +#line 1082 "src/parse-gram.c" break; case 55: // "%param" - -/* Line 752 of yacc.c */ -#line 249 "src/parse-gram.y" +/* Line 709 of yacc.c */ +#line 252 "src/parse-gram.y" { switch (((*yyvaluep).param)) { @@ -1145,80 +1096,88 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp) case param_none: aver (false); break; } } -/* Line 752 of yacc.c */ -#line 1150 "src/parse-gram.c" +/* Line 709 of yacc.c */ +#line 1101 "src/parse-gram.c" break; - case 72: // symbol.prec - -/* Line 752 of yacc.c */ -#line 209 "src/parse-gram.y" - { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); } -/* Line 752 of yacc.c */ -#line 1159 "src/parse-gram.c" + case 64: // code_props_type +/* Line 709 of yacc.c */ +#line 427 "src/parse-gram.y" + { fprintf (yyo, "%s", code_props_type_string (((*yyvaluep).code_type))); } +/* Line 709 of yacc.c */ +#line 1109 "src/parse-gram.c" break; - case 85: // variable - -/* Line 752 of yacc.c */ -#line 199 "src/parse-gram.y" - { fputs (((*yyvaluep).uniqstr), stderr); } -/* Line 752 of yacc.c */ -#line 1168 "src/parse-gram.c" + case 73: // symbol.prec +/* Line 709 of yacc.c */ +#line 212 "src/parse-gram.y" + { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); } +/* Line 709 of yacc.c */ +#line 1117 "src/parse-gram.c" break; - case 86: // content.opt - -/* Line 752 of yacc.c */ -#line 195 "src/parse-gram.y" - { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); } -/* Line 752 of yacc.c */ -#line 1177 "src/parse-gram.c" + case 77: // tag +/* Line 709 of yacc.c */ +#line 206 "src/parse-gram.y" + { fprintf (yyo, "<%s>", ((*yyvaluep).uniqstr)); } +/* Line 709 of yacc.c */ +#line 1125 "src/parse-gram.c" break; - case 87: // braceless - -/* Line 752 of yacc.c */ -#line 195 "src/parse-gram.y" - { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); } -/* Line 752 of yacc.c */ -#line 1186 "src/parse-gram.c" + case 87: // variable +/* Line 709 of yacc.c */ +#line 202 "src/parse-gram.y" + { fputs (((*yyvaluep).uniqstr), yyo); } +/* Line 709 of yacc.c */ +#line 1133 "src/parse-gram.c" break; - case 88: // id - -/* Line 752 of yacc.c */ -#line 209 "src/parse-gram.y" - { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); } -/* Line 752 of yacc.c */ -#line 1195 "src/parse-gram.c" + case 88: // content.opt +/* Line 709 of yacc.c */ +#line 198 "src/parse-gram.y" + { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); } +/* Line 709 of yacc.c */ +#line 1141 "src/parse-gram.c" break; - case 89: // id_colon - -/* Line 752 of yacc.c */ -#line 210 "src/parse-gram.y" - { fprintf (stderr, "%s:", ((*yyvaluep).symbol)->tag); } -/* Line 752 of yacc.c */ -#line 1204 "src/parse-gram.c" + case 89: // braceless +/* Line 709 of yacc.c */ +#line 198 "src/parse-gram.y" + { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); } +/* Line 709 of yacc.c */ +#line 1149 "src/parse-gram.c" break; - case 90: // symbol + case 90: // id +/* Line 709 of yacc.c */ +#line 212 "src/parse-gram.y" + { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); } +/* Line 709 of yacc.c */ +#line 1157 "src/parse-gram.c" + break; -/* Line 752 of yacc.c */ -#line 209 "src/parse-gram.y" - { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); } -/* Line 752 of yacc.c */ -#line 1213 "src/parse-gram.c" + case 91: // id_colon +/* Line 709 of yacc.c */ +#line 213 "src/parse-gram.y" + { fprintf (yyo, "%s:", ((*yyvaluep).symbol)->tag); } +/* Line 709 of yacc.c */ +#line 1165 "src/parse-gram.c" break; - case 91: // string_as_id + case 92: // symbol +/* Line 709 of yacc.c */ +#line 212 "src/parse-gram.y" + { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); } +/* Line 709 of yacc.c */ +#line 1173 "src/parse-gram.c" + break; -/* Line 752 of yacc.c */ -#line 209 "src/parse-gram.y" - { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); } -/* Line 752 of yacc.c */ -#line 1222 "src/parse-gram.c" + case 93: // string_as_id +/* Line 709 of yacc.c */ +#line 212 "src/parse-gram.y" + { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); } +/* Line 709 of yacc.c */ +#line 1181 "src/parse-gram.c" break; default: @@ -1231,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]); @@ -1260,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++) @@ -1284,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]; @@ -1325,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. */ @@ -1456,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 @@ -1479,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 @@ -1595,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++) @@ -1619,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; @@ -1704,12 +1620,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 @@ -1717,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 @@ -1767,7 +1679,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; @@ -1835,23 +1747,11 @@ 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); - if (!yymsg) yymsg = "Deleting"; YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); @@ -1864,49 +1764,14 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp) } -/* Prevent warnings from -Wmissing-prototypes. */ -#ifdef YYPARSE_PARAM -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -int yyparse (void *YYPARSE_PARAM); -#else -int yyparse (); -#endif -#else /* ! YYPARSE_PARAM */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -int yyparse (void); -#else -int yyparse (); -#endif -#endif /* ! YYPARSE_PARAM */ /*----------. | 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; @@ -1929,7 +1794,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. */ @@ -1960,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; @@ -1979,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; @@ -2012,18 +1876,17 @@ YYLTYPE yylloc; #endif /* User initialization code. */ -/* Line 1525 of yacc.c */ -#line 98 "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 1525 of yacc.c */ -#line 2025 "src/parse-gram.c" +/* Line 1464 of yacc.c */ +#line 1889 "src/parse-gram.c" yylsp[0] = yylloc; - goto yysetstate; /*------------------------------------------------------------. @@ -2214,8 +2077,8 @@ yyreduce: switch (yyn) { case 6: -/* Line 1741 of yacc.c */ -#line 285 "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])); @@ -2225,107 +2088,107 @@ yyreduce: plain_code.code, (yylsp[0])); code_scanner_last_string_free (); } -/* Line 1741 of yacc.c */ -#line 2230 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2093 "src/parse-gram.c" break; case 7: -/* Line 1741 of yacc.c */ -#line 295 "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 1741 of yacc.c */ -#line 2240 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2103 "src/parse-gram.c" break; case 8: -/* Line 1741 of yacc.c */ -#line 299 "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 1741 of yacc.c */ -#line 2251 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2114 "src/parse-gram.c" break; case 9: -/* Line 1741 of yacc.c */ -#line 303 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 306 "src/parse-gram.y" { defines_flag = true; } -/* Line 1741 of yacc.c */ -#line 2259 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2122 "src/parse-gram.c" break; case 10: -/* Line 1741 of yacc.c */ -#line 305 "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 1741 of yacc.c */ -#line 2270 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2133 "src/parse-gram.c" break; case 11: -/* Line 1741 of yacc.c */ -#line 310 "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 1741 of yacc.c */ -#line 2281 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2144 "src/parse-gram.c" break; case 12: -/* Line 1741 of yacc.c */ -#line 314 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 317 "src/parse-gram.y" { expected_sr_conflicts = (yyvsp[0].integer); } -/* Line 1741 of yacc.c */ -#line 2289 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2152 "src/parse-gram.c" break; case 13: -/* Line 1741 of yacc.c */ -#line 315 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 318 "src/parse-gram.y" { expected_rr_conflicts = (yyvsp[0].integer); } -/* Line 1741 of yacc.c */ -#line 2297 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2160 "src/parse-gram.c" break; case 14: -/* Line 1741 of yacc.c */ -#line 316 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 319 "src/parse-gram.y" { spec_file_prefix = (yyvsp[0].chars); } -/* Line 1741 of yacc.c */ -#line 2305 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2168 "src/parse-gram.c" break; case 15: -/* Line 1741 of yacc.c */ -#line 317 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 320 "src/parse-gram.y" { spec_file_prefix = (yyvsp[0].chars); } -/* Line 1741 of yacc.c */ -#line 2313 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2176 "src/parse-gram.c" break; case 16: -/* Line 1741 of yacc.c */ -#line 319 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 322 "src/parse-gram.y" { nondeterministic_parser = true; glr_parser = true; } -/* Line 1741 of yacc.c */ -#line 2324 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2187 "src/parse-gram.c" break; case 17: -/* Line 1741 of yacc.c */ -#line 324 "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])); @@ -2334,96 +2197,96 @@ yyreduce: muscle_code_grow ("initial_action", action.code, (yylsp[0])); code_scanner_last_string_free (); } -/* Line 1741 of yacc.c */ -#line 2339 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2202 "src/parse-gram.c" break; case 18: -/* Line 1741 of yacc.c */ -#line 332 "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 1741 of yacc.c */ -#line 2347 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2210 "src/parse-gram.c" break; case 19: -/* Line 1741 of yacc.c */ -#line 333 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 336 "src/parse-gram.y" { spec_name_prefix = (yyvsp[0].chars); } -/* Line 1741 of yacc.c */ -#line 2355 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2218 "src/parse-gram.c" break; case 20: -/* Line 1741 of yacc.c */ -#line 334 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 337 "src/parse-gram.y" { spec_name_prefix = (yyvsp[0].chars); } -/* Line 1741 of yacc.c */ -#line 2363 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2226 "src/parse-gram.c" break; case 21: -/* Line 1741 of yacc.c */ -#line 335 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 338 "src/parse-gram.y" { no_lines_flag = true; } -/* Line 1741 of yacc.c */ -#line 2371 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2234 "src/parse-gram.c" break; case 22: -/* Line 1741 of yacc.c */ -#line 336 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 339 "src/parse-gram.y" { nondeterministic_parser = true; } -/* Line 1741 of yacc.c */ -#line 2379 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2242 "src/parse-gram.c" break; case 23: -/* Line 1741 of yacc.c */ -#line 337 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 340 "src/parse-gram.y" { spec_outfile = (yyvsp[0].chars); } -/* Line 1741 of yacc.c */ -#line 2387 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2250 "src/parse-gram.c" break; case 24: -/* Line 1741 of yacc.c */ -#line 338 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 341 "src/parse-gram.y" { spec_outfile = (yyvsp[0].chars); } -/* Line 1741 of yacc.c */ -#line 2395 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2258 "src/parse-gram.c" break; case 25: -/* Line 1741 of yacc.c */ -#line 339 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 342 "src/parse-gram.y" { current_param = (yyvsp[0].param); } -/* Line 1741 of yacc.c */ -#line 2403 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2266 "src/parse-gram.c" break; case 26: -/* Line 1741 of yacc.c */ -#line 339 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 342 "src/parse-gram.y" { current_param = param_none; } -/* Line 1741 of yacc.c */ -#line 2411 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2274 "src/parse-gram.c" break; case 27: -/* Line 1741 of yacc.c */ -#line 340 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 343 "src/parse-gram.y" { version_check (&(yylsp[0]), (yyvsp[0].chars)); } -/* Line 1741 of yacc.c */ -#line 2419 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2282 "src/parse-gram.c" break; case 28: -/* Line 1741 of yacc.c */ -#line 342 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 345 "src/parse-gram.y" { char const *skeleton_user = (yyvsp[0].chars); - if (mbschr (skeleton_user, '/')) + if (strchr (skeleton_user, '/')) { size_t dir_length = strlen (current_file); char *skeleton_build; @@ -2435,7 +2298,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); @@ -2444,199 +2307,207 @@ yyreduce: } skeleton_arg (skeleton_user, grammar_prio, (yylsp[-1])); } -/* Line 1741 of yacc.c */ -#line 2449 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2312 "src/parse-gram.c" break; case 29: -/* Line 1741 of yacc.c */ -#line 365 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 368 "src/parse-gram.y" { token_table_flag = true; } -/* Line 1741 of yacc.c */ -#line 2457 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2320 "src/parse-gram.c" break; case 30: -/* Line 1741 of yacc.c */ -#line 366 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 369 "src/parse-gram.y" { report_flag |= report_states; } -/* Line 1741 of yacc.c */ -#line 2465 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2328 "src/parse-gram.c" break; case 31: -/* Line 1741 of yacc.c */ -#line 367 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 370 "src/parse-gram.y" { yacc_flag = true; } -/* Line 1741 of yacc.c */ -#line 2473 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2336 "src/parse-gram.c" break; case 33: -/* Line 1741 of yacc.c */ -#line 372 "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 1741 of yacc.c */ -#line 2481 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2344 "src/parse-gram.c" break; case 34: -/* Line 1741 of yacc.c */ -#line 373 "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 1741 of yacc.c */ -#line 2489 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2352 "src/parse-gram.c" break; case 37: -/* Line 1741 of yacc.c */ -#line 385 "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 1741 of yacc.c */ -#line 2499 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2362 "src/parse-gram.c" break; case 38: -/* Line 1741 of yacc.c */ -#line 389 "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_destructor_set (list, (yyvsp[-1].code), (yylsp[-1])); - 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 1741 of yacc.c */ -#line 2512 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2380 "src/parse-gram.c" break; case 39: -/* Line 1741 of yacc.c */ -#line 396 "src/parse-gram.y" - { - symbol_list *list; - for (list = (yyvsp[0].list); list; list = list->next) - symbol_list_printer_set (list, (yyvsp[-1].code), (yylsp[-1])); - symbol_list_free ((yyvsp[0].list)); - } -/* Line 1741 of yacc.c */ -#line 2525 "src/parse-gram.c" - break; - - case 40: -/* Line 1741 of yacc.c */ -#line 403 "src/parse-gram.y" +/* Line 1679 of yacc.c */ +#line 404 "src/parse-gram.y" { default_prec = true; } -/* Line 1741 of yacc.c */ -#line 2535 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2390 "src/parse-gram.c" break; - case 41: -/* Line 1741 of yacc.c */ -#line 407 "src/parse-gram.y" + case 40: +/* Line 1679 of yacc.c */ +#line 408 "src/parse-gram.y" { default_prec = false; } -/* Line 1741 of yacc.c */ -#line 2545 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2400 "src/parse-gram.c" break; - case 42: -/* Line 1741 of yacc.c */ -#line 411 "src/parse-gram.y" + case 41: +/* 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 1741 of yacc.c */ -#line 2558 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2413 "src/parse-gram.c" break; - case 43: -/* Line 1741 of yacc.c */ -#line 418 "src/parse-gram.y" + case 42: +/* 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 1741 of yacc.c */ -#line 2569 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2424 "src/parse-gram.c" + break; + + case 43: +/* Line 1679 of yacc.c */ +#line 429 "src/parse-gram.y" + { (yyval.code_type) = destructor; } +/* Line 1679 of yacc.c */ +#line 2432 "src/parse-gram.c" break; case 44: -/* Line 1741 of yacc.c */ -#line 432 "src/parse-gram.y" - {} -/* Line 1741 of yacc.c */ -#line 2577 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 430 "src/parse-gram.y" + { (yyval.code_type) = printer; } +/* Line 1679 of yacc.c */ +#line 2440 "src/parse-gram.c" break; case 45: -/* Line 1741 of yacc.c */ -#line 433 "src/parse-gram.y" - { muscle_code_grow ("union_name", (yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1741 of yacc.c */ -#line 2585 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 440 "src/parse-gram.y" + {} +/* Line 1679 of yacc.c */ +#line 2448 "src/parse-gram.c" break; case 46: -/* Line 1741 of yacc.c */ -#line 438 "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 1679 of yacc.c */ +#line 2456 "src/parse-gram.c" + break; + + case 47: +/* 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 1741 of yacc.c */ -#line 2597 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2468 "src/parse-gram.c" break; - case 47: -/* Line 1741 of yacc.c */ -#line 449 "src/parse-gram.y" + case 48: +/* Line 1679 of yacc.c */ +#line 457 "src/parse-gram.y" { current_class = nterm_sym; } -/* Line 1741 of yacc.c */ -#line 2605 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2476 "src/parse-gram.c" break; - case 48: -/* Line 1741 of yacc.c */ -#line 450 "src/parse-gram.y" + case 49: +/* Line 1679 of yacc.c */ +#line 458 "src/parse-gram.y" { current_class = unknown_sym; current_type = NULL; } -/* Line 1741 of yacc.c */ -#line 2616 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2487 "src/parse-gram.c" break; - case 49: -/* Line 1741 of yacc.c */ -#line 454 "src/parse-gram.y" + case 50: +/* Line 1679 of yacc.c */ +#line 462 "src/parse-gram.y" { current_class = token_sym; } -/* Line 1741 of yacc.c */ -#line 2624 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2495 "src/parse-gram.c" break; - case 50: -/* Line 1741 of yacc.c */ -#line 455 "src/parse-gram.y" + case 51: +/* Line 1679 of yacc.c */ +#line 463 "src/parse-gram.y" { current_class = unknown_sym; current_type = NULL; } -/* Line 1741 of yacc.c */ -#line 2635 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2506 "src/parse-gram.c" break; - case 51: -/* Line 1741 of yacc.c */ -#line 460 "src/parse-gram.y" + case 52: +/* Line 1679 of yacc.c */ +#line 468 "src/parse-gram.y" { symbol_list *list; tag_seen = true; @@ -2644,13 +2515,13 @@ yyreduce: symbol_type_set (list->content.sym, (yyvsp[-1].uniqstr), (yylsp[-1])); symbol_list_free ((yyvsp[0].list)); } -/* Line 1741 of yacc.c */ -#line 2649 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2520 "src/parse-gram.c" break; - case 52: -/* Line 1741 of yacc.c */ -#line 471 "src/parse-gram.y" + case 53: +/* Line 1679 of yacc.c */ +#line 479 "src/parse-gram.y" { symbol_list *list; ++current_prec; @@ -2662,358 +2533,358 @@ yyreduce: symbol_list_free ((yyvsp[0].list)); current_type = NULL; } -/* Line 1741 of yacc.c */ -#line 2667 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2538 "src/parse-gram.c" break; - case 53: -/* Line 1741 of yacc.c */ -#line 485 "src/parse-gram.y" + case 54: +/* Line 1679 of yacc.c */ +#line 493 "src/parse-gram.y" { (yyval.assoc) = left_assoc; } -/* Line 1741 of yacc.c */ -#line 2675 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2546 "src/parse-gram.c" break; - case 54: -/* Line 1741 of yacc.c */ -#line 486 "src/parse-gram.y" + case 55: +/* Line 1679 of yacc.c */ +#line 494 "src/parse-gram.y" { (yyval.assoc) = right_assoc; } -/* Line 1741 of yacc.c */ -#line 2683 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2554 "src/parse-gram.c" break; - case 55: -/* Line 1741 of yacc.c */ -#line 487 "src/parse-gram.y" + case 56: +/* Line 1679 of yacc.c */ +#line 495 "src/parse-gram.y" { (yyval.assoc) = non_assoc; } -/* Line 1741 of yacc.c */ -#line 2691 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2562 "src/parse-gram.c" break; - case 56: -/* Line 1741 of yacc.c */ -#line 488 "src/parse-gram.y" + case 57: +/* Line 1679 of yacc.c */ +#line 496 "src/parse-gram.y" { (yyval.assoc) = precedence_assoc; } -/* Line 1741 of yacc.c */ -#line 2699 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2570 "src/parse-gram.c" break; - case 57: -/* Line 1741 of yacc.c */ -#line 492 "src/parse-gram.y" + case 58: +/* Line 1679 of yacc.c */ +#line 500 "src/parse-gram.y" { current_type = NULL; } -/* Line 1741 of yacc.c */ -#line 2707 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2578 "src/parse-gram.c" break; - case 58: -/* Line 1741 of yacc.c */ -#line 493 "src/parse-gram.y" + case 59: +/* Line 1679 of yacc.c */ +#line 501 "src/parse-gram.y" { current_type = (yyvsp[0].uniqstr); tag_seen = true; } -/* Line 1741 of yacc.c */ -#line 2715 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2586 "src/parse-gram.c" break; - case 59: -/* Line 1741 of yacc.c */ -#line 499 "src/parse-gram.y" + case 60: +/* Line 1679 of yacc.c */ +#line 507 "src/parse-gram.y" { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); } -/* Line 1741 of yacc.c */ -#line 2723 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2594 "src/parse-gram.c" break; - case 60: -/* Line 1741 of yacc.c */ -#line 501 "src/parse-gram.y" + case 61: +/* 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 1741 of yacc.c */ -#line 2731 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2602 "src/parse-gram.c" break; - case 61: -/* Line 1741 of yacc.c */ -#line 505 "src/parse-gram.y" + case 62: +/* Line 1679 of yacc.c */ +#line 513 "src/parse-gram.y" { (yyval.symbol) = (yyvsp[0].symbol); } -/* Line 1741 of yacc.c */ -#line 2739 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2610 "src/parse-gram.c" break; - case 62: -/* Line 1741 of yacc.c */ -#line 506 "src/parse-gram.y" + case 63: +/* 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 1741 of yacc.c */ -#line 2747 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2618 "src/parse-gram.c" break; - case 63: -/* Line 1741 of yacc.c */ -#line 512 "src/parse-gram.y" + case 64: +/* Line 1679 of yacc.c */ +#line 520 "src/parse-gram.y" { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); } -/* Line 1741 of yacc.c */ -#line 2755 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2626 "src/parse-gram.c" break; - case 64: -/* Line 1741 of yacc.c */ -#line 514 "src/parse-gram.y" + case 65: +/* 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 1741 of yacc.c */ -#line 2763 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2634 "src/parse-gram.c" break; - case 65: -/* Line 1741 of yacc.c */ -#line 518 "src/parse-gram.y" + case 66: +/* Line 1679 of yacc.c */ +#line 526 "src/parse-gram.y" { (yyval.list) = (yyvsp[0].list); } -/* Line 1741 of yacc.c */ -#line 2771 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2642 "src/parse-gram.c" break; - case 66: -/* Line 1741 of yacc.c */ -#line 519 "src/parse-gram.y" + case 67: +/* Line 1679 of yacc.c */ +#line 527 "src/parse-gram.y" { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), (yyvsp[0].list)); } -/* Line 1741 of yacc.c */ -#line 2779 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2650 "src/parse-gram.c" break; - case 67: -/* Line 1741 of yacc.c */ -#line 523 "src/parse-gram.y" + case 68: +/* Line 1679 of yacc.c */ +#line 531 "src/parse-gram.y" { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); } -/* Line 1741 of yacc.c */ -#line 2787 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2658 "src/parse-gram.c" break; - case 68: -/* Line 1741 of yacc.c */ -#line 524 "src/parse-gram.y" + case 69: +/* Line 1679 of yacc.c */ +#line 532 "src/parse-gram.y" { (yyval.list) = symbol_list_type_new ((yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1741 of yacc.c */ -#line 2795 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2666 "src/parse-gram.c" break; - case 69: -/* Line 1741 of yacc.c */ -#line 525 "src/parse-gram.y" - { (yyval.list) = symbol_list_default_tagged_new ((yylsp[0])); } -/* Line 1741 of yacc.c */ -#line 2803 "src/parse-gram.c" + case 71: +/* Line 1679 of yacc.c */ +#line 537 "src/parse-gram.y" + { (yyval.uniqstr) = uniqstr_new ("*"); } +/* Line 1679 of yacc.c */ +#line 2674 "src/parse-gram.c" break; - case 70: -/* Line 1741 of yacc.c */ -#line 526 "src/parse-gram.y" - { (yyval.list) = symbol_list_default_tagless_new ((yylsp[0])); } -/* Line 1741 of yacc.c */ -#line 2811 "src/parse-gram.c" + case 72: +/* Line 1679 of yacc.c */ +#line 538 "src/parse-gram.y" + { (yyval.uniqstr) = uniqstr_new (""); } +/* Line 1679 of yacc.c */ +#line 2682 "src/parse-gram.c" break; - case 71: -/* Line 1741 of yacc.c */ -#line 532 "src/parse-gram.y" + case 73: +/* Line 1679 of yacc.c */ +#line 544 "src/parse-gram.y" { current_type = (yyvsp[0].uniqstr); tag_seen = true; } -/* Line 1741 of yacc.c */ -#line 2822 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2693 "src/parse-gram.c" break; - case 72: -/* Line 1741 of yacc.c */ -#line 537 "src/parse-gram.y" + case 74: +/* 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 1741 of yacc.c */ -#line 2833 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2704 "src/parse-gram.c" break; - case 73: -/* Line 1741 of yacc.c */ -#line 542 "src/parse-gram.y" + case 75: +/* 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 1741 of yacc.c */ -#line 2845 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2716 "src/parse-gram.c" break; - case 74: -/* Line 1741 of yacc.c */ -#line 548 "src/parse-gram.y" + case 76: +/* 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 1741 of yacc.c */ -#line 2857 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2728 "src/parse-gram.c" break; - case 75: -/* Line 1741 of yacc.c */ -#line 554 "src/parse-gram.y" + case 77: +/* 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 1741 of yacc.c */ -#line 2870 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2741 "src/parse-gram.c" break; - case 82: -/* Line 1741 of yacc.c */ -#line 584 "src/parse-gram.y" + case 84: +/* Line 1679 of yacc.c */ +#line 596 "src/parse-gram.y" { yyerrok; } -/* Line 1741 of yacc.c */ -#line 2880 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2751 "src/parse-gram.c" break; - case 83: -/* Line 1741 of yacc.c */ -#line 590 "src/parse-gram.y" + case 85: +/* Line 1679 of yacc.c */ +#line 602 "src/parse-gram.y" { current_lhs ((yyvsp[-1].symbol), (yylsp[-1]), (yyvsp[0].named_ref)); } -/* Line 1741 of yacc.c */ -#line 2888 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2759 "src/parse-gram.c" break; - case 84: -/* Line 1741 of yacc.c */ -#line 591 "src/parse-gram.y" + case 86: +/* Line 1679 of yacc.c */ +#line 603 "src/parse-gram.y" { /* Free the current lhs. */ current_lhs (0, (yylsp[-3]), 0); } -/* Line 1741 of yacc.c */ -#line 2899 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2770 "src/parse-gram.c" break; - case 85: -/* Line 1741 of yacc.c */ -#line 598 "src/parse-gram.y" + case 87: +/* Line 1679 of yacc.c */ +#line 610 "src/parse-gram.y" { grammar_current_rule_end ((yylsp[0])); } -/* Line 1741 of yacc.c */ -#line 2907 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2778 "src/parse-gram.c" break; - case 86: -/* Line 1741 of yacc.c */ -#line 599 "src/parse-gram.y" + case 88: +/* Line 1679 of yacc.c */ +#line 611 "src/parse-gram.y" { grammar_current_rule_end ((yylsp[0])); } -/* Line 1741 of yacc.c */ -#line 2915 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2786 "src/parse-gram.c" break; - case 88: -/* Line 1741 of yacc.c */ -#line 605 "src/parse-gram.y" + case 90: +/* 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 1741 of yacc.c */ -#line 2924 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2795 "src/parse-gram.c" break; - case 89: -/* Line 1741 of yacc.c */ -#line 608 "src/parse-gram.y" + case 91: +/* 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 1741 of yacc.c */ -#line 2932 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2803 "src/parse-gram.c" break; - case 90: -/* Line 1741 of yacc.c */ -#line 610 "src/parse-gram.y" + case 92: +/* 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 1741 of yacc.c */ -#line 2940 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2811 "src/parse-gram.c" break; - case 91: -/* Line 1741 of yacc.c */ -#line 612 "src/parse-gram.y" + case 93: +/* Line 1679 of yacc.c */ +#line 624 "src/parse-gram.y" { grammar_current_rule_action_append ((yyvsp[0].code), (yylsp[0]), NULL, true); } -/* Line 1741 of yacc.c */ -#line 2948 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2819 "src/parse-gram.c" break; - case 92: -/* Line 1741 of yacc.c */ -#line 614 "src/parse-gram.y" + case 94: +/* Line 1679 of yacc.c */ +#line 626 "src/parse-gram.y" { grammar_current_rule_prec_set ((yyvsp[0].symbol), (yylsp[0])); } -/* Line 1741 of yacc.c */ -#line 2956 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2827 "src/parse-gram.c" break; - case 93: -/* Line 1741 of yacc.c */ -#line 616 "src/parse-gram.y" + case 95: +/* Line 1679 of yacc.c */ +#line 628 "src/parse-gram.y" { grammar_current_rule_dprec_set ((yyvsp[0].integer), (yylsp[0])); } -/* Line 1741 of yacc.c */ -#line 2964 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2835 "src/parse-gram.c" break; - case 94: -/* Line 1741 of yacc.c */ -#line 618 "src/parse-gram.y" + case 96: +/* Line 1679 of yacc.c */ +#line 630 "src/parse-gram.y" { grammar_current_rule_merge_set ((yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1741 of yacc.c */ -#line 2972 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2843 "src/parse-gram.c" break; - case 95: -/* Line 1741 of yacc.c */ -#line 622 "src/parse-gram.y" + case 97: +/* Line 1679 of yacc.c */ +#line 634 "src/parse-gram.y" { (yyval.named_ref) = 0; } -/* Line 1741 of yacc.c */ -#line 2980 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2851 "src/parse-gram.c" break; - case 96: -/* Line 1741 of yacc.c */ -#line 624 "src/parse-gram.y" + case 98: +/* Line 1679 of yacc.c */ +#line 636 "src/parse-gram.y" { (yyval.named_ref) = named_ref_new((yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1741 of yacc.c */ -#line 2988 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2859 "src/parse-gram.c" break; - case 98: -/* Line 1741 of yacc.c */ -#line 635 "src/parse-gram.y" + case 100: +/* Line 1679 of yacc.c */ +#line 647 "src/parse-gram.y" { (yyval.uniqstr) = uniqstr_new ((yyvsp[0].chars)); } -/* Line 1741 of yacc.c */ -#line 2996 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2867 "src/parse-gram.c" break; - case 99: -/* Line 1741 of yacc.c */ -#line 640 "src/parse-gram.y" + case 101: +/* Line 1679 of yacc.c */ +#line 652 "src/parse-gram.y" { (yyval.chars) = ""; } -/* Line 1741 of yacc.c */ -#line 3004 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2875 "src/parse-gram.c" break; - case 100: -/* Line 1741 of yacc.c */ -#line 641 "src/parse-gram.y" + case 102: +/* Line 1679 of yacc.c */ +#line 653 "src/parse-gram.y" { (yyval.chars) = (yyvsp[0].uniqstr); } -/* Line 1741 of yacc.c */ -#line 3012 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2883 "src/parse-gram.c" break; - case 102: -/* Line 1741 of yacc.c */ -#line 652 "src/parse-gram.y" + case 104: +/* Line 1679 of yacc.c */ +#line 664 "src/parse-gram.y" { code_props plain_code; (yyvsp[0].code)[strlen ((yyvsp[0].code)) - 1] = '\n'; @@ -3022,52 +2893,52 @@ yyreduce: gram_scanner_last_string_free (); (yyval.chars) = plain_code.code; } -/* Line 1741 of yacc.c */ -#line 3027 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2898 "src/parse-gram.c" break; - case 103: -/* Line 1741 of yacc.c */ -#line 672 "src/parse-gram.y" + case 105: +/* Line 1679 of yacc.c */ +#line 684 "src/parse-gram.y" { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1741 of yacc.c */ -#line 3035 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2906 "src/parse-gram.c" break; - case 104: -/* Line 1741 of yacc.c */ -#line 674 "src/parse-gram.y" + case 106: +/* 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 1741 of yacc.c */ -#line 3047 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2918 "src/parse-gram.c" break; - case 105: -/* Line 1741 of yacc.c */ -#line 682 "src/parse-gram.y" + case 107: +/* Line 1679 of yacc.c */ +#line 694 "src/parse-gram.y" { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1741 of yacc.c */ -#line 3055 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2926 "src/parse-gram.c" break; - case 108: -/* Line 1741 of yacc.c */ -#line 694 "src/parse-gram.y" + case 110: +/* 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 1741 of yacc.c */ -#line 3066 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2937 "src/parse-gram.c" break; - case 110: -/* Line 1741 of yacc.c */ -#line 703 "src/parse-gram.y" + case 112: +/* 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])); @@ -3076,13 +2947,13 @@ yyreduce: muscle_code_grow ("epilogue", plain_code.code, (yylsp[0])); code_scanner_last_string_free (); } -/* Line 1741 of yacc.c */ -#line 3081 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2952 "src/parse-gram.c" break; -/* Line 1741 of yacc.c */ -#line 3086 "src/parse-gram.c" +/* Line 1679 of yacc.c */ +#line 2957 "src/parse-gram.c" default: break; } if (yychar_backup != yychar) @@ -3123,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. */ @@ -3325,12 +3196,10 @@ yyreturn: if (yymsg != yymsgbuf) YYSTACK_FREE (yymsg); #endif - /* Make sure YYID is used. */ - return YYID (yyresult); + return yyresult; } - -/* Line 2001 of yacc.c */ -#line 713 "src/parse-gram.y" +/* Line 1937 of yacc.c */ +#line 725 "src/parse-gram.y" @@ -3385,28 +3254,20 @@ 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) - complain_at (loc, _("missing identifier in parameter declaration")); + complain (&loc, complaint, _("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)); if (type & param_lex) muscle_pair_list_grow ("lex_param", decl, name); if (type & param_parse) @@ -3423,16 +3284,16 @@ 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 (EX_CONFIG); + complain (loc, complaint, "require bison %s, but have %s", + version, PACKAGE_VERSION); + exit (EX_MISMATCH); } } static void gram_error (location const *loc, char const *msg) { - complain_at (*loc, "%s", msg); + complain (loc, complaint, "%s", msg); } char const *