X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/2ce4ed68c9b156fd353ada1a986bb61dfa42f60a..0049ec8628e5a320d055a0cea8676a58cec60986:/src/parse-gram.c diff --git a/src/parse-gram.c b/src/parse-gram.c index 2a666893..6bf88c77 100644 --- a/src/parse-gram.c +++ b/src/parse-gram.c @@ -1,20 +1,21 @@ -/* A Bison parser, made by GNU Bison 2.3+. */ -/* Skeleton implementation for Bison's Yacc-like parsers in C +/* A Bison parser, made by GNU Bison 2.3a+. */ - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 +/* Skeleton implementation for Bison's Yacc-like parsers in C + + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, @@ -29,7 +30,7 @@ special exception, which will cause the skeleton and the resulting Bison output files to be licensed under the GNU General Public License without this special exception. - + This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ @@ -47,7 +48,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 +56,12 @@ /* Pure parsers. */ #define YYPURE 1 +/* Push parsers. */ +#define YYPUSH 0 + +/* Pull parsers. */ +#define YYPULL 1 + /* Using locations. */ #define YYLSP_NEEDED 1 @@ -69,11 +76,13 @@ #define yylloc gram_lloc /* Copy the first part of user declarations. */ -/* Line 164 of yacc.c. */ + +/* Line 1537 of yacc.c */ #line 1 "../../src/parse-gram.y" /* Bison Grammar Parser -*- C -*- - Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, + Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -148,6 +157,9 @@ static int current_prec = 0; #define YYTYPE_UINT8 uint_fast8_t +/* Line 1537 of yacc.c */ +#line 162 "../../src/parse-gram.c" + /* Enabling traces. */ #ifndef YYDEBUG # define YYDEBUG 1 @@ -187,32 +199,32 @@ static int current_prec = 0; 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_CODE = 271, + PERCENT_DEBUG = 272, + PERCENT_DEFAULT_PREC = 273, + PERCENT_DEFINE = 274, + PERCENT_DEFINES = 275, + PERCENT_ERROR_VERBOSE = 276, + PERCENT_EXPECT = 277, + PERCENT_EXPECT_RR = 278, + PERCENT_FILE_PREFIX = 279, + PERCENT_GLR_PARSER = 280, + PERCENT_INITIAL_ACTION = 281, + PERCENT_LANGUAGE = 282, + PERCENT_LEX_PARAM = 283, + PERCENT_LOCATIONS = 284, + PERCENT_NAME_PREFIX = 285, + PERCENT_NO_DEFAULT_PREC = 286, + PERCENT_NO_LINES = 287, + PERCENT_NONDETERMINISTIC_PARSER = 288, + PERCENT_OUTPUT = 289, + PERCENT_PARSE_PARAM = 290, + PERCENT_PURE_PARSER = 291, + PERCENT_PUSH_PARSER = 292, + PERCENT_PUSH_PULL_PARSER = 293, + PERCENT_REQUIRE = 294, + PERCENT_SKELETON = 295, + PERCENT_START = 296, PERCENT_TOKEN_TABLE = 297, PERCENT_VERBOSE = 298, PERCENT_YACC = 299, @@ -227,7 +239,9 @@ static int current_prec = 0; PROLOGUE = 308, SEMICOLON = 309, TYPE = 310, - PERCENT_UNION = 311 + TYPE_TAG_ANY = 311, + TYPE_TAG_NONE = 312, + PERCENT_UNION = 313 }; #endif /* Tokens. */ @@ -245,32 +259,32 @@ static int current_prec = 0; #define PERCENT_PREC 268 #define PERCENT_DPREC 269 #define PERCENT_MERGE 270 -#define PERCENT_AFTER_HEADER 271 -#define PERCENT_BEFORE_HEADER 272 -#define PERCENT_DEBUG 273 -#define PERCENT_DEFAULT_PREC 274 -#define PERCENT_DEFINE 275 -#define PERCENT_DEFINES 276 -#define PERCENT_END_HEADER 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_PURE_PARSER 292 -#define PERCENT_REQUIRE 293 -#define PERCENT_SKELETON 294 -#define PERCENT_START 295 -#define PERCENT_START_HEADER 296 +#define PERCENT_CODE 271 +#define PERCENT_DEBUG 272 +#define PERCENT_DEFAULT_PREC 273 +#define PERCENT_DEFINE 274 +#define PERCENT_DEFINES 275 +#define PERCENT_ERROR_VERBOSE 276 +#define PERCENT_EXPECT 277 +#define PERCENT_EXPECT_RR 278 +#define PERCENT_FILE_PREFIX 279 +#define PERCENT_GLR_PARSER 280 +#define PERCENT_INITIAL_ACTION 281 +#define PERCENT_LANGUAGE 282 +#define PERCENT_LEX_PARAM 283 +#define PERCENT_LOCATIONS 284 +#define PERCENT_NAME_PREFIX 285 +#define PERCENT_NO_DEFAULT_PREC 286 +#define PERCENT_NO_LINES 287 +#define PERCENT_NONDETERMINISTIC_PARSER 288 +#define PERCENT_OUTPUT 289 +#define PERCENT_PARSE_PARAM 290 +#define PERCENT_PURE_PARSER 291 +#define PERCENT_PUSH_PARSER 292 +#define PERCENT_PUSH_PULL_PARSER 293 +#define PERCENT_REQUIRE 294 +#define PERCENT_SKELETON 295 +#define PERCENT_START 296 #define PERCENT_TOKEN_TABLE 297 #define PERCENT_VERBOSE 298 #define PERCENT_YACC 299 @@ -285,27 +299,34 @@ static int current_prec = 0; #define PROLOGUE 308 #define SEMICOLON 309 #define TYPE 310 -#define PERCENT_UNION 311 +#define TYPE_TAG_ANY 311 +#define TYPE_TAG_NONE 312 +#define PERCENT_UNION 313 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -/* Line 198 of yacc.c. */ -#line 97 "../../src/parse-gram.y" { + +/* Line 1537 of yacc.c */ +#line 97 "../../src/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 308 "../../src/parse-gram.c" - YYSTYPE; + + + +/* Line 1537 of yacc.c */ +#line 329 "../../src/parse-gram.c" +} YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 @@ -327,8 +348,9 @@ typedef struct YYLTYPE /* Copy the second part of user declarations. */ -/* Line 221 of yacc.c. */ -#line 332 "../../src/parse-gram.c" + +/* Line 1537 of yacc.c */ +#line 354 "../../src/parse-gram.c" #ifdef short # undef short @@ -545,20 +567,20 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 3 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 168 +#define YYLAST 158 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 57 +#define YYNTOKENS 59 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 29 +#define YYNNTS 31 /* YYNRULES -- Number of rules. */ -#define YYNRULES 92 +#define YYNRULES 103 /* YYNRULES -- Number of states. */ -#define YYNSTATES 131 +#define YYNSTATES 141 /* 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) @@ -597,68 +619,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 + 55, 56, 57, 58 }; #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, 19, 22, - 24, 28, 30, 33, 35, 38, 41, 45, 47, 50, - 53, 55, 59, 61, 63, 67, 70, 72, 75, 78, - 81, 83, 85, 87, 89, 91, 93, 96, 100, 104, - 106, 108, 109, 111, 115, 116, 120, 121, 125, 129, - 133, 135, 137, 139, 140, 142, 144, 147, 149, 151, - 154, 157, 161, 163, 166, 168, 171, 173, 176, 179, - 180, 184, 186, 190, 193, 194, 197, 200, 204, 208, - 212, 214, 216, 217, 219, 221, 223, 225, 227, 229, - 231, 233, 234 + 0, 0, 3, 8, 9, 12, 14, 16, 18, 22, + 24, 27, 29, 32, 35, 38, 42, 44, 47, 50, + 53, 55, 58, 62, 64, 66, 69, 73, 76, 78, + 80, 82, 85, 88, 90, 92, 94, 96, 98, 100, + 103, 107, 111, 113, 115, 118, 122, 123, 125, 129, + 130, 134, 135, 139, 143, 147, 149, 151, 153, 154, + 156, 158, 161, 163, 166, 168, 170, 172, 174, 176, + 178, 181, 184, 188, 190, 193, 195, 198, 200, 203, + 206, 207, 211, 213, 217, 220, 221, 224, 227, 231, + 235, 239, 241, 243, 244, 246, 248, 250, 252, 254, + 256, 258, 260, 261 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int8 yyrhs[] = { - 58, 0, -1, 59, 51, 72, 85, -1, -1, 59, - 60, -1, 61, -1, 53, -1, 16, 80, -1, 17, - 80, -1, 18, -1, 20, 3, 79, -1, 21, -1, - 22, 80, -1, 23, -1, 24, 4, -1, 25, 4, - -1, 26, 48, 3, -1, 27, -1, 28, 45, -1, - 29, 45, -1, 30, -1, 31, 48, 3, -1, 33, - -1, 34, -1, 35, 48, 3, -1, 36, 45, -1, - 37, -1, 38, 3, -1, 39, 3, -1, 41, 80, - -1, 42, -1, 43, -1, 44, -1, 54, -1, 66, - -1, 63, -1, 40, 83, -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, 83, -1, 69, 83, -1, 55, -1, 81, - -1, 81, 4, -1, 81, 84, -1, 81, 4, 84, - -1, 70, -1, 71, 70, -1, 73, -1, 72, 73, - -1, 74, -1, 61, 54, -1, 1, 54, -1, -1, - 82, 75, 76, -1, 77, -1, 76, 52, 77, -1, - 76, 54, -1, -1, 77, 83, -1, 77, 45, -1, - 77, 13, 83, -1, 77, 14, 4, -1, 77, 15, - 55, -1, 3, -1, 80, -1, -1, 78, -1, 45, - -1, 49, -1, 46, -1, 50, -1, 81, -1, 84, - -1, 3, -1, -1, 51, 47, -1 + 60, 0, -1, 61, 51, 76, 89, -1, -1, 61, + 62, -1, 63, -1, 53, -1, 17, -1, 19, 82, + 83, -1, 20, -1, 20, 3, -1, 21, -1, 22, + 4, -1, 23, 4, -1, 24, 3, -1, 24, 48, + 3, -1, 25, -1, 26, 45, -1, 27, 3, -1, + 28, 45, -1, 29, -1, 30, 3, -1, 30, 48, + 3, -1, 32, -1, 33, -1, 34, 3, -1, 34, + 48, 3, -1, 35, 45, -1, 36, -1, 37, -1, + 38, -1, 39, 3, -1, 40, 3, -1, 42, -1, + 43, -1, 44, -1, 54, -1, 68, -1, 65, -1, + 41, 87, -1, 8, 45, 72, -1, 9, 45, 72, + -1, 18, -1, 31, -1, 16, 84, -1, 16, 49, + 84, -1, -1, 49, -1, 58, 64, 84, -1, -1, + 6, 66, 75, -1, -1, 5, 67, 75, -1, 7, + 55, 71, -1, 69, 70, 71, -1, 10, -1, 11, + -1, 12, -1, -1, 55, -1, 87, -1, 71, 87, + -1, 73, -1, 72, 73, -1, 87, -1, 55, -1, + 56, -1, 57, -1, 55, -1, 85, -1, 85, 4, + -1, 85, 88, -1, 85, 4, 88, -1, 74, -1, + 75, 74, -1, 77, -1, 76, 77, -1, 78, -1, + 63, 54, -1, 1, 54, -1, -1, 86, 79, 80, + -1, 81, -1, 80, 52, 81, -1, 80, 54, -1, + -1, 81, 87, -1, 81, 45, -1, 81, 13, 87, + -1, 81, 14, 4, -1, 81, 15, 55, -1, 49, + -1, 3, -1, -1, 3, -1, 45, -1, 49, -1, + 46, -1, 50, -1, 85, -1, 88, -1, 3, -1, + -1, 51, 47, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 205, 205, 213, 215, 219, 220, 221, 222, 223, - 224, 225, 226, 227, 228, 229, 230, 231, 236, 240, - 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, - 251, 252, 253, 254, 258, 259, 260, 264, 272, 280, - 284, 298, 299, 303, 325, 325, 330, 330, 335, 346, - 361, 362, 363, 367, 368, 373, 374, 379, 384, 389, - 395, 401, 412, 413, 422, 423, 429, 430, 431, 438, - 438, 442, 443, 444, 449, 450, 452, 454, 456, 458, - 468, 469, 475, 479, 484, 500, 502, 511, 516, 517, - 522, 529, 531 + 0, 210, 210, 218, 220, 224, 225, 235, 236, 250, + 251, 256, 257, 258, 259, 260, 261, 266, 275, 276, + 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, + 287, 288, 289, 313, 314, 315, 316, 320, 321, 322, + 326, 333, 340, 344, 348, 353, 376, 377, 381, 393, + 393, 398, 398, 403, 414, 429, 430, 431, 435, 436, + 441, 443, 448, 449, 453, 454, 455, 456, 461, 466, + 471, 477, 483, 494, 495, 504, 505, 511, 512, 513, + 520, 520, 524, 525, 526, 531, 532, 534, 536, 538, + 540, 550, 551, 557, 560, 569, 589, 591, 600, 605, + 606, 611, 618, 620 }; #endif @@ -670,23 +697,25 @@ 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\"", - "\"%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", - "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", "content", "content.opt", "braceless", "id", - "id_colon", "symbol", "string_as_id", "epilogue.opt", 0 + "\"%dprec\"", "\"%merge\"", "\"%code\"", "\"%debug\"", + "\"%default-prec\"", "\"%define\"", "\"%defines\"", "\"%error-verbose\"", + "\"%expect\"", "\"%expect-rr\"", "\"%file-prefix\"", "\"%glr-parser\"", + "\"%initial-action\"", "\"%language\"", "\"%lex-param\"", + "\"%locations\"", "\"%name-prefix\"", "\"%no-default-prec\"", + "\"%no-lines\"", "\"%nondeterministic-parser\"", "\"%output\"", + "\"%parse-param\"", "\"%pure-parser\"", "\"%push-parser\"", + "\"%push-pull-parser\"", "\"%require\"", "\"%skeleton\"", "\"%start\"", + "\"%token-table\"", "\"%verbose\"", "\"%yacc\"", "\"{...}\"", "\"char\"", + "\"epilogue\"", "\"=\"", "\"identifier\"", "\"identifier:\"", "\"%%\"", + "\"|\"", "\"%{...%}\"", "\";\"", "\"type\"", "\"<*>\"", "\"<>\"", + "\"%union\"", "$accept", "input", "prologue_declarations", + "prologue_declaration", "grammar_declaration", "union_name", + "symbol_declaration", "$@1", "$@2", "precedence_declaration", + "precedence_declarator", "type.opt", "symbols.1", "generic_symlist", + "generic_symlist_item", "symbol_def", "symbol_defs.1", "grammar", + "rules_or_grammar_declaration", "rules", "$@3", "rhses.1", "rhs", + "variable", "content.opt", "braceless", "id", "id_colon", "symbol", + "string_as_id", "epilogue.opt", 0 }; #endif @@ -700,38 +729,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 + 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, 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, 79, 80, 81, 81, 82, 83, 83, - 84, 85, 85 + 0, 59, 60, 61, 61, 62, 62, 62, 62, 62, + 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, + 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, + 62, 62, 62, 62, 62, 62, 62, 63, 63, 63, + 63, 63, 63, 63, 63, 63, 64, 64, 63, 66, + 65, 67, 65, 65, 68, 69, 69, 69, 70, 70, + 71, 71, 72, 72, 73, 73, 73, 73, 74, 74, + 74, 74, 74, 75, 75, 76, 76, 77, 77, 77, + 79, 78, 80, 80, 80, 81, 81, 81, 81, 81, + 81, 82, 82, 83, 83, 84, 85, 85, 86, 87, + 87, 88, 89, 89 }; /* 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, - 3, 1, 2, 1, 2, 2, 3, 1, 2, 2, - 1, 3, 1, 1, 3, 2, 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, 0, 1, 1, 1, 1, 1, 1, 1, - 1, 0, 2 + 0, 2, 4, 0, 2, 1, 1, 1, 3, 1, + 2, 1, 2, 2, 2, 3, 1, 2, 2, 2, + 1, 2, 3, 1, 1, 2, 3, 2, 1, 1, + 1, 2, 2, 1, 1, 1, 1, 1, 1, 2, + 3, 3, 1, 1, 2, 3, 0, 1, 3, 0, + 3, 0, 3, 3, 3, 1, 1, 1, 0, 1, + 1, 2, 1, 2, 1, 1, 1, 1, 1, 1, + 2, 2, 3, 1, 2, 1, 2, 1, 2, 2, + 0, 3, 1, 3, 2, 0, 2, 2, 3, 3, + 3, 1, 1, 0, 1, 1, 1, 1, 1, 1, + 1, 1, 0, 2 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -739,123 +770,126 @@ static const yytype_uint8 yyr2[] = means the default is an error. */ static const yytype_uint8 yydefact[] = { - 3, 0, 0, 1, 46, 44, 0, 0, 0, 50, - 51, 52, 0, 0, 9, 39, 0, 11, 0, 13, - 0, 0, 0, 17, 0, 0, 20, 0, 40, 22, - 23, 0, 0, 26, 0, 0, 0, 0, 30, 31, - 32, 0, 6, 33, 41, 4, 5, 35, 34, 53, - 0, 0, 0, 0, 0, 84, 7, 8, 82, 12, - 14, 15, 0, 18, 19, 0, 0, 25, 27, 28, - 90, 86, 85, 88, 36, 89, 29, 0, 87, 0, - 0, 64, 66, 69, 42, 0, 54, 0, 57, 62, - 47, 58, 45, 48, 55, 37, 38, 80, 83, 10, - 81, 16, 21, 24, 68, 67, 0, 65, 2, 74, - 43, 49, 63, 59, 60, 56, 92, 70, 71, 61, - 74, 73, 0, 0, 0, 76, 75, 72, 77, 78, - 79 + 3, 0, 0, 1, 51, 49, 0, 0, 0, 55, + 56, 57, 0, 7, 42, 0, 9, 11, 0, 0, + 0, 16, 0, 0, 0, 20, 0, 43, 23, 24, + 0, 0, 28, 29, 30, 0, 0, 0, 33, 34, + 35, 0, 6, 36, 46, 4, 5, 38, 37, 58, + 0, 0, 0, 0, 0, 95, 0, 44, 92, 91, + 93, 10, 12, 13, 14, 0, 17, 18, 19, 21, + 0, 25, 0, 27, 31, 32, 101, 97, 96, 99, + 39, 100, 0, 98, 0, 0, 75, 77, 80, 47, + 0, 59, 0, 68, 73, 52, 69, 50, 53, 60, + 65, 66, 67, 40, 62, 64, 41, 45, 94, 8, + 15, 22, 26, 79, 78, 0, 76, 2, 85, 48, + 54, 74, 70, 71, 61, 63, 103, 81, 82, 72, + 85, 84, 0, 0, 0, 87, 86, 83, 88, 89, + 90 }; /* YYDEFGOTO[NTERM-NUM]. */ -static const yytype_int8 yydefgoto[] = +static const yytype_int16 yydefgoto[] = { - -1, 1, 2, 45, 79, 85, 47, 51, 50, 48, - 49, 87, 93, 89, 90, 80, 81, 82, 109, 117, - 118, 98, 99, 56, 73, 83, 94, 75, 108 + -1, 1, 2, 45, 84, 90, 47, 51, 50, 48, + 49, 92, 98, 103, 104, 94, 95, 85, 86, 87, + 118, 127, 128, 60, 109, 57, 79, 88, 105, 81, + 117 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -91 -static const yytype_int8 yypact[] = +#define YYPACT_NINF -79 +static const yytype_int16 yypact[] = { - -91, 29, 112, -91, -91, -91, -39, -14, -13, -91, - -91, -91, -12, -12, -91, -91, 33, -91, -12, -91, - 35, 36, -11, -91, 5, 6, -91, 1, -91, -91, - -91, 7, 9, -91, 53, 61, 27, -12, -91, -91, - -91, 60, -91, -91, 14, -91, -91, -91, -91, 19, - -31, -31, 27, 27, 27, -91, -91, -91, 3, -91, - -91, -91, 77, -91, -91, 81, 84, -91, -91, -91, - -91, -91, -91, -91, -91, -91, -91, 34, -91, 39, - 2, -91, -91, -91, -91, 44, -91, 27, -91, -91, - -31, 16, -31, 27, -91, 27, 27, -91, -91, -91, - -91, -91, -91, -91, -91, -91, 43, -91, -91, -91, - -91, 27, -91, 91, -91, -91, -91, -27, 32, -91, - -91, -91, 27, 92, 40, -91, -91, 32, -91, -91, - -91 + -79, 5, 96, -79, -79, -79, -6, 13, 18, -79, + -79, -79, -8, -79, -79, 27, 66, -79, 74, 82, + 31, -79, 43, 86, 45, -79, 32, -79, -79, -79, + 33, 47, -79, -79, -79, 91, 93, 26, -79, -79, + -79, 15, -79, -79, 48, -79, -79, -79, -79, 44, + 38, 38, 26, 11, 11, -79, 53, -79, -79, -79, + 106, -79, -79, -79, -79, 107, -79, -79, -79, -79, + 108, -79, 138, -79, -79, -79, -79, -79, -79, -79, + -79, -79, 88, -79, 89, 1, -79, -79, -79, -79, + 53, -79, 26, -79, -79, 38, 50, 38, 26, -79, + -79, -79, -79, 11, -79, -79, 11, -79, -79, -79, + -79, -79, -79, -79, -79, 97, -79, -79, -79, -79, + 26, -79, 142, -79, -79, -79, -79, -7, 25, -79, + -79, -79, 26, 144, 98, -79, -79, 25, -79, -79, + -79 }; /* YYPGOTO[NTERM-NUM]. */ -static const yytype_int8 yypgoto[] = +static const yytype_int16 yypgoto[] = { - -91, -91, -91, -91, 95, -91, -91, -91, -91, -91, - -91, -91, -49, -64, 47, -91, 21, -91, -91, -91, - -21, -91, -91, 4, -7, -91, -36, -90, -91 + -79, -79, -79, -79, 149, -79, -79, -79, -79, -79, + -79, -79, 54, 101, -21, -33, 105, -79, 67, -79, + -79, -79, 28, -79, -79, -13, -47, -79, -37, -78, + -79 }; /* 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 -92 +#define YYTABLE_NINF -103 static const yytype_int16 yytable[] = { - 74, 114, -91, 77, 95, 96, 97, 4, 5, 6, - 7, 8, 9, 10, 11, 71, 52, 57, 72, 70, - 113, 15, 59, 119, 88, 120, 112, 121, 112, 3, - 70, 53, 54, 55, 28, 70, 58, 62, 111, 60, - 61, 76, 36, 91, 91, 122, 123, 124, 55, 65, - 63, 64, 78, 106, 67, 66, 68, 115, 44, 115, - 115, 77, 100, 84, 69, 4, 5, 6, 7, 8, - 9, 10, 11, 71, 86, 115, 72, 125, 71, 15, - 101, 72, 126, 91, 102, 91, 128, 103, 104, 110, - 116, 126, 28, 105, 70, 130, 129, 46, 92, 127, - 36, 107, 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 + 80, -102, 82, 96, 96, 3, 4, 5, 6, 7, + 8, 9, 10, 11, 76, 99, 82, 12, 123, 14, + 4, 5, 6, 7, 8, 9, 10, 11, 76, 76, + 58, 12, 27, 14, 64, 69, 71, 55, 132, 133, + 134, 56, 37, 107, 129, 130, 27, 131, 96, 52, + 96, 83, 115, 76, 122, 99, 37, 77, 53, 44, + 78, 124, 121, 54, 121, 83, 100, 101, 102, 61, + 135, 77, 77, 44, 78, 78, 59, 119, 62, 65, + 70, 72, 125, 124, 77, 125, 63, 78, 66, 67, + 68, 136, 73, 93, 74, 138, 75, 89, 55, 91, + 136, 4, 5, 6, 7, 8, 9, 10, 11, 108, + 110, 111, 12, 13, 14, 15, 16, 17, 18, 19, + 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, + 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, + 40, 112, 113, 114, 126, 76, 120, 41, 139, 42, + 43, 46, 116, 140, 44, 106, 97, 0, 137 }; -static const yytype_int8 yycheck[] = +static const yytype_int16 yycheck[] = { - 36, 91, 0, 1, 53, 54, 3, 5, 6, 7, - 8, 9, 10, 11, 12, 46, 55, 13, 49, 3, - 4, 19, 18, 113, 55, 52, 90, 54, 92, 0, - 3, 45, 45, 45, 32, 3, 3, 48, 87, 4, - 4, 37, 40, 50, 51, 13, 14, 15, 45, 48, - 45, 45, 50, 51, 45, 48, 3, 93, 56, 95, - 96, 1, 58, 49, 3, 5, 6, 7, 8, 9, - 10, 11, 12, 46, 55, 111, 49, 45, 46, 19, - 3, 49, 118, 90, 3, 92, 122, 3, 54, 45, - 47, 127, 32, 54, 3, 55, 4, 2, 51, 120, - 40, 80, -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, 50, 51, 0, 5, 6, 7, 8, + 9, 10, 11, 12, 3, 52, 1, 16, 96, 18, + 5, 6, 7, 8, 9, 10, 11, 12, 3, 3, + 3, 16, 31, 18, 3, 3, 3, 45, 13, 14, + 15, 49, 41, 56, 122, 52, 31, 54, 95, 55, + 97, 50, 51, 3, 4, 92, 41, 46, 45, 58, + 49, 98, 95, 45, 97, 50, 55, 56, 57, 3, + 45, 46, 46, 58, 49, 49, 49, 90, 4, 48, + 48, 48, 103, 120, 46, 106, 4, 49, 45, 3, + 45, 128, 45, 55, 3, 132, 3, 49, 45, 55, + 137, 5, 6, 7, 8, 9, 10, 11, 12, 3, + 3, 3, 16, 17, 18, 19, 20, 21, 22, 23, + 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, + 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, + 44, 3, 54, 54, 47, 3, 92, 51, 4, 53, + 54, 2, 85, 55, 58, 54, 51, -1, 130 }; /* 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, + 0, 60, 61, 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, 80, 80, 3, 80, - 4, 4, 48, 45, 45, 48, 48, 45, 3, 3, - 3, 46, 49, 81, 83, 84, 80, 1, 50, 61, - 72, 73, 74, 82, 49, 62, 55, 68, 55, 70, - 71, 81, 71, 69, 83, 69, 69, 3, 78, 79, - 80, 3, 3, 3, 54, 54, 51, 73, 85, 75, - 45, 69, 70, 4, 84, 83, 47, 76, 77, 84, - 52, 54, 13, 14, 15, 45, 83, 77, 83, 4, + 44, 51, 53, 54, 58, 62, 63, 65, 68, 69, + 67, 66, 55, 45, 45, 45, 49, 84, 3, 49, + 82, 3, 4, 4, 3, 48, 45, 3, 45, 3, + 48, 3, 48, 45, 3, 3, 3, 46, 49, 85, + 87, 88, 1, 50, 63, 76, 77, 78, 86, 49, + 64, 55, 70, 55, 74, 75, 85, 75, 71, 87, + 55, 56, 57, 72, 73, 87, 72, 84, 3, 83, + 3, 3, 3, 54, 54, 51, 77, 89, 79, 84, + 71, 74, 4, 88, 87, 73, 47, 80, 81, 88, + 52, 54, 13, 14, 15, 45, 87, 81, 87, 4, 55 }; @@ -1005,116 +1039,148 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp) switch (yytype) { case 3: /* "\"string\"" */ -/* Line 670 of yacc.c. */ -#line 183 "../../src/parse-gram.y" + +/* Line 1537 of yacc.c */ +#line 188 "../../src/parse-gram.y" { fputs (quotearg_style (c_quoting_style, (yyvaluep->chars)), stderr); }; -/* Line 670 of yacc.c. */ -#line 1013 "../../src/parse-gram.c" + +/* Line 1537 of yacc.c */ +#line 1049 "../../src/parse-gram.c" break; case 4: /* "\"integer\"" */ -/* Line 670 of yacc.c. */ -#line 194 "../../src/parse-gram.y" + +/* Line 1537 of yacc.c */ +#line 199 "../../src/parse-gram.y" { fprintf (stderr, "%d", (yyvaluep->integer)); }; -/* Line 670 of yacc.c. */ -#line 1020 "../../src/parse-gram.c" + +/* Line 1537 of yacc.c */ +#line 1058 "../../src/parse-gram.c" break; case 45: /* "\"{...}\"" */ -/* Line 670 of yacc.c. */ -#line 185 "../../src/parse-gram.y" - { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -/* Line 670 of yacc.c. */ -#line 1027 "../../src/parse-gram.c" + +/* Line 1537 of yacc.c */ +#line 190 "../../src/parse-gram.y" + { fprintf (stderr, "{\n%s\n}", (yyvaluep->code)); }; + +/* Line 1537 of yacc.c */ +#line 1067 "../../src/parse-gram.c" break; case 46: /* "\"char\"" */ -/* Line 670 of yacc.c. */ -#line 178 "../../src/parse-gram.y" + +/* Line 1537 of yacc.c */ +#line 182 "../../src/parse-gram.y" { fputs (char_name ((yyvaluep->character)), stderr); }; -/* Line 670 of yacc.c. */ -#line 1034 "../../src/parse-gram.c" + +/* Line 1537 of yacc.c */ +#line 1076 "../../src/parse-gram.c" break; case 47: /* "\"epilogue\"" */ -/* Line 670 of yacc.c. */ -#line 185 "../../src/parse-gram.y" + +/* Line 1537 of yacc.c */ +#line 190 "../../src/parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -/* Line 670 of yacc.c. */ -#line 1041 "../../src/parse-gram.c" + +/* Line 1537 of yacc.c */ +#line 1085 "../../src/parse-gram.c" break; case 49: /* "\"identifier\"" */ -/* Line 670 of yacc.c. */ -#line 190 "../../src/parse-gram.y" + +/* Line 1537 of yacc.c */ +#line 195 "../../src/parse-gram.y" { fputs ((yyvaluep->uniqstr), stderr); }; -/* Line 670 of yacc.c. */ -#line 1048 "../../src/parse-gram.c" + +/* Line 1537 of yacc.c */ +#line 1094 "../../src/parse-gram.c" break; case 50: /* "\"identifier:\"" */ -/* Line 670 of yacc.c. */ -#line 191 "../../src/parse-gram.y" + +/* Line 1537 of yacc.c */ +#line 196 "../../src/parse-gram.y" { fprintf (stderr, "%s:", (yyvaluep->uniqstr)); }; -/* Line 670 of yacc.c. */ -#line 1055 "../../src/parse-gram.c" + +/* Line 1537 of yacc.c */ +#line 1103 "../../src/parse-gram.c" break; case 53: /* "\"%{...%}\"" */ -/* Line 670 of yacc.c. */ -#line 185 "../../src/parse-gram.y" + +/* Line 1537 of yacc.c */ +#line 190 "../../src/parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -/* Line 670 of yacc.c. */ -#line 1062 "../../src/parse-gram.c" + +/* Line 1537 of yacc.c */ +#line 1112 "../../src/parse-gram.c" break; case 55: /* "\"type\"" */ -/* Line 670 of yacc.c. */ -#line 189 "../../src/parse-gram.y" + +/* Line 1537 of yacc.c */ +#line 194 "../../src/parse-gram.y" { fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); }; -/* Line 670 of yacc.c. */ -#line 1069 "../../src/parse-gram.c" + +/* Line 1537 of yacc.c */ +#line 1121 "../../src/parse-gram.c" break; - case 78: /* "content" */ -/* Line 670 of yacc.c. */ -#line 185 "../../src/parse-gram.y" - { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -/* Line 670 of yacc.c. */ -#line 1076 "../../src/parse-gram.c" + case 82: /* "variable" */ + +/* Line 1537 of yacc.c */ +#line 195 "../../src/parse-gram.y" + { fputs ((yyvaluep->uniqstr), stderr); }; + +/* Line 1537 of yacc.c */ +#line 1130 "../../src/parse-gram.c" break; - case 79: /* "content.opt" */ -/* Line 670 of yacc.c. */ -#line 185 "../../src/parse-gram.y" + case 83: /* "content.opt" */ + +/* Line 1537 of yacc.c */ +#line 190 "../../src/parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -/* Line 670 of yacc.c. */ -#line 1083 "../../src/parse-gram.c" + +/* Line 1537 of yacc.c */ +#line 1139 "../../src/parse-gram.c" break; - case 80: /* "braceless" */ -/* Line 670 of yacc.c. */ -#line 185 "../../src/parse-gram.y" + case 84: /* "braceless" */ + +/* Line 1537 of yacc.c */ +#line 190 "../../src/parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -/* Line 670 of yacc.c. */ -#line 1090 "../../src/parse-gram.c" + +/* Line 1537 of yacc.c */ +#line 1148 "../../src/parse-gram.c" break; - case 81: /* "id" */ -/* Line 670 of yacc.c. */ -#line 197 "../../src/parse-gram.y" + case 85: /* "id" */ + +/* Line 1537 of yacc.c */ +#line 202 "../../src/parse-gram.y" { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; -/* Line 670 of yacc.c. */ -#line 1097 "../../src/parse-gram.c" + +/* Line 1537 of yacc.c */ +#line 1157 "../../src/parse-gram.c" break; - case 82: /* "id_colon" */ -/* Line 670 of yacc.c. */ -#line 198 "../../src/parse-gram.y" + case 86: /* "id_colon" */ + +/* Line 1537 of yacc.c */ +#line 203 "../../src/parse-gram.y" { fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); }; -/* Line 670 of yacc.c. */ -#line 1104 "../../src/parse-gram.c" + +/* Line 1537 of yacc.c */ +#line 1166 "../../src/parse-gram.c" break; - case 83: /* "symbol" */ -/* Line 670 of yacc.c. */ -#line 197 "../../src/parse-gram.y" + case 87: /* "symbol" */ + +/* Line 1537 of yacc.c */ +#line 202 "../../src/parse-gram.y" { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; -/* Line 670 of yacc.c. */ -#line 1111 "../../src/parse-gram.c" + +/* Line 1537 of yacc.c */ +#line 1175 "../../src/parse-gram.c" break; - case 84: /* "string_as_id" */ -/* Line 670 of yacc.c. */ -#line 197 "../../src/parse-gram.y" + case 88: /* "string_as_id" */ + +/* Line 1537 of yacc.c */ +#line 202 "../../src/parse-gram.y" { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; -/* Line 670 of yacc.c. */ -#line 1118 "../../src/parse-gram.c" + +/* Line 1537 of yacc.c */ +#line 1184 "../../src/parse-gram.c" break; default: break; @@ -1627,16 +1693,18 @@ YYLTYPE yylloc; /* User initialization code. */ - /* Line 1082 of yacc.c. */ -#line 88 "../../src/parse-gram.y" + +/* Line 1537 of yacc.c */ +#line 89 "../../src/parse-gram.y" { /* Bison's grammar can initial empty locations, hence a default location is needed. */ boundary_set (&yylloc.start, current_file, 1, 1); boundary_set (&yylloc.end, current_file, 1, 1); } -/* Line 1082 of yacc.c. */ -#line 1640 "../../src/parse-gram.c" + +/* Line 1537 of yacc.c */ +#line 1708 "../../src/parse-gram.c" yylsp[0] = yylloc; goto yysetstate; @@ -1718,6 +1786,9 @@ YYLTYPE yylloc; YYDPRINTF ((stderr, "Entering state %d\n", yystate)); + if (yystate == YYFINAL) + YYACCEPT; + goto yybackup; /*-----------. @@ -1767,9 +1838,6 @@ yybackup: goto yyreduce; } - if (yyn == YYFINAL) - YYACCEPT; - /* Count tokens shifted since error; after three, turn off error status. */ if (yyerrstatus) @@ -1778,9 +1846,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; @@ -1821,373 +1888,553 @@ yyreduce: switch (yyn) { case 6: -/* Line 1270 of yacc.c. */ -#line 220 "../../src/parse-gram.y" - { prologue_augment (translate_code ((yyvsp[(1) - (1)].chars), (yylsp[(1) - (1)])), (yylsp[(1) - (1)]), union_seen); } + +/* Line 1537 of yacc.c */ +#line 226 "../../src/parse-gram.y" + { + code_props plain_code; + code_props_plain_init (&plain_code, (yyvsp[(1) - (1)].chars), (yylsp[(1) - (1)])); + code_props_translate_code (&plain_code); + gram_scanner_last_string_free (); + muscle_code_grow (union_seen ? "post_prologue" : "pre_prologue", + plain_code.code, (yylsp[(1) - (1)])); + code_scanner_last_string_free (); + } break; case 7: -/* Line 1270 of yacc.c. */ -#line 221 "../../src/parse-gram.y" - { prologue_augment ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)]), true); } + +/* Line 1537 of yacc.c */ +#line 235 "../../src/parse-gram.y" + { debug_flag = true; } break; case 8: -/* Line 1270 of yacc.c. */ -#line 222 "../../src/parse-gram.y" - { prologue_augment ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)]), false); } + +/* Line 1537 of yacc.c */ +#line 237 "../../src/parse-gram.y" + { + char const name_prefix[] = "percent_define("; + size_t length = strlen ((yyvsp[(2) - (3)].uniqstr)); + char *name = xmalloc (sizeof name_prefix + length + 1); + strcpy (name, name_prefix); + strcpy (name + sizeof name_prefix - 1, (yyvsp[(2) - (3)].uniqstr)); + strcpy (name + sizeof name_prefix - 1 + length, ")"); + if (muscle_find_const (name)) + warn_at ((yylsp[(2) - (3)]), _("%s `%s' redefined"), "%define variable", (yyvsp[(2) - (3)].uniqstr)); + MUSCLE_INSERT_STRING (uniqstr_new (name), (yyvsp[(3) - (3)].chars)); + free (name); + muscle_grow_user_name_list ("percent_define_user_variables", (yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)])); + } break; case 9: -/* Line 1270 of yacc.c. */ -#line 223 "../../src/parse-gram.y" - { debug_flag = true; } + +/* Line 1537 of yacc.c */ +#line 250 "../../src/parse-gram.y" + { defines_flag = true; } break; case 10: -/* Line 1270 of yacc.c. */ -#line 224 "../../src/parse-gram.y" - { muscle_insert ((yyvsp[(2) - (3)].chars), (yyvsp[(3) - (3)].chars)); } + +/* Line 1537 of yacc.c */ +#line 252 "../../src/parse-gram.y" + { + defines_flag = true; + spec_defines_file = xstrdup ((yyvsp[(2) - (2)].chars)); + } break; case 11: -/* Line 1270 of yacc.c. */ -#line 225 "../../src/parse-gram.y" - { defines_flag = true; } + +/* Line 1537 of yacc.c */ +#line 256 "../../src/parse-gram.y" + { error_verbose = true; } break; case 12: -/* Line 1270 of yacc.c. */ -#line 226 "../../src/parse-gram.y" - { muscle_code_grow ("end_header", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); } + +/* Line 1537 of yacc.c */ +#line 257 "../../src/parse-gram.y" + { expected_sr_conflicts = (yyvsp[(2) - (2)].integer); } break; case 13: -/* Line 1270 of yacc.c. */ -#line 227 "../../src/parse-gram.y" - { error_verbose = true; } + +/* Line 1537 of yacc.c */ +#line 258 "../../src/parse-gram.y" + { expected_rr_conflicts = (yyvsp[(2) - (2)].integer); } break; case 14: -/* Line 1270 of yacc.c. */ -#line 228 "../../src/parse-gram.y" - { expected_sr_conflicts = (yyvsp[(2) - (2)].integer); } + +/* Line 1537 of yacc.c */ +#line 259 "../../src/parse-gram.y" + { spec_file_prefix = (yyvsp[(2) - (2)].chars); } break; case 15: -/* Line 1270 of yacc.c. */ -#line 229 "../../src/parse-gram.y" - { expected_rr_conflicts = (yyvsp[(2) - (2)].integer); } - break; - case 16: -/* Line 1270 of yacc.c. */ -#line 230 "../../src/parse-gram.y" +/* Line 1537 of yacc.c */ +#line 260 "../../src/parse-gram.y" { spec_file_prefix = (yyvsp[(3) - (3)].chars); } break; - case 17: -/* Line 1270 of yacc.c. */ -#line 232 "../../src/parse-gram.y" + case 16: + +/* Line 1537 of yacc.c */ +#line 262 "../../src/parse-gram.y" { nondeterministic_parser = true; glr_parser = true; } break; - case 18: -/* Line 1270 of yacc.c. */ -#line 237 "../../src/parse-gram.y" + case 17: + +/* Line 1537 of yacc.c */ +#line 267 "../../src/parse-gram.y" { - muscle_code_grow ("initial_action", translate_symbol_action ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])), (yylsp[(2) - (2)])); + code_props action; + code_props_symbol_action_init (&action, (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); + code_props_translate_code (&action); + gram_scanner_last_string_free (); + muscle_code_grow ("initial_action", action.code, (yylsp[(2) - (2)])); + code_scanner_last_string_free (); } break; + case 18: + +/* Line 1537 of yacc.c */ +#line 275 "../../src/parse-gram.y" + { language_argmatch ((yyvsp[(2) - (2)].chars), 1, &(yylsp[(1) - (2)])); } + break; + case 19: -/* Line 1270 of yacc.c. */ -#line 240 "../../src/parse-gram.y" - { add_param ("lex_param", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); } + +/* Line 1537 of yacc.c */ +#line 276 "../../src/parse-gram.y" + { add_param ("lex_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); } break; case 20: -/* Line 1270 of yacc.c. */ -#line 241 "../../src/parse-gram.y" + +/* Line 1537 of yacc.c */ +#line 277 "../../src/parse-gram.y" { locations_flag = true; } break; case 21: -/* Line 1270 of yacc.c. */ -#line 242 "../../src/parse-gram.y" - { spec_name_prefix = (yyvsp[(3) - (3)].chars); } + +/* Line 1537 of yacc.c */ +#line 278 "../../src/parse-gram.y" + { spec_name_prefix = (yyvsp[(2) - (2)].chars); } break; case 22: -/* Line 1270 of yacc.c. */ -#line 243 "../../src/parse-gram.y" - { no_lines_flag = true; } + +/* Line 1537 of yacc.c */ +#line 279 "../../src/parse-gram.y" + { spec_name_prefix = (yyvsp[(3) - (3)].chars); } break; case 23: -/* Line 1270 of yacc.c. */ -#line 244 "../../src/parse-gram.y" - { nondeterministic_parser = true; } + +/* Line 1537 of yacc.c */ +#line 280 "../../src/parse-gram.y" + { no_lines_flag = true; } break; case 24: -/* Line 1270 of yacc.c. */ -#line 245 "../../src/parse-gram.y" - { spec_outfile = (yyvsp[(3) - (3)].chars); } + +/* Line 1537 of yacc.c */ +#line 281 "../../src/parse-gram.y" + { nondeterministic_parser = true; } break; case 25: -/* Line 1270 of yacc.c. */ -#line 246 "../../src/parse-gram.y" - { add_param ("parse_param", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); } + +/* Line 1537 of yacc.c */ +#line 282 "../../src/parse-gram.y" + { spec_outfile = (yyvsp[(2) - (2)].chars); } break; case 26: -/* Line 1270 of yacc.c. */ -#line 247 "../../src/parse-gram.y" - { pure_parser = true; } + +/* Line 1537 of yacc.c */ +#line 283 "../../src/parse-gram.y" + { spec_outfile = (yyvsp[(3) - (3)].chars); } break; case 27: -/* Line 1270 of yacc.c. */ -#line 248 "../../src/parse-gram.y" - { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); } + +/* Line 1537 of yacc.c */ +#line 284 "../../src/parse-gram.y" + { add_param ("parse_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); } break; case 28: -/* Line 1270 of yacc.c. */ -#line 249 "../../src/parse-gram.y" - { skeleton = (yyvsp[(2) - (2)].chars); } + +/* Line 1537 of yacc.c */ +#line 285 "../../src/parse-gram.y" + { pure_parser = true; } break; case 29: -/* Line 1270 of yacc.c. */ -#line 250 "../../src/parse-gram.y" - { muscle_code_grow ("start_header", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); } + +/* Line 1537 of yacc.c */ +#line 286 "../../src/parse-gram.y" + { push_parser = true; pull_parser = false; } break; case 30: -/* Line 1270 of yacc.c. */ -#line 251 "../../src/parse-gram.y" - { token_table_flag = true; } + +/* Line 1537 of yacc.c */ +#line 287 "../../src/parse-gram.y" + { push_parser = true; pull_parser = true; } break; case 31: -/* Line 1270 of yacc.c. */ -#line 252 "../../src/parse-gram.y" - { report_flag = report_states; } + +/* Line 1537 of yacc.c */ +#line 288 "../../src/parse-gram.y" + { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); } break; case 32: -/* Line 1270 of yacc.c. */ -#line 253 "../../src/parse-gram.y" + +/* Line 1537 of yacc.c */ +#line 290 "../../src/parse-gram.y" + { + char const *skeleton_user = (yyvsp[(2) - (2)].chars); + if (strchr (skeleton_user, '/')) + { + size_t dir_length = strlen (current_file); + char *skeleton_build; + while (dir_length && current_file[dir_length - 1] != '/') + --dir_length; + while (dir_length && current_file[dir_length - 1] == '/') + --dir_length; + skeleton_build = + xmalloc (dir_length + 1 + strlen (skeleton_user) + 1); + if (dir_length > 0) + { + strncpy (skeleton_build, current_file, dir_length); + skeleton_build[dir_length++] = '/'; + } + strcpy (skeleton_build + dir_length, skeleton_user); + skeleton_user = uniqstr_new (skeleton_build); + free (skeleton_build); + } + skeleton_arg (skeleton_user, 1, &(yylsp[(1) - (2)])); + } + break; + + case 33: + +/* Line 1537 of yacc.c */ +#line 313 "../../src/parse-gram.y" + { token_table_flag = true; } + break; + + case 34: + +/* Line 1537 of yacc.c */ +#line 314 "../../src/parse-gram.y" + { report_flag = report_states; } + break; + + case 35: + +/* Line 1537 of yacc.c */ +#line 315 "../../src/parse-gram.y" { yacc_flag = true; } break; - case 36: -/* Line 1270 of yacc.c. */ -#line 261 "../../src/parse-gram.y" + case 39: + +/* Line 1537 of yacc.c */ +#line 323 "../../src/parse-gram.y" { grammar_start_symbol_set ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); } break; - case 37: -/* Line 1270 of yacc.c. */ -#line 265 "../../src/parse-gram.y" + case 40: + +/* Line 1537 of yacc.c */ +#line 327 "../../src/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, (yyvsp[(2) - (3)].code), (yylsp[(2) - (3)])); symbol_list_free ((yyvsp[(3) - (3)].list)); } break; - case 38: -/* Line 1270 of yacc.c. */ -#line 273 "../../src/parse-gram.y" + case 41: + +/* Line 1537 of yacc.c */ +#line 334 "../../src/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, (yyvsp[(2) - (3)].code), (yylsp[(2) - (3)])); symbol_list_free ((yyvsp[(3) - (3)].list)); } break; - case 39: -/* Line 1270 of yacc.c. */ -#line 281 "../../src/parse-gram.y" + case 42: + +/* Line 1537 of yacc.c */ +#line 341 "../../src/parse-gram.y" { default_prec = true; } break; - case 40: -/* Line 1270 of yacc.c. */ -#line 285 "../../src/parse-gram.y" + case 43: + +/* Line 1537 of yacc.c */ +#line 345 "../../src/parse-gram.y" { default_prec = false; } break; - case 41: -/* Line 1270 of yacc.c. */ -#line 298 "../../src/parse-gram.y" + case 44: + +/* Line 1537 of yacc.c */ +#line 349 "../../src/parse-gram.y" + { + muscle_code_grow ("percent_code()", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); + code_scanner_last_string_free (); + } + break; + + case 45: + +/* Line 1537 of yacc.c */ +#line 354 "../../src/parse-gram.y" + { + char const name_prefix[] = "percent_code("; + size_t length = strlen ((yyvsp[(2) - (3)].uniqstr)); + char *name = xmalloc (sizeof name_prefix + length + 1); + strcpy (name, name_prefix); + strcpy (name + sizeof name_prefix - 1, (yyvsp[(2) - (3)].uniqstr)); + strcpy (name + sizeof name_prefix - 1 + length, ")"); + muscle_code_grow (uniqstr_new (name), (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)])); + free (name); + code_scanner_last_string_free (); + muscle_grow_user_name_list ("percent_code_user_qualifiers", (yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)])); + } + break; + + case 46: + +/* Line 1537 of yacc.c */ +#line 376 "../../src/parse-gram.y" {} break; - case 42: -/* Line 1270 of yacc.c. */ -#line 299 "../../src/parse-gram.y" + case 47: + +/* Line 1537 of yacc.c */ +#line 377 "../../src/parse-gram.y" { muscle_code_grow ("union_name", (yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; - case 43: -/* Line 1270 of yacc.c. */ -#line 304 "../../src/parse-gram.y" - { - char const *body = (yyvsp[(3) - (3)].chars); - - if (union_seen) - { - /* 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++; - } + case 48: +/* Line 1537 of yacc.c */ +#line 382 "../../src/parse-gram.y" + { union_seen = true; - muscle_code_grow ("stype", body, (yylsp[(3) - (3)])); + muscle_code_grow ("stype", (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)])); + code_scanner_last_string_free (); } break; - case 44: -/* Line 1270 of yacc.c. */ -#line 325 "../../src/parse-gram.y" + case 49: + +/* Line 1537 of yacc.c */ +#line 393 "../../src/parse-gram.y" { current_class = nterm_sym; } break; - case 45: -/* Line 1270 of yacc.c. */ -#line 326 "../../src/parse-gram.y" + case 50: + +/* Line 1537 of yacc.c */ +#line 394 "../../src/parse-gram.y" { current_class = unknown_sym; current_type = NULL; } break; - case 46: -/* Line 1270 of yacc.c. */ -#line 330 "../../src/parse-gram.y" + case 51: + +/* Line 1537 of yacc.c */ +#line 398 "../../src/parse-gram.y" { current_class = token_sym; } break; - case 47: -/* Line 1270 of yacc.c. */ -#line 331 "../../src/parse-gram.y" + case 52: + +/* Line 1537 of yacc.c */ +#line 399 "../../src/parse-gram.y" { current_class = unknown_sym; current_type = NULL; } break; - case 48: -/* Line 1270 of yacc.c. */ -#line 336 "../../src/parse-gram.y" + case 53: + +/* Line 1537 of yacc.c */ +#line 404 "../../src/parse-gram.y" { - tag_seen = true; 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 49: -/* Line 1270 of yacc.c. */ -#line 347 "../../src/parse-gram.y" + case 54: + +/* Line 1537 of yacc.c */ +#line 415 "../../src/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; } break; - case 50: -/* Line 1270 of yacc.c. */ -#line 361 "../../src/parse-gram.y" + case 55: + +/* Line 1537 of yacc.c */ +#line 429 "../../src/parse-gram.y" { (yyval.assoc) = left_assoc; } break; - case 51: -/* Line 1270 of yacc.c. */ -#line 362 "../../src/parse-gram.y" + case 56: + +/* Line 1537 of yacc.c */ +#line 430 "../../src/parse-gram.y" { (yyval.assoc) = right_assoc; } break; - case 52: -/* Line 1270 of yacc.c. */ -#line 363 "../../src/parse-gram.y" + case 57: + +/* Line 1537 of yacc.c */ +#line 431 "../../src/parse-gram.y" { (yyval.assoc) = non_assoc; } break; - case 53: -/* Line 1270 of yacc.c. */ -#line 367 "../../src/parse-gram.y" + case 58: + +/* Line 1537 of yacc.c */ +#line 435 "../../src/parse-gram.y" { current_type = NULL; } break; - case 54: -/* Line 1270 of yacc.c. */ -#line 368 "../../src/parse-gram.y" + case 59: + +/* Line 1537 of yacc.c */ +#line 436 "../../src/parse-gram.y" { current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; } break; - case 55: -/* Line 1270 of yacc.c. */ -#line 373 "../../src/parse-gram.y" - { (yyval.list) = symbol_list_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); } + case 60: + +/* Line 1537 of yacc.c */ +#line 442 "../../src/parse-gram.y" + { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); } break; - case 56: -/* Line 1270 of yacc.c. */ -#line 374 "../../src/parse-gram.y" - { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); } + case 61: + +/* Line 1537 of yacc.c */ +#line 444 "../../src/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 57: -/* Line 1270 of yacc.c. */ -#line 380 "../../src/parse-gram.y" + case 62: + +/* Line 1537 of yacc.c */ +#line 448 "../../src/parse-gram.y" + { (yyval.list) = (yyvsp[(1) - (1)].list); } + break; + + case 63: + +/* Line 1537 of yacc.c */ +#line 449 "../../src/parse-gram.y" + { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); } + break; + + case 64: + +/* Line 1537 of yacc.c */ +#line 453 "../../src/parse-gram.y" + { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); } + break; + + case 65: + +/* Line 1537 of yacc.c */ +#line 454 "../../src/parse-gram.y" + { (yyval.list) = symbol_list_type_new ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } + break; + + case 66: + +/* Line 1537 of yacc.c */ +#line 455 "../../src/parse-gram.y" + { (yyval.list) = symbol_list_default_tagged_new ((yylsp[(1) - (1)])); } + break; + + case 67: + +/* Line 1537 of yacc.c */ +#line 456 "../../src/parse-gram.y" + { (yyval.list) = symbol_list_default_tagless_new ((yylsp[(1) - (1)])); } + break; + + case 68: + +/* Line 1537 of yacc.c */ +#line 462 "../../src/parse-gram.y" { current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; } break; - case 58: -/* Line 1270 of yacc.c. */ -#line 385 "../../src/parse-gram.y" + case 69: + +/* Line 1537 of yacc.c */ +#line 467 "../../src/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 59: -/* Line 1270 of yacc.c. */ -#line 390 "../../src/parse-gram.y" + case 70: + +/* Line 1537 of yacc.c */ +#line 472 "../../src/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)])); @@ -2195,9 +2442,10 @@ yyreduce: } break; - case 60: -/* Line 1270 of yacc.c. */ -#line 396 "../../src/parse-gram.y" + case 71: + +/* Line 1537 of yacc.c */ +#line 478 "../../src/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)])); @@ -2205,9 +2453,10 @@ yyreduce: } break; - case 61: -/* Line 1270 of yacc.c. */ -#line 402 "../../src/parse-gram.y" + case 72: + +/* Line 1537 of yacc.c */ +#line 484 "../../src/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)])); @@ -2216,95 +2465,119 @@ yyreduce: } break; - case 68: -/* Line 1270 of yacc.c. */ -#line 432 "../../src/parse-gram.y" + case 79: + +/* Line 1537 of yacc.c */ +#line 514 "../../src/parse-gram.y" { yyerrok; } break; - case 69: -/* Line 1270 of yacc.c. */ -#line 438 "../../src/parse-gram.y" + case 80: + +/* Line 1537 of yacc.c */ +#line 520 "../../src/parse-gram.y" { current_lhs = (yyvsp[(1) - (1)].symbol); current_lhs_location = (yylsp[(1) - (1)]); } break; - case 71: -/* Line 1270 of yacc.c. */ -#line 442 "../../src/parse-gram.y" + case 82: + +/* Line 1537 of yacc.c */ +#line 524 "../../src/parse-gram.y" { grammar_current_rule_end ((yylsp[(1) - (1)])); } break; - case 72: -/* Line 1270 of yacc.c. */ -#line 443 "../../src/parse-gram.y" + case 83: + +/* Line 1537 of yacc.c */ +#line 525 "../../src/parse-gram.y" { grammar_current_rule_end ((yylsp[(3) - (3)])); } break; - case 74: -/* Line 1270 of yacc.c. */ -#line 449 "../../src/parse-gram.y" + case 85: + +/* Line 1537 of yacc.c */ +#line 531 "../../src/parse-gram.y" { grammar_current_rule_begin (current_lhs, current_lhs_location); } break; - case 75: -/* Line 1270 of yacc.c. */ -#line 451 "../../src/parse-gram.y" + case 86: + +/* Line 1537 of yacc.c */ +#line 533 "../../src/parse-gram.y" { grammar_current_rule_symbol_append ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); } break; - case 76: -/* Line 1270 of yacc.c. */ -#line 453 "../../src/parse-gram.y" - { grammar_current_rule_action_append ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); } + case 87: + +/* Line 1537 of yacc.c */ +#line 535 "../../src/parse-gram.y" + { grammar_current_rule_action_append ((yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); } break; - case 77: -/* Line 1270 of yacc.c. */ -#line 455 "../../src/parse-gram.y" + case 88: + +/* Line 1537 of yacc.c */ +#line 537 "../../src/parse-gram.y" { grammar_current_rule_prec_set ((yyvsp[(3) - (3)].symbol), (yylsp[(3) - (3)])); } break; - case 78: -/* Line 1270 of yacc.c. */ -#line 457 "../../src/parse-gram.y" + case 89: + +/* Line 1537 of yacc.c */ +#line 539 "../../src/parse-gram.y" { grammar_current_rule_dprec_set ((yyvsp[(3) - (3)].integer), (yylsp[(3) - (3)])); } break; - case 79: -/* Line 1270 of yacc.c. */ -#line 459 "../../src/parse-gram.y" + case 90: + +/* Line 1537 of yacc.c */ +#line 541 "../../src/parse-gram.y" { grammar_current_rule_merge_set ((yyvsp[(3) - (3)].uniqstr), (yylsp[(3) - (3)])); } break; - case 82: -/* Line 1270 of yacc.c. */ -#line 475 "../../src/parse-gram.y" + case 92: + +/* Line 1537 of yacc.c */ +#line 551 "../../src/parse-gram.y" + { (yyval.uniqstr) = uniqstr_new ((yyvsp[(1) - (1)].chars)); } + break; + + case 93: + +/* Line 1537 of yacc.c */ +#line 557 "../../src/parse-gram.y" { - static char one[] = "1"; - (yyval.chars) = one; + (yyval.chars) = ""; } break; - case 84: -/* Line 1270 of yacc.c. */ -#line 485 "../../src/parse-gram.y" + case 95: + +/* Line 1537 of yacc.c */ +#line 570 "../../src/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)])); + code_props plain_code; + (yyvsp[(1) - (1)].code)[strlen ((yyvsp[(1) - (1)].code)) - 1] = '\n'; + code_props_plain_init (&plain_code, (yyvsp[(1) - (1)].code)+1, (yylsp[(1) - (1)])); + code_props_translate_code (&plain_code); + gram_scanner_last_string_free (); + (yyval.chars) = plain_code.code; } break; - case 85: -/* Line 1270 of yacc.c. */ -#line 501 "../../src/parse-gram.y" + case 96: + +/* Line 1537 of yacc.c */ +#line 590 "../../src/parse-gram.y" { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; - case 86: -/* Line 1270 of yacc.c. */ -#line 503 "../../src/parse-gram.y" + case 97: + +/* Line 1537 of yacc.c */ +#line 592 "../../src/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); @@ -2312,33 +2585,41 @@ yyreduce: } break; - case 87: -/* Line 1270 of yacc.c. */ -#line 511 "../../src/parse-gram.y" + case 98: + +/* Line 1537 of yacc.c */ +#line 600 "../../src/parse-gram.y" { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; - case 90: -/* Line 1270 of yacc.c. */ -#line 523 "../../src/parse-gram.y" + case 101: + +/* Line 1537 of yacc.c */ +#line 612 "../../src/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 92: -/* Line 1270 of yacc.c. */ -#line 532 "../../src/parse-gram.y" + case 103: + +/* Line 1537 of yacc.c */ +#line 621 "../../src/parse-gram.y" { - muscle_code_grow ("epilogue", translate_code ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])), (yylsp[(2) - (2)])); + code_props plain_code; + code_props_plain_init (&plain_code, (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); + code_props_translate_code (&plain_code); gram_scanner_last_string_free (); + muscle_code_grow ("epilogue", plain_code.code, (yylsp[(2) - (2)])); + code_scanner_last_string_free (); } break; -/* Line 1270 of yacc.c. */ -#line 2342 "../../src/parse-gram.c" + +/* Line 1537 of yacc.c */ +#line 2623 "../../src/parse-gram.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -2489,9 +2770,6 @@ yyerrlab1: YY_STACK_PRINT (yyss, yyssp); } - if (yyn == YYFINAL) - YYACCEPT; - *++yyvsp = yylval; yyerror_range[1] = yylloc; @@ -2532,7 +2810,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 @@ -2558,8 +2836,9 @@ yyreturn: } -/* Line 1490 of yacc.c. */ -#line 538 "../../src/parse-gram.y" + +/* Line 1537 of yacc.c */ +#line 631 "../../src/parse-gram.y"