X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/f16b08196c780556cbf50691e2944960aebc46f6..42ee26bb96ea939c40c1c922ba404456e718b823:/src/parse-gram.c diff --git a/src/parse-gram.c b/src/parse-gram.c index 01dc5b94..ec80e44a 100644 --- a/src/parse-gram.c +++ b/src/parse-gram.c @@ -54,12 +54,6 @@ /* Pure parsers. */ #define YYPURE 1 -/* Push parsers. */ -#define YYPUSH 0 - -/* Pull parsers. */ -#define YYPULL 1 - /* Using locations. */ #define YYLSP_NEEDED 1 @@ -79,8 +73,8 @@ #line 1 "parse-gram.y" /* Bison Grammar Parser -*- C -*- - Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, - Inc. + Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software + Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -153,7 +147,7 @@ static int current_prec = 0; /* Line 22 of yacc.c */ -#line 157 "parse-gram.c" +#line 151 "parse-gram.c" /* Enabling traces. */ #ifndef YYDEBUG @@ -215,28 +209,26 @@ static int current_prec = 0; PERCENT_OUTPUT = 289, PERCENT_PARSE_PARAM = 290, PERCENT_PURE_PARSER = 291, - PERCENT_PUSH_PARSER = 292, - PERCENT_PUSH_PULL_PARSER = 293, - PERCENT_REQUIRE = 294, - PERCENT_SKELETON = 295, - PERCENT_START = 296, - PERCENT_TOKEN_TABLE = 297, - PERCENT_VERBOSE = 298, - PERCENT_YACC = 299, - BRACED_CODE = 300, - CHAR = 301, - EPILOGUE = 302, - EQUAL = 303, - ID = 304, - ID_COLON = 305, - PERCENT_PERCENT = 306, - PIPE = 307, - PROLOGUE = 308, - SEMICOLON = 309, - TYPE = 310, - TYPE_TAG_ANY = 311, - TYPE_TAG_NONE = 312, - PERCENT_UNION = 313 + PERCENT_REQUIRE = 292, + PERCENT_SKELETON = 293, + PERCENT_START = 294, + PERCENT_TOKEN_TABLE = 295, + PERCENT_VERBOSE = 296, + PERCENT_YACC = 297, + BRACED_CODE = 298, + CHAR = 299, + EPILOGUE = 300, + EQUAL = 301, + ID = 302, + ID_COLON = 303, + PERCENT_PERCENT = 304, + PIPE = 305, + PROLOGUE = 306, + SEMICOLON = 307, + TYPE = 308, + TYPE_TAG_ANY = 309, + TYPE_TAG_NONE = 310, + PERCENT_UNION = 311 }; #endif /* Tokens. */ @@ -275,28 +267,26 @@ static int current_prec = 0; #define PERCENT_OUTPUT 289 #define PERCENT_PARSE_PARAM 290 #define PERCENT_PURE_PARSER 291 -#define PERCENT_PUSH_PARSER 292 -#define PERCENT_PUSH_PULL_PARSER 293 -#define PERCENT_REQUIRE 294 -#define PERCENT_SKELETON 295 -#define PERCENT_START 296 -#define PERCENT_TOKEN_TABLE 297 -#define PERCENT_VERBOSE 298 -#define PERCENT_YACC 299 -#define BRACED_CODE 300 -#define CHAR 301 -#define EPILOGUE 302 -#define EQUAL 303 -#define ID 304 -#define ID_COLON 305 -#define PERCENT_PERCENT 306 -#define PIPE 307 -#define PROLOGUE 308 -#define SEMICOLON 309 -#define TYPE 310 -#define TYPE_TAG_ANY 311 -#define TYPE_TAG_NONE 312 -#define PERCENT_UNION 313 +#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 CHAR 299 +#define EPILOGUE 300 +#define EQUAL 301 +#define ID 302 +#define ID_COLON 303 +#define PERCENT_PERCENT 304 +#define PIPE 305 +#define PROLOGUE 306 +#define SEMICOLON 307 +#define TYPE 308 +#define TYPE_TAG_ANY 309 +#define TYPE_TAG_NONE 310 +#define PERCENT_UNION 311 @@ -320,7 +310,7 @@ typedef union YYSTYPE /* Line 22 of yacc.c */ -#line 324 "parse-gram.c" +#line 314 "parse-gram.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -345,7 +335,7 @@ typedef struct YYLTYPE /* Line 22 of yacc.c */ -#line 349 "parse-gram.c" +#line 339 "parse-gram.c" #ifdef short # undef short @@ -562,20 +552,20 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 3 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 158 +#define YYLAST 156 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 59 +#define YYNTOKENS 57 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 31 +#define YYNNTS 33 /* YYNRULES -- Number of rules. */ -#define YYNRULES 103 +#define YYNRULES 105 /* YYNRULES -- Number of states. */ -#define YYNSTATES 141 +#define YYNSTATES 143 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 313 +#define YYMAXUTOK 311 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -614,7 +604,7 @@ static const yytype_uint8 yytranslate[] = 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, - 55, 56, 57, 58 + 55, 56 }; #if YYDEBUG @@ -625,62 +615,62 @@ static const yytype_uint16 yyprhs[] = 0, 0, 3, 8, 9, 12, 14, 16, 18, 22, 24, 27, 29, 32, 35, 38, 42, 44, 47, 50, 53, 55, 58, 62, 64, 66, 69, 73, 76, 78, - 80, 82, 85, 88, 90, 92, 94, 96, 98, 100, - 103, 107, 111, 113, 115, 118, 122, 123, 125, 129, - 130, 134, 135, 139, 143, 147, 149, 151, 153, 154, - 156, 158, 161, 163, 166, 168, 170, 172, 174, 176, - 178, 181, 184, 188, 190, 193, 195, 198, 200, 203, - 206, 207, 211, 213, 217, 220, 221, 224, 227, 231, - 235, 239, 241, 243, 244, 246, 248, 250, 252, 254, - 256, 258, 260, 261 + 81, 84, 86, 88, 90, 92, 94, 96, 99, 103, + 107, 109, 111, 114, 118, 119, 121, 125, 126, 130, + 131, 135, 139, 143, 145, 147, 149, 150, 152, 154, + 157, 159, 162, 164, 167, 169, 172, 174, 176, 178, + 180, 182, 184, 187, 190, 194, 196, 199, 201, 204, + 206, 209, 212, 213, 217, 219, 223, 226, 227, 230, + 233, 237, 241, 245, 247, 249, 250, 252, 254, 256, + 258, 260, 262, 264, 266, 267 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int8 yyrhs[] = { - 60, 0, -1, 61, 51, 76, 89, -1, -1, 61, - 62, -1, 63, -1, 53, -1, 17, -1, 19, 82, + 58, 0, -1, 59, 49, 76, 89, -1, -1, 59, + 60, -1, 61, -1, 51, -1, 17, -1, 19, 82, 83, -1, 20, -1, 20, 3, -1, 21, -1, 22, - 4, -1, 23, 4, -1, 24, 3, -1, 24, 48, - 3, -1, 25, -1, 26, 45, -1, 27, 3, -1, - 28, 45, -1, 29, -1, 30, 3, -1, 30, 48, + 4, -1, 23, 4, -1, 24, 3, -1, 24, 46, + 3, -1, 25, -1, 26, 43, -1, 27, 3, -1, + 28, 43, -1, 29, -1, 30, 3, -1, 30, 46, 3, -1, 32, -1, 33, -1, 34, 3, -1, 34, - 48, 3, -1, 35, 45, -1, 36, -1, 37, -1, - 38, -1, 39, 3, -1, 40, 3, -1, 42, -1, - 43, -1, 44, -1, 54, -1, 68, -1, 65, -1, - 41, 87, -1, 8, 45, 72, -1, 9, 45, 72, - -1, 18, -1, 31, -1, 16, 84, -1, 16, 49, - 84, -1, -1, 49, -1, 58, 64, 84, -1, -1, - 6, 66, 75, -1, -1, 5, 67, 75, -1, 7, - 55, 71, -1, 69, 70, 71, -1, 10, -1, 11, - -1, 12, -1, -1, 55, -1, 87, -1, 71, 87, - -1, 73, -1, 72, 73, -1, 87, -1, 55, -1, - 56, -1, 57, -1, 55, -1, 85, -1, 85, 4, - -1, 85, 88, -1, 85, 4, 88, -1, 74, -1, - 75, 74, -1, 77, -1, 76, 77, -1, 78, -1, - 63, 54, -1, 1, 54, -1, -1, 86, 79, 80, - -1, 81, -1, 80, 52, 81, -1, 80, 54, -1, - -1, 81, 87, -1, 81, 45, -1, 81, 13, 87, - -1, 81, 14, 4, -1, 81, 15, 55, -1, 49, - -1, 3, -1, -1, 3, -1, 45, -1, 49, -1, - 46, -1, 50, -1, 85, -1, 88, -1, 3, -1, - -1, 51, 47, -1 + 46, 3, -1, 35, 43, -1, 36, -1, 37, 3, + -1, 38, 3, -1, 40, -1, 41, -1, 42, -1, + 52, -1, 66, -1, 63, -1, 39, 87, -1, 8, + 43, 72, -1, 9, 43, 72, -1, 18, -1, 31, + -1, 16, 84, -1, 16, 47, 84, -1, -1, 47, + -1, 56, 62, 84, -1, -1, 6, 64, 75, -1, + -1, 5, 65, 75, -1, 7, 53, 71, -1, 67, + 68, 69, -1, 10, -1, 11, -1, 12, -1, -1, + 53, -1, 70, -1, 69, 70, -1, 87, -1, 87, + 4, -1, 87, -1, 71, 87, -1, 73, -1, 72, + 73, -1, 87, -1, 53, -1, 54, -1, 55, -1, + 53, -1, 85, -1, 85, 4, -1, 85, 88, -1, + 85, 4, 88, -1, 74, -1, 75, 74, -1, 77, + -1, 76, 77, -1, 78, -1, 61, 52, -1, 1, + 52, -1, -1, 86, 79, 80, -1, 81, -1, 80, + 50, 81, -1, 80, 52, -1, -1, 81, 87, -1, + 81, 43, -1, 81, 13, 87, -1, 81, 14, 4, + -1, 81, 15, 53, -1, 47, -1, 3, -1, -1, + 3, -1, 43, -1, 47, -1, 44, -1, 48, -1, + 85, -1, 88, -1, 3, -1, -1, 49, 45, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 207, 207, 215, 217, 221, 222, 232, 233, 237, - 238, 243, 244, 245, 246, 247, 248, 253, 262, 263, - 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, - 274, 275, 276, 300, 301, 302, 303, 307, 308, 309, - 313, 320, 327, 331, 335, 342, 357, 358, 362, 374, - 374, 379, 379, 384, 395, 410, 411, 412, 416, 417, - 422, 424, 429, 430, 434, 435, 436, 437, 442, 447, - 452, 458, 464, 475, 476, 485, 486, 492, 493, 494, - 501, 501, 505, 506, 507, 512, 513, 515, 517, 519, - 521, 531, 532, 538, 541, 550, 570, 572, 581, 586, - 587, 592, 599, 601 + 0, 204, 204, 212, 214, 218, 219, 229, 230, 234, + 235, 240, 241, 242, 243, 244, 245, 250, 259, 260, + 261, 262, 263, 264, 265, 266, 267, 268, 269, 282, + 283, 307, 308, 309, 310, 314, 315, 316, 320, 327, + 334, 338, 342, 349, 364, 365, 369, 381, 381, 386, + 386, 391, 402, 417, 418, 419, 423, 424, 429, 431, + 436, 437, 442, 444, 449, 450, 454, 455, 456, 457, + 462, 467, 472, 478, 484, 495, 496, 505, 506, 512, + 513, 514, 521, 521, 525, 526, 527, 532, 533, 535, + 537, 539, 541, 551, 552, 558, 561, 570, 590, 592, + 601, 606, 607, 612, 619, 621 }; #endif @@ -698,15 +688,15 @@ static const char *const yytname[] = "\"%initial-action\"", "\"%language\"", "\"%lex-param\"", "\"%locations\"", "\"%name-prefix\"", "\"%no-default-prec\"", "\"%no-lines\"", "\"%nondeterministic-parser\"", "\"%output\"", - "\"%parse-param\"", "\"%pure-parser\"", "\"%push-parser\"", - "\"%push-pull-parser\"", "\"%require\"", "\"%skeleton\"", "\"%start\"", - "\"%token-table\"", "\"%verbose\"", "\"%yacc\"", "\"{...}\"", "\"char\"", - "\"epilogue\"", "\"=\"", "\"identifier\"", "\"identifier:\"", "\"%%\"", - "\"|\"", "\"%{...%}\"", "\";\"", "\"type\"", "\"<*>\"", "\"<>\"", - "\"%union\"", "$accept", "input", "prologue_declarations", - "prologue_declaration", "grammar_declaration", "union_name", - "symbol_declaration", "$@1", "$@2", "precedence_declaration", - "precedence_declarator", "type.opt", "symbols.1", "generic_symlist", + "\"%parse-param\"", "\"%pure-parser\"", "\"%require\"", "\"%skeleton\"", + "\"%start\"", "\"%token-table\"", "\"%verbose\"", "\"%yacc\"", + "\"{...}\"", "\"char\"", "\"epilogue\"", "\"=\"", "\"identifier\"", + "\"identifier:\"", "\"%%\"", "\"|\"", "\"%{...%}\"", "\";\"", "\"type\"", + "\"<*>\"", "\"<>\"", "\"%union\"", "$accept", "input", + "prologue_declarations", "prologue_declaration", "grammar_declaration", + "union_name", "symbol_declaration", "$@1", "$@2", + "precedence_declaration", "precedence_declarator", "type.opt", + "symbols.prec", "symbol.prec", "symbols.1", "generic_symlist", "generic_symlist_item", "symbol_def", "symbol_defs.1", "grammar", "rules_or_grammar_declaration", "rules", "$@3", "rhses.1", "rhs", "variable", "content.opt", "braceless", "id", "id_colon", "symbol", @@ -724,24 +714,24 @@ static const yytype_uint16 yytoknum[] = 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, - 305, 306, 307, 308, 309, 310, 311, 312, 313 + 305, 306, 307, 308, 309, 310, 311 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint8 yyr1[] = { - 0, 59, 60, 61, 61, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 63, 63, 63, - 63, 63, 63, 63, 63, 63, 64, 64, 63, 66, - 65, 67, 65, 65, 68, 69, 69, 69, 70, 70, - 71, 71, 72, 72, 73, 73, 73, 73, 74, 74, - 74, 74, 74, 75, 75, 76, 76, 77, 77, 77, - 79, 78, 80, 80, 80, 81, 81, 81, 81, 81, - 81, 82, 82, 83, 83, 84, 85, 85, 86, 87, - 87, 88, 89, 89 + 0, 57, 58, 59, 59, 60, 60, 60, 60, 60, + 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, + 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, + 60, 60, 60, 60, 60, 61, 61, 61, 61, 61, + 61, 61, 61, 61, 62, 62, 61, 64, 63, 65, + 63, 63, 66, 67, 67, 67, 68, 68, 69, 69, + 70, 70, 71, 71, 72, 72, 73, 73, 73, 73, + 74, 74, 74, 74, 74, 75, 75, 76, 76, 77, + 77, 77, 79, 78, 80, 80, 80, 81, 81, 81, + 81, 81, 81, 82, 82, 83, 83, 84, 85, 85, + 86, 87, 87, 88, 89, 89 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -749,15 +739,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, - 1, 2, 3, 1, 1, 2, 3, 2, 1, 1, - 1, 2, 2, 1, 1, 1, 1, 1, 1, 2, - 3, 3, 1, 1, 2, 3, 0, 1, 3, 0, - 3, 0, 3, 3, 3, 1, 1, 1, 0, 1, - 1, 2, 1, 2, 1, 1, 1, 1, 1, 1, - 2, 2, 3, 1, 2, 1, 2, 1, 2, 2, - 0, 3, 1, 3, 2, 0, 2, 2, 3, 3, - 3, 1, 1, 0, 1, 1, 1, 1, 1, 1, - 1, 1, 0, 2 + 1, 2, 3, 1, 1, 2, 3, 2, 1, 2, + 2, 1, 1, 1, 1, 1, 1, 2, 3, 3, + 1, 1, 2, 3, 0, 1, 3, 0, 3, 0, + 3, 3, 3, 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, 3, 1, 3, 2, 0, 2, 2, + 3, 3, 3, 1, 1, 0, 1, 1, 1, 1, + 1, 1, 1, 1, 0, 2 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -765,127 +755,127 @@ static const yytype_uint8 yyr2[] = means the default is an error. */ static const yytype_uint8 yydefact[] = { - 3, 0, 0, 1, 51, 49, 0, 0, 0, 55, - 56, 57, 0, 7, 42, 0, 9, 11, 0, 0, - 0, 16, 0, 0, 0, 20, 0, 43, 23, 24, - 0, 0, 28, 29, 30, 0, 0, 0, 33, 34, - 35, 0, 6, 36, 46, 4, 5, 38, 37, 58, - 0, 0, 0, 0, 0, 95, 0, 44, 92, 91, - 93, 10, 12, 13, 14, 0, 17, 18, 19, 21, - 0, 25, 0, 27, 31, 32, 101, 97, 96, 99, - 39, 100, 0, 98, 0, 0, 75, 77, 80, 47, - 0, 59, 0, 68, 73, 52, 69, 50, 53, 60, - 65, 66, 67, 40, 62, 64, 41, 45, 94, 8, - 15, 22, 26, 79, 78, 0, 76, 2, 85, 48, - 54, 74, 70, 71, 61, 63, 103, 81, 82, 72, - 85, 84, 0, 0, 0, 87, 86, 83, 88, 89, - 90 + 3, 0, 0, 1, 49, 47, 0, 0, 0, 53, + 54, 55, 0, 7, 40, 0, 9, 11, 0, 0, + 0, 16, 0, 0, 0, 20, 0, 41, 23, 24, + 0, 0, 28, 0, 0, 0, 31, 32, 33, 0, + 6, 34, 44, 4, 5, 36, 35, 56, 0, 0, + 0, 0, 0, 97, 0, 42, 94, 93, 95, 10, + 12, 13, 14, 0, 17, 18, 19, 21, 0, 25, + 0, 27, 29, 30, 103, 99, 98, 101, 37, 102, + 0, 100, 0, 0, 77, 79, 82, 45, 0, 57, + 0, 70, 75, 50, 71, 48, 51, 62, 67, 68, + 69, 38, 64, 66, 39, 43, 96, 8, 15, 22, + 26, 81, 80, 0, 78, 2, 87, 46, 52, 58, + 60, 76, 72, 73, 63, 65, 105, 83, 84, 59, + 61, 74, 87, 86, 0, 0, 0, 89, 88, 85, + 90, 91, 92 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 1, 2, 45, 84, 90, 47, 51, 50, 48, - 49, 92, 98, 103, 104, 94, 95, 85, 86, 87, - 118, 127, 128, 60, 109, 57, 79, 88, 105, 81, - 117 + -1, 1, 2, 43, 82, 88, 45, 49, 48, 46, + 47, 90, 118, 119, 96, 101, 102, 92, 93, 83, + 84, 85, 116, 127, 128, 58, 107, 55, 77, 86, + 103, 79, 115 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -79 +#define YYPACT_NINF -60 static const yytype_int16 yypact[] = { - -79, 5, 96, -79, -79, -79, -6, 13, 18, -79, - -79, -79, -8, -79, -79, 27, 66, -79, 74, 82, - 31, -79, 43, 86, 45, -79, 32, -79, -79, -79, - 33, 47, -79, -79, -79, 91, 93, 26, -79, -79, - -79, 15, -79, -79, 48, -79, -79, -79, -79, 44, - 38, 38, 26, 11, 11, -79, 53, -79, -79, -79, - 106, -79, -79, -79, -79, 107, -79, -79, -79, -79, - 108, -79, 138, -79, -79, -79, -79, -79, -79, -79, - -79, -79, 88, -79, 89, 1, -79, -79, -79, -79, - 53, -79, 26, -79, -79, 38, 50, 38, 26, -79, - -79, -79, -79, 11, -79, -79, 11, -79, -79, -79, - -79, -79, -79, -79, -79, 97, -79, -79, -79, -79, - 26, -79, 142, -79, -79, -79, -79, -7, 25, -79, - -79, -79, 26, 144, 98, -79, -79, 25, -79, -79, - -79 + -60, 18, 100, -60, -60, -60, -16, 24, 27, -60, + -60, -60, -8, -60, -60, 11, 70, -60, 71, 80, + 2, -60, 46, 87, 48, -60, 31, -60, -60, -60, + 40, 49, -60, 91, 92, 0, -60, -60, -60, 15, + -60, -60, 50, -60, -60, -60, -60, 43, 12, 12, + 0, 25, 25, -60, 55, -60, -60, -60, 97, -60, + -60, -60, -60, 98, -60, -60, -60, -60, 99, -60, + 110, -60, -60, -60, -60, -60, -60, -60, -60, -60, + 51, -60, 62, 1, -60, -60, -60, -60, 55, -60, + 0, -60, -60, 12, 84, 12, 0, -60, -60, -60, + -60, 25, -60, -60, 25, -60, -60, -60, -60, -60, + -60, -60, -60, 101, -60, -60, -60, -60, 0, -60, + 111, -60, 140, -60, -60, -60, -60, 10, 38, -60, + -60, -60, -60, -60, 0, 141, 94, -60, -60, 38, + -60, -60, -60 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -79, -79, -79, -79, 149, -79, -79, -79, -79, -79, - -79, -79, 54, 101, -21, -33, 105, -79, 67, -79, - -79, -79, 28, -79, -79, -13, -47, -79, -37, -78, - -79 + -60, -60, -60, -60, 142, -60, -60, -60, -60, -60, + -60, -60, -60, 30, -60, 102, -59, -27, 104, -60, + 67, -60, -60, -60, 23, -60, -60, -50, -19, -60, + -35, -58, -60 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If positive, shift that token. If negative, reduce the rule which number is the opposite. If zero, do what YYDEFACT says. If YYTABLE_NINF, syntax error. */ -#define YYTABLE_NINF -103 +#define YYTABLE_NINF -105 static const yytype_int16 yytable[] = { - 80, -102, 82, 96, 96, 3, 4, 5, 6, 7, - 8, 9, 10, 11, 76, 99, 82, 12, 123, 14, - 4, 5, 6, 7, 8, 9, 10, 11, 76, 76, - 58, 12, 27, 14, 64, 69, 71, 55, 132, 133, - 134, 56, 37, 107, 129, 130, 27, 131, 96, 52, - 96, 83, 115, 76, 122, 99, 37, 77, 53, 44, - 78, 124, 121, 54, 121, 83, 100, 101, 102, 61, - 135, 77, 77, 44, 78, 78, 59, 119, 62, 65, - 70, 72, 125, 124, 77, 125, 63, 78, 66, 67, - 68, 136, 73, 93, 74, 138, 75, 89, 55, 91, - 136, 4, 5, 6, 7, 8, 9, 10, 11, 108, - 110, 111, 12, 13, 14, 15, 16, 17, 18, 19, - 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, - 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, - 40, 112, 113, 114, 126, 76, 120, 41, 139, 42, - 43, 46, 116, 140, 44, 106, 97, 0, 137 + 78, -104, 80, 74, 105, 62, 4, 5, 6, 7, + 8, 9, 10, 11, 56, 97, 80, 12, 3, 14, + 4, 5, 6, 7, 8, 9, 10, 11, 74, 94, + 94, 12, 27, 14, 67, 53, 123, 50, 117, 54, + 35, 74, 125, 69, 75, 125, 27, 76, 63, 81, + 113, 134, 135, 136, 35, 120, 75, 42, 57, 76, + 132, 124, 133, 81, 131, 91, 121, 51, 121, 75, + 52, 42, 76, 59, 94, 60, 94, 68, 98, 99, + 100, 137, 75, 120, 61, 76, 70, 74, 122, 64, + 65, 66, 71, 138, 72, 73, 89, 87, 53, 140, + 106, 108, 109, 111, 138, 4, 5, 6, 7, 8, + 9, 10, 11, 110, 112, 130, 12, 13, 14, 15, + 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, + 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, + 36, 37, 38, 74, 44, 141, 126, 142, 129, 39, + 114, 40, 41, 95, 104, 139, 42 }; -static const yytype_int16 yycheck[] = +static const yytype_uint8 yycheck[] = { - 37, 0, 1, 50, 51, 0, 5, 6, 7, 8, - 9, 10, 11, 12, 3, 52, 1, 16, 96, 18, - 5, 6, 7, 8, 9, 10, 11, 12, 3, 3, - 3, 16, 31, 18, 3, 3, 3, 45, 13, 14, - 15, 49, 41, 56, 122, 52, 31, 54, 95, 55, - 97, 50, 51, 3, 4, 92, 41, 46, 45, 58, - 49, 98, 95, 45, 97, 50, 55, 56, 57, 3, - 45, 46, 46, 58, 49, 49, 49, 90, 4, 48, - 48, 48, 103, 120, 46, 106, 4, 49, 45, 3, - 45, 128, 45, 55, 3, 132, 3, 49, 45, 55, - 137, 5, 6, 7, 8, 9, 10, 11, 12, 3, - 3, 3, 16, 17, 18, 19, 20, 21, 22, 23, - 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, - 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, - 44, 3, 54, 54, 47, 3, 92, 51, 4, 53, - 54, 2, 85, 55, 58, 54, 51, -1, 130 + 35, 0, 1, 3, 54, 3, 5, 6, 7, 8, + 9, 10, 11, 12, 3, 50, 1, 16, 0, 18, + 5, 6, 7, 8, 9, 10, 11, 12, 3, 48, + 49, 16, 31, 18, 3, 43, 94, 53, 88, 47, + 39, 3, 101, 3, 44, 104, 31, 47, 46, 48, + 49, 13, 14, 15, 39, 90, 44, 56, 47, 47, + 50, 96, 52, 48, 122, 53, 93, 43, 95, 44, + 43, 56, 47, 3, 93, 4, 95, 46, 53, 54, + 55, 43, 44, 118, 4, 47, 46, 3, 4, 43, + 3, 43, 43, 128, 3, 3, 53, 47, 43, 134, + 3, 3, 3, 52, 139, 5, 6, 7, 8, 9, + 10, 11, 12, 3, 52, 4, 16, 17, 18, 19, + 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, + 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, + 40, 41, 42, 3, 2, 4, 45, 53, 118, 49, + 83, 51, 52, 49, 52, 132, 56 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const yytype_uint8 yystos[] = { - 0, 60, 61, 0, 5, 6, 7, 8, 9, 10, + 0, 58, 59, 0, 5, 6, 7, 8, 9, 10, 11, 12, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, - 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, - 44, 51, 53, 54, 58, 62, 63, 65, 68, 69, - 67, 66, 55, 45, 45, 45, 49, 84, 3, 49, - 82, 3, 4, 4, 3, 48, 45, 3, 45, 3, - 48, 3, 48, 45, 3, 3, 3, 46, 49, 85, - 87, 88, 1, 50, 63, 76, 77, 78, 86, 49, - 64, 55, 70, 55, 74, 75, 85, 75, 71, 87, - 55, 56, 57, 72, 73, 87, 72, 84, 3, 83, - 3, 3, 3, 54, 54, 51, 77, 89, 79, 84, - 71, 74, 4, 88, 87, 73, 47, 80, 81, 88, - 52, 54, 13, 14, 15, 45, 87, 81, 87, 4, - 55 + 34, 35, 36, 37, 38, 39, 40, 41, 42, 49, + 51, 52, 56, 60, 61, 63, 66, 67, 65, 64, + 53, 43, 43, 43, 47, 84, 3, 47, 82, 3, + 4, 4, 3, 46, 43, 3, 43, 3, 46, 3, + 46, 43, 3, 3, 3, 44, 47, 85, 87, 88, + 1, 48, 61, 76, 77, 78, 86, 47, 62, 53, + 68, 53, 74, 75, 85, 75, 71, 87, 53, 54, + 55, 72, 73, 87, 72, 84, 3, 83, 3, 3, + 3, 52, 52, 49, 77, 89, 79, 84, 69, 70, + 87, 74, 4, 88, 87, 73, 45, 80, 81, 70, + 4, 88, 50, 52, 13, 14, 15, 43, 87, 81, + 87, 4, 53 }; #define yyerrok (yyerrstatus = 0) @@ -1036,146 +1026,146 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp) case 3: /* "\"string\"" */ /* Line 22 of yacc.c */ -#line 185 "parse-gram.y" +#line 182 "parse-gram.y" { fputs (quotearg_style (c_quoting_style, (yyvaluep->chars)), stderr); }; /* Line 22 of yacc.c */ -#line 1044 "parse-gram.c" +#line 1034 "parse-gram.c" break; case 4: /* "\"integer\"" */ /* Line 22 of yacc.c */ -#line 196 "parse-gram.y" +#line 193 "parse-gram.y" { fprintf (stderr, "%d", (yyvaluep->integer)); }; /* Line 22 of yacc.c */ -#line 1053 "parse-gram.c" +#line 1043 "parse-gram.c" break; - case 45: /* "\"{...}\"" */ + case 43: /* "\"{...}\"" */ /* Line 22 of yacc.c */ -#line 187 "parse-gram.y" +#line 184 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->code)); }; /* Line 22 of yacc.c */ -#line 1062 "parse-gram.c" +#line 1052 "parse-gram.c" break; - case 46: /* "\"char\"" */ + case 44: /* "\"char\"" */ /* Line 22 of yacc.c */ -#line 179 "parse-gram.y" +#line 176 "parse-gram.y" { fputs (char_name ((yyvaluep->character)), stderr); }; /* Line 22 of yacc.c */ -#line 1071 "parse-gram.c" +#line 1061 "parse-gram.c" break; - case 47: /* "\"epilogue\"" */ + case 45: /* "\"epilogue\"" */ /* Line 22 of yacc.c */ -#line 187 "parse-gram.y" +#line 184 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; /* Line 22 of yacc.c */ -#line 1080 "parse-gram.c" +#line 1070 "parse-gram.c" break; - case 49: /* "\"identifier\"" */ + case 47: /* "\"identifier\"" */ /* Line 22 of yacc.c */ -#line 192 "parse-gram.y" +#line 189 "parse-gram.y" { fputs ((yyvaluep->uniqstr), stderr); }; /* Line 22 of yacc.c */ -#line 1089 "parse-gram.c" +#line 1079 "parse-gram.c" break; - case 50: /* "\"identifier:\"" */ + case 48: /* "\"identifier:\"" */ /* Line 22 of yacc.c */ -#line 193 "parse-gram.y" +#line 190 "parse-gram.y" { fprintf (stderr, "%s:", (yyvaluep->uniqstr)); }; /* Line 22 of yacc.c */ -#line 1098 "parse-gram.c" +#line 1088 "parse-gram.c" break; - case 53: /* "\"%{...%}\"" */ + case 51: /* "\"%{...%}\"" */ /* Line 22 of yacc.c */ -#line 187 "parse-gram.y" +#line 184 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; /* Line 22 of yacc.c */ -#line 1107 "parse-gram.c" +#line 1097 "parse-gram.c" break; - case 55: /* "\"type\"" */ + case 53: /* "\"type\"" */ /* Line 22 of yacc.c */ -#line 191 "parse-gram.y" +#line 188 "parse-gram.y" { fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); }; /* Line 22 of yacc.c */ -#line 1116 "parse-gram.c" +#line 1106 "parse-gram.c" break; case 82: /* "variable" */ /* Line 22 of yacc.c */ -#line 192 "parse-gram.y" +#line 189 "parse-gram.y" { fputs ((yyvaluep->uniqstr), stderr); }; /* Line 22 of yacc.c */ -#line 1125 "parse-gram.c" +#line 1115 "parse-gram.c" break; case 83: /* "content.opt" */ /* Line 22 of yacc.c */ -#line 187 "parse-gram.y" +#line 184 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; /* Line 22 of yacc.c */ -#line 1134 "parse-gram.c" +#line 1124 "parse-gram.c" break; case 84: /* "braceless" */ /* Line 22 of yacc.c */ -#line 187 "parse-gram.y" +#line 184 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; /* Line 22 of yacc.c */ -#line 1143 "parse-gram.c" +#line 1133 "parse-gram.c" break; case 85: /* "id" */ /* Line 22 of yacc.c */ -#line 199 "parse-gram.y" +#line 196 "parse-gram.y" { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; /* Line 22 of yacc.c */ -#line 1152 "parse-gram.c" +#line 1142 "parse-gram.c" break; case 86: /* "id_colon" */ /* Line 22 of yacc.c */ -#line 200 "parse-gram.y" +#line 197 "parse-gram.y" { fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); }; /* Line 22 of yacc.c */ -#line 1161 "parse-gram.c" +#line 1151 "parse-gram.c" break; case 87: /* "symbol" */ /* Line 22 of yacc.c */ -#line 199 "parse-gram.y" +#line 196 "parse-gram.y" { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; /* Line 22 of yacc.c */ -#line 1170 "parse-gram.c" +#line 1160 "parse-gram.c" break; case 88: /* "string_as_id" */ /* Line 22 of yacc.c */ -#line 199 "parse-gram.y" +#line 196 "parse-gram.y" { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; /* Line 22 of yacc.c */ -#line 1179 "parse-gram.c" +#line 1169 "parse-gram.c" break; default: break; @@ -1627,10 +1617,10 @@ YYLTYPE yylloc; YYSIZE_T yymsg_alloc = sizeof yymsgbuf; #endif - /* Three stacks and their tools: - `yyss': related to states, - `yyvs': related to semantic values, - `yyls': related to locations. + /* The stacks and their tools: + `yyss' is related to states. + `yyvs' is related to semantic values. + `yyls' is related to locations. Refer to the stacks thru separate pointers, to allow yyoverflow to reallocate them elsewhere. */ @@ -1699,7 +1689,7 @@ YYLTYPE yylloc; } /* Line 22 of yacc.c */ -#line 1703 "parse-gram.c" +#line 1693 "parse-gram.c" yylsp[0] = yylloc; goto yysetstate; @@ -1885,7 +1875,7 @@ yyreduce: case 6: /* Line 22 of yacc.c */ -#line 223 "parse-gram.y" +#line 220 "parse-gram.y" { code_props plain_code; code_props_plain_init (&plain_code, (yyvsp[(1) - (1)].chars), (yylsp[(1) - (1)])); @@ -1900,14 +1890,14 @@ yyreduce: case 7: /* Line 22 of yacc.c */ -#line 232 "parse-gram.y" +#line 229 "parse-gram.y" { debug_flag = true; } break; case 8: /* Line 22 of yacc.c */ -#line 234 "parse-gram.y" +#line 231 "parse-gram.y" { muscle_percent_define_insert ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars)); } @@ -1916,14 +1906,14 @@ yyreduce: case 9: /* Line 22 of yacc.c */ -#line 237 "parse-gram.y" +#line 234 "parse-gram.y" { defines_flag = true; } break; case 10: /* Line 22 of yacc.c */ -#line 239 "parse-gram.y" +#line 236 "parse-gram.y" { defines_flag = true; spec_defines_file = xstrdup ((yyvsp[(2) - (2)].chars)); @@ -1933,42 +1923,42 @@ yyreduce: case 11: /* Line 22 of yacc.c */ -#line 243 "parse-gram.y" +#line 240 "parse-gram.y" { error_verbose = true; } break; case 12: /* Line 22 of yacc.c */ -#line 244 "parse-gram.y" +#line 241 "parse-gram.y" { expected_sr_conflicts = (yyvsp[(2) - (2)].integer); } break; case 13: /* Line 22 of yacc.c */ -#line 245 "parse-gram.y" +#line 242 "parse-gram.y" { expected_rr_conflicts = (yyvsp[(2) - (2)].integer); } break; case 14: /* Line 22 of yacc.c */ -#line 246 "parse-gram.y" +#line 243 "parse-gram.y" { spec_file_prefix = (yyvsp[(2) - (2)].chars); } break; case 15: /* Line 22 of yacc.c */ -#line 247 "parse-gram.y" +#line 244 "parse-gram.y" { spec_file_prefix = (yyvsp[(3) - (3)].chars); } break; case 16: /* Line 22 of yacc.c */ -#line 249 "parse-gram.y" +#line 246 "parse-gram.y" { nondeterministic_parser = true; glr_parser = true; @@ -1978,7 +1968,7 @@ yyreduce: case 17: /* Line 22 of yacc.c */ -#line 254 "parse-gram.y" +#line 251 "parse-gram.y" { code_props action; code_props_symbol_action_init (&action, (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); @@ -1992,105 +1982,102 @@ yyreduce: case 18: /* Line 22 of yacc.c */ -#line 262 "parse-gram.y" +#line 259 "parse-gram.y" { language_argmatch ((yyvsp[(2) - (2)].chars), 1, &(yylsp[(1) - (2)])); } break; case 19: /* Line 22 of yacc.c */ -#line 263 "parse-gram.y" +#line 260 "parse-gram.y" { add_param ("lex_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); } break; case 20: /* Line 22 of yacc.c */ -#line 264 "parse-gram.y" +#line 261 "parse-gram.y" { locations_flag = true; } break; case 21: /* Line 22 of yacc.c */ -#line 265 "parse-gram.y" +#line 262 "parse-gram.y" { spec_name_prefix = (yyvsp[(2) - (2)].chars); } break; case 22: /* Line 22 of yacc.c */ -#line 266 "parse-gram.y" +#line 263 "parse-gram.y" { spec_name_prefix = (yyvsp[(3) - (3)].chars); } break; case 23: /* Line 22 of yacc.c */ -#line 267 "parse-gram.y" +#line 264 "parse-gram.y" { no_lines_flag = true; } break; case 24: /* Line 22 of yacc.c */ -#line 268 "parse-gram.y" +#line 265 "parse-gram.y" { nondeterministic_parser = true; } break; case 25: /* Line 22 of yacc.c */ -#line 269 "parse-gram.y" +#line 266 "parse-gram.y" { spec_outfile = (yyvsp[(2) - (2)].chars); } break; case 26: /* Line 22 of yacc.c */ -#line 270 "parse-gram.y" +#line 267 "parse-gram.y" { spec_outfile = (yyvsp[(3) - (3)].chars); } break; case 27: /* Line 22 of yacc.c */ -#line 271 "parse-gram.y" +#line 268 "parse-gram.y" { add_param ("parse_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); } break; case 28: /* Line 22 of yacc.c */ -#line 272 "parse-gram.y" - { pure_parser = true; } +#line 270 "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 + complain if %pure-parser is specified multiple times. */ + if (!muscle_find_const ("percent_define(api.pure)")) + muscle_percent_define_insert ("api.pure", (yylsp[(1) - (1)]), ""); + /* In all cases, use api.pure now so that the backend doesn't complain if + the skeleton ignores api.pure, but do warn now if there's a previous + conflicting definition from an actual %define. */ + if (!muscle_percent_define_flag_if ("api.pure")) + muscle_percent_define_insert ("api.pure", (yylsp[(1) - (1)]), ""); + } break; case 29: /* Line 22 of yacc.c */ -#line 273 "parse-gram.y" - { push_parser = true; pull_parser = false; } - break; - - case 30: - -/* Line 22 of yacc.c */ -#line 274 "parse-gram.y" - { push_parser = true; pull_parser = true; } - break; - - case 31: - -/* Line 22 of yacc.c */ -#line 275 "parse-gram.y" +#line 282 "parse-gram.y" { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); } break; - case 32: + case 30: /* Line 22 of yacc.c */ -#line 277 "parse-gram.y" +#line 284 "parse-gram.y" { char const *skeleton_user = (yyvsp[(2) - (2)].chars); if (strchr (skeleton_user, '/')) @@ -2116,40 +2103,40 @@ yyreduce: } break; - case 33: + case 31: /* Line 22 of yacc.c */ -#line 300 "parse-gram.y" +#line 307 "parse-gram.y" { token_table_flag = true; } break; - case 34: + case 32: /* Line 22 of yacc.c */ -#line 301 "parse-gram.y" - { report_flag = report_states; } +#line 308 "parse-gram.y" + { report_flag |= report_states; } break; - case 35: + case 33: /* Line 22 of yacc.c */ -#line 302 "parse-gram.y" +#line 309 "parse-gram.y" { yacc_flag = true; } break; - case 39: + case 37: /* Line 22 of yacc.c */ -#line 310 "parse-gram.y" +#line 317 "parse-gram.y" { grammar_start_symbol_set ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); } break; - case 40: + case 38: /* Line 22 of yacc.c */ -#line 314 "parse-gram.y" +#line 321 "parse-gram.y" { symbol_list *list; for (list = (yyvsp[(3) - (3)].list); list; list = list->next) @@ -2158,10 +2145,10 @@ yyreduce: } break; - case 41: + case 39: /* Line 22 of yacc.c */ -#line 321 "parse-gram.y" +#line 328 "parse-gram.y" { symbol_list *list; for (list = (yyvsp[(3) - (3)].list); list; list = list->next) @@ -2170,28 +2157,28 @@ yyreduce: } break; - case 42: + case 40: /* Line 22 of yacc.c */ -#line 328 "parse-gram.y" +#line 335 "parse-gram.y" { default_prec = true; } break; - case 43: + case 41: /* Line 22 of yacc.c */ -#line 332 "parse-gram.y" +#line 339 "parse-gram.y" { default_prec = false; } break; - case 44: + case 42: /* Line 22 of yacc.c */ -#line 336 "parse-gram.y" +#line 343 "parse-gram.y" { /* Do not invoke muscle_percent_code_grow here since it invokes muscle_user_name_list_grow. */ @@ -2200,34 +2187,34 @@ yyreduce: } break; - case 45: + case 43: /* Line 22 of yacc.c */ -#line 343 "parse-gram.y" +#line 350 "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 (); } break; - case 46: + case 44: /* Line 22 of yacc.c */ -#line 357 "parse-gram.y" +#line 364 "parse-gram.y" {} break; - case 47: + case 45: /* Line 22 of yacc.c */ -#line 358 "parse-gram.y" +#line 365 "parse-gram.y" { muscle_code_grow ("union_name", (yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; - case 48: + case 46: /* Line 22 of yacc.c */ -#line 363 "parse-gram.y" +#line 370 "parse-gram.y" { union_seen = true; muscle_code_grow ("stype", (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)])); @@ -2235,44 +2222,44 @@ yyreduce: } break; - case 49: + case 47: /* Line 22 of yacc.c */ -#line 374 "parse-gram.y" +#line 381 "parse-gram.y" { current_class = nterm_sym; } break; - case 50: + case 48: /* Line 22 of yacc.c */ -#line 375 "parse-gram.y" +#line 382 "parse-gram.y" { current_class = unknown_sym; current_type = NULL; } break; - case 51: + case 49: /* Line 22 of yacc.c */ -#line 379 "parse-gram.y" +#line 386 "parse-gram.y" { current_class = token_sym; } break; - case 52: + case 50: /* Line 22 of yacc.c */ -#line 380 "parse-gram.y" +#line 387 "parse-gram.y" { current_class = unknown_sym; current_type = NULL; } break; - case 53: + case 51: /* Line 22 of yacc.c */ -#line 385 "parse-gram.y" +#line 392 "parse-gram.y" { symbol_list *list; tag_seen = true; @@ -2282,10 +2269,10 @@ yyreduce: } break; - case 54: + case 52: /* Line 22 of yacc.c */ -#line 396 "parse-gram.y" +#line 403 "parse-gram.y" { symbol_list *list; ++current_prec; @@ -2299,121 +2286,149 @@ yyreduce: } break; - case 55: + case 53: /* Line 22 of yacc.c */ -#line 410 "parse-gram.y" +#line 417 "parse-gram.y" { (yyval.assoc) = left_assoc; } break; - case 56: + case 54: /* Line 22 of yacc.c */ -#line 411 "parse-gram.y" +#line 418 "parse-gram.y" { (yyval.assoc) = right_assoc; } break; - case 57: + case 55: /* Line 22 of yacc.c */ -#line 412 "parse-gram.y" +#line 419 "parse-gram.y" { (yyval.assoc) = non_assoc; } break; - case 58: + case 56: /* Line 22 of yacc.c */ -#line 416 "parse-gram.y" +#line 423 "parse-gram.y" { current_type = NULL; } break; - case 59: + case 57: /* Line 22 of yacc.c */ -#line 417 "parse-gram.y" +#line 424 "parse-gram.y" { current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; } break; - case 60: + case 58: /* Line 22 of yacc.c */ -#line 423 "parse-gram.y" +#line 430 "parse-gram.y" { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); } break; - case 61: + case 59: /* Line 22 of yacc.c */ -#line 425 "parse-gram.y" +#line 432 "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 22 of yacc.c */ +#line 436 "parse-gram.y" + { (yyval.symbol) = (yyvsp[(1) - (1)].symbol); } + break; + + case 61: + +/* Line 22 of yacc.c */ +#line 437 "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 22 of yacc.c */ -#line 429 "parse-gram.y" - { (yyval.list) = (yyvsp[(1) - (1)].list); } +#line 443 "parse-gram.y" + { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); } break; case 63: /* Line 22 of yacc.c */ -#line 430 "parse-gram.y" - { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); } +#line 445 "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 22 of yacc.c */ -#line 434 "parse-gram.y" - { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); } +#line 449 "parse-gram.y" + { (yyval.list) = (yyvsp[(1) - (1)].list); } break; case 65: /* Line 22 of yacc.c */ -#line 435 "parse-gram.y" - { (yyval.list) = symbol_list_type_new ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } +#line 450 "parse-gram.y" + { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); } break; case 66: /* Line 22 of yacc.c */ -#line 436 "parse-gram.y" - { (yyval.list) = symbol_list_default_tagged_new ((yylsp[(1) - (1)])); } +#line 454 "parse-gram.y" + { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); } break; case 67: /* Line 22 of yacc.c */ -#line 437 "parse-gram.y" - { (yyval.list) = symbol_list_default_tagless_new ((yylsp[(1) - (1)])); } +#line 455 "parse-gram.y" + { (yyval.list) = symbol_list_type_new ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; case 68: /* Line 22 of yacc.c */ -#line 443 "parse-gram.y" +#line 456 "parse-gram.y" + { (yyval.list) = symbol_list_default_tagged_new ((yylsp[(1) - (1)])); } + break; + + case 69: + +/* Line 22 of yacc.c */ +#line 457 "parse-gram.y" + { (yyval.list) = symbol_list_default_tagless_new ((yylsp[(1) - (1)])); } + break; + + case 70: + +/* Line 22 of yacc.c */ +#line 463 "parse-gram.y" { current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; } break; - case 69: + case 71: /* Line 22 of yacc.c */ -#line 448 "parse-gram.y" +#line 468 "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)])); } break; - case 70: + case 72: /* Line 22 of yacc.c */ -#line 453 "parse-gram.y" +#line 473 "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)])); @@ -2421,10 +2436,10 @@ yyreduce: } break; - case 71: + case 73: /* Line 22 of yacc.c */ -#line 459 "parse-gram.y" +#line 479 "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)])); @@ -2432,10 +2447,10 @@ yyreduce: } break; - case 72: + case 74: /* Line 22 of yacc.c */ -#line 465 "parse-gram.y" +#line 485 "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)])); @@ -2444,98 +2459,98 @@ yyreduce: } break; - case 79: + case 81: /* Line 22 of yacc.c */ -#line 495 "parse-gram.y" +#line 515 "parse-gram.y" { yyerrok; } break; - case 80: + case 82: /* Line 22 of yacc.c */ -#line 501 "parse-gram.y" +#line 521 "parse-gram.y" { current_lhs = (yyvsp[(1) - (1)].symbol); current_lhs_location = (yylsp[(1) - (1)]); } break; - case 82: + case 84: /* Line 22 of yacc.c */ -#line 505 "parse-gram.y" +#line 525 "parse-gram.y" { grammar_current_rule_end ((yylsp[(1) - (1)])); } break; - case 83: + case 85: /* Line 22 of yacc.c */ -#line 506 "parse-gram.y" +#line 526 "parse-gram.y" { grammar_current_rule_end ((yylsp[(3) - (3)])); } break; - case 85: + case 87: /* Line 22 of yacc.c */ -#line 512 "parse-gram.y" +#line 532 "parse-gram.y" { grammar_current_rule_begin (current_lhs, current_lhs_location); } break; - case 86: + case 88: /* Line 22 of yacc.c */ -#line 514 "parse-gram.y" +#line 534 "parse-gram.y" { grammar_current_rule_symbol_append ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); } break; - case 87: + case 89: /* Line 22 of yacc.c */ -#line 516 "parse-gram.y" +#line 536 "parse-gram.y" { grammar_current_rule_action_append ((yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); } break; - case 88: + case 90: /* Line 22 of yacc.c */ -#line 518 "parse-gram.y" +#line 538 "parse-gram.y" { grammar_current_rule_prec_set ((yyvsp[(3) - (3)].symbol), (yylsp[(3) - (3)])); } break; - case 89: + case 91: /* Line 22 of yacc.c */ -#line 520 "parse-gram.y" +#line 540 "parse-gram.y" { grammar_current_rule_dprec_set ((yyvsp[(3) - (3)].integer), (yylsp[(3) - (3)])); } break; - case 90: + case 92: /* Line 22 of yacc.c */ -#line 522 "parse-gram.y" +#line 542 "parse-gram.y" { grammar_current_rule_merge_set ((yyvsp[(3) - (3)].uniqstr), (yylsp[(3) - (3)])); } break; - case 92: + case 94: /* Line 22 of yacc.c */ -#line 532 "parse-gram.y" +#line 552 "parse-gram.y" { (yyval.uniqstr) = uniqstr_new ((yyvsp[(1) - (1)].chars)); } break; - case 93: + case 95: /* Line 22 of yacc.c */ -#line 538 "parse-gram.y" +#line 558 "parse-gram.y" { (yyval.chars) = ""; } break; - case 95: + case 97: /* Line 22 of yacc.c */ -#line 551 "parse-gram.y" +#line 571 "parse-gram.y" { code_props plain_code; (yyvsp[(1) - (1)].code)[strlen ((yyvsp[(1) - (1)].code)) - 1] = '\n'; @@ -2546,17 +2561,17 @@ yyreduce: } break; - case 96: + case 98: /* Line 22 of yacc.c */ -#line 571 "parse-gram.y" +#line 591 "parse-gram.y" { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; - case 97: + case 99: /* Line 22 of yacc.c */ -#line 573 "parse-gram.y" +#line 593 "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); @@ -2564,27 +2579,27 @@ yyreduce: } break; - case 98: + case 100: /* Line 22 of yacc.c */ -#line 581 "parse-gram.y" +#line 601 "parse-gram.y" { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; - case 101: + case 103: /* Line 22 of yacc.c */ -#line 593 "parse-gram.y" +#line 613 "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); } break; - case 103: + case 105: /* Line 22 of yacc.c */ -#line 602 "parse-gram.y" +#line 622 "parse-gram.y" { code_props plain_code; code_props_plain_init (&plain_code, (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); @@ -2598,7 +2613,7 @@ yyreduce: /* Line 22 of yacc.c */ -#line 2602 "parse-gram.c" +#line 2617 "parse-gram.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -2817,7 +2832,7 @@ yyreturn: /* Line 22 of yacc.c */ -#line 612 "parse-gram.y" +#line 632 "parse-gram.y"