X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/592d0b1eb5a6e8041df3d1461dc9fca60e3e0a54..6e30ede87a1c39c53842a6a747ecd9f7484d92a5:/src/parse-gram.c diff --git a/src/parse-gram.c b/src/parse-gram.c index 6bf88c77..4d4e1722 100644 --- a/src/parse-gram.c +++ b/src/parse-gram.c @@ -1,15 +1,13 @@ - -/* A Bison parser, made by GNU Bison 2.3a+. */ +/* A Bison parser, made by GNU Bison 2.4.1.206-8a8b-dirty. */ /* 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. + Copyright (C) 1984, 1989-1990, 2000-2010 Free Software Foundation, Inc. - This program is free software; you can redistribute it and/or modify + 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. + the Free Software Foundation, either version 3 of the License, 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 @@ -17,9 +15,7 @@ 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, - Boston, MA 02110-1301, USA. */ + along with this program. If not, see . */ /* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work @@ -48,7 +44,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.3a+" +#define YYBISON_VERSION "2.4.1.206-8a8b-dirty" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -66,29 +62,28 @@ #define YYLSP_NEEDED 1 /* Substitute the variable and function names. */ -#define yyparse gram_parse -#define yylex gram_lex -#define yyerror gram_error -#define yylval gram_lval -#define yychar gram_char -#define yydebug gram_debug -#define yynerrs gram_nerrs -#define yylloc gram_lloc +#define yyparse gram_parse +#define yylex gram_lex +#define yyerror gram_error +#define yylval gram_lval +#define yychar gram_char +#define yydebug gram_debug +#define yynerrs gram_nerrs +#define yylloc gram_lloc /* Copy the first part of user declarations. */ -/* Line 1537 of yacc.c */ -#line 1 "../../src/parse-gram.y" +/* Line 251 of yacc.c */ +#line 1 "parse-gram.y" /* Bison Grammar Parser -*- C -*- - Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, - Inc. + Copyright (C) 2002-2010 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. - This program is free software; you can redistribute it and/or modify + 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 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -97,22 +92,18 @@ 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, Boston, MA - 02110-1301 USA -*/ + along with this program. If not, see . */ #include #include "system.h" -#include - #include "complain.h" #include "conflicts.h" #include "files.h" #include "getargs.h" #include "gram.h" -#include "muscle_tab.h" +#include "muscle-tab.h" +#include "named-ref.h" #include "quotearg.h" #include "reader.h" #include "symlist.h" @@ -149,6 +140,7 @@ static symbol_class current_class = unknown_sym; static uniqstr current_type = NULL; static symbol *current_lhs; static location current_lhs_location; +static named_ref *current_lhs_named_ref; static int current_prec = 0; #define YYTYPE_INT16 int_fast16_t @@ -157,8 +149,8 @@ static int current_prec = 0; #define YYTYPE_UINT8 uint_fast8_t -/* Line 1537 of yacc.c */ -#line 162 "../../src/parse-gram.c" +/* Line 251 of yacc.c */ +#line 154 "parse-gram.c" /* Enabling traces. */ #ifndef YYDEBUG @@ -220,28 +212,27 @@ static int current_prec = 0; PERCENT_OUTPUT = 289, PERCENT_PARSE_PARAM = 290, PERCENT_PURE_PARSER = 291, - PERCENT_PUSH_PARSER = 292, - PERCENT_PUSH_PULL_PARSER = 293, - PERCENT_REQUIRE = 294, - PERCENT_SKELETON = 295, - PERCENT_START = 296, - PERCENT_TOKEN_TABLE = 297, - PERCENT_VERBOSE = 298, - PERCENT_YACC = 299, - BRACED_CODE = 300, - CHAR = 301, - EPILOGUE = 302, - EQUAL = 303, - ID = 304, - ID_COLON = 305, - PERCENT_PERCENT = 306, - PIPE = 307, - PROLOGUE = 308, - SEMICOLON = 309, - TYPE = 310, - TYPE_TAG_ANY = 311, - TYPE_TAG_NONE = 312, - PERCENT_UNION = 313 + PERCENT_REQUIRE = 292, + PERCENT_SKELETON = 293, + PERCENT_START = 294, + PERCENT_TOKEN_TABLE = 295, + PERCENT_VERBOSE = 296, + PERCENT_YACC = 297, + BRACED_CODE = 298, + BRACKETED_ID = 299, + CHAR = 300, + EPILOGUE = 301, + EQUAL = 302, + ID = 303, + ID_COLON = 304, + PERCENT_PERCENT = 305, + PIPE = 306, + PROLOGUE = 307, + SEMICOLON = 308, + TYPE = 309, + TYPE_TAG_ANY = 310, + TYPE_TAG_NONE = 311, + PERCENT_UNION = 312 }; #endif /* Tokens. */ @@ -280,28 +271,27 @@ static int current_prec = 0; #define PERCENT_OUTPUT 289 #define PERCENT_PARSE_PARAM 290 #define PERCENT_PURE_PARSER 291 -#define PERCENT_PUSH_PARSER 292 -#define PERCENT_PUSH_PULL_PARSER 293 -#define PERCENT_REQUIRE 294 -#define PERCENT_SKELETON 295 -#define PERCENT_START 296 -#define PERCENT_TOKEN_TABLE 297 -#define PERCENT_VERBOSE 298 -#define PERCENT_YACC 299 -#define BRACED_CODE 300 -#define CHAR 301 -#define EPILOGUE 302 -#define EQUAL 303 -#define ID 304 -#define ID_COLON 305 -#define PERCENT_PERCENT 306 -#define PIPE 307 -#define PROLOGUE 308 -#define SEMICOLON 309 -#define TYPE 310 -#define TYPE_TAG_ANY 311 -#define TYPE_TAG_NONE 312 -#define PERCENT_UNION 313 +#define PERCENT_REQUIRE 292 +#define PERCENT_SKELETON 293 +#define PERCENT_START 294 +#define PERCENT_TOKEN_TABLE 295 +#define PERCENT_VERBOSE 296 +#define PERCENT_YACC 297 +#define BRACED_CODE 298 +#define BRACKETED_ID 299 +#define CHAR 300 +#define EPILOGUE 301 +#define EQUAL 302 +#define ID 303 +#define ID_COLON 304 +#define PERCENT_PERCENT 305 +#define PIPE 306 +#define PROLOGUE 307 +#define SEMICOLON 308 +#define TYPE 309 +#define TYPE_TAG_ANY 310 +#define TYPE_TAG_NONE 311 +#define PERCENT_UNION 312 @@ -310,8 +300,8 @@ static int current_prec = 0; typedef union YYSTYPE { -/* Line 1537 of yacc.c */ -#line 97 "../../src/parse-gram.y" +/* Line 276 of yacc.c */ +#line 93 "parse-gram.y" symbol *symbol; symbol_list *list; @@ -321,11 +311,12 @@ typedef union YYSTYPE assoc assoc; uniqstr uniqstr; unsigned char character; + named_ref *named_ref; -/* Line 1537 of yacc.c */ -#line 329 "../../src/parse-gram.c" +/* Line 276 of yacc.c */ +#line 320 "parse-gram.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -349,8 +340,8 @@ typedef struct YYLTYPE /* Copy the second part of user declarations. */ -/* Line 1537 of yacc.c */ -#line 354 "../../src/parse-gram.c" +/* Line 326 of yacc.c */ +#line 345 "parse-gram.c" #ifdef short # undef short @@ -400,7 +391,7 @@ typedef short int yytype_int16; #define YYSIZE_MAXIMUM ((YYSIZE_T) -1) #ifndef YY_ -# if YYENABLE_NLS +# if defined YYENABLE_NLS && YYENABLE_NLS # if ENABLE_NLS # include /* INFRINGES ON USER NAME SPACE */ # define YY_(msgid) dgettext ("bison-runtime", msgid) @@ -514,9 +505,9 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */ /* A type that is properly aligned for any stack member. */ union yyalloc { - yytype_int16 yyss; - YYSTYPE yyvs; - YYLTYPE yyls; + yytype_int16 yyss_alloc; + YYSTYPE yyvs_alloc; + YYLTYPE yyls_alloc; }; /* The size of the maximum gap between one aligned stack and the next. */ @@ -551,12 +542,12 @@ union yyalloc elements in the stack, and YYPTR gives the new location of the stack. Advance YYPTR to a properly aligned location for the next stack. */ -# define YYSTACK_RELOCATE(Stack) \ +# define YYSTACK_RELOCATE(Stack_alloc, Stack) \ do \ { \ YYSIZE_T yynewbytes; \ - YYCOPY (&yyptr->Stack, Stack, yysize); \ - Stack = &yyptr->Stack; \ + YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ + Stack = &yyptr->Stack_alloc; \ yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ yyptr += yynewbytes / sizeof (*yyptr); \ } \ @@ -567,20 +558,20 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 3 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 158 +#define YYLAST 160 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 59 +#define YYNTOKENS 58 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 31 +#define YYNNTS 34 /* YYNRULES -- Number of rules. */ -#define YYNRULES 103 +#define YYNRULES 108 /* YYNRULES -- Number of states. */ -#define YYNSTATES 141 +#define YYNSTATES 148 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 313 +#define YYMAXUTOK 312 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -619,7 +610,7 @@ static const yytype_uint8 yytranslate[] = 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, - 55, 56, 57, 58 + 55, 56, 57 }; #if YYDEBUG @@ -630,62 +621,63 @@ static const yytype_uint16 yyprhs[] = 0, 0, 3, 8, 9, 12, 14, 16, 18, 22, 24, 27, 29, 32, 35, 38, 42, 44, 47, 50, 53, 55, 58, 62, 64, 66, 69, 73, 76, 78, - 80, 82, 85, 88, 90, 92, 94, 96, 98, 100, - 103, 107, 111, 113, 115, 118, 122, 123, 125, 129, - 130, 134, 135, 139, 143, 147, 149, 151, 153, 154, - 156, 158, 161, 163, 166, 168, 170, 172, 174, 176, - 178, 181, 184, 188, 190, 193, 195, 198, 200, 203, - 206, 207, 211, 213, 217, 220, 221, 224, 227, 231, - 235, 239, 241, 243, 244, 246, 248, 250, 252, 254, - 256, 258, 260, 261 + 81, 84, 86, 88, 90, 92, 94, 96, 99, 103, + 107, 109, 111, 114, 118, 119, 121, 125, 126, 130, + 131, 135, 139, 143, 145, 147, 149, 150, 152, 154, + 157, 159, 162, 164, 167, 169, 172, 174, 176, 178, + 180, 182, 184, 187, 190, 194, 196, 199, 201, 204, + 206, 209, 212, 213, 218, 220, 224, 227, 228, 232, + 236, 240, 244, 248, 249, 251, 253, 255, 256, 258, + 260, 262, 264, 266, 268, 270, 272, 274, 275 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int8 yyrhs[] = { - 60, 0, -1, 61, 51, 76, 89, -1, -1, 61, - 62, -1, 63, -1, 53, -1, 17, -1, 19, 82, - 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, + 59, 0, -1, 60, 50, 77, 91, -1, -1, 60, + 61, -1, 62, -1, 52, -1, 17, -1, 19, 84, + 85, -1, 20, -1, 20, 3, -1, 21, -1, 22, + 4, -1, 23, 4, -1, 24, 3, -1, 24, 47, + 3, -1, 25, -1, 26, 43, -1, 27, 3, -1, + 28, 43, -1, 29, -1, 30, 3, -1, 30, 47, 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 + 47, 3, -1, 35, 43, -1, 36, -1, 37, 3, + -1, 38, 3, -1, 40, -1, 41, -1, 42, -1, + 53, -1, 67, -1, 64, -1, 39, 89, -1, 8, + 43, 73, -1, 9, 43, 73, -1, 18, -1, 31, + -1, 16, 86, -1, 16, 48, 86, -1, -1, 48, + -1, 57, 63, 86, -1, -1, 6, 65, 76, -1, + -1, 5, 66, 76, -1, 7, 54, 72, -1, 68, + 69, 70, -1, 10, -1, 11, -1, 12, -1, -1, + 54, -1, 71, -1, 70, 71, -1, 89, -1, 89, + 4, -1, 89, -1, 72, 89, -1, 74, -1, 73, + 74, -1, 89, -1, 54, -1, 55, -1, 56, -1, + 54, -1, 87, -1, 87, 4, -1, 87, 90, -1, + 87, 4, 90, -1, 75, -1, 76, 75, -1, 78, + -1, 77, 78, -1, 79, -1, 62, 53, -1, 1, + 53, -1, -1, 88, 83, 80, 81, -1, 82, -1, + 81, 51, 82, -1, 81, 53, -1, -1, 82, 89, + 83, -1, 82, 43, 83, -1, 82, 13, 89, -1, + 82, 14, 4, -1, 82, 15, 54, -1, -1, 44, + -1, 48, -1, 3, -1, -1, 48, -1, 3, -1, + 43, -1, 48, -1, 45, -1, 49, -1, 87, -1, + 90, -1, 3, -1, -1, 50, 46, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 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 + 0, 208, 208, 216, 218, 222, 223, 233, 234, 239, + 240, 245, 246, 247, 248, 249, 250, 255, 264, 265, + 266, 267, 268, 269, 270, 271, 272, 273, 274, 289, + 290, 314, 315, 316, 317, 321, 322, 323, 327, 334, + 341, 345, 349, 356, 371, 372, 376, 388, 388, 393, + 393, 398, 409, 424, 425, 426, 430, 431, 436, 438, + 443, 444, 449, 451, 456, 457, 461, 462, 463, 464, + 469, 474, 479, 485, 491, 502, 503, 512, 513, 519, + 520, 521, 528, 528, 533, 534, 535, 540, 542, 544, + 546, 548, 550, 555, 557, 568, 569, 574, 575, 576, + 585, 605, 607, 616, 621, 622, 627, 634, 636 }; #endif @@ -703,19 +695,19 @@ static const char *const yytname[] = "\"%initial-action\"", "\"%language\"", "\"%lex-param\"", "\"%locations\"", "\"%name-prefix\"", "\"%no-default-prec\"", "\"%no-lines\"", "\"%nondeterministic-parser\"", "\"%output\"", - "\"%parse-param\"", "\"%pure-parser\"", "\"%push-parser\"", - "\"%push-pull-parser\"", "\"%require\"", "\"%skeleton\"", "\"%start\"", - "\"%token-table\"", "\"%verbose\"", "\"%yacc\"", "\"{...}\"", "\"char\"", - "\"epilogue\"", "\"=\"", "\"identifier\"", "\"identifier:\"", "\"%%\"", - "\"|\"", "\"%{...%}\"", "\";\"", "\"type\"", "\"<*>\"", "\"<>\"", - "\"%union\"", "$accept", "input", "prologue_declarations", - "prologue_declaration", "grammar_declaration", "union_name", - "symbol_declaration", "$@1", "$@2", "precedence_declaration", - "precedence_declarator", "type.opt", "symbols.1", "generic_symlist", + "\"%parse-param\"", "\"%pure-parser\"", "\"%require\"", "\"%skeleton\"", + "\"%start\"", "\"%token-table\"", "\"%verbose\"", "\"%yacc\"", + "\"{...}\"", "\"[identifier]\"", "\"char\"", "\"epilogue\"", "\"=\"", + "\"identifier\"", "\"identifier:\"", "\"%%\"", "\"|\"", "\"%{...%}\"", + "\";\"", "\"type\"", "\"<*>\"", "\"<>\"", "\"%union\"", "$accept", + "input", "prologue_declarations", "prologue_declaration", + "grammar_declaration", "union_name", "symbol_declaration", "$@1", "$@2", + "precedence_declaration", "precedence_declarator", "type.opt", + "symbols.prec", "symbol.prec", "symbols.1", "generic_symlist", "generic_symlist_item", "symbol_def", "symbol_defs.1", "grammar", "rules_or_grammar_declaration", "rules", "$@3", "rhses.1", "rhs", - "variable", "content.opt", "braceless", "id", "id_colon", "symbol", - "string_as_id", "epilogue.opt", 0 + "named_ref.opt", "variable", "content.opt", "braceless", "id", + "id_colon", "symbol", "string_as_id", "epilogue.opt", 0 }; #endif @@ -729,24 +721,24 @@ static const yytype_uint16 yytoknum[] = 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, - 305, 306, 307, 308, 309, 310, 311, 312, 313 + 305, 306, 307, 308, 309, 310, 311, 312 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint8 yyr1[] = { - 0, 59, 60, 61, 61, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 63, 63, 63, - 63, 63, 63, 63, 63, 63, 64, 64, 63, 66, - 65, 67, 65, 65, 68, 69, 69, 69, 70, 70, - 71, 71, 72, 72, 73, 73, 73, 73, 74, 74, - 74, 74, 74, 75, 75, 76, 76, 77, 77, 77, - 79, 78, 80, 80, 80, 81, 81, 81, 81, 81, - 81, 82, 82, 83, 83, 84, 85, 85, 86, 87, - 87, 88, 89, 89 + 0, 58, 59, 60, 60, 61, 61, 61, 61, 61, + 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, + 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, + 61, 61, 61, 61, 61, 62, 62, 62, 62, 62, + 62, 62, 62, 62, 63, 63, 62, 65, 64, 66, + 64, 64, 67, 68, 68, 68, 69, 69, 70, 70, + 71, 71, 72, 72, 73, 73, 74, 74, 74, 74, + 75, 75, 75, 75, 75, 76, 76, 77, 77, 78, + 78, 78, 80, 79, 81, 81, 81, 82, 82, 82, + 82, 82, 82, 83, 83, 84, 84, 85, 85, 85, + 86, 87, 87, 88, 89, 89, 90, 91, 91 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -754,143 +746,150 @@ static const yytype_uint8 yyr2[] = { 0, 2, 4, 0, 2, 1, 1, 1, 3, 1, 2, 1, 2, 2, 2, 3, 1, 2, 2, 2, - 1, 2, 3, 1, 1, 2, 3, 2, 1, 1, - 1, 2, 2, 1, 1, 1, 1, 1, 1, 2, - 3, 3, 1, 1, 2, 3, 0, 1, 3, 0, - 3, 0, 3, 3, 3, 1, 1, 1, 0, 1, - 1, 2, 1, 2, 1, 1, 1, 1, 1, 1, - 2, 2, 3, 1, 2, 1, 2, 1, 2, 2, - 0, 3, 1, 3, 2, 0, 2, 2, 3, 3, - 3, 1, 1, 0, 1, 1, 1, 1, 1, 1, - 1, 1, 0, 2 + 1, 2, 3, 1, 1, 2, 3, 2, 1, 2, + 2, 1, 1, 1, 1, 1, 1, 2, 3, 3, + 1, 1, 2, 3, 0, 1, 3, 0, 3, 0, + 3, 3, 3, 1, 1, 1, 0, 1, 1, 2, + 1, 2, 1, 2, 1, 2, 1, 1, 1, 1, + 1, 1, 2, 2, 3, 1, 2, 1, 2, 1, + 2, 2, 0, 4, 1, 3, 2, 0, 3, 3, + 3, 3, 3, 0, 1, 1, 1, 0, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 0, 2 }; -/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state - STATE-NUM when YYTABLE doesn't specify something else to do. Zero +/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM. + Performed when YYTABLE doesn't specify something else to do. Zero means the default is an error. */ static const yytype_uint8 yydefact[] = { - 3, 0, 0, 1, 51, 49, 0, 0, 0, 55, - 56, 57, 0, 7, 42, 0, 9, 11, 0, 0, - 0, 16, 0, 0, 0, 20, 0, 43, 23, 24, - 0, 0, 28, 29, 30, 0, 0, 0, 33, 34, - 35, 0, 6, 36, 46, 4, 5, 38, 37, 58, - 0, 0, 0, 0, 0, 95, 0, 44, 92, 91, - 93, 10, 12, 13, 14, 0, 17, 18, 19, 21, - 0, 25, 0, 27, 31, 32, 101, 97, 96, 99, - 39, 100, 0, 98, 0, 0, 75, 77, 80, 47, - 0, 59, 0, 68, 73, 52, 69, 50, 53, 60, - 65, 66, 67, 40, 62, 64, 41, 45, 94, 8, - 15, 22, 26, 79, 78, 0, 76, 2, 85, 48, - 54, 74, 70, 71, 61, 63, 103, 81, 82, 72, - 85, 84, 0, 0, 0, 87, 86, 83, 88, 89, - 90 + 3, 0, 0, 1, 49, 47, 0, 0, 0, 53, + 54, 55, 0, 7, 40, 0, 9, 11, 0, 0, + 0, 16, 0, 0, 0, 20, 0, 41, 23, 24, + 0, 0, 28, 0, 0, 0, 31, 32, 33, 0, + 6, 34, 44, 4, 5, 36, 35, 56, 0, 0, + 0, 0, 0, 100, 0, 42, 96, 95, 97, 10, + 12, 13, 14, 0, 17, 18, 19, 21, 0, 25, + 0, 27, 29, 30, 106, 102, 101, 104, 37, 105, + 0, 103, 0, 0, 77, 79, 93, 45, 0, 57, + 0, 70, 75, 50, 71, 48, 51, 62, 67, 68, + 69, 38, 64, 66, 39, 43, 99, 98, 8, 15, + 22, 26, 81, 80, 0, 78, 2, 94, 82, 46, + 52, 58, 60, 76, 72, 73, 63, 65, 108, 87, + 59, 61, 74, 83, 84, 87, 86, 0, 0, 0, + 93, 93, 85, 90, 91, 92, 89, 88 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 1, 2, 45, 84, 90, 47, 51, 50, 48, - 49, 92, 98, 103, 104, 94, 95, 85, 86, 87, - 118, 127, 128, 60, 109, 57, 79, 88, 105, 81, - 117 + -1, 1, 2, 43, 82, 88, 45, 49, 48, 46, + 47, 90, 120, 121, 96, 101, 102, 92, 93, 83, + 84, 85, 129, 133, 134, 118, 58, 108, 55, 77, + 86, 103, 79, 116 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -79 +#define YYPACT_NINF -91 static const yytype_int16 yypact[] = { - -79, 5, 96, -79, -79, -79, -6, 13, 18, -79, - -79, -79, -8, -79, -79, 27, 66, -79, 74, 82, - 31, -79, 43, 86, 45, -79, 32, -79, -79, -79, - 33, 47, -79, -79, -79, 91, 93, 26, -79, -79, - -79, 15, -79, -79, 48, -79, -79, -79, -79, 44, - 38, 38, 26, 11, 11, -79, 53, -79, -79, -79, - 106, -79, -79, -79, -79, 107, -79, -79, -79, -79, - 108, -79, 138, -79, -79, -79, -79, -79, -79, -79, - -79, -79, 88, -79, 89, 1, -79, -79, -79, -79, - 53, -79, 26, -79, -79, 38, 50, 38, 26, -79, - -79, -79, -79, 11, -79, -79, 11, -79, -79, -79, - -79, -79, -79, -79, -79, 97, -79, -79, -79, -79, - 26, -79, 142, -79, -79, -79, -79, -7, 25, -79, - -79, -79, 26, 144, 98, -79, -79, 25, -79, -79, - -79 + -91, 3, 103, -91, -91, -91, -36, 2, 10, -91, + -91, -91, 9, -91, -91, 32, 60, -91, 65, 67, + 27, -91, 41, 73, 51, -91, 39, -91, -91, -91, + 40, 52, -91, 93, 95, 33, -91, -91, -91, 15, + -91, -91, 53, -91, -91, -91, -91, 46, 43, 43, + 33, 11, 11, -91, 61, -91, -91, -91, 35, -91, + -91, -91, -91, 100, -91, -91, -91, -91, 102, -91, + 113, -91, -91, -91, -91, -91, -91, -91, -91, -91, + 64, -91, 94, 1, -91, -91, 62, -91, 61, -91, + 33, -91, -91, 43, 86, 43, 33, -91, -91, -91, + -91, 11, -91, -91, 11, -91, -91, -91, -91, -91, + -91, -91, -91, -91, 72, -91, -91, -91, -91, -91, + 33, -91, 142, -91, 145, -91, -91, -91, -91, -91, + -91, -91, -91, 17, 34, -91, -91, 33, 146, 97, + 62, 62, 34, -91, -91, -91, -91, -91 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -79, -79, -79, -79, 149, -79, -79, -79, -79, -79, - -79, -79, 54, 101, -21, -33, 105, -79, 67, -79, - -79, -79, 28, -79, -79, -13, -47, -79, -37, -78, - -79 + -91, -91, -91, -91, 147, -91, -91, -91, -91, -91, + -91, -91, -91, 37, -91, 106, -60, -33, 105, -91, + 69, -91, -91, -91, 24, -48, -91, -91, -49, -20, + -91, -35, -90, -91 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If positive, shift that token. If negative, reduce the rule which - number is the opposite. If zero, do what YYDEFACT says. - If YYTABLE_NINF, syntax error. */ -#define YYTABLE_NINF -103 + number is the opposite. If YYTABLE_NINF, syntax error. */ +#define YYTABLE_NINF -108 static const yytype_int16 yytable[] = { - 80, -102, 82, 96, 96, 3, 4, 5, 6, 7, - 8, 9, 10, 11, 76, 99, 82, 12, 123, 14, - 4, 5, 6, 7, 8, 9, 10, 11, 76, 76, - 58, 12, 27, 14, 64, 69, 71, 55, 132, 133, - 134, 56, 37, 107, 129, 130, 27, 131, 96, 52, - 96, 83, 115, 76, 122, 99, 37, 77, 53, 44, - 78, 124, 121, 54, 121, 83, 100, 101, 102, 61, - 135, 77, 77, 44, 78, 78, 59, 119, 62, 65, - 70, 72, 125, 124, 77, 125, 63, 78, 66, 67, - 68, 136, 73, 93, 74, 138, 75, 89, 55, 91, - 136, 4, 5, 6, 7, 8, 9, 10, 11, 108, - 110, 111, 12, 13, 14, 15, 16, 17, 18, 19, - 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, - 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, - 40, 112, 113, 114, 126, 76, 120, 41, 139, 42, - 43, 46, 116, 140, 44, 106, 97, 0, 137 + 78, -107, 80, 3, 125, 105, 4, 5, 6, 7, + 8, 9, 10, 11, 74, 97, 80, 12, 50, 14, + 4, 5, 6, 7, 8, 9, 10, 11, 94, 94, + 62, 12, 27, 14, 132, 56, 74, 74, 106, 119, + 35, 127, 67, 69, 127, 51, 27, 137, 138, 139, + 81, 114, 53, 52, 35, 122, 75, 54, 42, 76, + 123, 126, 123, 59, 81, 98, 99, 100, 135, 60, + 136, 61, 42, 94, 63, 94, 65, 140, 75, 75, + 57, 76, 76, 107, 64, 122, 68, 70, 75, 74, + 124, 76, 146, 147, 66, 71, 72, 91, 73, 141, + 89, 87, 143, 109, 53, 110, 117, 141, 4, 5, + 6, 7, 8, 9, 10, 11, 111, 112, 128, 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, 131, 113, 74, 44, + 144, 145, 115, 39, 95, 40, 41, 130, 104, 142, + 42 }; -static const yytype_int16 yycheck[] = +#define yypact_value_is_default(yystate) \ + ((yystate) == (-91)) + +#define yytable_value_is_error(yytable_value) \ + YYID (0) + +static const yytype_uint8 yycheck[] = { - 37, 0, 1, 50, 51, 0, 5, 6, 7, 8, - 9, 10, 11, 12, 3, 52, 1, 16, 96, 18, - 5, 6, 7, 8, 9, 10, 11, 12, 3, 3, - 3, 16, 31, 18, 3, 3, 3, 45, 13, 14, - 15, 49, 41, 56, 122, 52, 31, 54, 95, 55, - 97, 50, 51, 3, 4, 92, 41, 46, 45, 58, - 49, 98, 95, 45, 97, 50, 55, 56, 57, 3, - 45, 46, 46, 58, 49, 49, 49, 90, 4, 48, - 48, 48, 103, 120, 46, 106, 4, 49, 45, 3, - 45, 128, 45, 55, 3, 132, 3, 49, 45, 55, - 137, 5, 6, 7, 8, 9, 10, 11, 12, 3, - 3, 3, 16, 17, 18, 19, 20, 21, 22, 23, - 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, - 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, - 44, 3, 54, 54, 47, 3, 92, 51, 4, 53, - 54, 2, 85, 55, 58, 54, 51, -1, 130 + 35, 0, 1, 0, 94, 54, 5, 6, 7, 8, + 9, 10, 11, 12, 3, 50, 1, 16, 54, 18, + 5, 6, 7, 8, 9, 10, 11, 12, 48, 49, + 3, 16, 31, 18, 124, 3, 3, 3, 3, 88, + 39, 101, 3, 3, 104, 43, 31, 13, 14, 15, + 49, 50, 43, 43, 39, 90, 45, 48, 57, 48, + 93, 96, 95, 3, 49, 54, 55, 56, 51, 4, + 53, 4, 57, 93, 47, 95, 3, 43, 45, 45, + 48, 48, 48, 48, 43, 120, 47, 47, 45, 3, + 4, 48, 140, 141, 43, 43, 3, 54, 3, 134, + 54, 48, 137, 3, 43, 3, 44, 142, 5, 6, + 7, 8, 9, 10, 11, 12, 3, 53, 46, 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, 4, 53, 3, 2, + 4, 54, 83, 50, 49, 52, 53, 120, 52, 135, + 57 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const yytype_uint8 yystos[] = { - 0, 60, 61, 0, 5, 6, 7, 8, 9, 10, + 0, 59, 60, 0, 5, 6, 7, 8, 9, 10, 11, 12, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, - 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, - 44, 51, 53, 54, 58, 62, 63, 65, 68, 69, - 67, 66, 55, 45, 45, 45, 49, 84, 3, 49, - 82, 3, 4, 4, 3, 48, 45, 3, 45, 3, - 48, 3, 48, 45, 3, 3, 3, 46, 49, 85, - 87, 88, 1, 50, 63, 76, 77, 78, 86, 49, - 64, 55, 70, 55, 74, 75, 85, 75, 71, 87, - 55, 56, 57, 72, 73, 87, 72, 84, 3, 83, - 3, 3, 3, 54, 54, 51, 77, 89, 79, 84, - 71, 74, 4, 88, 87, 73, 47, 80, 81, 88, - 52, 54, 13, 14, 15, 45, 87, 81, 87, 4, - 55 + 34, 35, 36, 37, 38, 39, 40, 41, 42, 50, + 52, 53, 57, 61, 62, 64, 67, 68, 66, 65, + 54, 43, 43, 43, 48, 86, 3, 48, 84, 3, + 4, 4, 3, 47, 43, 3, 43, 3, 47, 3, + 47, 43, 3, 3, 3, 45, 48, 87, 89, 90, + 1, 49, 62, 77, 78, 79, 88, 48, 63, 54, + 69, 54, 75, 76, 87, 76, 72, 89, 54, 55, + 56, 73, 74, 89, 73, 86, 3, 48, 85, 3, + 3, 3, 53, 53, 50, 78, 91, 44, 83, 86, + 70, 71, 89, 75, 4, 90, 89, 74, 46, 80, + 71, 4, 90, 81, 82, 51, 53, 13, 14, 15, + 43, 89, 82, 89, 4, 54, 83, 83 }; #define yyerrok (yyerrstatus = 0) @@ -905,9 +904,18 @@ static const yytype_uint8 yystos[] = /* Like YYERROR except do call yyerror. This remains here temporarily to ease the transition to the new meaning of YYERROR, for GCC. - Once GCC version 2 has supplanted version 1, this can go. */ + Once GCC version 2 has supplanted version 1, this can go. However, + YYFAIL appears to be in use. Nevertheless, it is formally deprecated + in Bison 2.4.2's NEWS entry, where a plan to phase it out is + discussed. */ #define YYFAIL goto yyerrlab +#if defined YYFAIL + /* This is here to suppress warnings from the GCC cpp's + -Wunused-macros. Normally we don't worry about that warning, but + some users do, and we want to make it easy for users to remove + YYFAIL uses, which will produce warnings from Bison 2.5. */ +#endif #define YYRECOVERING() (!!yyerrstatus) @@ -917,7 +925,6 @@ do \ { \ yychar = (Token); \ yylval = (Value); \ - yytoken = YYTRANSLATE (yychar); \ YYPOPSTACK (1); \ goto yybackup; \ } \ @@ -964,7 +971,7 @@ while (YYID (0)) we won't break user code: when these are the locations we know. */ #ifndef YY_LOCATION_PRINT -# if YYLTYPE_IS_TRIVIAL +# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL # define YY_LOCATION_PRINT(File, Loc) \ fprintf (File, "%d.%d-%d.%d", \ (Loc).first_line, (Loc).first_column, \ @@ -1040,147 +1047,165 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp) { case 3: /* "\"string\"" */ -/* Line 1537 of yacc.c */ -#line 188 "../../src/parse-gram.y" +/* Line 797 of yacc.c */ +#line 183 "parse-gram.y" { fputs (quotearg_style (c_quoting_style, (yyvaluep->chars)), stderr); }; -/* Line 1537 of yacc.c */ -#line 1049 "../../src/parse-gram.c" +/* Line 797 of yacc.c */ +#line 1056 "parse-gram.c" break; case 4: /* "\"integer\"" */ -/* Line 1537 of yacc.c */ -#line 199 "../../src/parse-gram.y" +/* Line 797 of yacc.c */ +#line 195 "parse-gram.y" { fprintf (stderr, "%d", (yyvaluep->integer)); }; -/* Line 1537 of yacc.c */ -#line 1058 "../../src/parse-gram.c" +/* Line 797 of yacc.c */ +#line 1065 "parse-gram.c" break; - case 45: /* "\"{...}\"" */ + case 43: /* "\"{...}\"" */ -/* Line 1537 of yacc.c */ -#line 190 "../../src/parse-gram.y" +/* Line 797 of yacc.c */ +#line 185 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->code)); }; -/* Line 1537 of yacc.c */ -#line 1067 "../../src/parse-gram.c" +/* Line 797 of yacc.c */ +#line 1074 "parse-gram.c" break; - case 46: /* "\"char\"" */ + case 44: /* "\"[identifier]\"" */ + +/* Line 797 of yacc.c */ +#line 190 "parse-gram.y" + { fprintf (stderr, "[%s]", (yyvaluep->uniqstr)); }; -/* Line 1537 of yacc.c */ -#line 182 "../../src/parse-gram.y" +/* Line 797 of yacc.c */ +#line 1083 "parse-gram.c" + break; + case 45: /* "\"char\"" */ + +/* Line 797 of yacc.c */ +#line 177 "parse-gram.y" { fputs (char_name ((yyvaluep->character)), stderr); }; -/* Line 1537 of yacc.c */ -#line 1076 "../../src/parse-gram.c" +/* Line 797 of yacc.c */ +#line 1092 "parse-gram.c" break; - case 47: /* "\"epilogue\"" */ + case 46: /* "\"epilogue\"" */ -/* Line 1537 of yacc.c */ -#line 190 "../../src/parse-gram.y" +/* Line 797 of yacc.c */ +#line 185 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -/* Line 1537 of yacc.c */ -#line 1085 "../../src/parse-gram.c" +/* Line 797 of yacc.c */ +#line 1101 "parse-gram.c" break; - case 49: /* "\"identifier\"" */ + case 48: /* "\"identifier\"" */ -/* Line 1537 of yacc.c */ -#line 195 "../../src/parse-gram.y" +/* Line 797 of yacc.c */ +#line 189 "parse-gram.y" { fputs ((yyvaluep->uniqstr), stderr); }; -/* Line 1537 of yacc.c */ -#line 1094 "../../src/parse-gram.c" +/* Line 797 of yacc.c */ +#line 1110 "parse-gram.c" break; - case 50: /* "\"identifier:\"" */ + case 49: /* "\"identifier:\"" */ -/* Line 1537 of yacc.c */ -#line 196 "../../src/parse-gram.y" +/* Line 797 of yacc.c */ +#line 191 "parse-gram.y" { fprintf (stderr, "%s:", (yyvaluep->uniqstr)); }; -/* Line 1537 of yacc.c */ -#line 1103 "../../src/parse-gram.c" +/* Line 797 of yacc.c */ +#line 1119 "parse-gram.c" break; - case 53: /* "\"%{...%}\"" */ + case 52: /* "\"%{...%}\"" */ -/* Line 1537 of yacc.c */ -#line 190 "../../src/parse-gram.y" +/* Line 797 of yacc.c */ +#line 185 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -/* Line 1537 of yacc.c */ -#line 1112 "../../src/parse-gram.c" +/* Line 797 of yacc.c */ +#line 1128 "parse-gram.c" break; - case 55: /* "\"type\"" */ + case 54: /* "\"type\"" */ -/* Line 1537 of yacc.c */ -#line 194 "../../src/parse-gram.y" +/* Line 797 of yacc.c */ +#line 192 "parse-gram.y" { fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); }; -/* Line 1537 of yacc.c */ -#line 1121 "../../src/parse-gram.c" +/* Line 797 of yacc.c */ +#line 1137 "parse-gram.c" break; - case 82: /* "variable" */ + case 71: /* "symbol.prec" */ + +/* Line 797 of yacc.c */ +#line 198 "parse-gram.y" + { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; -/* Line 1537 of yacc.c */ -#line 195 "../../src/parse-gram.y" +/* Line 797 of yacc.c */ +#line 1146 "parse-gram.c" + break; + case 84: /* "variable" */ + +/* Line 797 of yacc.c */ +#line 189 "parse-gram.y" { fputs ((yyvaluep->uniqstr), stderr); }; -/* Line 1537 of yacc.c */ -#line 1130 "../../src/parse-gram.c" +/* Line 797 of yacc.c */ +#line 1155 "parse-gram.c" break; - case 83: /* "content.opt" */ + case 85: /* "content.opt" */ -/* Line 1537 of yacc.c */ -#line 190 "../../src/parse-gram.y" +/* Line 797 of yacc.c */ +#line 185 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -/* Line 1537 of yacc.c */ -#line 1139 "../../src/parse-gram.c" +/* Line 797 of yacc.c */ +#line 1164 "parse-gram.c" break; - case 84: /* "braceless" */ + case 86: /* "braceless" */ -/* Line 1537 of yacc.c */ -#line 190 "../../src/parse-gram.y" +/* Line 797 of yacc.c */ +#line 185 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -/* Line 1537 of yacc.c */ -#line 1148 "../../src/parse-gram.c" +/* Line 797 of yacc.c */ +#line 1173 "parse-gram.c" break; - case 85: /* "id" */ + case 87: /* "id" */ -/* Line 1537 of yacc.c */ -#line 202 "../../src/parse-gram.y" +/* Line 797 of yacc.c */ +#line 198 "parse-gram.y" { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; -/* Line 1537 of yacc.c */ -#line 1157 "../../src/parse-gram.c" +/* Line 797 of yacc.c */ +#line 1182 "parse-gram.c" break; - case 86: /* "id_colon" */ + case 88: /* "id_colon" */ -/* Line 1537 of yacc.c */ -#line 203 "../../src/parse-gram.y" +/* Line 797 of yacc.c */ +#line 199 "parse-gram.y" { fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); }; -/* Line 1537 of yacc.c */ -#line 1166 "../../src/parse-gram.c" +/* Line 797 of yacc.c */ +#line 1191 "parse-gram.c" break; - case 87: /* "symbol" */ + case 89: /* "symbol" */ -/* Line 1537 of yacc.c */ -#line 202 "../../src/parse-gram.y" +/* Line 797 of yacc.c */ +#line 198 "parse-gram.y" { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; -/* Line 1537 of yacc.c */ -#line 1175 "../../src/parse-gram.c" +/* Line 797 of yacc.c */ +#line 1200 "parse-gram.c" break; - case 88: /* "string_as_id" */ + case 90: /* "string_as_id" */ -/* Line 1537 of yacc.c */ -#line 202 "../../src/parse-gram.y" +/* Line 797 of yacc.c */ +#line 198 "parse-gram.y" { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; -/* Line 1537 of yacc.c */ -#line 1184 "../../src/parse-gram.c" +/* Line 797 of yacc.c */ +#line 1209 "parse-gram.c" break; default: break; @@ -1272,11 +1297,11 @@ yy_reduce_print (yyvsp, yylsp, yyrule) /* The symbols being reduced. */ for (yyi = 0; yyi < yynrhs; yyi++) { - fprintf (stderr, " $%d = ", yyi + 1); + YYFPRINTF (stderr, " $%d = ", yyi + 1); yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi], &(yyvsp[(yyi + 1) - (yynrhs)]) , &(yylsp[(yyi + 1) - (yynrhs)]) ); - fprintf (stderr, "\n"); + YYFPRINTF (stderr, "\n"); } } @@ -1416,111 +1441,121 @@ yytnamerr (char *yyres, const char *yystr) } # endif -/* Copy into YYRESULT an error message about the unexpected token - YYCHAR while in state YYSTATE. Return the number of bytes copied, - including the terminating null byte. If YYRESULT is null, do not - copy anything; just return the number of bytes that would be - copied. As a special case, return 0 if an ordinary "syntax error" - message will do. Return YYSIZE_MAXIMUM if overflow occurs during - size calculation. */ -static YYSIZE_T -yysyntax_error (char *yyresult, int yystate, int yychar) +/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message + about the unexpected token YYTOKEN while in state YYSTATE. + + Return 0 if *YYMSG was successfully written. Return 1 if an ordinary + "syntax error" message will suffice instead. Return 2 if *YYMSG is + not large enough to hold the message. In the last case, also set + *YYMSG_ALLOC to either (a) the required number of bytes or (b) zero + if the required number of bytes is too large to store. */ +static int +yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, + int yystate, int yytoken) { int yyn = yypact[yystate]; if (! (YYPACT_NINF < yyn && yyn <= YYLAST)) - return 0; + return 1; else { - int yytype = YYTRANSLATE (yychar); - YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]); + YYSIZE_T yysize0 = yytnamerr (0, yytname[yytoken]); YYSIZE_T yysize = yysize0; YYSIZE_T yysize1; - int yysize_overflow = 0; enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; + /* Internationalized format string. */ + const char *yyformat = 0; + /* Arguments of yyformat. */ char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; - int yyx; - -# if 0 - /* This is so xgettext sees the translatable formats that are - constructed on the fly. */ - YY_("syntax error, unexpected %s"); - YY_("syntax error, unexpected %s, expecting %s"); - YY_("syntax error, unexpected %s, expecting %s or %s"); - YY_("syntax error, unexpected %s, expecting %s or %s or %s"); - YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"); -# endif - char *yyfmt; - char const *yyf; - static char const yyunexpected[] = "syntax error, unexpected %s"; - static char const yyexpecting[] = ", expecting %s"; - static char const yyor[] = " or %s"; - char yyformat[sizeof yyunexpected - + sizeof yyexpecting - 1 - + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2) - * (sizeof yyor - 1))]; - char const *yyprefix = yyexpecting; /* Start YYX at -YYN if negative to avoid negative indexes in - YYCHECK. */ + YYCHECK. In other words, skip the first -YYN actions for this + state because they are default actions. */ int yyxbegin = yyn < 0 ? -yyn : 0; /* Stay within bounds of both yycheck and yytname. */ int yychecklim = YYLAST - yyn + 1; int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; - int yycount = 1; + /* Number of reported tokens (one for the "unexpected", one per + "expected"). */ + int yycount = 0; + int yyx; - yyarg[0] = yytname[yytype]; - yyfmt = yystpcpy (yyformat, yyunexpected); + yyarg[yycount++] = yytname[yytoken]; for (yyx = yyxbegin; yyx < yyxend; ++yyx) - if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) + if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR + && !yytable_value_is_error (yytable[yyx + yyn])) { if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) { yycount = 1; yysize = yysize0; - yyformat[sizeof yyunexpected - 1] = '\0'; break; } yyarg[yycount++] = yytname[yyx]; yysize1 = yysize + yytnamerr (0, yytname[yyx]); - yysize_overflow |= (yysize1 < yysize); + if (! (yysize <= yysize1 + && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + { + /* Overflow. */ + *yymsg_alloc = 0; + return 2; + } yysize = yysize1; - yyfmt = yystpcpy (yyfmt, yyprefix); - yyprefix = yyor; } - yyf = YY_(yyformat); - yysize1 = yysize + yystrlen (yyf); - yysize_overflow |= (yysize1 < yysize); + switch (yycount) + { +#define YYCASE_(N, S) \ + case N: \ + yyformat = S; \ + break + YYCASE_(1, YY_("syntax error, unexpected %s")); + YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s")); + YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s")); + YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s")); + YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s")); +#undef YYCASE_ + } + + yysize1 = yysize + yystrlen (yyformat); + if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + { + /* Overflow. */ + *yymsg_alloc = 0; + return 2; + } yysize = yysize1; - if (yysize_overflow) - return YYSIZE_MAXIMUM; + if (*yymsg_alloc < yysize) + { + *yymsg_alloc = 2 * yysize; + if (! (yysize <= *yymsg_alloc + && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM)) + *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM; + return 2; + } - if (yyresult) - { - /* Avoid sprintf, as that infringes on the user's name space. - Don't have undefined behavior even if the translation - produced a string with the wrong number of "%s"s. */ - char *yyp = yyresult; - int yyi = 0; - while ((*yyp = *yyf) != '\0') - { - if (*yyp == '%' && yyf[1] == 's' && yyi < yycount) - { - yyp += yytnamerr (yyp, yyarg[yyi++]); - yyf += 2; - } - else - { - yyp++; - yyf++; - } - } - } - return yysize; + /* Avoid sprintf, as that infringes on the user's name space. + Don't have undefined behavior even if the translation + produced a string with the wrong number of "%s"s. */ + { + char *yyp = *yymsg; + int yyi = 0; + while ((*yyp = *yyformat) != '\0') + if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount) + { + yyp += yytnamerr (yyp, yyarg[yyi++]); + yyformat += 2; + } + else + { + yyp++; + yyformat++; + } + } + return 0; } } #endif /* YYERROR_VERBOSE */ @@ -1558,10 +1593,9 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp) break; } } - -/* Prevent warnings from -Wmissing-prototypes. */ +/* Prevent warnings from -Wmissing-prototypes. */ #ifdef YYPARSE_PARAM #if defined __STDC__ || defined __cplusplus int yyparse (void *YYPARSE_PARAM); @@ -1577,10 +1611,6 @@ int yyparse (); #endif /* ! YYPARSE_PARAM */ - - - - /*----------. | yyparse. | `----------*/ @@ -1607,95 +1637,103 @@ yyparse () #endif #endif { - /* The lookahead symbol. */ +/* The lookahead symbol. */ int yychar; /* The semantic value of the lookahead symbol. */ YYSTYPE yylval; -/* Number of syntax errors so far. */ -int yynerrs; /* Location data for the lookahead symbol. */ YYLTYPE yylloc; - int yystate; - int yyn; - int yyresult; - /* Number of tokens to shift before error messages enabled. */ - int yyerrstatus; - /* Lookahead token as an internal (translated) token number. */ - int yytoken = 0; -#if YYERROR_VERBOSE - /* Buffer for error messages, and its allocated size. */ - char yymsgbuf[128]; - char *yymsg = yymsgbuf; - YYSIZE_T yymsg_alloc = sizeof yymsgbuf; -#endif + /* Number of syntax errors so far. */ + int yynerrs; - /* Three stacks and their tools: - `yyss': related to states, - `yyvs': related to semantic values, - `yyls': related to locations. + int yystate; + /* Number of tokens to shift before error messages enabled. */ + int yyerrstatus; - Refer to the stacks thru separate pointers, to allow yyoverflow - to reallocate them elsewhere. */ + /* The stacks and their tools: + `yyss': related to states. + `yyvs': related to semantic values. + `yyls': related to locations. - /* The state stack. */ - yytype_int16 yyssa[YYINITDEPTH]; - yytype_int16 *yyss = yyssa; - yytype_int16 *yyssp; + Refer to the stacks thru separate pointers, to allow yyoverflow + to reallocate them elsewhere. */ - /* The semantic value stack. */ - YYSTYPE yyvsa[YYINITDEPTH]; - YYSTYPE *yyvs = yyvsa; - YYSTYPE *yyvsp; + /* The state stack. */ + yytype_int16 yyssa[YYINITDEPTH]; + yytype_int16 *yyss; + yytype_int16 *yyssp; - /* The location stack. */ - YYLTYPE yylsa[YYINITDEPTH]; - YYLTYPE *yyls = yylsa; - YYLTYPE *yylsp; - /* The locations where the error started and ended. */ - YYLTYPE yyerror_range[2]; + /* The semantic value stack. */ + YYSTYPE yyvsa[YYINITDEPTH]; + YYSTYPE *yyvs; + YYSTYPE *yyvsp; -#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N), yylsp -= (N)) + /* The location stack. */ + YYLTYPE yylsa[YYINITDEPTH]; + YYLTYPE *yyls; + YYLTYPE *yylsp; - YYSIZE_T yystacksize = YYINITDEPTH; + /* The locations where the error started and ended. */ + YYLTYPE yyerror_range[3]; + YYSIZE_T yystacksize; + + int yyn; + int yyresult; + /* Lookahead token as an internal (translated) token number. */ + int yytoken; /* The variables used to return semantic value and location from the action routines. */ YYSTYPE yyval; YYLTYPE yyloc; +#if YYERROR_VERBOSE + /* Buffer for error messages, and its allocated size. */ + char yymsgbuf[128]; + char *yymsg = yymsgbuf; + YYSIZE_T yymsg_alloc = sizeof yymsgbuf; +#endif + +#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N), yylsp -= (N)) + /* The number of symbols on the RHS of the reduced rule. Keep to zero when no symbol should be popped. */ int yylen = 0; + yytoken = 0; + yyss = yyssa; + yyvs = yyvsa; + yyls = yylsa; + yystacksize = YYINITDEPTH; + YYDPRINTF ((stderr, "Starting parse\n")); yystate = 0; yyerrstatus = 0; yynerrs = 0; - yychar = YYEMPTY; /* Cause a token to be read. */ + yychar = YYEMPTY; /* Cause a token to be read. */ /* Initialize stack pointers. Waste one element of value and location stack so that they stay on the same level as the state stack. The wasted elements are never initialized. */ - yyssp = yyss; yyvsp = yyvs; yylsp = yyls; -#if YYLTYPE_IS_TRIVIAL + +#if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL /* Initialize the default location before parsing starts. */ yylloc.first_line = yylloc.last_line = 1; yylloc.first_column = yylloc.last_column = 1; #endif +/* User initialization code. */ - /* User initialization code. */ - -/* Line 1537 of yacc.c */ -#line 89 "../../src/parse-gram.y" +/* Line 1280 of yacc.c */ +#line 85 "parse-gram.y" { /* Bison's grammar can initial empty locations, hence a default location is needed. */ @@ -1703,9 +1741,10 @@ YYLTYPE yylloc; boundary_set (&yylloc.end, current_file, 1, 1); } -/* Line 1537 of yacc.c */ -#line 1708 "../../src/parse-gram.c" +/* Line 1280 of yacc.c */ +#line 1746 "parse-gram.c" yylsp[0] = yylloc; + goto yysetstate; /*------------------------------------------------------------. @@ -1742,6 +1781,7 @@ YYLTYPE yylloc; &yyvs1, yysize * sizeof (*yyvsp), &yyls1, yysize * sizeof (*yylsp), &yystacksize); + yyls = yyls1; yyss = yyss1; yyvs = yyvs1; @@ -1763,9 +1803,9 @@ YYLTYPE yylloc; (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); if (! yyptr) goto yyexhaustedlab; - YYSTACK_RELOCATE (yyss); - YYSTACK_RELOCATE (yyvs); - YYSTACK_RELOCATE (yyls); + YYSTACK_RELOCATE (yyss_alloc, yyss); + YYSTACK_RELOCATE (yyvs_alloc, yyvs); + YYSTACK_RELOCATE (yyls_alloc, yyls); # undef YYSTACK_RELOCATE if (yyss1 != yyssa) YYSTACK_FREE (yyss1); @@ -1801,7 +1841,7 @@ yybackup: /* First try to decide what to do without reference to lookahead token. */ yyn = yypact[yystate]; - if (yyn == YYPACT_NINF) + if (yypact_value_is_default (yyn)) goto yydefault; /* Not known => get a lookahead token if don't already have one. */ @@ -1832,7 +1872,7 @@ yybackup: yyn = yytable[yyn]; if (yyn <= 0) { - if (yyn == 0 || yyn == YYTABLE_NINF) + if (yytable_value_is_error (yyn)) goto yyerrlab; yyn = -yyn; goto yyreduce; @@ -1889,8 +1929,8 @@ yyreduce: { case 6: -/* Line 1537 of yacc.c */ -#line 226 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 224 "parse-gram.y" { code_props plain_code; code_props_plain_init (&plain_code, (yyvsp[(1) - (1)].chars), (yylsp[(1) - (1)])); @@ -1904,41 +1944,32 @@ yyreduce: case 7: -/* Line 1537 of yacc.c */ -#line 235 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 233 "parse-gram.y" { debug_flag = true; } break; case 8: -/* Line 1537 of yacc.c */ -#line 237 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 235 "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)])); + muscle_percent_define_insert ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars), + MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE); } break; case 9: -/* Line 1537 of yacc.c */ -#line 250 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 239 "parse-gram.y" { defines_flag = true; } break; case 10: -/* Line 1537 of yacc.c */ -#line 252 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 241 "parse-gram.y" { defines_flag = true; spec_defines_file = xstrdup ((yyvsp[(2) - (2)].chars)); @@ -1947,43 +1978,43 @@ yyreduce: case 11: -/* Line 1537 of yacc.c */ -#line 256 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 245 "parse-gram.y" { error_verbose = true; } break; case 12: -/* Line 1537 of yacc.c */ -#line 257 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 246 "parse-gram.y" { expected_sr_conflicts = (yyvsp[(2) - (2)].integer); } break; case 13: -/* Line 1537 of yacc.c */ -#line 258 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 247 "parse-gram.y" { expected_rr_conflicts = (yyvsp[(2) - (2)].integer); } break; case 14: -/* Line 1537 of yacc.c */ -#line 259 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 248 "parse-gram.y" { spec_file_prefix = (yyvsp[(2) - (2)].chars); } break; case 15: -/* Line 1537 of yacc.c */ -#line 260 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 249 "parse-gram.y" { spec_file_prefix = (yyvsp[(3) - (3)].chars); } break; case 16: -/* Line 1537 of yacc.c */ -#line 262 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 251 "parse-gram.y" { nondeterministic_parser = true; glr_parser = true; @@ -1992,8 +2023,8 @@ yyreduce: case 17: -/* Line 1537 of yacc.c */ -#line 267 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 256 "parse-gram.y" { code_props action; code_props_symbol_action_init (&action, (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); @@ -2006,106 +2037,105 @@ yyreduce: case 18: -/* Line 1537 of yacc.c */ -#line 275 "../../src/parse-gram.y" - { language_argmatch ((yyvsp[(2) - (2)].chars), 1, &(yylsp[(1) - (2)])); } +/* Line 1493 of yacc.c */ +#line 264 "parse-gram.y" + { language_argmatch ((yyvsp[(2) - (2)].chars), grammar_prio, (yylsp[(1) - (2)])); } break; case 19: -/* Line 1537 of yacc.c */ -#line 276 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 265 "parse-gram.y" { add_param ("lex_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); } break; case 20: -/* Line 1537 of yacc.c */ -#line 277 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 266 "parse-gram.y" { locations_flag = true; } break; case 21: -/* Line 1537 of yacc.c */ -#line 278 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 267 "parse-gram.y" { spec_name_prefix = (yyvsp[(2) - (2)].chars); } break; case 22: -/* Line 1537 of yacc.c */ -#line 279 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 268 "parse-gram.y" { spec_name_prefix = (yyvsp[(3) - (3)].chars); } break; case 23: -/* Line 1537 of yacc.c */ -#line 280 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 269 "parse-gram.y" { no_lines_flag = true; } break; case 24: -/* Line 1537 of yacc.c */ -#line 281 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 270 "parse-gram.y" { nondeterministic_parser = true; } break; case 25: -/* Line 1537 of yacc.c */ -#line 282 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 271 "parse-gram.y" { spec_outfile = (yyvsp[(2) - (2)].chars); } break; case 26: -/* Line 1537 of yacc.c */ -#line 283 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 272 "parse-gram.y" { spec_outfile = (yyvsp[(3) - (3)].chars); } break; case 27: -/* Line 1537 of yacc.c */ -#line 284 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 273 "parse-gram.y" { add_param ("parse_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); } break; case 28: -/* Line 1537 of yacc.c */ -#line 285 "../../src/parse-gram.y" - { pure_parser = true; } +/* Line 1493 of yacc.c */ +#line 275 "parse-gram.y" + { + /* %pure-parser is deprecated in favor of `%define api.pure', so use + `%define api.pure' in a backward-compatible manner here. First, don't + complain if %pure-parser is specified multiple times. */ + if (!muscle_find_const ("percent_define(api.pure)")) + muscle_percent_define_insert ("api.pure", (yylsp[(1) - (1)]), "", + MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE); + /* In all cases, use api.pure now so that the backend doesn't complain if + the skeleton ignores api.pure, but do warn now if there's a previous + conflicting definition from an actual %define. */ + if (!muscle_percent_define_flag_if ("api.pure")) + muscle_percent_define_insert ("api.pure", (yylsp[(1) - (1)]), "", + MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE); + } break; case 29: -/* Line 1537 of yacc.c */ -#line 286 "../../src/parse-gram.y" - { push_parser = true; pull_parser = false; } - break; - - case 30: - -/* Line 1537 of yacc.c */ -#line 287 "../../src/parse-gram.y" - { push_parser = true; pull_parser = true; } - break; - - case 31: - -/* Line 1537 of yacc.c */ -#line 288 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 289 "parse-gram.y" { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); } break; - case 32: + case 30: -/* Line 1537 of yacc.c */ -#line 290 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 291 "parse-gram.y" { char const *skeleton_user = (yyvsp[(2) - (2)].chars); if (strchr (skeleton_user, '/')) @@ -2127,44 +2157,44 @@ yyreduce: skeleton_user = uniqstr_new (skeleton_build); free (skeleton_build); } - skeleton_arg (skeleton_user, 1, &(yylsp[(1) - (2)])); + skeleton_arg (skeleton_user, grammar_prio, (yylsp[(1) - (2)])); } break; - case 33: + case 31: -/* Line 1537 of yacc.c */ -#line 313 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 314 "parse-gram.y" { token_table_flag = true; } break; - case 34: + case 32: -/* Line 1537 of yacc.c */ -#line 314 "../../src/parse-gram.y" - { report_flag = report_states; } +/* Line 1493 of yacc.c */ +#line 315 "parse-gram.y" + { report_flag |= report_states; } break; - case 35: + case 33: -/* Line 1537 of yacc.c */ -#line 315 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 316 "parse-gram.y" { yacc_flag = true; } break; - case 39: + case 37: -/* Line 1537 of yacc.c */ -#line 323 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 324 "parse-gram.y" { grammar_start_symbol_set ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); } break; - case 40: + case 38: -/* Line 1537 of yacc.c */ -#line 327 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 328 "parse-gram.y" { symbol_list *list; for (list = (yyvsp[(3) - (3)].list); list; list = list->next) @@ -2173,10 +2203,10 @@ yyreduce: } break; - case 41: + case 39: -/* Line 1537 of yacc.c */ -#line 334 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 335 "parse-gram.y" { symbol_list *list; for (list = (yyvsp[(3) - (3)].list); list; list = list->next) @@ -2185,70 +2215,64 @@ yyreduce: } break; - case 42: + case 40: -/* Line 1537 of yacc.c */ -#line 341 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 342 "parse-gram.y" { default_prec = true; } break; - case 43: + case 41: -/* Line 1537 of yacc.c */ -#line 345 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 346 "parse-gram.y" { default_prec = false; } break; - case 44: + case 42: -/* Line 1537 of yacc.c */ -#line 349 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 350 "parse-gram.y" { + /* Do not invoke muscle_percent_code_grow here since it invokes + muscle_user_name_list_grow. */ muscle_code_grow ("percent_code()", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); code_scanner_last_string_free (); } break; - case 45: + case 43: -/* Line 1537 of yacc.c */ -#line 354 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 357 "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); + muscle_percent_code_grow ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)])); code_scanner_last_string_free (); - muscle_grow_user_name_list ("percent_code_user_qualifiers", (yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)])); } break; - case 46: + case 44: -/* Line 1537 of yacc.c */ -#line 376 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 371 "parse-gram.y" {} break; - case 47: + case 45: -/* Line 1537 of yacc.c */ -#line 377 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 372 "parse-gram.y" { muscle_code_grow ("union_name", (yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; - case 48: + case 46: -/* Line 1537 of yacc.c */ -#line 382 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 377 "parse-gram.y" { union_seen = true; muscle_code_grow ("stype", (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)])); @@ -2256,44 +2280,44 @@ yyreduce: } break; - case 49: + case 47: -/* Line 1537 of yacc.c */ -#line 393 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 388 "parse-gram.y" { current_class = nterm_sym; } break; - case 50: + case 48: -/* Line 1537 of yacc.c */ -#line 394 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 389 "parse-gram.y" { current_class = unknown_sym; current_type = NULL; } break; - case 51: + case 49: -/* Line 1537 of yacc.c */ -#line 398 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 393 "parse-gram.y" { current_class = token_sym; } break; - case 52: + case 50: -/* Line 1537 of yacc.c */ -#line 399 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 394 "parse-gram.y" { current_class = unknown_sym; current_type = NULL; } break; - case 53: + case 51: -/* Line 1537 of yacc.c */ -#line 404 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 399 "parse-gram.y" { symbol_list *list; tag_seen = true; @@ -2303,10 +2327,10 @@ yyreduce: } break; - case 54: + case 52: -/* Line 1537 of yacc.c */ -#line 415 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 410 "parse-gram.y" { symbol_list *list; ++current_prec; @@ -2320,121 +2344,149 @@ yyreduce: } break; - case 55: + case 53: -/* Line 1537 of yacc.c */ -#line 429 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 424 "parse-gram.y" { (yyval.assoc) = left_assoc; } break; - case 56: + case 54: -/* Line 1537 of yacc.c */ -#line 430 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 425 "parse-gram.y" { (yyval.assoc) = right_assoc; } break; - case 57: + case 55: -/* Line 1537 of yacc.c */ -#line 431 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 426 "parse-gram.y" { (yyval.assoc) = non_assoc; } break; - case 58: + case 56: -/* Line 1537 of yacc.c */ -#line 435 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 430 "parse-gram.y" { current_type = NULL; } break; - case 59: + case 57: -/* Line 1537 of yacc.c */ -#line 436 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 431 "parse-gram.y" { current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; } break; - case 60: + case 58: -/* Line 1537 of yacc.c */ -#line 442 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 437 "parse-gram.y" { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); } break; - case 61: + case 59: -/* Line 1537 of yacc.c */ -#line 444 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 439 "parse-gram.y" { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); } break; + case 60: + +/* Line 1493 of yacc.c */ +#line 443 "parse-gram.y" + { (yyval.symbol) = (yyvsp[(1) - (1)].symbol); } + break; + + case 61: + +/* Line 1493 of yacc.c */ +#line 444 "parse-gram.y" + { (yyval.symbol) = (yyvsp[(1) - (2)].symbol); symbol_user_token_number_set ((yyvsp[(1) - (2)].symbol), (yyvsp[(2) - (2)].integer), (yylsp[(2) - (2)])); } + break; + case 62: -/* Line 1537 of yacc.c */ -#line 448 "../../src/parse-gram.y" - { (yyval.list) = (yyvsp[(1) - (1)].list); } +/* Line 1493 of yacc.c */ +#line 450 "parse-gram.y" + { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); } 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)); } +/* Line 1493 of yacc.c */ +#line 452 "parse-gram.y" + { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); } break; case 64: -/* Line 1537 of yacc.c */ -#line 453 "../../src/parse-gram.y" - { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); } +/* Line 1493 of yacc.c */ +#line 456 "parse-gram.y" + { (yyval.list) = (yyvsp[(1) - (1)].list); } 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)])); } +/* Line 1493 of yacc.c */ +#line 457 "parse-gram.y" + { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); } break; case 66: -/* Line 1537 of yacc.c */ -#line 455 "../../src/parse-gram.y" - { (yyval.list) = symbol_list_default_tagged_new ((yylsp[(1) - (1)])); } +/* Line 1493 of yacc.c */ +#line 461 "parse-gram.y" + { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (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)])); } +/* Line 1493 of yacc.c */ +#line 462 "parse-gram.y" + { (yyval.list) = symbol_list_type_new ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; case 68: -/* Line 1537 of yacc.c */ -#line 462 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 463 "parse-gram.y" + { (yyval.list) = symbol_list_default_tagged_new ((yylsp[(1) - (1)])); } + break; + + case 69: + +/* Line 1493 of yacc.c */ +#line 464 "parse-gram.y" + { (yyval.list) = symbol_list_default_tagless_new ((yylsp[(1) - (1)])); } + break; + + case 70: + +/* Line 1493 of yacc.c */ +#line 470 "parse-gram.y" { current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; } break; - case 69: + case 71: -/* Line 1537 of yacc.c */ -#line 467 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 475 "parse-gram.y" { symbol_class_set ((yyvsp[(1) - (1)].symbol), current_class, (yylsp[(1) - (1)]), true); symbol_type_set ((yyvsp[(1) - (1)].symbol), current_type, (yylsp[(1) - (1)])); } break; - case 70: + case 72: -/* Line 1537 of yacc.c */ -#line 472 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 480 "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)])); @@ -2442,10 +2494,10 @@ yyreduce: } break; - case 71: + case 73: -/* Line 1537 of yacc.c */ -#line 478 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 486 "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)])); @@ -2453,10 +2505,10 @@ yyreduce: } break; - case 72: + case 74: -/* Line 1537 of yacc.c */ -#line 484 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 492 "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)])); @@ -2465,98 +2517,119 @@ yyreduce: } break; - case 79: + case 81: -/* Line 1537 of yacc.c */ -#line 514 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 522 "parse-gram.y" { yyerrok; } break; - case 80: + case 82: -/* Line 1537 of yacc.c */ -#line 520 "../../src/parse-gram.y" - { current_lhs = (yyvsp[(1) - (1)].symbol); current_lhs_location = (yylsp[(1) - (1)]); } +/* Line 1493 of yacc.c */ +#line 528 "parse-gram.y" + { current_lhs = (yyvsp[(1) - (2)].symbol); current_lhs_location = (yylsp[(1) - (2)]); + current_lhs_named_ref = (yyvsp[(2) - (2)].named_ref); } break; - case 82: + case 84: -/* Line 1537 of yacc.c */ -#line 524 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 533 "parse-gram.y" { grammar_current_rule_end ((yylsp[(1) - (1)])); } break; - case 83: + case 85: -/* Line 1537 of yacc.c */ -#line 525 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 534 "parse-gram.y" { grammar_current_rule_end ((yylsp[(3) - (3)])); } break; - case 85: + case 87: -/* Line 1537 of yacc.c */ -#line 531 "../../src/parse-gram.y" - { grammar_current_rule_begin (current_lhs, current_lhs_location); } +/* Line 1493 of yacc.c */ +#line 540 "parse-gram.y" + { grammar_current_rule_begin (current_lhs, current_lhs_location, + current_lhs_named_ref); } break; - case 86: + case 88: -/* Line 1537 of yacc.c */ -#line 533 "../../src/parse-gram.y" - { grammar_current_rule_symbol_append ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); } +/* Line 1493 of yacc.c */ +#line 543 "parse-gram.y" + { grammar_current_rule_symbol_append ((yyvsp[(2) - (3)].symbol), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].named_ref)); } break; - case 87: + case 89: -/* Line 1537 of yacc.c */ -#line 535 "../../src/parse-gram.y" - { grammar_current_rule_action_append ((yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); } +/* Line 1493 of yacc.c */ +#line 545 "parse-gram.y" + { grammar_current_rule_action_append ((yyvsp[(2) - (3)].code), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].named_ref)); } break; - case 88: + case 90: -/* Line 1537 of yacc.c */ -#line 537 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 547 "parse-gram.y" { grammar_current_rule_prec_set ((yyvsp[(3) - (3)].symbol), (yylsp[(3) - (3)])); } break; - case 89: + case 91: -/* Line 1537 of yacc.c */ -#line 539 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 549 "parse-gram.y" { grammar_current_rule_dprec_set ((yyvsp[(3) - (3)].integer), (yylsp[(3) - (3)])); } break; - case 90: + case 92: -/* Line 1537 of yacc.c */ -#line 541 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 551 "parse-gram.y" { grammar_current_rule_merge_set ((yyvsp[(3) - (3)].uniqstr), (yylsp[(3) - (3)])); } break; - case 92: + case 93: -/* Line 1537 of yacc.c */ -#line 551 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 555 "parse-gram.y" + { (yyval.named_ref) = 0; } + break; + + case 94: + +/* Line 1493 of yacc.c */ +#line 557 "parse-gram.y" + { (yyval.named_ref) = named_ref_new((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } + break; + + case 96: + +/* Line 1493 of yacc.c */ +#line 569 "parse-gram.y" { (yyval.uniqstr) = uniqstr_new ((yyvsp[(1) - (1)].chars)); } break; - case 93: + case 97: -/* Line 1537 of yacc.c */ -#line 557 "../../src/parse-gram.y" - { - (yyval.chars) = ""; - } +/* Line 1493 of yacc.c */ +#line 574 "parse-gram.y" + { (yyval.chars) = ""; } + break; + + case 98: + +/* Line 1493 of yacc.c */ +#line 575 "parse-gram.y" + { (yyval.chars) = (yyvsp[(1) - (1)].uniqstr); } break; - case 95: + case 100: -/* Line 1537 of yacc.c */ -#line 570 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 586 "parse-gram.y" { code_props plain_code; (yyvsp[(1) - (1)].code)[strlen ((yyvsp[(1) - (1)].code)) - 1] = '\n'; @@ -2567,17 +2640,17 @@ yyreduce: } break; - case 96: + case 101: -/* Line 1537 of yacc.c */ -#line 590 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 606 "parse-gram.y" { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; - case 97: + case 102: -/* Line 1537 of yacc.c */ -#line 592 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 608 "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); @@ -2585,27 +2658,27 @@ yyreduce: } break; - case 98: + case 103: -/* Line 1537 of yacc.c */ -#line 600 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 616 "parse-gram.y" { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; - case 101: + case 106: -/* Line 1537 of yacc.c */ -#line 612 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 628 "parse-gram.y" { (yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[(1) - (1)].chars)), (yylsp[(1) - (1)])); symbol_class_set ((yyval.symbol), token_sym, (yylsp[(1) - (1)]), false); } break; - case 103: + case 108: -/* Line 1537 of yacc.c */ -#line 621 "../../src/parse-gram.y" +/* Line 1493 of yacc.c */ +#line 637 "parse-gram.y" { code_props plain_code; code_props_plain_init (&plain_code, (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); @@ -2618,10 +2691,21 @@ yyreduce: -/* Line 1537 of yacc.c */ -#line 2623 "../../src/parse-gram.c" +/* Line 1493 of yacc.c */ +#line 2696 "parse-gram.c" default: break; } + /* User semantic actions sometimes alter yychar, and that requires + that yytoken be updated with the new translation. We take the + approach of translating immediately before every use of yytoken. + One alternative is translating here after every semantic action, + but that translation would be missed if the semantic action invokes + YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or + if it invokes YYBACKUP. In the case of YYABORT or YYACCEPT, an + incorrect destructor might then be invoked immediately. In the + case of YYERROR or YYBACKUP, subsequent parser actions might lead + to an incorrect destructor call or verbose syntax error message + before the lookahead is translated. */ YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); YYPOPSTACK (yylen); @@ -2650,6 +2734,10 @@ yyreduce: | yyerrlab -- here on detecting error | `------------------------------------*/ yyerrlab: + /* Make sure we have latest lookahead translation. See comments at + user semantic actions for why this is necessary. */ + yytoken = YYTRANSLATE (yychar); + /* If not already recovering from an error, report this error. */ if (!yyerrstatus) { @@ -2657,41 +2745,32 @@ yyerrlab: #if ! YYERROR_VERBOSE yyerror (YY_("syntax error")); #else - { - YYSIZE_T yysize = yysyntax_error (0, yystate, yychar); - if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM) - { - YYSIZE_T yyalloc = 2 * yysize; - if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM)) - yyalloc = YYSTACK_ALLOC_MAXIMUM; - if (yymsg != yymsgbuf) - YYSTACK_FREE (yymsg); - yymsg = (char *) YYSTACK_ALLOC (yyalloc); - if (yymsg) - yymsg_alloc = yyalloc; - else - { - yymsg = yymsgbuf; - yymsg_alloc = sizeof yymsgbuf; - } - } - - if (0 < yysize && yysize <= yymsg_alloc) - { - (void) yysyntax_error (yymsg, yystate, yychar); - yyerror (yymsg); - } - else - { - yyerror (YY_("syntax error")); - if (yysize != 0) - goto yyexhaustedlab; - } - } + while (1) + { + int yysyntax_error_status = + yysyntax_error (&yymsg_alloc, &yymsg, yystate, yytoken); + if (yysyntax_error_status == 2 && 0 < yymsg_alloc) + { + if (yymsg != yymsgbuf) + YYSTACK_FREE (yymsg); + yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc); + if (yymsg) + continue; + yymsg = yymsgbuf; + yymsg_alloc = sizeof yymsgbuf; + } + if (yysyntax_error_status == 0) + yyerror (yymsg); + else + yyerror (YY_("syntax error")); + if (yysyntax_error_status == 2) + goto yyexhaustedlab; + break; + } #endif } - yyerror_range[0] = yylloc; + yyerror_range[1] = yylloc; if (yyerrstatus == 3) { @@ -2728,7 +2807,7 @@ yyerrorlab: if (/*CONSTCOND*/ 0) goto yyerrorlab; - yyerror_range[0] = yylsp[1-yylen]; + yyerror_range[1] = yylsp[1-yylen]; /* Do not reclaim the symbols of the rule which action triggered this YYERROR. */ YYPOPSTACK (yylen); @@ -2747,7 +2826,7 @@ yyerrlab1: for (;;) { yyn = yypact[yystate]; - if (yyn != YYPACT_NINF) + if (!yypact_value_is_default (yyn)) { yyn += YYTERROR; if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) @@ -2762,7 +2841,7 @@ yyerrlab1: if (yyssp == yyss) YYABORT; - yyerror_range[0] = *yylsp; + yyerror_range[1] = *yylsp; yydestruct ("Error: popping", yystos[yystate], yyvsp, yylsp); YYPOPSTACK (1); @@ -2772,10 +2851,10 @@ yyerrlab1: *++yyvsp = yylval; - yyerror_range[1] = yylloc; + yyerror_range[2] = yylloc; /* Using YYLLOC is tempting, but would change the location of the lookahead. YYLOC is available though. */ - YYLLOC_DEFAULT (yyloc, (yyerror_range - 1), 2); + YYLLOC_DEFAULT (yyloc, yyerror_range, 2); *++yylsp = yyloc; /* Shift the error token. */ @@ -2799,7 +2878,7 @@ yyabortlab: yyresult = 1; goto yyreturn; -#ifndef yyoverflow +#if !defined(yyoverflow) || YYERROR_VERBOSE /*-------------------------------------------------. | yyexhaustedlab -- memory exhaustion comes here. | `-------------------------------------------------*/ @@ -2811,8 +2890,13 @@ yyexhaustedlab: yyreturn: if (yychar != YYEMPTY) - yydestruct ("Cleanup: discarding lookahead", - yytoken, &yylval, &yylloc); + { + /* Make sure we have latest lookahead translation. See comments at + user semantic actions for why this is necessary. */ + yytoken = YYTRANSLATE (yychar); + yydestruct ("Cleanup: discarding lookahead", + yytoken, &yylval, &yylloc); + } /* Do not reclaim the symbols of the rule which action triggered this YYABORT or YYACCEPT. */ YYPOPSTACK (yylen); @@ -2837,8 +2921,8 @@ yyreturn: -/* Line 1537 of yacc.c */ -#line 631 "../../src/parse-gram.y" +/* Line 1724 of yacc.c */ +#line 647 "parse-gram.y"