X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/2cbe6b7f8f268366877078c8256011e20a76c464..02975b9aade52df362645b82a81ac2134290e221:/src/parse-gram.c diff --git a/src/parse-gram.c b/src/parse-gram.c index 9278fdfb..7d90f772 100644 --- a/src/parse-gram.c +++ b/src/parse-gram.c @@ -188,55 +188,56 @@ static int current_prec = 0; PERCENT_TYPE = 262, PERCENT_DESTRUCTOR = 263, PERCENT_PRINTER = 264, - PERCENT_SYMBOL_DEFAULT = 265, - PERCENT_LEFT = 266, - PERCENT_RIGHT = 267, - PERCENT_NONASSOC = 268, - PERCENT_PREC = 269, - PERCENT_DPREC = 270, - PERCENT_MERGE = 271, - PERCENT_CODE = 272, - PERCENT_CODE_TOP = 273, - PERCENT_DEBUG = 274, - PERCENT_DEFAULT_PREC = 275, - PERCENT_DEFINE = 276, - PERCENT_DEFINES = 277, - PERCENT_ERROR_VERBOSE = 278, - PERCENT_EXPECT = 279, - PERCENT_EXPECT_RR = 280, - PERCENT_FILE_PREFIX = 281, - PERCENT_GLR_PARSER = 282, - PERCENT_INITIAL_ACTION = 283, - PERCENT_LEX_PARAM = 284, - PERCENT_LOCATIONS = 285, - PERCENT_NAME_PREFIX = 286, - PERCENT_NO_DEFAULT_PREC = 287, - PERCENT_NO_LINES = 288, - PERCENT_NONDETERMINISTIC_PARSER = 289, - PERCENT_OUTPUT = 290, - PERCENT_PARSE_PARAM = 291, - PERCENT_PROVIDES = 292, - PERCENT_PURE_PARSER = 293, - PERCENT_PUSH_PARSER = 294, - PERCENT_REQUIRE = 295, - PERCENT_REQUIRES = 296, - PERCENT_SKELETON = 297, - PERCENT_START = 298, - PERCENT_TOKEN_TABLE = 299, - PERCENT_VERBOSE = 300, - PERCENT_YACC = 301, - BRACED_CODE = 302, - CHAR = 303, - EPILOGUE = 304, - EQUAL = 305, - ID = 306, - ID_COLON = 307, - PERCENT_PERCENT = 308, - PIPE = 309, - PROLOGUE = 310, - SEMICOLON = 311, - TYPE = 312, - PERCENT_UNION = 313 + PERCENT_LEFT = 265, + PERCENT_RIGHT = 266, + PERCENT_NONASSOC = 267, + PERCENT_PREC = 268, + PERCENT_DPREC = 269, + PERCENT_MERGE = 270, + PERCENT_CODE = 271, + PERCENT_CODE_TOP = 272, + PERCENT_DEBUG = 273, + PERCENT_DEFAULT_PREC = 274, + PERCENT_DEFINE = 275, + PERCENT_DEFINES = 276, + PERCENT_ERROR_VERBOSE = 277, + PERCENT_EXPECT = 278, + PERCENT_EXPECT_RR = 279, + PERCENT_FILE_PREFIX = 280, + PERCENT_GLR_PARSER = 281, + PERCENT_INITIAL_ACTION = 282, + PERCENT_LEX_PARAM = 283, + PERCENT_LOCATIONS = 284, + PERCENT_NAME_PREFIX = 285, + PERCENT_NO_DEFAULT_PREC = 286, + PERCENT_NO_LINES = 287, + PERCENT_NONDETERMINISTIC_PARSER = 288, + PERCENT_OUTPUT = 289, + PERCENT_PARSE_PARAM = 290, + PERCENT_PROVIDES = 291, + PERCENT_PURE_PARSER = 292, + PERCENT_PUSH_PARSER = 293, + PERCENT_REQUIRE = 294, + PERCENT_REQUIRES = 295, + PERCENT_SKELETON = 296, + PERCENT_START = 297, + PERCENT_TOKEN_TABLE = 298, + PERCENT_VERBOSE = 299, + PERCENT_YACC = 300, + BRACED_CODE = 301, + CHAR = 302, + EPILOGUE = 303, + EQUAL = 304, + ID = 305, + ID_COLON = 306, + PERCENT_PERCENT = 307, + PIPE = 308, + PROLOGUE = 309, + SEMICOLON = 310, + TYPE = 311, + TYPE_TAG_ANY = 312, + TYPE_TAG_NONE = 313, + PERCENT_UNION = 314 }; #endif /* Tokens. */ @@ -248,55 +249,56 @@ static int current_prec = 0; #define PERCENT_TYPE 262 #define PERCENT_DESTRUCTOR 263 #define PERCENT_PRINTER 264 -#define PERCENT_SYMBOL_DEFAULT 265 -#define PERCENT_LEFT 266 -#define PERCENT_RIGHT 267 -#define PERCENT_NONASSOC 268 -#define PERCENT_PREC 269 -#define PERCENT_DPREC 270 -#define PERCENT_MERGE 271 -#define PERCENT_CODE 272 -#define PERCENT_CODE_TOP 273 -#define PERCENT_DEBUG 274 -#define PERCENT_DEFAULT_PREC 275 -#define PERCENT_DEFINE 276 -#define PERCENT_DEFINES 277 -#define PERCENT_ERROR_VERBOSE 278 -#define PERCENT_EXPECT 279 -#define PERCENT_EXPECT_RR 280 -#define PERCENT_FILE_PREFIX 281 -#define PERCENT_GLR_PARSER 282 -#define PERCENT_INITIAL_ACTION 283 -#define PERCENT_LEX_PARAM 284 -#define PERCENT_LOCATIONS 285 -#define PERCENT_NAME_PREFIX 286 -#define PERCENT_NO_DEFAULT_PREC 287 -#define PERCENT_NO_LINES 288 -#define PERCENT_NONDETERMINISTIC_PARSER 289 -#define PERCENT_OUTPUT 290 -#define PERCENT_PARSE_PARAM 291 -#define PERCENT_PROVIDES 292 -#define PERCENT_PURE_PARSER 293 -#define PERCENT_PUSH_PARSER 294 -#define PERCENT_REQUIRE 295 -#define PERCENT_REQUIRES 296 -#define PERCENT_SKELETON 297 -#define PERCENT_START 298 -#define PERCENT_TOKEN_TABLE 299 -#define PERCENT_VERBOSE 300 -#define PERCENT_YACC 301 -#define BRACED_CODE 302 -#define CHAR 303 -#define EPILOGUE 304 -#define EQUAL 305 -#define ID 306 -#define ID_COLON 307 -#define PERCENT_PERCENT 308 -#define PIPE 309 -#define PROLOGUE 310 -#define SEMICOLON 311 -#define TYPE 312 -#define PERCENT_UNION 313 +#define PERCENT_LEFT 265 +#define PERCENT_RIGHT 266 +#define PERCENT_NONASSOC 267 +#define PERCENT_PREC 268 +#define PERCENT_DPREC 269 +#define PERCENT_MERGE 270 +#define PERCENT_CODE 271 +#define PERCENT_CODE_TOP 272 +#define PERCENT_DEBUG 273 +#define PERCENT_DEFAULT_PREC 274 +#define PERCENT_DEFINE 275 +#define PERCENT_DEFINES 276 +#define PERCENT_ERROR_VERBOSE 277 +#define PERCENT_EXPECT 278 +#define PERCENT_EXPECT_RR 279 +#define PERCENT_FILE_PREFIX 280 +#define PERCENT_GLR_PARSER 281 +#define PERCENT_INITIAL_ACTION 282 +#define PERCENT_LEX_PARAM 283 +#define PERCENT_LOCATIONS 284 +#define PERCENT_NAME_PREFIX 285 +#define PERCENT_NO_DEFAULT_PREC 286 +#define PERCENT_NO_LINES 287 +#define PERCENT_NONDETERMINISTIC_PARSER 288 +#define PERCENT_OUTPUT 289 +#define PERCENT_PARSE_PARAM 290 +#define PERCENT_PROVIDES 291 +#define PERCENT_PURE_PARSER 292 +#define PERCENT_PUSH_PARSER 293 +#define PERCENT_REQUIRE 294 +#define PERCENT_REQUIRES 295 +#define PERCENT_SKELETON 296 +#define PERCENT_START 297 +#define PERCENT_TOKEN_TABLE 298 +#define PERCENT_VERBOSE 299 +#define PERCENT_YACC 300 +#define BRACED_CODE 301 +#define CHAR 302 +#define EPILOGUE 303 +#define EQUAL 304 +#define ID 305 +#define ID_COLON 306 +#define PERCENT_PERCENT 307 +#define PIPE 308 +#define PROLOGUE 309 +#define SEMICOLON 310 +#define TYPE 311 +#define TYPE_TAG_ANY 312 +#define TYPE_TAG_NONE 313 +#define PERCENT_UNION 314 @@ -305,19 +307,20 @@ static int current_prec = 0; typedef union YYSTYPE { /* Line 198 of yacc.c */ -#line 98 "parse-gram.y" +#line 97 "parse-gram.y" symbol *symbol; symbol_list *list; int integer; - char *chars; + char const *chars; + char *code; assoc assoc; uniqstr uniqstr; unsigned char character; } /* Line 198 of yacc.c */ -#line 321 "parse-gram.c" +#line 324 "parse-gram.c" YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -342,7 +345,7 @@ typedef struct YYLTYPE /* Line 221 of yacc.c */ -#line 346 "parse-gram.c" +#line 349 "parse-gram.c" #ifdef short # undef short @@ -559,20 +562,20 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 3 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 187 +#define YYLAST 182 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 59 +#define YYNTOKENS 60 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 31 /* YYNRULES -- Number of rules. */ -#define YYNRULES 98 +#define YYNRULES 103 /* YYNRULES -- Number of states. */ -#define YYNSTATES 137 +#define YYNSTATES 142 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 313 +#define YYMAXUTOK 314 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -611,69 +614,73 @@ 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, 57, 58, 59 }; #if YYDEBUG /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in YYRHS. */ -static const yytype_uint8 yyprhs[] = +static const yytype_uint16 yyprhs[] = { 0, 0, 3, 8, 9, 12, 14, 16, 18, 22, - 24, 26, 29, 32, 36, 38, 41, 44, 46, 50, - 52, 54, 58, 61, 63, 65, 68, 71, 73, 75, - 77, 79, 81, 83, 86, 90, 94, 96, 98, 101, - 104, 107, 110, 111, 113, 117, 118, 122, 123, 127, - 131, 135, 137, 139, 141, 142, 144, 146, 149, 151, - 154, 156, 158, 160, 162, 164, 167, 170, 174, 176, - 179, 181, 184, 186, 189, 192, 193, 197, 199, 203, - 206, 207, 210, 213, 217, 221, 225, 227, 229, 230, - 232, 234, 236, 238, 240, 242, 244, 246, 247 + 24, 27, 29, 32, 35, 38, 42, 44, 47, 50, + 52, 55, 59, 61, 63, 66, 70, 73, 75, 77, + 80, 83, 85, 87, 89, 91, 93, 95, 98, 102, + 106, 108, 110, 113, 116, 119, 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 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int8 yyrhs[] = { - 60, 0, -1, 61, 53, 76, 89, -1, -1, 61, - 62, -1, 63, -1, 55, -1, 19, -1, 21, 3, - 83, -1, 22, -1, 23, -1, 24, 4, -1, 25, - 4, -1, 26, 50, 3, -1, 27, -1, 28, 47, - -1, 29, 47, -1, 30, -1, 31, 50, 3, -1, - 33, -1, 34, -1, 35, 50, 3, -1, 36, 47, - -1, 38, -1, 39, -1, 40, 3, -1, 42, 3, - -1, 44, -1, 45, -1, 46, -1, 56, -1, 68, - -1, 65, -1, 43, 87, -1, 8, 47, 72, -1, - 9, 47, 72, -1, 20, -1, 32, -1, 17, 84, - -1, 18, 84, -1, 37, 84, -1, 41, 84, -1, - -1, 51, -1, 58, 64, 47, -1, -1, 6, 66, - 75, -1, -1, 5, 67, 75, -1, 7, 57, 71, - -1, 69, 70, 71, -1, 11, -1, 12, -1, 13, - -1, -1, 57, -1, 87, -1, 71, 87, -1, 73, - -1, 72, 73, -1, 87, -1, 57, -1, 10, -1, - 57, -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, 56, -1, 1, - 56, -1, -1, 86, 79, 80, -1, 81, -1, 80, - 54, 81, -1, 80, 56, -1, -1, 81, 87, -1, - 81, 47, -1, 81, 14, 87, -1, 81, 15, 4, - -1, 81, 16, 57, -1, 3, -1, 84, -1, -1, - 82, -1, 47, -1, 51, -1, 48, -1, 52, -1, - 85, -1, 88, -1, 3, -1, -1, 53, 49, -1 + 61, 0, -1, 62, 52, 77, 90, -1, -1, 62, + 63, -1, 64, -1, 54, -1, 18, -1, 20, 3, + 84, -1, 21, -1, 21, 3, -1, 22, -1, 23, + 4, -1, 24, 4, -1, 25, 3, -1, 25, 49, + 3, -1, 26, -1, 27, 46, -1, 28, 46, -1, + 29, -1, 30, 3, -1, 30, 49, 3, -1, 32, + -1, 33, -1, 34, 3, -1, 34, 49, 3, -1, + 35, 46, -1, 37, -1, 38, -1, 39, 3, -1, + 41, 3, -1, 43, -1, 44, -1, 45, -1, 55, + -1, 69, -1, 66, -1, 42, 88, -1, 8, 46, + 73, -1, 9, 46, 73, -1, 19, -1, 31, -1, + 16, 85, -1, 17, 85, -1, 36, 85, -1, 40, + 85, -1, -1, 50, -1, 59, 65, 46, -1, -1, + 6, 67, 76, -1, -1, 5, 68, 76, -1, 7, + 56, 72, -1, 70, 71, 72, -1, 10, -1, 11, + -1, 12, -1, -1, 56, -1, 88, -1, 72, 88, + -1, 74, -1, 73, 74, -1, 88, -1, 56, -1, + 57, -1, 58, -1, 56, -1, 86, -1, 86, 4, + -1, 86, 89, -1, 86, 4, 89, -1, 75, -1, + 76, 75, -1, 78, -1, 77, 78, -1, 79, -1, + 64, 55, -1, 1, 55, -1, -1, 87, 80, 81, + -1, 82, -1, 81, 53, 82, -1, 81, 55, -1, + -1, 82, 88, -1, 82, 46, -1, 82, 13, 88, + -1, 82, 14, 4, -1, 82, 15, 56, -1, 3, + -1, 85, -1, -1, 83, -1, 46, -1, 50, -1, + 47, -1, 51, -1, 86, -1, 89, -1, 3, -1, + -1, 52, 48, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 209, 209, 217, 219, 223, 224, 225, 226, 227, - 228, 229, 230, 231, 232, 237, 241, 242, 243, 244, - 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, - 255, 259, 260, 261, 265, 273, 281, 285, 289, 290, - 291, 292, 303, 304, 308, 336, 336, 341, 341, 346, - 357, 372, 373, 374, 378, 379, 384, 386, 391, 392, - 396, 397, 398, 403, 408, 413, 419, 425, 436, 437, - 446, 447, 453, 454, 455, 462, 462, 466, 467, 468, - 473, 474, 476, 478, 480, 482, 492, 493, 499, 503, - 508, 524, 526, 535, 540, 541, 546, 553, 555 + 0, 210, 210, 218, 220, 224, 225, 226, 227, 228, + 229, 234, 235, 236, 237, 238, 239, 244, 248, 249, + 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, + 260, 261, 262, 263, 264, 268, 269, 270, 274, 282, + 290, 294, 298, 299, 300, 301, 312, 313, 317, 345, + 345, 350, 350, 355, 366, 381, 382, 383, 387, 388, + 393, 395, 400, 401, 405, 406, 407, 408, 413, 418, + 423, 429, 435, 446, 447, 456, 457, 463, 464, 465, + 472, 472, 476, 477, 478, 483, 484, 486, 488, 490, + 492, 502, 503, 509, 513, 518, 534, 536, 545, 550, + 551, 556, 563, 565 }; #endif @@ -684,26 +691,25 @@ static const char *const yytname[] = { "\"end of file\"", "error", "$undefined", "\"string\"", "\"integer\"", "\"%token\"", "\"%nterm\"", "\"%type\"", "\"%destructor\"", - "\"%printer\"", "\"%symbol-default\"", "\"%left\"", "\"%right\"", - "\"%nonassoc\"", "\"%prec\"", "\"%dprec\"", "\"%merge\"", "\"%code\"", - "\"%code-top\"", "\"%debug\"", "\"%default-prec\"", "\"%define\"", - "\"%defines\"", "\"%error-verbose\"", "\"%expect\"", "\"%expect-rr\"", - "\"%file-prefix\"", "\"%glr-parser\"", "\"%initial-action\"", - "\"%lex-param\"", "\"%locations\"", "\"%name-prefix\"", - "\"%no-default-prec\"", "\"%no-lines\"", "\"%nondeterministic-parser\"", - "\"%output\"", "\"%parse-param\"", "\"%provides\"", "\"%pure-parser\"", - "\"%push-parser\"", "\"%require\"", "\"%requires\"", "\"%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", - "generic_symlist_item", "symbol_def", "symbol_defs.1", "grammar", - "rules_or_grammar_declaration", "rules", "@3", "rhses.1", "rhs", - "content", "content.opt", "braceless", "id", "id_colon", "symbol", - "string_as_id", "epilogue.opt", 0 + "\"%printer\"", "\"%left\"", "\"%right\"", "\"%nonassoc\"", "\"%prec\"", + "\"%dprec\"", "\"%merge\"", "\"%code\"", "\"%code-top\"", "\"%debug\"", + "\"%default-prec\"", "\"%define\"", "\"%defines\"", "\"%error-verbose\"", + "\"%expect\"", "\"%expect-rr\"", "\"%file-prefix\"", "\"%glr-parser\"", + "\"%initial-action\"", "\"%lex-param\"", "\"%locations\"", + "\"%name-prefix\"", "\"%no-default-prec\"", "\"%no-lines\"", + "\"%nondeterministic-parser\"", "\"%output\"", "\"%parse-param\"", + "\"%provides\"", "\"%pure-parser\"", "\"%push-parser\"", "\"%require\"", + "\"%requires\"", "\"%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", "generic_symlist_item", "symbol_def", + "symbol_defs.1", "grammar", "rules_or_grammar_declaration", "rules", + "$@3", "rhses.1", "rhs", "content", "content.opt", "braceless", "id", + "id_colon", "symbol", "string_as_id", "epilogue.opt", 0 }; #endif @@ -717,38 +723,40 @@ 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, 312, 313, 314 }; # 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, 63, 63, 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, 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, 60, 61, 62, 62, 63, 63, 63, 63, 63, + 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + 63, 63, 63, 63, 63, 64, 64, 64, 64, 64, + 64, 64, 64, 64, 64, 64, 65, 65, 64, 67, + 66, 68, 66, 66, 69, 70, 70, 70, 71, 71, + 72, 72, 73, 73, 74, 74, 74, 74, 75, 75, + 75, 75, 75, 76, 76, 77, 77, 78, 78, 78, + 80, 79, 81, 81, 81, 82, 82, 82, 82, 82, + 82, 83, 83, 84, 84, 85, 86, 86, 87, 88, + 88, 89, 90, 90 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ static const yytype_uint8 yyr2[] = { 0, 2, 4, 0, 2, 1, 1, 1, 3, 1, - 1, 2, 2, 3, 1, 2, 2, 1, 3, 1, - 1, 3, 2, 1, 1, 2, 2, 1, 1, 1, - 1, 1, 1, 2, 3, 3, 1, 1, 2, 2, - 2, 2, 0, 1, 3, 0, 3, 0, 3, 3, - 3, 1, 1, 1, 0, 1, 1, 2, 1, 2, - 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 + 2, 1, 2, 2, 2, 3, 1, 2, 2, 1, + 2, 3, 1, 1, 2, 3, 2, 1, 1, 2, + 2, 1, 1, 1, 1, 1, 1, 2, 3, 3, + 1, 1, 2, 2, 2, 2, 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 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -756,130 +764,133 @@ static const yytype_uint8 yyr2[] = means the default is an error. */ static const yytype_uint8 yydefact[] = { - 3, 0, 0, 1, 47, 45, 0, 0, 0, 51, - 52, 53, 0, 0, 7, 36, 0, 9, 10, 0, - 0, 0, 14, 0, 0, 17, 0, 37, 19, 20, - 0, 0, 0, 23, 24, 0, 0, 0, 0, 27, - 28, 29, 0, 6, 30, 42, 4, 5, 32, 31, - 54, 0, 0, 0, 0, 0, 90, 38, 39, 88, - 11, 12, 0, 15, 16, 0, 0, 22, 40, 25, - 41, 26, 96, 92, 91, 94, 33, 95, 0, 93, - 0, 0, 70, 72, 75, 43, 0, 55, 0, 63, - 68, 48, 64, 46, 49, 56, 62, 61, 34, 58, - 60, 35, 86, 89, 8, 87, 13, 18, 21, 74, - 73, 0, 71, 2, 80, 44, 50, 69, 65, 66, - 57, 59, 98, 76, 77, 67, 80, 79, 0, 0, - 0, 82, 81, 78, 83, 84, 85 + 3, 0, 0, 1, 51, 49, 0, 0, 0, 55, + 56, 57, 0, 0, 7, 40, 0, 9, 11, 0, + 0, 0, 16, 0, 0, 19, 0, 41, 22, 23, + 0, 0, 0, 27, 28, 0, 0, 0, 0, 31, + 32, 33, 0, 6, 34, 46, 4, 5, 36, 35, + 58, 0, 0, 0, 0, 0, 95, 42, 43, 93, + 10, 12, 13, 14, 0, 17, 18, 20, 0, 24, + 0, 26, 44, 29, 45, 30, 101, 97, 96, 99, + 37, 100, 0, 98, 0, 0, 75, 77, 80, 47, + 0, 59, 0, 68, 73, 52, 69, 50, 53, 60, + 65, 66, 67, 38, 62, 64, 39, 91, 94, 8, + 92, 15, 21, 25, 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 }; /* YYDEFGOTO[NTERM-NUM]. */ -static const yytype_int8 yydefgoto[] = +static const yytype_int16 yydefgoto[] = { - -1, 1, 2, 46, 80, 86, 48, 52, 51, 49, - 50, 88, 94, 98, 99, 90, 91, 81, 82, 83, - 114, 123, 124, 103, 104, 57, 75, 84, 100, 77, - 113 + -1, 1, 2, 46, 84, 90, 48, 52, 51, 49, + 50, 92, 98, 103, 104, 94, 95, 85, 86, 87, + 119, 128, 129, 108, 109, 57, 79, 88, 105, 81, + 118 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -82 -static const yytype_int16 yypact[] = +#define YYPACT_NINF -97 +static const yytype_int8 yypact[] = { - -82, 4, 91, -82, -82, -82, -52, -31, -24, -82, - -82, -82, -8, -8, -82, -82, 49, -82, -82, 53, - 54, 12, -82, 16, 26, -82, 30, -82, -82, -82, - 32, 36, -8, -82, -82, 81, -8, 82, 0, -82, - -82, -82, 23, -82, -82, 37, -82, -82, -82, -82, - 34, 19, 19, 0, 17, 17, -82, -82, -82, 14, - -82, -82, 84, -82, -82, 86, 90, -82, -82, -82, - -82, -82, -82, -82, -82, -82, -82, -82, 38, -82, - 45, 1, -82, -82, -82, -82, 58, -82, 0, -82, - -82, 19, 43, 19, 0, -82, -82, -82, 17, -82, - -82, 17, -82, -82, -82, -82, -82, -82, -82, -82, - -82, 57, -82, -82, -82, -82, 0, -82, 104, -82, - -82, -82, -82, 15, 136, -82, -82, -82, 0, 88, - 85, -82, -82, 136, -82, -82, -82 + -97, 3, 123, -97, -97, -97, -42, -6, -5, -97, + -97, -97, -3, -3, -97, -97, 41, 55, -97, 57, + 60, 1, -97, 36, 40, -97, 10, -97, -97, -97, + 23, 44, -3, -97, -97, 85, -3, 90, -2, -97, + -97, -97, 68, -97, -97, 46, -97, -97, -97, -97, + 38, 42, 42, -2, -1, -1, -97, -97, -97, 35, + -97, -97, -97, -97, 94, -97, -97, -97, 98, -97, + 99, -97, -97, -97, -97, -97, -97, -97, -97, -97, + -97, -97, 48, -97, 50, 11, -97, -97, -97, -97, + 61, -97, -2, -97, -97, 42, 5, 42, -2, -97, + -97, -97, -97, -1, -97, -97, -1, -97, -97, -97, + -97, -97, -97, -97, -97, -97, 58, -97, -97, -97, + -97, -2, -97, 109, -97, -97, -97, -97, -22, 21, + -97, -97, -97, -2, 110, 59, -97, -97, 21, -97, + -97, -97 }; /* YYPGOTO[NTERM-NUM]. */ -static const yytype_int16 yypgoto[] = +static const yytype_int8 yypgoto[] = { - -82, -82, -82, -82, 141, -82, -82, -82, -82, -82, - -82, -82, 50, 93, -76, -14, 101, -82, 64, -82, - -82, -82, 28, -82, -82, 13, 89, -82, -38, -81, - -82 + -97, -97, -97, -97, 111, -97, -97, -97, -97, -97, + -97, -97, 24, 62, -96, -58, 66, -97, 37, -97, + -97, -97, -11, -97, -97, -7, 14, -97, -38, -91, + -97 }; /* 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 -98 +#define YYTABLE_NINF -103 static const yytype_int16 yytable[] = { - 76, -97, 78, 72, 3, 53, 4, 5, 6, 7, - 8, 119, 9, 10, 11, 95, 54, 102, 12, 13, - 72, 15, 121, 55, 78, 121, 58, 96, 4, 5, - 6, 7, 8, 27, 9, 10, 11, 125, 32, 56, - 12, 13, 36, 15, 38, 68, 72, 118, 73, 70, - 95, 74, 59, 79, 111, 27, 120, 60, 61, 45, - 32, 56, 62, 63, 36, 73, 38, 73, 74, 126, - 74, 127, 105, 64, 97, 79, 89, 117, 120, 117, - 65, 45, 66, 67, 69, 71, 132, 106, 85, 107, - 134, 87, 135, 108, 109, 132, 4, 5, 6, 7, - 8, 110, 9, 10, 11, 115, 122, 72, 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, 41, 116, 72, - 92, 92, 136, 47, 42, 112, 43, 44, 101, 45, - 128, 129, 130, 93, 133, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 92, 0, 92, 131, 73, 0, 0, 74 + 80, 76, 76, 3, 63, 124, 58, 126, 76, 123, + 126, -102, 82, 67, 53, 99, 4, 5, 6, 7, + 8, 9, 10, 11, 76, 72, 69, 12, 13, 74, + 15, 131, 130, 132, 133, 134, 135, 122, 107, 122, + 54, 55, 27, 56, 59, 77, 77, 32, 78, 78, + 64, 36, 110, 38, 99, 100, 101, 102, 60, 68, + 125, 61, 83, 116, 62, 96, 96, 136, 77, 82, + 45, 78, 70, 4, 5, 6, 7, 8, 9, 10, + 11, 56, 65, 125, 12, 13, 66, 15, 73, 77, + 71, 137, 78, 75, 91, 139, 89, 111, 93, 27, + 137, 112, 113, 114, 32, 115, 127, 120, 36, 96, + 38, 96, 76, 47, 140, 141, 121, 106, 97, 83, + 138, 0, 117, 0, 0, 0, 0, 45, 4, 5, + 6, 7, 8, 9, 10, 11, 0, 0, 0, 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, 41, 0, + 0, 0, 0, 0, 0, 42, 0, 43, 44, 0, + 0, 0, 45 }; static const yytype_int16 yycheck[] = { - 38, 0, 1, 3, 0, 57, 5, 6, 7, 8, - 9, 92, 11, 12, 13, 53, 47, 3, 17, 18, - 3, 20, 98, 47, 1, 101, 13, 10, 5, 6, - 7, 8, 9, 32, 11, 12, 13, 118, 37, 47, - 17, 18, 41, 20, 43, 32, 3, 4, 48, 36, - 88, 51, 3, 52, 53, 32, 94, 4, 4, 58, - 37, 47, 50, 47, 41, 48, 43, 48, 51, 54, - 51, 56, 59, 47, 57, 52, 57, 91, 116, 93, - 50, 58, 50, 47, 3, 3, 124, 3, 51, 3, - 128, 57, 4, 3, 56, 133, 5, 6, 7, 8, - 9, 56, 11, 12, 13, 47, 49, 3, 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, 45, 46, 88, 3, - 51, 52, 57, 2, 53, 81, 55, 56, 55, 58, - 14, 15, 16, 52, 126, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 91, -1, 93, 47, 48, -1, -1, 51 + 38, 3, 3, 0, 3, 96, 13, 103, 3, 4, + 106, 0, 1, 3, 56, 53, 5, 6, 7, 8, + 9, 10, 11, 12, 3, 32, 3, 16, 17, 36, + 19, 53, 123, 55, 13, 14, 15, 95, 3, 97, + 46, 46, 31, 46, 3, 47, 47, 36, 50, 50, + 49, 40, 59, 42, 92, 56, 57, 58, 3, 49, + 98, 4, 51, 52, 4, 51, 52, 46, 47, 1, + 59, 50, 49, 5, 6, 7, 8, 9, 10, 11, + 12, 46, 46, 121, 16, 17, 46, 19, 3, 47, + 46, 129, 50, 3, 56, 133, 50, 3, 56, 31, + 138, 3, 3, 55, 36, 55, 48, 46, 40, 95, + 42, 97, 3, 2, 4, 56, 92, 55, 52, 51, + 131, -1, 85, -1, -1, -1, -1, 59, 5, 6, + 7, 8, 9, 10, 11, 12, -1, -1, -1, 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, 45, -1, + -1, -1, -1, -1, -1, 52, -1, 54, 55, -1, + -1, -1, 59 }; /* 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, 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, 40, 41, 42, 43, 44, - 45, 46, 53, 55, 56, 58, 62, 63, 65, 68, - 69, 67, 66, 57, 47, 47, 47, 84, 84, 3, - 4, 4, 50, 47, 47, 50, 50, 47, 84, 3, - 84, 3, 3, 48, 51, 85, 87, 88, 1, 52, - 63, 76, 77, 78, 86, 51, 64, 57, 70, 57, - 74, 75, 85, 75, 71, 87, 10, 57, 72, 73, - 87, 72, 3, 82, 83, 84, 3, 3, 3, 56, - 56, 53, 77, 89, 79, 47, 71, 74, 4, 88, - 87, 73, 49, 80, 81, 88, 54, 56, 14, 15, - 16, 47, 87, 81, 87, 4, 57 + 0, 61, 62, 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, 45, 52, 54, 55, 59, 63, 64, 66, 69, + 70, 68, 67, 56, 46, 46, 46, 85, 85, 3, + 3, 4, 4, 3, 49, 46, 46, 3, 49, 3, + 49, 46, 85, 3, 85, 3, 3, 47, 50, 86, + 88, 89, 1, 51, 64, 77, 78, 79, 87, 50, + 65, 56, 71, 56, 75, 76, 86, 76, 72, 88, + 56, 57, 58, 73, 74, 88, 73, 3, 83, 84, + 85, 3, 3, 3, 55, 55, 52, 78, 90, 80, + 46, 72, 75, 4, 89, 88, 74, 48, 81, 82, + 89, 53, 55, 13, 14, 15, 46, 88, 82, 88, + 4, 56 }; #define yyerrok (yyerrstatus = 0) @@ -1030,146 +1041,146 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp) case 3: /* "\"string\"" */ /* Line 670 of yacc.c */ -#line 187 "parse-gram.y" +#line 188 "parse-gram.y" { fputs (quotearg_style (c_quoting_style, (yyvaluep->chars)), stderr); }; /* Line 670 of yacc.c */ -#line 1038 "parse-gram.c" +#line 1049 "parse-gram.c" break; case 4: /* "\"integer\"" */ /* Line 670 of yacc.c */ -#line 198 "parse-gram.y" +#line 199 "parse-gram.y" { fprintf (stderr, "%d", (yyvaluep->integer)); }; /* Line 670 of yacc.c */ -#line 1047 "parse-gram.c" +#line 1058 "parse-gram.c" break; - case 47: /* "\"{...}\"" */ + case 46: /* "\"{...}\"" */ /* Line 670 of yacc.c */ -#line 189 "parse-gram.y" - { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; +#line 190 "parse-gram.y" + { fprintf (stderr, "{\n%s\n}", (yyvaluep->code)); }; /* Line 670 of yacc.c */ -#line 1056 "parse-gram.c" +#line 1067 "parse-gram.c" break; - case 48: /* "\"char\"" */ + case 47: /* "\"char\"" */ /* Line 670 of yacc.c */ #line 182 "parse-gram.y" { fputs (char_name ((yyvaluep->character)), stderr); }; /* Line 670 of yacc.c */ -#line 1065 "parse-gram.c" +#line 1076 "parse-gram.c" break; - case 49: /* "\"epilogue\"" */ + case 48: /* "\"epilogue\"" */ /* Line 670 of yacc.c */ -#line 189 "parse-gram.y" +#line 190 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; /* Line 670 of yacc.c */ -#line 1074 "parse-gram.c" +#line 1085 "parse-gram.c" break; - case 51: /* "\"identifier\"" */ + case 50: /* "\"identifier\"" */ /* Line 670 of yacc.c */ -#line 194 "parse-gram.y" +#line 195 "parse-gram.y" { fputs ((yyvaluep->uniqstr), stderr); }; /* Line 670 of yacc.c */ -#line 1083 "parse-gram.c" +#line 1094 "parse-gram.c" break; - case 52: /* "\"identifier:\"" */ + case 51: /* "\"identifier:\"" */ /* Line 670 of yacc.c */ -#line 195 "parse-gram.y" +#line 196 "parse-gram.y" { fprintf (stderr, "%s:", (yyvaluep->uniqstr)); }; /* Line 670 of yacc.c */ -#line 1092 "parse-gram.c" +#line 1103 "parse-gram.c" break; - case 55: /* "\"%{...%}\"" */ + case 54: /* "\"%{...%}\"" */ /* Line 670 of yacc.c */ -#line 189 "parse-gram.y" +#line 190 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; /* Line 670 of yacc.c */ -#line 1101 "parse-gram.c" +#line 1112 "parse-gram.c" break; - case 57: /* "\"type\"" */ + case 56: /* "\"type\"" */ /* Line 670 of yacc.c */ -#line 193 "parse-gram.y" +#line 194 "parse-gram.y" { fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); }; /* Line 670 of yacc.c */ -#line 1110 "parse-gram.c" +#line 1121 "parse-gram.c" break; - case 82: /* "content" */ + case 83: /* "content" */ /* Line 670 of yacc.c */ -#line 189 "parse-gram.y" +#line 190 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; /* Line 670 of yacc.c */ -#line 1119 "parse-gram.c" +#line 1130 "parse-gram.c" break; - case 83: /* "content.opt" */ + case 84: /* "content.opt" */ /* Line 670 of yacc.c */ -#line 189 "parse-gram.y" +#line 190 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; /* Line 670 of yacc.c */ -#line 1128 "parse-gram.c" +#line 1139 "parse-gram.c" break; - case 84: /* "braceless" */ + case 85: /* "braceless" */ /* Line 670 of yacc.c */ -#line 189 "parse-gram.y" +#line 190 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; /* Line 670 of yacc.c */ -#line 1137 "parse-gram.c" +#line 1148 "parse-gram.c" break; - case 85: /* "id" */ + case 86: /* "id" */ /* Line 670 of yacc.c */ -#line 201 "parse-gram.y" +#line 202 "parse-gram.y" { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; /* Line 670 of yacc.c */ -#line 1146 "parse-gram.c" +#line 1157 "parse-gram.c" break; - case 86: /* "id_colon" */ + case 87: /* "id_colon" */ /* Line 670 of yacc.c */ -#line 202 "parse-gram.y" +#line 203 "parse-gram.y" { fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); }; /* Line 670 of yacc.c */ -#line 1155 "parse-gram.c" +#line 1166 "parse-gram.c" break; - case 87: /* "symbol" */ + case 88: /* "symbol" */ /* Line 670 of yacc.c */ -#line 201 "parse-gram.y" +#line 202 "parse-gram.y" { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; /* Line 670 of yacc.c */ -#line 1164 "parse-gram.c" +#line 1175 "parse-gram.c" break; - case 88: /* "string_as_id" */ + case 89: /* "string_as_id" */ /* Line 670 of yacc.c */ -#line 201 "parse-gram.y" +#line 202 "parse-gram.y" { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; /* Line 670 of yacc.c */ -#line 1173 "parse-gram.c" +#line 1184 "parse-gram.c" break; default: break; @@ -1693,7 +1704,7 @@ YYLTYPE yylloc; } /* Line 1082 of yacc.c */ -#line 1697 "parse-gram.c" +#line 1708 "parse-gram.c" yylsp[0] = yylloc; goto yysetstate; @@ -1879,277 +1890,308 @@ yyreduce: case 6: /* Line 1269 of yacc.c */ -#line 224 "parse-gram.y" +#line 225 "parse-gram.y" { prologue_augment (translate_code ((yyvsp[(1) - (1)].chars), (yylsp[(1) - (1)])), (yylsp[(1) - (1)]), union_seen); } break; case 7: /* Line 1269 of yacc.c */ -#line 225 "parse-gram.y" +#line 226 "parse-gram.y" { debug_flag = true; } break; case 8: /* Line 1269 of yacc.c */ -#line 226 "parse-gram.y" +#line 227 "parse-gram.y" { muscle_insert ((yyvsp[(2) - (3)].chars), (yyvsp[(3) - (3)].chars)); } break; case 9: /* Line 1269 of yacc.c */ -#line 227 "parse-gram.y" +#line 228 "parse-gram.y" { defines_flag = true; } break; case 10: /* Line 1269 of yacc.c */ -#line 228 "parse-gram.y" - { error_verbose = true; } +#line 230 "parse-gram.y" + { + defines_flag = true; + spec_defines_file = xstrdup ((yyvsp[(2) - (2)].chars)); + } break; case 11: /* Line 1269 of yacc.c */ -#line 229 "parse-gram.y" - { expected_sr_conflicts = (yyvsp[(2) - (2)].integer); } +#line 234 "parse-gram.y" + { error_verbose = true; } break; case 12: /* Line 1269 of yacc.c */ -#line 230 "parse-gram.y" - { expected_rr_conflicts = (yyvsp[(2) - (2)].integer); } +#line 235 "parse-gram.y" + { expected_sr_conflicts = (yyvsp[(2) - (2)].integer); } break; case 13: /* Line 1269 of yacc.c */ -#line 231 "parse-gram.y" - { spec_file_prefix = (yyvsp[(3) - (3)].chars); } +#line 236 "parse-gram.y" + { expected_rr_conflicts = (yyvsp[(2) - (2)].integer); } break; case 14: /* Line 1269 of yacc.c */ -#line 233 "parse-gram.y" +#line 237 "parse-gram.y" + { spec_file_prefix = (yyvsp[(2) - (2)].chars); } + break; + + case 15: + +/* Line 1269 of yacc.c */ +#line 238 "parse-gram.y" + { spec_file_prefix = (yyvsp[(3) - (3)].chars); } + break; + + case 16: + +/* Line 1269 of yacc.c */ +#line 240 "parse-gram.y" { nondeterministic_parser = true; glr_parser = true; } break; - case 15: + case 17: /* Line 1269 of yacc.c */ -#line 238 "parse-gram.y" +#line 245 "parse-gram.y" { - muscle_code_grow ("initial_action", translate_symbol_action ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])), (yylsp[(2) - (2)])); + muscle_code_grow ("initial_action", translate_symbol_action ((yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])), (yylsp[(2) - (2)])); } break; - case 16: + case 18: /* Line 1269 of yacc.c */ -#line 241 "parse-gram.y" - { add_param ("lex_param", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); } +#line 248 "parse-gram.y" + { add_param ("lex_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); } break; - case 17: + case 19: /* Line 1269 of yacc.c */ -#line 242 "parse-gram.y" +#line 249 "parse-gram.y" { locations_flag = true; } break; - case 18: + case 20: /* Line 1269 of yacc.c */ -#line 243 "parse-gram.y" +#line 250 "parse-gram.y" + { spec_name_prefix = (yyvsp[(2) - (2)].chars); } + break; + + case 21: + +/* Line 1269 of yacc.c */ +#line 251 "parse-gram.y" { spec_name_prefix = (yyvsp[(3) - (3)].chars); } break; - case 19: + case 22: /* Line 1269 of yacc.c */ -#line 244 "parse-gram.y" +#line 252 "parse-gram.y" { no_lines_flag = true; } break; - case 20: + case 23: /* Line 1269 of yacc.c */ -#line 245 "parse-gram.y" +#line 253 "parse-gram.y" { nondeterministic_parser = true; } break; - case 21: + case 24: /* Line 1269 of yacc.c */ -#line 246 "parse-gram.y" +#line 254 "parse-gram.y" + { spec_outfile = (yyvsp[(2) - (2)].chars); } + break; + + case 25: + +/* Line 1269 of yacc.c */ +#line 255 "parse-gram.y" { spec_outfile = (yyvsp[(3) - (3)].chars); } break; - case 22: + case 26: /* Line 1269 of yacc.c */ -#line 247 "parse-gram.y" - { add_param ("parse_param", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); } +#line 256 "parse-gram.y" + { add_param ("parse_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); } break; - case 23: + case 27: /* Line 1269 of yacc.c */ -#line 248 "parse-gram.y" +#line 257 "parse-gram.y" { pure_parser = true; } break; - case 24: + case 28: /* Line 1269 of yacc.c */ -#line 249 "parse-gram.y" +#line 258 "parse-gram.y" { push_parser = true; } break; - case 25: + case 29: /* Line 1269 of yacc.c */ -#line 250 "parse-gram.y" +#line 259 "parse-gram.y" { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); } break; - case 26: + case 30: /* Line 1269 of yacc.c */ -#line 251 "parse-gram.y" +#line 260 "parse-gram.y" { skeleton = (yyvsp[(2) - (2)].chars); } break; - case 27: + case 31: /* Line 1269 of yacc.c */ -#line 252 "parse-gram.y" +#line 261 "parse-gram.y" { token_table_flag = true; } break; - case 28: + case 32: /* Line 1269 of yacc.c */ -#line 253 "parse-gram.y" +#line 262 "parse-gram.y" { report_flag = report_states; } break; - case 29: + case 33: /* Line 1269 of yacc.c */ -#line 254 "parse-gram.y" +#line 263 "parse-gram.y" { yacc_flag = true; } break; - case 33: + case 37: /* Line 1269 of yacc.c */ -#line 262 "parse-gram.y" +#line 271 "parse-gram.y" { grammar_start_symbol_set ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); } break; - case 34: + case 38: /* Line 1269 of yacc.c */ -#line 266 "parse-gram.y" +#line 275 "parse-gram.y" { symbol_list *list; - const char *action = translate_symbol_action ((yyvsp[(2) - (3)].chars), (yylsp[(2) - (3)])); + const char *action = translate_symbol_action ((yyvsp[(2) - (3)].code), (yylsp[(2) - (3)])); for (list = (yyvsp[(3) - (3)].list); list; list = list->next) - symbol_list_destructor_set (list, action, (yylsp[(2) - (3)])); + symbol_list_destructor_set (list, action, (yylsp[(2) - (3)])); symbol_list_free ((yyvsp[(3) - (3)].list)); } break; - case 35: + case 39: /* Line 1269 of yacc.c */ -#line 274 "parse-gram.y" +#line 283 "parse-gram.y" { symbol_list *list; - const char *action = translate_symbol_action ((yyvsp[(2) - (3)].chars), (yylsp[(2) - (3)])); + const char *action = translate_symbol_action ((yyvsp[(2) - (3)].code), (yylsp[(2) - (3)])); for (list = (yyvsp[(3) - (3)].list); list; list = list->next) - symbol_list_printer_set (list, action, (yylsp[(2) - (3)])); + symbol_list_printer_set (list, action, (yylsp[(2) - (3)])); symbol_list_free ((yyvsp[(3) - (3)].list)); } break; - case 36: + case 40: /* Line 1269 of yacc.c */ -#line 282 "parse-gram.y" +#line 291 "parse-gram.y" { default_prec = true; } break; - case 37: + case 41: /* Line 1269 of yacc.c */ -#line 286 "parse-gram.y" +#line 295 "parse-gram.y" { default_prec = false; } break; - case 38: + case 42: /* Line 1269 of yacc.c */ -#line 289 "parse-gram.y" +#line 298 "parse-gram.y" { prologue_augment ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)]), true); } break; - case 39: + case 43: /* Line 1269 of yacc.c */ -#line 290 "parse-gram.y" +#line 299 "parse-gram.y" { prologue_augment ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)]), false); } break; - case 40: + case 44: /* Line 1269 of yacc.c */ -#line 291 "parse-gram.y" +#line 300 "parse-gram.y" { muscle_code_grow ("provides", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); } break; - case 41: + case 45: /* Line 1269 of yacc.c */ -#line 292 "parse-gram.y" +#line 301 "parse-gram.y" { muscle_code_grow ("requires", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); } break; - case 42: + case 46: /* Line 1269 of yacc.c */ -#line 303 "parse-gram.y" +#line 312 "parse-gram.y" {} break; - case 43: + case 47: /* Line 1269 of yacc.c */ -#line 304 "parse-gram.y" +#line 313 "parse-gram.y" { muscle_code_grow ("union_name", (yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; - case 44: + case 48: /* Line 1269 of yacc.c */ -#line 309 "parse-gram.y" +#line 318 "parse-gram.y" { - char const *body = (yyvsp[(3) - (3)].chars); + char const *body = (yyvsp[(3) - (3)].code); /* Concatenate the %union bodies. If this is the first %union, make sure the synchronization line appears after the opening '{' so as not to @@ -2171,44 +2213,44 @@ yyreduce: } break; - case 45: + case 49: /* Line 1269 of yacc.c */ -#line 336 "parse-gram.y" +#line 345 "parse-gram.y" { current_class = nterm_sym; } break; - case 46: + case 50: /* Line 1269 of yacc.c */ -#line 337 "parse-gram.y" +#line 346 "parse-gram.y" { current_class = unknown_sym; current_type = NULL; } break; - case 47: + case 51: /* Line 1269 of yacc.c */ -#line 341 "parse-gram.y" +#line 350 "parse-gram.y" { current_class = token_sym; } break; - case 48: + case 52: /* Line 1269 of yacc.c */ -#line 342 "parse-gram.y" +#line 351 "parse-gram.y" { current_class = unknown_sym; current_type = NULL; } break; - case 49: + case 53: /* Line 1269 of yacc.c */ -#line 347 "parse-gram.y" +#line 356 "parse-gram.y" { symbol_list *list; tag_seen = true; @@ -2218,10 +2260,10 @@ yyreduce: } break; - case 50: + case 54: /* Line 1269 of yacc.c */ -#line 358 "parse-gram.y" +#line 367 "parse-gram.y" { symbol_list *list; ++current_prec; @@ -2235,114 +2277,121 @@ yyreduce: } break; - case 51: + case 55: /* Line 1269 of yacc.c */ -#line 372 "parse-gram.y" +#line 381 "parse-gram.y" { (yyval.assoc) = left_assoc; } break; - case 52: + case 56: /* Line 1269 of yacc.c */ -#line 373 "parse-gram.y" +#line 382 "parse-gram.y" { (yyval.assoc) = right_assoc; } break; - case 53: + case 57: /* Line 1269 of yacc.c */ -#line 374 "parse-gram.y" +#line 383 "parse-gram.y" { (yyval.assoc) = non_assoc; } break; - case 54: + case 58: /* Line 1269 of yacc.c */ -#line 378 "parse-gram.y" +#line 387 "parse-gram.y" { current_type = NULL; } break; - case 55: + case 59: /* Line 1269 of yacc.c */ -#line 379 "parse-gram.y" +#line 388 "parse-gram.y" { current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; } break; - case 56: + case 60: /* Line 1269 of yacc.c */ -#line 385 "parse-gram.y" +#line 394 "parse-gram.y" { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); } break; - case 57: + case 61: /* Line 1269 of yacc.c */ -#line 387 "parse-gram.y" +#line 396 "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 58: + case 62: /* Line 1269 of yacc.c */ -#line 391 "parse-gram.y" +#line 400 "parse-gram.y" { (yyval.list) = (yyvsp[(1) - (1)].list); } break; - case 59: + case 63: /* Line 1269 of yacc.c */ -#line 392 "parse-gram.y" +#line 401 "parse-gram.y" { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); } break; - case 60: + case 64: /* Line 1269 of yacc.c */ -#line 396 "parse-gram.y" +#line 405 "parse-gram.y" { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); } break; - case 61: + case 65: /* Line 1269 of yacc.c */ -#line 397 "parse-gram.y" +#line 406 "parse-gram.y" { (yyval.list) = symbol_list_type_new ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; - case 62: + case 66: /* Line 1269 of yacc.c */ -#line 398 "parse-gram.y" - { (yyval.list) = symbol_list_default_new ((yylsp[(1) - (1)])); } +#line 407 "parse-gram.y" + { (yyval.list) = symbol_list_default_tagged_new ((yylsp[(1) - (1)])); } break; - case 63: + case 67: /* Line 1269 of yacc.c */ -#line 404 "parse-gram.y" +#line 408 "parse-gram.y" + { (yyval.list) = symbol_list_default_tagless_new ((yylsp[(1) - (1)])); } + break; + + case 68: + +/* Line 1269 of yacc.c */ +#line 414 "parse-gram.y" { current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; } break; - case 64: + case 69: /* Line 1269 of yacc.c */ -#line 409 "parse-gram.y" +#line 419 "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 65: + case 70: /* Line 1269 of yacc.c */ -#line 414 "parse-gram.y" +#line 424 "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)])); @@ -2350,10 +2399,10 @@ yyreduce: } break; - case 66: + case 71: /* Line 1269 of yacc.c */ -#line 420 "parse-gram.y" +#line 430 "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)])); @@ -2361,10 +2410,10 @@ yyreduce: } break; - case 67: + case 72: /* Line 1269 of yacc.c */ -#line 426 "parse-gram.y" +#line 436 "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)])); @@ -2373,109 +2422,109 @@ yyreduce: } break; - case 74: + case 79: /* Line 1269 of yacc.c */ -#line 456 "parse-gram.y" +#line 466 "parse-gram.y" { yyerrok; } break; - case 75: + case 80: /* Line 1269 of yacc.c */ -#line 462 "parse-gram.y" +#line 472 "parse-gram.y" { current_lhs = (yyvsp[(1) - (1)].symbol); current_lhs_location = (yylsp[(1) - (1)]); } break; - case 77: + case 82: /* Line 1269 of yacc.c */ -#line 466 "parse-gram.y" +#line 476 "parse-gram.y" { grammar_current_rule_end ((yylsp[(1) - (1)])); } break; - case 78: + case 83: /* Line 1269 of yacc.c */ -#line 467 "parse-gram.y" +#line 477 "parse-gram.y" { grammar_current_rule_end ((yylsp[(3) - (3)])); } break; - case 80: + case 85: /* Line 1269 of yacc.c */ -#line 473 "parse-gram.y" +#line 483 "parse-gram.y" { grammar_current_rule_begin (current_lhs, current_lhs_location); } break; - case 81: + case 86: /* Line 1269 of yacc.c */ -#line 475 "parse-gram.y" +#line 485 "parse-gram.y" { grammar_current_rule_symbol_append ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); } break; - case 82: + case 87: /* Line 1269 of yacc.c */ -#line 477 "parse-gram.y" - { grammar_current_rule_action_append ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); } +#line 487 "parse-gram.y" + { grammar_current_rule_action_append ((yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); } break; - case 83: + case 88: /* Line 1269 of yacc.c */ -#line 479 "parse-gram.y" +#line 489 "parse-gram.y" { grammar_current_rule_prec_set ((yyvsp[(3) - (3)].symbol), (yylsp[(3) - (3)])); } break; - case 84: + case 89: /* Line 1269 of yacc.c */ -#line 481 "parse-gram.y" +#line 491 "parse-gram.y" { grammar_current_rule_dprec_set ((yyvsp[(3) - (3)].integer), (yylsp[(3) - (3)])); } break; - case 85: + case 90: /* Line 1269 of yacc.c */ -#line 483 "parse-gram.y" +#line 493 "parse-gram.y" { grammar_current_rule_merge_set ((yyvsp[(3) - (3)].uniqstr), (yylsp[(3) - (3)])); } break; - case 88: + case 93: /* Line 1269 of yacc.c */ -#line 499 "parse-gram.y" +#line 509 "parse-gram.y" { static char one[] = "1"; (yyval.chars) = one; } break; - case 90: + case 95: /* Line 1269 of yacc.c */ -#line 509 "parse-gram.y" +#line 519 "parse-gram.y" { - (yyvsp[(1) - (1)].chars)[strlen ((yyvsp[(1) - (1)].chars)) - 1] = '\n'; - (yyval.chars) = translate_code ((yyvsp[(1) - (1)].chars) + 1, (yylsp[(1) - (1)])); + (yyvsp[(1) - (1)].code)[strlen ((yyvsp[(1) - (1)].code)) - 1] = '\n'; + (yyval.chars) = translate_code ((yyvsp[(1) - (1)].code) + 1, (yylsp[(1) - (1)])); } break; - case 91: + case 96: /* Line 1269 of yacc.c */ -#line 525 "parse-gram.y" +#line 535 "parse-gram.y" { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; - case 92: + case 97: /* Line 1269 of yacc.c */ -#line 527 "parse-gram.y" +#line 537 "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); @@ -2483,27 +2532,27 @@ yyreduce: } break; - case 93: + case 98: /* Line 1269 of yacc.c */ -#line 535 "parse-gram.y" +#line 545 "parse-gram.y" { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; - case 96: + case 101: /* Line 1269 of yacc.c */ -#line 547 "parse-gram.y" +#line 557 "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 98: + case 103: /* Line 1269 of yacc.c */ -#line 556 "parse-gram.y" +#line 566 "parse-gram.y" { muscle_code_grow ("epilogue", translate_code ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])), (yylsp[(2) - (2)])); gram_scanner_last_string_free (); @@ -2513,7 +2562,7 @@ yyreduce: /* Line 1269 of yacc.c */ -#line 2517 "parse-gram.c" +#line 2566 "parse-gram.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -2732,7 +2781,7 @@ yyreturn: /* Line 1486 of yacc.c */ -#line 562 "parse-gram.y" +#line 572 "parse-gram.y"