X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/3b452f4ea6f6e69ba90d93cf1bed2ef1437f5b29..3b2942e671eadc31ca5cacf4c2965a1cac4edf04:/src/parse-gram.c diff --git a/src/parse-gram.c b/src/parse-gram.c index 1f4dfbba..064f8f41 100644 --- a/src/parse-gram.c +++ b/src/parse-gram.c @@ -1,4 +1,4 @@ -/* A Bison parser, made by GNU Bison 2.3+. */ +/* A Bison parser, made by GNU Bison 2.3a. */ /* Skeleton implementation for Bison's Yacc-like parsers in C @@ -47,7 +47,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.3+" +#define YYBISON_VERSION "2.3a" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -55,6 +55,9 @@ /* Pure parsers. */ #define YYPURE 1 +/* Push parsers. */ +#define YYPUSH 0 + /* Using locations. */ #define YYLSP_NEEDED 1 @@ -127,10 +130,17 @@ static void gram_error (location const *, char const *); static char const *char_name (char); -static void add_param (char const *, char *, location); +/** Add a lex-param or a parse-param. + * + * \param type \a lex_param or \a parse_param + * \param decl the formal argument + * \param loc the location in the source. + */ +static void add_param (char const *type, char *decl, location loc); + static symbol_class current_class = unknown_sym; -static uniqstr current_type = 0; +static uniqstr current_type = NULL; static symbol *current_lhs; static location current_lhs_location; static int current_prec = 0; @@ -174,63 +184,124 @@ static int current_prec = 0; PERCENT_TYPE = 262, PERCENT_DESTRUCTOR = 263, PERCENT_PRINTER = 264, - PERCENT_LEFT = 265, - PERCENT_RIGHT = 266, - PERCENT_NONASSOC = 267, - PERCENT_PREC = 268, - PERCENT_DPREC = 269, - PERCENT_MERGE = 270, - PERCENT_AFTER_HEADER = 271, - PERCENT_BEFORE_HEADER = 272, - PERCENT_DEBUG = 273, - PERCENT_DEFAULT_PREC = 274, - PERCENT_DEFINE = 275, - PERCENT_DEFINES = 276, - PERCENT_END_HEADER = 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_PURE_PARSER = 292, - PERCENT_REQUIRE = 293, - PERCENT_SKELETON = 294, - PERCENT_START = 295, - PERCENT_START_HEADER = 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, - PERCENT_UNION = 311 + PERCENT_SYMBOL_DEFAULT = 265, + PERCENT_LEFT = 266, + PERCENT_RIGHT = 267, + PERCENT_NONASSOC = 268, + PERCENT_PREC = 269, + PERCENT_DPREC = 270, + PERCENT_MERGE = 271, + PERCENT_AFTER_HEADER = 272, + PERCENT_BEFORE_HEADER = 273, + PERCENT_DEBUG = 274, + PERCENT_DEFAULT_PREC = 275, + PERCENT_DEFINE = 276, + PERCENT_DEFINES = 277, + PERCENT_END_HEADER = 278, + PERCENT_ERROR_VERBOSE = 279, + PERCENT_EXPECT = 280, + PERCENT_EXPECT_RR = 281, + PERCENT_FILE_PREFIX = 282, + PERCENT_GLR_PARSER = 283, + PERCENT_INITIAL_ACTION = 284, + PERCENT_LEX_PARAM = 285, + PERCENT_LOCATIONS = 286, + PERCENT_NAME_PREFIX = 287, + PERCENT_NO_DEFAULT_PREC = 288, + PERCENT_NO_LINES = 289, + PERCENT_NONDETERMINISTIC_PARSER = 290, + PERCENT_OUTPUT = 291, + PERCENT_PARSE_PARAM = 292, + PERCENT_PURE_PARSER = 293, + PERCENT_PUSH_PARSER = 294, + PERCENT_REQUIRE = 295, + PERCENT_SKELETON = 296, + PERCENT_START = 297, + PERCENT_START_HEADER = 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 }; #endif +/* Tokens. */ +#define GRAM_EOF 0 +#define STRING 258 +#define INT 259 +#define PERCENT_TOKEN 260 +#define PERCENT_NTERM 261 +#define PERCENT_TYPE 262 +#define PERCENT_DESTRUCTOR 263 +#define PERCENT_PRINTER 264 +#define PERCENT_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_AFTER_HEADER 272 +#define PERCENT_BEFORE_HEADER 273 +#define PERCENT_DEBUG 274 +#define PERCENT_DEFAULT_PREC 275 +#define PERCENT_DEFINE 276 +#define PERCENT_DEFINES 277 +#define PERCENT_END_HEADER 278 +#define PERCENT_ERROR_VERBOSE 279 +#define PERCENT_EXPECT 280 +#define PERCENT_EXPECT_RR 281 +#define PERCENT_FILE_PREFIX 282 +#define PERCENT_GLR_PARSER 283 +#define PERCENT_INITIAL_ACTION 284 +#define PERCENT_LEX_PARAM 285 +#define PERCENT_LOCATIONS 286 +#define PERCENT_NAME_PREFIX 287 +#define PERCENT_NO_DEFAULT_PREC 288 +#define PERCENT_NO_LINES 289 +#define PERCENT_NONDETERMINISTIC_PARSER 290 +#define PERCENT_OUTPUT 291 +#define PERCENT_PARSE_PARAM 292 +#define PERCENT_PURE_PARSER 293 +#define PERCENT_PUSH_PARSER 294 +#define PERCENT_REQUIRE 295 +#define PERCENT_SKELETON 296 +#define PERCENT_START 297 +#define PERCENT_START_HEADER 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 + #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -/* Line 195 of yacc.c. */ -#line 90 "parse-gram.y" -{ +{/* Line 198 of yacc.c. */ +#line 98 "parse-gram.y" + symbol *symbol; symbol_list *list; int integer; @@ -239,12 +310,12 @@ typedef union YYSTYPE uniqstr uniqstr; unsigned char character; } -/* Line 195 of yacc.c. */ -#line 244 "parse-gram.c" +/* Line 198 of yacc.c. */ +#line 315 "parse-gram.c" YYSTYPE; +# define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 -# define YYSTYPE_IS_TRIVIAL 1 #endif #if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED @@ -263,8 +334,8 @@ typedef struct YYLTYPE /* Copy the second part of user declarations. */ -/* Line 219 of yacc.c. */ -#line 268 "parse-gram.c" +/* Line 221 of yacc.c. */ +#line 339 "parse-gram.c" #ifdef short # undef short @@ -481,20 +552,20 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 3 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 192 +#define YYLAST 185 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 57 +#define YYNTOKENS 59 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 27 +#define YYNNTS 31 /* YYNRULES -- Number of rules. */ -#define YYNRULES 89 +#define YYNRULES 98 /* YYNRULES -- Number of states. */ -#define YYNSTATES 128 +#define YYNSTATES 137 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 311 +#define YYMAXUTOK 313 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -533,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 + 55, 56, 57, 58 }; #if YYDEBUG @@ -542,57 +613,60 @@ static const yytype_uint8 yytranslate[] = static const yytype_uint8 yyprhs[] = { 0, 0, 3, 8, 9, 12, 14, 16, 19, 22, - 24, 27, 31, 33, 36, 38, 41, 44, 48, 50, - 53, 56, 58, 62, 64, 66, 70, 73, 75, 78, - 81, 84, 86, 88, 90, 92, 94, 96, 99, 103, - 107, 109, 111, 112, 114, 118, 119, 123, 124, 128, - 132, 136, 138, 140, 142, 143, 145, 147, 150, 152, - 154, 157, 160, 164, 166, 169, 171, 174, 176, 179, - 182, 183, 187, 189, 193, 196, 197, 200, 203, 207, - 211, 215, 217, 219, 221, 223, 225, 227, 229, 230 + 24, 28, 30, 33, 35, 38, 41, 45, 47, 50, + 53, 55, 59, 61, 63, 67, 70, 72, 74, 77, + 80, 83, 85, 87, 89, 91, 93, 95, 98, 102, + 106, 108, 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 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int8 yyrhs[] = { - 58, 0, -1, 59, 51, 72, 83, -1, -1, 59, - 60, -1, 61, -1, 53, -1, 16, 45, -1, 17, - 45, -1, 18, -1, 20, 82, -1, 20, 82, 82, - -1, 21, -1, 22, 45, -1, 23, -1, 24, 4, - -1, 25, 4, -1, 26, 48, 82, -1, 27, -1, - 28, 45, -1, 29, 45, -1, 30, -1, 31, 48, - 82, -1, 33, -1, 34, -1, 35, 48, 82, -1, - 36, 45, -1, 37, -1, 38, 82, -1, 39, 82, - -1, 41, 45, -1, 42, -1, 43, -1, 44, -1, - 54, -1, 66, -1, 63, -1, 40, 80, -1, 8, - 45, 69, -1, 9, 45, 69, -1, 19, -1, 32, - -1, -1, 49, -1, 56, 62, 45, -1, -1, 6, - 64, 71, -1, -1, 5, 65, 71, -1, 7, 55, - 69, -1, 67, 68, 69, -1, 10, -1, 11, -1, - 12, -1, -1, 55, -1, 80, -1, 69, 80, -1, - 55, -1, 78, -1, 78, 4, -1, 78, 81, -1, - 78, 4, 81, -1, 70, -1, 71, 70, -1, 73, - -1, 72, 73, -1, 74, -1, 61, 54, -1, 1, - 54, -1, -1, 79, 75, 76, -1, 77, -1, 76, - 52, 77, -1, 76, 54, -1, -1, 77, 80, -1, - 77, 45, -1, 77, 13, 80, -1, 77, 14, 4, - -1, 77, 15, 55, -1, 49, -1, 46, -1, 50, - -1, 78, -1, 81, -1, 3, -1, 3, -1, -1, - 51, 47, -1 + 60, 0, -1, 61, 53, 76, 89, -1, -1, 61, + 62, -1, 63, -1, 55, -1, 17, 84, -1, 18, + 84, -1, 19, -1, 21, 3, 83, -1, 22, -1, + 23, 84, -1, 24, -1, 25, 4, -1, 26, 4, + -1, 27, 50, 3, -1, 28, -1, 29, 47, -1, + 30, 47, -1, 31, -1, 32, 50, 3, -1, 34, + -1, 35, -1, 36, 50, 3, -1, 37, 47, -1, + 38, -1, 39, -1, 40, 3, -1, 41, 3, -1, + 43, 84, -1, 44, -1, 45, -1, 46, -1, 56, + -1, 68, -1, 65, -1, 42, 87, -1, 8, 47, + 72, -1, 9, 47, 72, -1, 20, -1, 33, -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 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 195, 195, 203, 205, 209, 210, 214, 220, 226, - 227, 232, 233, 234, 240, 241, 242, 243, 244, 249, - 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, - 263, 269, 270, 271, 272, 276, 277, 278, 282, 290, - 298, 302, 316, 317, 321, 343, 343, 348, 348, 353, - 363, 378, 379, 380, 384, 385, 390, 391, 396, 400, - 405, 411, 417, 428, 429, 438, 439, 445, 446, 447, - 454, 454, 458, 459, 460, 465, 466, 468, 470, 472, - 474, 487, 489, 498, 503, 504, 509, 518, 523, 525 + 0, 209, 209, 217, 219, 223, 224, 225, 226, 227, + 228, 229, 230, 231, 232, 233, 234, 235, 240, 244, + 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, + 255, 256, 257, 258, 259, 263, 264, 265, 269, 277, + 285, 289, 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 }; #endif @@ -603,24 +677,27 @@ static const char *const yytname[] = { "\"end of file\"", "error", "$undefined", "\"string\"", "\"integer\"", "\"%token\"", "\"%nterm\"", "\"%type\"", "\"%destructor\"", - "\"%printer\"", "\"%left\"", "\"%right\"", "\"%nonassoc\"", "\"%prec\"", - "\"%dprec\"", "\"%merge\"", "\"%after-header\"", "\"%before-header\"", - "\"%debug\"", "\"%default-prec\"", "\"%define\"", "\"%defines\"", - "\"%end-header\"", "\"%error-verbose\"", "\"%expect\"", "\"%expect-rr\"", + "\"%printer\"", "\"%symbol-default\"", "\"%left\"", "\"%right\"", + "\"%nonassoc\"", "\"%prec\"", "\"%dprec\"", "\"%merge\"", + "\"%after-header\"", "\"%before-header\"", "\"%debug\"", + "\"%default-prec\"", "\"%define\"", "\"%defines\"", "\"%end-header\"", + "\"%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\"", "\"%pure-parser\"", "\"%require\"", - "\"%skeleton\"", "\"%start\"", "\"%start-header\"", "\"%token-table\"", - "\"%verbose\"", "\"%yacc\"", "\"{...}\"", "\"char\"", "\"epilogue\"", - "\"=\"", "\"identifier\"", "\"identifier:\"", "\"%%\"", "\"|\"", - "\"%{...%}\"", "\";\"", "\"type\"", "\"%union\"", "$accept", "input", - "declarations", "declaration", "grammar_declaration", "union_name", + "\"%output\"", "\"%parse-param\"", "\"%pure-parser\"", + "\"%push-parser\"", "\"%require\"", "\"%skeleton\"", "\"%start\"", + "\"%start-header\"", "\"%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", "symbol_def", - "symbol_defs.1", "grammar", "rules_or_grammar_declaration", "rules", - "@3", "rhses.1", "rhs", "id", "id_colon", "symbol", "string_as_id", - "string_content", "epilogue.opt", 0 + "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 @@ -634,36 +711,38 @@ 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 + 305, 306, 307, 308, 309, 310, 311, 312, 313 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint8 yyr1[] = { - 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, 62, 62, 61, 64, 63, 65, 63, 63, - 66, 67, 67, 67, 68, 68, 69, 69, 70, 70, - 70, 70, 70, 71, 71, 72, 72, 73, 73, 73, - 75, 74, 76, 76, 76, 77, 77, 77, 77, 77, - 77, 78, 78, 79, 80, 80, 81, 82, 83, 83 + 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, 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 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ static const yytype_uint8 yyr2[] = { 0, 2, 4, 0, 2, 1, 1, 2, 2, 1, - 2, 3, 1, 2, 1, 2, 2, 3, 1, 2, - 2, 1, 3, 1, 1, 3, 2, 1, 2, 2, + 3, 1, 2, 1, 2, 2, 3, 1, 2, 2, + 1, 3, 1, 1, 3, 2, 1, 1, 2, 2, 2, 1, 1, 1, 1, 1, 1, 2, 3, 3, 1, 1, 0, 1, 3, 0, 3, 0, 3, 3, - 3, 1, 1, 1, 0, 1, 1, 2, 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, 1, 1, 1, 1, 1, 0, 2 + 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 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -672,126 +751,129 @@ static const yytype_uint8 yyr2[] = static const yytype_uint8 yydefact[] = { 3, 0, 0, 1, 47, 45, 0, 0, 0, 51, - 52, 53, 0, 0, 9, 40, 0, 12, 0, 14, - 0, 0, 0, 18, 0, 0, 21, 0, 41, 23, - 24, 0, 0, 27, 0, 0, 0, 0, 31, 32, - 33, 0, 6, 34, 42, 4, 5, 36, 35, 54, - 0, 0, 0, 0, 0, 7, 8, 87, 10, 13, - 15, 16, 0, 19, 20, 0, 0, 26, 28, 29, - 86, 82, 81, 84, 37, 85, 30, 0, 83, 0, - 0, 65, 67, 70, 43, 0, 55, 0, 58, 63, - 48, 59, 46, 49, 56, 38, 39, 11, 17, 22, - 25, 69, 68, 0, 66, 2, 75, 44, 50, 64, - 60, 61, 57, 89, 71, 72, 62, 75, 74, 0, - 0, 0, 77, 76, 73, 78, 79, 80 + 52, 53, 0, 0, 9, 40, 0, 11, 0, 13, + 0, 0, 0, 17, 0, 0, 20, 0, 41, 22, + 23, 0, 0, 26, 27, 0, 0, 0, 0, 31, + 32, 33, 0, 6, 34, 42, 4, 5, 36, 35, + 54, 0, 0, 0, 0, 0, 90, 7, 8, 88, + 12, 14, 15, 0, 18, 19, 0, 0, 25, 28, + 29, 96, 92, 91, 94, 37, 95, 30, 0, 93, + 0, 0, 70, 72, 75, 43, 0, 55, 0, 63, + 68, 48, 64, 46, 49, 56, 62, 61, 38, 58, + 60, 39, 86, 89, 10, 87, 16, 21, 24, 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 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int8 yydefgoto[] = { - -1, 1, 2, 45, 79, 85, 47, 51, 50, 48, - 49, 87, 93, 89, 90, 80, 81, 82, 106, 114, - 115, 73, 83, 94, 75, 58, 105 + -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, 74, 84, 100, 76, + 113 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -76 -static const yytype_int16 yypact[] = +#define YYPACT_NINF -90 +static const yytype_int8 yypact[] = { - -76, 6, 136, -76, -76, -76, -40, -12, -9, -76, - -76, -76, -5, 1, -76, -76, 40, -76, 5, -76, - 47, 50, 7, -76, 11, 18, -76, 19, -76, -76, - -76, 20, 25, -76, 40, 40, -2, 26, -76, -76, - -76, 84, -76, -76, 27, -76, -76, -76, -76, 14, - -23, -23, -2, -2, -2, -76, -76, -76, 40, -76, - -76, -76, 40, -76, -76, 40, 40, -76, -76, -76, - -76, -76, -76, -76, -76, -76, -76, 21, -76, 23, - 2, -76, -76, -76, -76, 28, -76, -2, -76, -76, - -23, 24, -23, -2, -76, -2, -2, -76, -76, -76, - -76, -76, -76, 31, -76, -76, -76, -76, -2, -76, - 71, -76, -76, -76, -32, 16, -76, -76, -76, -2, - 76, 29, -76, -76, 16, -76, -76, -76 + -90, 23, 92, -90, -90, -90, -24, -10, -6, -90, + -90, -90, -2, -2, -90, -90, 47, -90, -2, -90, + 62, 64, 20, -90, 25, 27, -90, 26, -90, -90, + -90, 28, 35, -90, -90, 72, 80, 14, -2, -90, + -90, -90, 19, -90, -90, 34, -90, -90, -90, -90, + 29, 16, 16, 14, 12, 12, -90, -90, -90, 8, + -90, -90, -90, 85, -90, -90, 86, 87, -90, -90, + -90, -90, -90, -90, -90, -90, -90, -90, 36, -90, + 37, 1, -90, -90, -90, -90, 48, -90, 14, -90, + -90, 16, 15, 16, 14, -90, -90, -90, 12, -90, + -90, 12, -90, -90, -90, -90, -90, -90, -90, -90, + -90, 45, -90, -90, -90, -90, 14, -90, 99, -90, + -90, -90, -90, -14, 33, -90, -90, -90, 14, 102, + 50, -90, -90, 33, -90, -90, -90 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int8 yypgoto[] = { - -76, -76, -76, -76, 79, -76, -76, -76, -76, -76, - -76, -76, -49, -53, 35, -76, 17, -76, -76, -76, - -35, -26, -76, -36, -75, -17, -76 + -90, -90, -90, -90, 106, -90, -90, -90, -90, -90, + -90, -90, 52, 88, -63, -35, 89, -90, 61, -90, + -90, -90, 30, -90, -90, 126, -47, -90, -37, -89, + -90 }; /* 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 -89 -static const yytype_int8 yytable[] = +#define YYTABLE_NINF -98 +static const yytype_int16 yytable[] = { - 74, 70, -88, 77, 95, 96, 3, 4, 5, 6, - 7, 8, 9, 10, 11, 52, 111, 68, 69, 70, - 117, 15, 118, 71, 91, 91, 72, 70, 110, 119, - 120, 121, 88, 53, 28, 116, 54, 109, 108, 109, - 55, 97, 36, 57, 71, 98, 56, 72, 99, 100, - 59, 60, 78, 103, 61, 62, 63, 112, 44, 112, - 112, 122, 71, 64, 91, 72, 91, 65, 66, 86, - 67, 76, 112, 107, 70, 101, 84, 102, 113, 123, - 126, 46, 124, 125, 127, 77, 92, 0, 123, 4, - 5, 6, 7, 8, 9, 10, 11, 104, 0, 0, - 0, 0, 0, 15, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 28, 0, 0, 0, - 0, 0, 0, 0, 36, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 78, 0, 0, 0, 0, 0, - 44, 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, 0, 0, 0, 0, 0, 0, 41, 0, 42, - 43, 0, 44 + 75, -97, 78, 119, 92, 92, 4, 5, 6, 7, + 8, 102, 9, 10, 11, 71, 95, 71, 71, 118, + 78, 15, 96, 3, 4, 5, 6, 7, 8, 125, + 9, 10, 11, 53, 28, 121, 71, 54, 121, 15, + 126, 55, 127, 37, 92, 56, 92, 128, 129, 130, + 59, 95, 28, 79, 111, 56, 117, 120, 117, 45, + 72, 37, 72, 73, 72, 73, 61, 73, 62, 97, + 63, 79, 64, 89, 65, 69, 66, 45, 67, 120, + 131, 72, 68, 70, 73, 85, 87, 132, 106, 107, + 108, 134, 109, 110, 122, 115, 132, 4, 5, 6, + 7, 8, 71, 9, 10, 11, 135, 136, 47, 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, 58, + 116, 93, 112, 101, 60, 42, 0, 43, 44, 0, + 45, 0, 0, 0, 0, 0, 133, 0, 0, 0, + 0, 0, 0, 0, 77, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 105 }; -static const yytype_int8 yycheck[] = +static const yytype_int16 yycheck[] = { - 36, 3, 0, 1, 53, 54, 0, 5, 6, 7, - 8, 9, 10, 11, 12, 55, 91, 34, 35, 3, - 52, 19, 54, 46, 50, 51, 49, 3, 4, 13, - 14, 15, 55, 45, 32, 110, 45, 90, 87, 92, - 45, 58, 40, 3, 46, 62, 45, 49, 65, 66, - 45, 4, 50, 51, 4, 48, 45, 93, 56, 95, - 96, 45, 46, 45, 90, 49, 92, 48, 48, 55, - 45, 45, 108, 45, 3, 54, 49, 54, 47, 115, - 4, 2, 117, 119, 55, 1, 51, -1, 124, 5, - 6, 7, 8, 9, 10, 11, 12, 80, -1, -1, - -1, -1, -1, 19, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 32, -1, -1, -1, - -1, -1, -1, -1, 40, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 50, -1, -1, -1, -1, -1, - 56, 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, -1, -1, -1, -1, -1, -1, 51, -1, 53, - 54, -1, 56 + 37, 0, 1, 92, 51, 52, 5, 6, 7, 8, + 9, 3, 11, 12, 13, 3, 53, 3, 3, 4, + 1, 20, 10, 0, 5, 6, 7, 8, 9, 118, + 11, 12, 13, 57, 33, 98, 3, 47, 101, 20, + 54, 47, 56, 42, 91, 47, 93, 14, 15, 16, + 3, 88, 33, 52, 53, 47, 91, 94, 93, 58, + 48, 42, 48, 51, 48, 51, 4, 51, 4, 57, + 50, 52, 47, 57, 47, 3, 50, 58, 50, 116, + 47, 48, 47, 3, 51, 51, 57, 124, 3, 3, + 3, 128, 56, 56, 49, 47, 133, 5, 6, 7, + 8, 9, 3, 11, 12, 13, 4, 57, 2, 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, 13, + 88, 52, 81, 55, 18, 53, -1, 55, 56, -1, + 58, -1, -1, -1, -1, -1, 126, -1, -1, -1, + -1, -1, -1, -1, 38, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 59 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const yytype_uint8 yystos[] = { - 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, 56, 60, 61, 63, 66, 67, - 65, 64, 55, 45, 45, 45, 45, 3, 82, 45, - 4, 4, 48, 45, 45, 48, 48, 45, 82, 82, - 3, 46, 49, 78, 80, 81, 45, 1, 50, 61, - 72, 73, 74, 79, 49, 62, 55, 68, 55, 70, - 71, 78, 71, 69, 80, 69, 69, 82, 82, 82, - 82, 54, 54, 51, 73, 83, 75, 45, 69, 70, - 4, 81, 80, 47, 76, 77, 81, 52, 54, 13, - 14, 15, 45, 80, 77, 80, 4, 55 + 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, + 84, 4, 4, 50, 47, 47, 50, 50, 47, 3, + 3, 3, 48, 51, 85, 87, 88, 84, 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 }; #define yyerrok (yyerrstatus = 0) @@ -940,102 +1022,116 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp) switch (yytype) { case 3: /* "\"string\"" */ -/* Line 668 of yacc.c. */ -#line 174 "parse-gram.y" +/* Line 670 of yacc.c. */ +#line 187 "parse-gram.y" { fputs (quotearg_style (c_quoting_style, (yyvaluep->chars)), stderr); }; -/* Line 668 of yacc.c. */ -#line 948 "parse-gram.c" +/* Line 670 of yacc.c. */ +#line 1030 "parse-gram.c" break; case 4: /* "\"integer\"" */ -/* Line 668 of yacc.c. */ -#line 184 "parse-gram.y" +/* Line 670 of yacc.c. */ +#line 198 "parse-gram.y" { fprintf (stderr, "%d", (yyvaluep->integer)); }; -/* Line 668 of yacc.c. */ -#line 955 "parse-gram.c" +/* Line 670 of yacc.c. */ +#line 1037 "parse-gram.c" break; - case 45: /* "\"{...}\"" */ -/* Line 668 of yacc.c. */ -#line 176 "parse-gram.y" + case 47: /* "\"{...}\"" */ +/* Line 670 of yacc.c. */ +#line 189 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -/* Line 668 of yacc.c. */ -#line 962 "parse-gram.c" +/* Line 670 of yacc.c. */ +#line 1044 "parse-gram.c" break; - case 46: /* "\"char\"" */ -/* Line 668 of yacc.c. */ -#line 171 "parse-gram.y" + case 48: /* "\"char\"" */ +/* Line 670 of yacc.c. */ +#line 182 "parse-gram.y" { fputs (char_name ((yyvaluep->character)), stderr); }; -/* Line 668 of yacc.c. */ -#line 969 "parse-gram.c" +/* Line 670 of yacc.c. */ +#line 1051 "parse-gram.c" break; - case 47: /* "\"epilogue\"" */ -/* Line 668 of yacc.c. */ -#line 176 "parse-gram.y" + case 49: /* "\"epilogue\"" */ +/* Line 670 of yacc.c. */ +#line 189 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -/* Line 668 of yacc.c. */ -#line 976 "parse-gram.c" +/* Line 670 of yacc.c. */ +#line 1058 "parse-gram.c" break; - case 49: /* "\"identifier\"" */ -/* Line 668 of yacc.c. */ -#line 180 "parse-gram.y" + case 51: /* "\"identifier\"" */ +/* Line 670 of yacc.c. */ +#line 194 "parse-gram.y" { fputs ((yyvaluep->uniqstr), stderr); }; -/* Line 668 of yacc.c. */ -#line 983 "parse-gram.c" +/* Line 670 of yacc.c. */ +#line 1065 "parse-gram.c" break; - case 50: /* "\"identifier:\"" */ -/* Line 668 of yacc.c. */ -#line 181 "parse-gram.y" + case 52: /* "\"identifier:\"" */ +/* Line 670 of yacc.c. */ +#line 195 "parse-gram.y" { fprintf (stderr, "%s:", (yyvaluep->uniqstr)); }; -/* Line 668 of yacc.c. */ -#line 990 "parse-gram.c" +/* Line 670 of yacc.c. */ +#line 1072 "parse-gram.c" break; - case 53: /* "\"%{...%}\"" */ -/* Line 668 of yacc.c. */ -#line 176 "parse-gram.y" + case 55: /* "\"%{...%}\"" */ +/* Line 670 of yacc.c. */ +#line 189 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -/* Line 668 of yacc.c. */ -#line 997 "parse-gram.c" +/* Line 670 of yacc.c. */ +#line 1079 "parse-gram.c" break; - case 55: /* "\"type\"" */ -/* Line 668 of yacc.c. */ -#line 179 "parse-gram.y" + case 57: /* "\"type\"" */ +/* Line 670 of yacc.c. */ +#line 193 "parse-gram.y" { fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); }; -/* Line 668 of yacc.c. */ -#line 1004 "parse-gram.c" +/* Line 670 of yacc.c. */ +#line 1086 "parse-gram.c" break; - case 78: /* "id" */ -/* Line 668 of yacc.c. */ -#line 187 "parse-gram.y" + case 82: /* "content" */ +/* Line 670 of yacc.c. */ +#line 189 "parse-gram.y" + { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; +/* Line 670 of yacc.c. */ +#line 1093 "parse-gram.c" + break; + case 83: /* "content.opt" */ +/* Line 670 of yacc.c. */ +#line 189 "parse-gram.y" + { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; +/* Line 670 of yacc.c. */ +#line 1100 "parse-gram.c" + break; + case 84: /* "braceless" */ +/* Line 670 of yacc.c. */ +#line 189 "parse-gram.y" + { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; +/* Line 670 of yacc.c. */ +#line 1107 "parse-gram.c" + break; + case 85: /* "id" */ +/* Line 670 of yacc.c. */ +#line 201 "parse-gram.y" { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; -/* Line 668 of yacc.c. */ -#line 1011 "parse-gram.c" +/* Line 670 of yacc.c. */ +#line 1114 "parse-gram.c" break; - case 79: /* "id_colon" */ -/* Line 668 of yacc.c. */ -#line 188 "parse-gram.y" + case 86: /* "id_colon" */ +/* Line 670 of yacc.c. */ +#line 202 "parse-gram.y" { fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); }; -/* Line 668 of yacc.c. */ -#line 1018 "parse-gram.c" +/* Line 670 of yacc.c. */ +#line 1121 "parse-gram.c" break; - case 80: /* "symbol" */ -/* Line 668 of yacc.c. */ -#line 187 "parse-gram.y" + case 87: /* "symbol" */ +/* Line 670 of yacc.c. */ +#line 201 "parse-gram.y" { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; -/* Line 668 of yacc.c. */ -#line 1025 "parse-gram.c" +/* Line 670 of yacc.c. */ +#line 1128 "parse-gram.c" break; - case 81: /* "string_as_id" */ -/* Line 668 of yacc.c. */ -#line 187 "parse-gram.y" + case 88: /* "string_as_id" */ +/* Line 670 of yacc.c. */ +#line 201 "parse-gram.y" { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; -/* Line 668 of yacc.c. */ -#line 1032 "parse-gram.c" - break; - case 82: /* "string_content" */ -/* Line 668 of yacc.c. */ -#line 174 "parse-gram.y" - { fputs (quotearg_style (c_quoting_style, (yyvaluep->chars)), stderr); }; -/* Line 668 of yacc.c. */ -#line 1039 "parse-gram.c" +/* Line 670 of yacc.c. */ +#line 1135 "parse-gram.c" break; default: break; @@ -1548,16 +1644,16 @@ YYLTYPE yylloc; /* User initialization code. */ - /* Line 1080 of yacc.c. */ -#line 81 "parse-gram.y" + /* Line 1082 of yacc.c. */ +#line 89 "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 1080 of yacc.c. */ -#line 1561 "parse-gram.c" +/* Line 1082 of yacc.c. */ +#line 1657 "parse-gram.c" yylsp[0] = yylloc; goto yysetstate; @@ -1639,6 +1735,9 @@ YYLTYPE yylloc; YYDPRINTF ((stderr, "Entering state %d\n", yystate)); + if (yystate == YYFINAL) + YYACCEPT; + goto yybackup; /*-----------. @@ -1688,9 +1787,6 @@ yybackup: goto yyreduce; } - if (yyn == YYFINAL) - YYACCEPT; - /* Count tokens shifted since error; after three, turn off error status. */ if (yyerrstatus) @@ -1699,9 +1795,8 @@ yybackup: /* Shift the lookahead token. */ YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); - /* Discard the shifted token unless it is eof. */ - if (yychar != YYEOF) - yychar = YYEMPTY; + /* Discard the shifted token. */ + yychar = YYEMPTY; yystate = yyn; *++yyvsp = yylval; @@ -1742,288 +1837,273 @@ yyreduce: switch (yyn) { case 6: -/* Line 1268 of yacc.c. */ -#line 211 "parse-gram.y" - { - prologue_augment (translate_code ((yyvsp[(1) - (1)].chars), (yylsp[(1) - (1)])), (yylsp[(1) - (1)]), typed); - } +/* Line 1269 of yacc.c. */ +#line 224 "parse-gram.y" + { prologue_augment (translate_code ((yyvsp[(1) - (1)].chars), (yylsp[(1) - (1)])), (yylsp[(1) - (1)]), union_seen); } break; case 7: -/* Line 1268 of yacc.c. */ -#line 215 "parse-gram.y" - { - /* Remove the '{', and replace the '}' with '\n'. */ - (yyvsp[(2) - (2)].chars)[strlen ((yyvsp[(2) - (2)].chars)) - 1] = '\n'; - prologue_augment (translate_code ((yyvsp[(2) - (2)].chars)+1, (yylsp[(2) - (2)])), (yylsp[(2) - (2)]), true); - } +/* Line 1269 of yacc.c. */ +#line 225 "parse-gram.y" + { prologue_augment ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)]), true); } break; case 8: -/* Line 1268 of yacc.c. */ -#line 221 "parse-gram.y" - { - /* Remove the '{', and replace the '}' with '\n'. */ - (yyvsp[(2) - (2)].chars)[strlen ((yyvsp[(2) - (2)].chars)) - 1] = '\n'; - prologue_augment (translate_code ((yyvsp[(2) - (2)].chars)+1, (yylsp[(2) - (2)])), (yylsp[(2) - (2)]), false); - } +/* Line 1269 of yacc.c. */ +#line 226 "parse-gram.y" + { prologue_augment ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)]), false); } break; case 9: -/* Line 1268 of yacc.c. */ -#line 226 "parse-gram.y" +/* Line 1269 of yacc.c. */ +#line 227 "parse-gram.y" { debug_flag = true; } break; case 10: -/* Line 1268 of yacc.c. */ +/* Line 1269 of yacc.c. */ #line 228 "parse-gram.y" - { - static char one[] = "1"; - muscle_insert ((yyvsp[(2) - (2)].chars), one); - } + { muscle_insert ((yyvsp[(2) - (3)].chars), (yyvsp[(3) - (3)].chars)); } break; case 11: -/* Line 1268 of yacc.c. */ -#line 232 "parse-gram.y" - { muscle_insert ((yyvsp[(2) - (3)].chars), (yyvsp[(3) - (3)].chars)); } +/* Line 1269 of yacc.c. */ +#line 229 "parse-gram.y" + { defines_flag = true; } break; case 12: -/* Line 1268 of yacc.c. */ -#line 233 "parse-gram.y" - { defines_flag = true; } +/* Line 1269 of yacc.c. */ +#line 230 "parse-gram.y" + { muscle_code_grow ("end_header", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); } break; case 13: -/* Line 1268 of yacc.c. */ -#line 235 "parse-gram.y" - { - /* Remove the '{', and replace the '}' with '\n'. */ - (yyvsp[(2) - (2)].chars)[strlen ((yyvsp[(2) - (2)].chars)) - 1] = '\n'; - muscle_code_grow ("end_header", translate_code ((yyvsp[(2) - (2)].chars)+1, (yylsp[(2) - (2)])), (yylsp[(2) - (2)])); - } - break; - - case 14: -/* Line 1268 of yacc.c. */ -#line 240 "parse-gram.y" +/* Line 1269 of yacc.c. */ +#line 231 "parse-gram.y" { error_verbose = true; } break; - case 15: -/* Line 1268 of yacc.c. */ -#line 241 "parse-gram.y" + case 14: +/* Line 1269 of yacc.c. */ +#line 232 "parse-gram.y" { expected_sr_conflicts = (yyvsp[(2) - (2)].integer); } break; - case 16: -/* Line 1268 of yacc.c. */ -#line 242 "parse-gram.y" + case 15: +/* Line 1269 of yacc.c. */ +#line 233 "parse-gram.y" { expected_rr_conflicts = (yyvsp[(2) - (2)].integer); } break; - case 17: -/* Line 1268 of yacc.c. */ -#line 243 "parse-gram.y" + case 16: +/* Line 1269 of yacc.c. */ +#line 234 "parse-gram.y" { spec_file_prefix = (yyvsp[(3) - (3)].chars); } break; - case 18: -/* Line 1268 of yacc.c. */ -#line 245 "parse-gram.y" + case 17: +/* Line 1269 of yacc.c. */ +#line 236 "parse-gram.y" { nondeterministic_parser = true; glr_parser = true; } break; - case 19: -/* Line 1268 of yacc.c. */ -#line 250 "parse-gram.y" + case 18: +/* Line 1269 of yacc.c. */ +#line 241 "parse-gram.y" { muscle_code_grow ("initial_action", translate_symbol_action ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])), (yylsp[(2) - (2)])); } break; - case 20: -/* Line 1268 of yacc.c. */ -#line 253 "parse-gram.y" + case 19: +/* Line 1269 of yacc.c. */ +#line 244 "parse-gram.y" { add_param ("lex_param", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); } break; - case 21: -/* Line 1268 of yacc.c. */ -#line 254 "parse-gram.y" + case 20: +/* Line 1269 of yacc.c. */ +#line 245 "parse-gram.y" { locations_flag = true; } break; - case 22: -/* Line 1268 of yacc.c. */ -#line 255 "parse-gram.y" + case 21: +/* Line 1269 of yacc.c. */ +#line 246 "parse-gram.y" { spec_name_prefix = (yyvsp[(3) - (3)].chars); } break; - case 23: -/* Line 1268 of yacc.c. */ -#line 256 "parse-gram.y" + case 22: +/* Line 1269 of yacc.c. */ +#line 247 "parse-gram.y" { no_lines_flag = true; } break; - case 24: -/* Line 1268 of yacc.c. */ -#line 257 "parse-gram.y" + case 23: +/* Line 1269 of yacc.c. */ +#line 248 "parse-gram.y" { nondeterministic_parser = true; } break; - case 25: -/* Line 1268 of yacc.c. */ -#line 258 "parse-gram.y" + case 24: +/* Line 1269 of yacc.c. */ +#line 249 "parse-gram.y" { spec_outfile = (yyvsp[(3) - (3)].chars); } break; - case 26: -/* Line 1268 of yacc.c. */ -#line 259 "parse-gram.y" + case 25: +/* Line 1269 of yacc.c. */ +#line 250 "parse-gram.y" { add_param ("parse_param", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); } break; - case 27: -/* Line 1268 of yacc.c. */ -#line 260 "parse-gram.y" + case 26: +/* Line 1269 of yacc.c. */ +#line 251 "parse-gram.y" { pure_parser = true; } break; + case 27: +/* Line 1269 of yacc.c. */ +#line 252 "parse-gram.y" + { push_parser = true; } + break; + case 28: -/* Line 1268 of yacc.c. */ -#line 261 "parse-gram.y" +/* Line 1269 of yacc.c. */ +#line 253 "parse-gram.y" { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); } break; case 29: -/* Line 1268 of yacc.c. */ -#line 262 "parse-gram.y" +/* Line 1269 of yacc.c. */ +#line 254 "parse-gram.y" { skeleton = (yyvsp[(2) - (2)].chars); } break; case 30: -/* Line 1268 of yacc.c. */ -#line 264 "parse-gram.y" - { - /* Remove the '{', and replace the '}' with '\n'. */ - (yyvsp[(2) - (2)].chars)[strlen ((yyvsp[(2) - (2)].chars)) - 1] = '\n'; - muscle_code_grow ("start_header", translate_code ((yyvsp[(2) - (2)].chars)+1, (yylsp[(2) - (2)])), (yylsp[(2) - (2)])); - } +/* Line 1269 of yacc.c. */ +#line 255 "parse-gram.y" + { muscle_code_grow ("start_header", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); } break; case 31: -/* Line 1268 of yacc.c. */ -#line 269 "parse-gram.y" +/* Line 1269 of yacc.c. */ +#line 256 "parse-gram.y" { token_table_flag = true; } break; case 32: -/* Line 1268 of yacc.c. */ -#line 270 "parse-gram.y" +/* Line 1269 of yacc.c. */ +#line 257 "parse-gram.y" { report_flag = report_states; } break; case 33: -/* Line 1268 of yacc.c. */ -#line 271 "parse-gram.y" +/* Line 1269 of yacc.c. */ +#line 258 "parse-gram.y" { yacc_flag = true; } break; case 37: -/* Line 1268 of yacc.c. */ -#line 279 "parse-gram.y" +/* Line 1269 of yacc.c. */ +#line 266 "parse-gram.y" { grammar_start_symbol_set ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); } break; case 38: -/* Line 1268 of yacc.c. */ -#line 283 "parse-gram.y" +/* Line 1269 of yacc.c. */ +#line 270 "parse-gram.y" { symbol_list *list; const char *action = translate_symbol_action ((yyvsp[(2) - (3)].chars), (yylsp[(2) - (3)])); for (list = (yyvsp[(3) - (3)].list); list; list = list->next) - symbol_destructor_set (list->sym, action, (yylsp[(2) - (3)])); + symbol_list_destructor_set (list, action, (yylsp[(2) - (3)])); symbol_list_free ((yyvsp[(3) - (3)].list)); } break; case 39: -/* Line 1268 of yacc.c. */ -#line 291 "parse-gram.y" +/* Line 1269 of yacc.c. */ +#line 278 "parse-gram.y" { symbol_list *list; const char *action = translate_symbol_action ((yyvsp[(2) - (3)].chars), (yylsp[(2) - (3)])); for (list = (yyvsp[(3) - (3)].list); list; list = list->next) - symbol_printer_set (list->sym, action, (yylsp[(2) - (3)])); + symbol_list_printer_set (list, action, (yylsp[(2) - (3)])); symbol_list_free ((yyvsp[(3) - (3)].list)); } break; case 40: -/* Line 1268 of yacc.c. */ -#line 299 "parse-gram.y" +/* Line 1269 of yacc.c. */ +#line 286 "parse-gram.y" { default_prec = true; } break; case 41: -/* Line 1268 of yacc.c. */ -#line 303 "parse-gram.y" +/* Line 1269 of yacc.c. */ +#line 290 "parse-gram.y" { default_prec = false; } break; case 42: -/* Line 1268 of yacc.c. */ -#line 316 "parse-gram.y" +/* Line 1269 of yacc.c. */ +#line 303 "parse-gram.y" {} break; case 43: -/* Line 1268 of yacc.c. */ -#line 317 "parse-gram.y" +/* Line 1269 of yacc.c. */ +#line 304 "parse-gram.y" { muscle_code_grow ("union_name", (yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; case 44: -/* Line 1268 of yacc.c. */ -#line 322 "parse-gram.y" +/* Line 1269 of yacc.c. */ +#line 309 "parse-gram.y" { char const *body = (yyvsp[(3) - (3)].chars); - if (typed) + /* Concatenate the %union bodies. If this is the first %union, make sure + the synchronization line appears after the opening '{' so as not to + confuse Doxygen. Otherwise, turn the previous %union's trailing '}' + into '\n', and omit the new %union's leading '{'. */ + if (!union_seen) + { + muscle_grow ("stype", "{", ""); + } + else { - /* Concatenate the union bodies, turning the first one's - trailing '}' into '\n', and omitting the second one's '{'. */ char *code = muscle_find ("stype"); code[strlen (code) - 1] = '\n'; - body++; } + body++; - typed = true; + union_seen = true; muscle_code_grow ("stype", body, (yylsp[(3) - (3)])); } break; case 45: -/* Line 1268 of yacc.c. */ -#line 343 "parse-gram.y" +/* Line 1269 of yacc.c. */ +#line 336 "parse-gram.y" { current_class = nterm_sym; } break; case 46: -/* Line 1268 of yacc.c. */ -#line 344 "parse-gram.y" +/* Line 1269 of yacc.c. */ +#line 337 "parse-gram.y" { current_class = unknown_sym; current_type = NULL; @@ -2031,14 +2111,14 @@ yyreduce: break; case 47: -/* Line 1268 of yacc.c. */ -#line 348 "parse-gram.y" +/* Line 1269 of yacc.c. */ +#line 341 "parse-gram.y" { current_class = token_sym; } break; case 48: -/* Line 1268 of yacc.c. */ -#line 349 "parse-gram.y" +/* Line 1269 of yacc.c. */ +#line 342 "parse-gram.y" { current_class = unknown_sym; current_type = NULL; @@ -2046,26 +2126,27 @@ yyreduce: break; case 49: -/* Line 1268 of yacc.c. */ -#line 354 "parse-gram.y" +/* Line 1269 of yacc.c. */ +#line 347 "parse-gram.y" { symbol_list *list; + tag_seen = true; for (list = (yyvsp[(3) - (3)].list); list; list = list->next) - symbol_type_set (list->sym, (yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)])); + symbol_type_set (list->content.sym, (yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)])); symbol_list_free ((yyvsp[(3) - (3)].list)); } break; case 50: -/* Line 1268 of yacc.c. */ -#line 364 "parse-gram.y" +/* Line 1269 of yacc.c. */ +#line 358 "parse-gram.y" { symbol_list *list; ++current_prec; for (list = (yyvsp[(3) - (3)].list); list; list = list->next) { - symbol_type_set (list->sym, current_type, (yylsp[(2) - (3)])); - symbol_precedence_set (list->sym, current_prec, (yyvsp[(1) - (3)].assoc), (yylsp[(1) - (3)])); + symbol_type_set (list->content.sym, current_type, (yylsp[(2) - (3)])); + symbol_precedence_set (list->content.sym, current_prec, (yyvsp[(1) - (3)].assoc), (yylsp[(1) - (3)])); } symbol_list_free ((yyvsp[(3) - (3)].list)); current_type = NULL; @@ -2073,67 +2154,98 @@ yyreduce: break; case 51: -/* Line 1268 of yacc.c. */ -#line 378 "parse-gram.y" +/* Line 1269 of yacc.c. */ +#line 372 "parse-gram.y" { (yyval.assoc) = left_assoc; } break; case 52: -/* Line 1268 of yacc.c. */ -#line 379 "parse-gram.y" +/* Line 1269 of yacc.c. */ +#line 373 "parse-gram.y" { (yyval.assoc) = right_assoc; } break; case 53: -/* Line 1268 of yacc.c. */ -#line 380 "parse-gram.y" +/* Line 1269 of yacc.c. */ +#line 374 "parse-gram.y" { (yyval.assoc) = non_assoc; } break; case 54: -/* Line 1268 of yacc.c. */ -#line 384 "parse-gram.y" +/* Line 1269 of yacc.c. */ +#line 378 "parse-gram.y" { current_type = NULL; } break; case 55: -/* Line 1268 of yacc.c. */ -#line 385 "parse-gram.y" - { current_type = (yyvsp[(1) - (1)].uniqstr); } +/* Line 1269 of yacc.c. */ +#line 379 "parse-gram.y" + { current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; } break; case 56: -/* Line 1268 of yacc.c. */ -#line 390 "parse-gram.y" - { (yyval.list) = symbol_list_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); } +/* Line 1269 of yacc.c. */ +#line 385 "parse-gram.y" + { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); } break; case 57: -/* Line 1268 of yacc.c. */ -#line 391 "parse-gram.y" - { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); } +/* Line 1269 of yacc.c. */ +#line 387 "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: -/* Line 1268 of yacc.c. */ +/* Line 1269 of yacc.c. */ +#line 391 "parse-gram.y" + { (yyval.list) = (yyvsp[(1) - (1)].list); } + break; + + case 59: +/* Line 1269 of yacc.c. */ +#line 392 "parse-gram.y" + { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); } + break; + + case 60: +/* Line 1269 of yacc.c. */ +#line 396 "parse-gram.y" + { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); } + break; + + case 61: +/* Line 1269 of yacc.c. */ #line 397 "parse-gram.y" + { (yyval.list) = symbol_list_type_new ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } + break; + + case 62: +/* Line 1269 of yacc.c. */ +#line 398 "parse-gram.y" + { (yyval.list) = symbol_list_default_new ((yylsp[(1) - (1)])); } + break; + + case 63: +/* Line 1269 of yacc.c. */ +#line 404 "parse-gram.y" { current_type = (yyvsp[(1) - (1)].uniqstr); + tag_seen = true; } break; - case 59: -/* Line 1268 of yacc.c. */ -#line 401 "parse-gram.y" + case 64: +/* Line 1269 of yacc.c. */ +#line 409 "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 60: -/* Line 1268 of yacc.c. */ -#line 406 "parse-gram.y" + case 65: +/* Line 1269 of yacc.c. */ +#line 414 "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)])); @@ -2141,9 +2253,9 @@ yyreduce: } break; - case 61: -/* Line 1268 of yacc.c. */ -#line 412 "parse-gram.y" + case 66: +/* Line 1269 of yacc.c. */ +#line 420 "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)])); @@ -2151,9 +2263,9 @@ yyreduce: } break; - case 62: -/* Line 1268 of yacc.c. */ -#line 418 "parse-gram.y" + case 67: +/* Line 1269 of yacc.c. */ +#line 426 "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)])); @@ -2162,77 +2274,95 @@ yyreduce: } break; - case 69: -/* Line 1268 of yacc.c. */ -#line 448 "parse-gram.y" + case 74: +/* Line 1269 of yacc.c. */ +#line 456 "parse-gram.y" { yyerrok; } break; - case 70: -/* Line 1268 of yacc.c. */ -#line 454 "parse-gram.y" + case 75: +/* Line 1269 of yacc.c. */ +#line 462 "parse-gram.y" { current_lhs = (yyvsp[(1) - (1)].symbol); current_lhs_location = (yylsp[(1) - (1)]); } break; - case 72: -/* Line 1268 of yacc.c. */ -#line 458 "parse-gram.y" + case 77: +/* Line 1269 of yacc.c. */ +#line 466 "parse-gram.y" { grammar_current_rule_end ((yylsp[(1) - (1)])); } break; - case 73: -/* Line 1268 of yacc.c. */ -#line 459 "parse-gram.y" + case 78: +/* Line 1269 of yacc.c. */ +#line 467 "parse-gram.y" { grammar_current_rule_end ((yylsp[(3) - (3)])); } break; - case 75: -/* Line 1268 of yacc.c. */ -#line 465 "parse-gram.y" + case 80: +/* Line 1269 of yacc.c. */ +#line 473 "parse-gram.y" { grammar_current_rule_begin (current_lhs, current_lhs_location); } break; - case 76: -/* Line 1268 of yacc.c. */ -#line 467 "parse-gram.y" + case 81: +/* Line 1269 of yacc.c. */ +#line 475 "parse-gram.y" { grammar_current_rule_symbol_append ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); } break; - case 77: -/* Line 1268 of yacc.c. */ -#line 469 "parse-gram.y" + case 82: +/* Line 1269 of yacc.c. */ +#line 477 "parse-gram.y" { grammar_current_rule_action_append ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); } break; - case 78: -/* Line 1268 of yacc.c. */ -#line 471 "parse-gram.y" + case 83: +/* Line 1269 of yacc.c. */ +#line 479 "parse-gram.y" { grammar_current_rule_prec_set ((yyvsp[(3) - (3)].symbol), (yylsp[(3) - (3)])); } break; - case 79: -/* Line 1268 of yacc.c. */ -#line 473 "parse-gram.y" + case 84: +/* Line 1269 of yacc.c. */ +#line 481 "parse-gram.y" { grammar_current_rule_dprec_set ((yyvsp[(3) - (3)].integer), (yylsp[(3) - (3)])); } break; - case 80: -/* Line 1268 of yacc.c. */ -#line 475 "parse-gram.y" + case 85: +/* Line 1269 of yacc.c. */ +#line 483 "parse-gram.y" { grammar_current_rule_merge_set ((yyvsp[(3) - (3)].uniqstr), (yylsp[(3) - (3)])); } break; - case 81: -/* Line 1268 of yacc.c. */ -#line 488 "parse-gram.y" + case 88: +/* Line 1269 of yacc.c. */ +#line 499 "parse-gram.y" + { + static char one[] = "1"; + (yyval.chars) = one; + } + break; + + case 90: +/* Line 1269 of yacc.c. */ +#line 509 "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)])); + } + break; + + case 91: +/* Line 1269 of yacc.c. */ +#line 525 "parse-gram.y" { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; - case 82: -/* Line 1268 of yacc.c. */ -#line 490 "parse-gram.y" + case 92: +/* Line 1269 of yacc.c. */ +#line 527 "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); @@ -2240,30 +2370,24 @@ yyreduce: } break; - case 83: -/* Line 1268 of yacc.c. */ -#line 498 "parse-gram.y" + case 93: +/* Line 1269 of yacc.c. */ +#line 535 "parse-gram.y" { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; - case 86: -/* Line 1268 of yacc.c. */ -#line 510 "parse-gram.y" + case 96: +/* Line 1269 of yacc.c. */ +#line 547 "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 87: -/* Line 1268 of yacc.c. */ -#line 519 "parse-gram.y" - { (yyval.chars) = (yyvsp[(1) - (1)].chars); } - break; - - case 89: -/* Line 1268 of yacc.c. */ -#line 526 "parse-gram.y" + case 98: +/* Line 1269 of yacc.c. */ +#line 556 "parse-gram.y" { muscle_code_grow ("epilogue", translate_code ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])), (yylsp[(2) - (2)])); gram_scanner_last_string_free (); @@ -2271,8 +2395,8 @@ yyreduce: break; -/* Line 1268 of yacc.c. */ -#line 2276 "parse-gram.c" +/* Line 1269 of yacc.c. */ +#line 2400 "parse-gram.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -2423,9 +2547,6 @@ yyerrlab1: YY_STACK_PRINT (yyss, yyssp); } - if (yyn == YYFINAL) - YYACCEPT; - *++yyvsp = yylval; yyerror_range[1] = yylloc; @@ -2466,7 +2587,7 @@ yyexhaustedlab: #endif yyreturn: - if (yychar != YYEOF && yychar != YYEMPTY) + if (yychar != YYEMPTY) yydestruct ("Cleanup: discarding lookahead", yytoken, &yylval, &yylloc); /* Do not reclaim the symbols of the rule which action triggered @@ -2492,8 +2613,8 @@ yyreturn: } -/* Line 1488 of yacc.c. */ -#line 532 "parse-gram.y" +/* Line 1486 of yacc.c. */ +#line 562 "parse-gram.y" @@ -2578,6 +2699,7 @@ add_param (char const *type, char *decl, location loc) gram_scanner_last_string_free (); } + static void version_check (location const *loc, char const *version) {