X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/dc450175c0cfc153b228ad503eefe65a039b46c0..ca2a6d1587f421a6c58b9f80cc8d6b983c9a62dc:/src/parse-gram.c?ds=sidebyside diff --git a/src/parse-gram.c b/src/parse-gram.c index 57480ae2..e5713416 100644 --- a/src/parse-gram.c +++ b/src/parse-gram.c @@ -1,9 +1,9 @@ -/* A Bison parser, made by GNU Bison 2.4.266-78f6. */ +/* A Bison parser, made by GNU Bison 2.4.516-804e. */ /* Implementation for Bison's Yacc-like parsers in C Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006, - 2007, 2008 Free Software Foundation, Inc. + 2007, 2008, 2009, 2010 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 @@ -45,7 +45,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.4.266-78f6" +#define YYBISON_VERSION "2.4.516-804e" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -73,12 +73,12 @@ #define yylloc gram_lloc /* Copy the first part of user declarations. */ -/* Line 191 of yacc.c */ -#line 1 "parse-gram.y" +/* Line 252 of yacc.c */ +#line 1 "src/parse-gram.y" /* Bison Grammar Parser -*- C -*- - Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software - Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 + Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -103,7 +103,8 @@ #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" @@ -127,28 +128,8 @@ static void gram_error (location const *, char const *); static char const *char_name (char); -/** Add a lex-param or a parse-param. - * - * \param type \a lex_param or \a parse_param - * \param decl the formal argument - * \param loc the location in the source. - */ -static void add_param (char const *type, char *decl, location loc); - - -static symbol_class current_class = unknown_sym; -static uniqstr current_type = NULL; -static symbol *current_lhs; -static location current_lhs_location; -static int current_prec = 0; - -#define YYTYPE_INT16 int_fast16_t -#define YYTYPE_INT8 int_fast8_t -#define YYTYPE_UINT16 uint_fast16_t -#define YYTYPE_UINT8 uint_fast8_t - -/* Line 191 of yacc.c */ -#line 152 "../../src/parse-gram.c" +/* Line 252 of yacc.c */ +#line 133 "src/parse-gram.c" /* Enabling traces. */ #ifndef YYDEBUG @@ -168,6 +149,24 @@ static int current_prec = 0; # define YYTOKEN_TABLE 0 #endif +/* "%code requires" blocks. */ +/* Line 272 of yacc.c */ +#line 202 "src/parse-gram.y" + +# ifndef PARAM_TYPE +# define PARAM_TYPE + typedef enum + { + param_none = 0, + param_lex = 1 << 0, + param_parse = 1 << 1, + param_both = param_lex | param_parse + } param_type; +# endif + + +/* Line 272 of yacc.c */ +#line 170 "src/parse-gram.c" /* Tokens. */ #ifndef YYTOKENTYPE @@ -191,46 +190,45 @@ static int current_prec = 0; PERCENT_DPREC = 270, PERCENT_MERGE = 271, PERCENT_CODE = 272, - PERCENT_DEBUG = 273, - PERCENT_DEFAULT_PREC = 274, - PERCENT_DEFINE = 275, - PERCENT_DEFINES = 276, - PERCENT_ERROR_VERBOSE = 277, - PERCENT_EXPECT = 278, - PERCENT_EXPECT_RR = 279, + PERCENT_DEFAULT_PREC = 273, + PERCENT_DEFINE = 274, + PERCENT_DEFINES = 275, + PERCENT_ERROR_VERBOSE = 276, + PERCENT_EXPECT = 277, + PERCENT_EXPECT_RR = 278, + PERCENT_FLAG = 279, PERCENT_FILE_PREFIX = 280, PERCENT_GLR_PARSER = 281, PERCENT_INITIAL_ACTION = 282, PERCENT_LANGUAGE = 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_TOKEN_TABLE = 296, - PERCENT_VERBOSE = 297, - PERCENT_YACC = 298, - BRACED_CODE = 299, - CHAR = 300, - EPILOGUE = 301, - EQUAL = 302, - ID = 303, - ID_COLON = 304, - PERCENT_PERCENT = 305, - PIPE = 306, - PROLOGUE = 307, - SEMICOLON = 308, - TAG = 309, - TAG_ANY = 310, - TAG_NONE = 311, - PERCENT_UNION = 312 + PERCENT_NAME_PREFIX = 284, + PERCENT_NO_DEFAULT_PREC = 285, + PERCENT_NO_LINES = 286, + PERCENT_NONDETERMINISTIC_PARSER = 287, + PERCENT_OUTPUT = 288, + PERCENT_REQUIRE = 289, + PERCENT_SKELETON = 290, + PERCENT_START = 291, + PERCENT_TOKEN_TABLE = 292, + PERCENT_VERBOSE = 293, + PERCENT_YACC = 294, + BRACED_CODE = 295, + BRACED_PREDICATE = 296, + BRACKETED_ID = 297, + CHAR = 298, + EPILOGUE = 299, + EQUAL = 300, + ID = 301, + ID_COLON = 302, + PERCENT_PERCENT = 303, + PIPE = 304, + PROLOGUE = 305, + SEMICOLON = 306, + TAG = 307, + TAG_ANY = 308, + TAG_NONE = 309, + PERCENT_PARAM = 310, + PERCENT_UNION = 311 }; #endif /* Tokens. */ @@ -250,46 +248,45 @@ static int current_prec = 0; #define PERCENT_DPREC 270 #define PERCENT_MERGE 271 #define PERCENT_CODE 272 -#define PERCENT_DEBUG 273 -#define PERCENT_DEFAULT_PREC 274 -#define PERCENT_DEFINE 275 -#define PERCENT_DEFINES 276 -#define PERCENT_ERROR_VERBOSE 277 -#define PERCENT_EXPECT 278 -#define PERCENT_EXPECT_RR 279 +#define PERCENT_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_FLAG 279 #define PERCENT_FILE_PREFIX 280 #define PERCENT_GLR_PARSER 281 #define PERCENT_INITIAL_ACTION 282 #define PERCENT_LANGUAGE 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_TOKEN_TABLE 296 -#define PERCENT_VERBOSE 297 -#define PERCENT_YACC 298 -#define BRACED_CODE 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 TAG 309 -#define TAG_ANY 310 -#define TAG_NONE 311 -#define PERCENT_UNION 312 +#define PERCENT_NAME_PREFIX 284 +#define PERCENT_NO_DEFAULT_PREC 285 +#define PERCENT_NO_LINES 286 +#define PERCENT_NONDETERMINISTIC_PARSER 287 +#define PERCENT_OUTPUT 288 +#define PERCENT_REQUIRE 289 +#define PERCENT_SKELETON 290 +#define PERCENT_START 291 +#define PERCENT_TOKEN_TABLE 292 +#define PERCENT_VERBOSE 293 +#define PERCENT_YACC 294 +#define BRACED_CODE 295 +#define BRACED_PREDICATE 296 +#define BRACKETED_ID 297 +#define CHAR 298 +#define EPILOGUE 299 +#define EQUAL 300 +#define ID 301 +#define ID_COLON 302 +#define PERCENT_PERCENT 303 +#define PIPE 304 +#define PROLOGUE 305 +#define SEMICOLON 306 +#define TAG 307 +#define TAG_ANY 308 +#define TAG_NONE 309 +#define PERCENT_PARAM 310 +#define PERCENT_UNION 311 @@ -297,21 +294,27 @@ static int current_prec = 0; #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE { -/* Line 216 of yacc.c */ -#line 92 "parse-gram.y" +/* Line 277 of yacc.c */ +#line 88 "src/parse-gram.y" + assoc assoc; + char *code; + char const *chars; + int integer; + named_ref *named_ref; symbol *symbol; symbol_list *list; - int integer; - char const *chars; - char *code; - assoc assoc; uniqstr uniqstr; unsigned char character; +/* Line 277 of yacc.c */ +#line 226 "src/parse-gram.y" -/* Line 216 of yacc.c */ -#line 315 "../../src/parse-gram.c" + param_type param; + + +/* Line 277 of yacc.c */ +#line 318 "src/parse-gram.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -334,8 +337,39 @@ typedef struct YYLTYPE /* Copy the second part of user declarations. */ -/* Line 266 of yacc.c */ -#line 339 "../../src/parse-gram.c" +/* Line 327 of yacc.c */ +#line 342 "src/parse-gram.c" +/* Unqualified %code blocks. */ +/* Line 328 of yacc.c */ +#line 56 "src/parse-gram.y" + + static int current_prec = 0; + static location current_lhs_location; + static named_ref *current_lhs_named_ref; + static symbol *current_lhs; + static symbol_class current_class = unknown_sym; + static uniqstr current_type = NULL; + + #define YYTYPE_INT16 int_fast16_t + #define YYTYPE_INT8 int_fast8_t + #define YYTYPE_UINT16 uint_fast16_t + #define YYTYPE_UINT8 uint_fast8_t + +/* Line 328 of yacc.c */ +#line 215 "src/parse-gram.y" + + /** Add a lex-param and/or a parse-param. + * + * \param type where to push this formal argument. + * \param decl the formal argument. Destroyed. + * \param loc the location in the source. + */ + static void add_param (param_type type, char *decl, location loc); + static param_type current_param = param_none; + + +/* Line 328 of yacc.c */ +#line 373 "src/parse-gram.c" #ifdef short # undef short @@ -385,7 +419,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) @@ -552,21 +586,21 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 3 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 203 +#define YYLAST 163 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 58 +#define YYNTOKENS 57 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 33 +#define YYNNTS 36 /* YYNRULES -- Number of rules. */ -#define YYNRULES 106 +#define YYNRULES 110 /* YYNSTATES -- Number of states. */ -#define YYNSTATES 144 +#define YYNSTATES 149 /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned by yylex, with out-of-bounds checking. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 312 +#define YYMAXUTOK 311 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -606,24 +640,25 @@ 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 + 55, 56 }; #if YYDEBUG /* YYRLINEYYN -- Source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 203, 203, 211, 213, 217, 218, 228, 229, 233, - 234, 239, 243, 244, 245, 246, 247, 252, 261, 262, - 263, 264, 265, 266, 267, 268, 269, 270, 271, 284, - 285, 309, 310, 311, 312, 316, 317, 318, 322, 329, - 336, 340, 344, 351, 366, 367, 371, 383, 383, 388, - 388, 393, 404, 419, 420, 421, 422, 426, 427, 432, - 434, 439, 440, 445, 447, 452, 453, 457, 458, 459, - 460, 465, 470, 475, 481, 487, 498, 499, 508, 509, - 515, 516, 517, 524, 524, 528, 529, 530, 535, 536, - 538, 540, 542, 544, 554, 555, 561, 564, 573, 593, - 595, 604, 609, 610, 615, 622, 624 + 0, 251, 251, 259, 261, 265, 266, 276, 280, 285, + 286, 291, 296, 297, 298, 299, 300, 305, 314, 315, + 316, 317, 318, 319, 320, 321, 321, 322, 323, 347, + 348, 349, 350, 354, 355, 364, 365, 366, 370, 377, + 384, 388, 392, 399, 414, 415, 419, 431, 431, 436, + 436, 441, 452, 467, 468, 469, 470, 474, 475, 480, + 482, 487, 488, 493, 495, 500, 501, 505, 506, 507, + 508, 513, 518, 523, 529, 535, 546, 547, 556, 557, + 563, 564, 565, 572, 572, 577, 578, 579, 584, 586, + 588, 590, 592, 594, 596, 601, 603, 613, 614, 619, + 620, 621, 630, 650, 652, 661, 666, 667, 672, 679, + 681 }; #endif @@ -636,24 +671,24 @@ static const char *const yytname[] = "\"%token\"", "\"%nterm\"", "\"%type\"", "\"%destructor\"", "\"%printer\"", "\"%left\"", "\"%right\"", "\"%nonassoc\"", "\"%precedence\"", "\"%prec\"", "\"%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\"", "\"%require\"", + "\"%default-prec\"", "\"%define\"", "\"%defines\"", "\"%error-verbose\"", + "\"%expect\"", "\"%expect-rr\"", "\"%\"", "\"%file-prefix\"", + "\"%glr-parser\"", "\"%initial-action\"", "\"%language\"", + "\"%name-prefix\"", "\"%no-default-prec\"", "\"%no-lines\"", + "\"%nondeterministic-parser\"", "\"%output\"", "\"%require\"", "\"%skeleton\"", "\"%start\"", "\"%token-table\"", "\"%verbose\"", - "\"%yacc\"", "\"{...}\"", "\"char\"", "\"epilogue\"", "\"=\"", - "\"identifier\"", "\"identifier:\"", "\"%%\"", "\"|\"", "\"%{...%}\"", - "\";\"", "\"\"", "\"<*>\"", "\"<>\"", "\"%union\"", "$accept", - "input", "prologue_declarations", "prologue_declaration", - "grammar_declaration", "union_name", "symbol_declaration", "$@1", "$@2", + "\"%yacc\"", "\"{...}\"", "\"%?{...}\"", "\"[identifier]\"", "\"char\"", + "\"epilogue\"", "\"=\"", "\"identifier\"", "\"identifier:\"", "\"%%\"", + "\"|\"", "\"%{...%}\"", "\";\"", "\"\"", "\"<*>\"", "\"<>\"", + "\"%param\"", "\"%union\"", "$accept", "input", "prologue_declarations", + "prologue_declaration", "$@1", "params", "grammar_declaration", + "union_name", "symbol_declaration", "$@2", "$@3", "precedence_declaration", "precedence_declarator", "tag.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 + "rules_or_grammar_declaration", "rules", "$@4", "rhses.1", "rhs", + "named_ref.opt", "variable", "content.opt", "braceless", "id", + "id_colon", "symbol", "string_as_id", "epilogue.opt", 0 }; #endif @@ -667,164 +702,162 @@ 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 + 305, 306, 307, 308, 309, 310, 311 }; # endif -#define YYPACT_NINF -81 +#define YYPACT_NINF -50 + +#define yypact_value_is_default(yystate) \ + ((yystate) == (-50)) -#define YYTABLE_NINF -106 +#define YYTABLE_NINF -110 + +#define yytable_value_is_error(yytable_value) \ + YYID (0) /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ static const yytype_int16 yypact[] = { - -81, 23, 111, -81, -81, -81, -28, -12, -8, -81, - -81, -81, -81, -13, -81, -81, 14, 43, -81, 48, - 49, 2, -81, 10, 53, 34, -81, 13, -81, -81, - -81, 26, 36, -81, 54, 78, 0, -81, -81, -81, - 58, -81, -81, 41, -81, -81, -81, -81, 28, -24, - -24, 0, 31, 31, -81, 44, -81, -81, -81, 81, - -81, -81, -81, -81, 88, -81, -81, -81, -81, 89, - -81, 91, -81, -81, -81, -81, -81, -81, -81, -81, - -81, 42, -81, 47, 1, -81, -81, -81, -81, 44, - -81, 0, -81, -81, -24, 40, -24, 0, -81, -81, - -81, -81, 31, -81, -81, 31, -81, -81, -81, -81, - -81, -81, -81, -81, 50, -81, -81, -81, -81, 0, - -81, 93, -81, 98, -81, -81, -81, -81, -14, 155, - -81, -81, -81, -81, -81, 0, 99, 51, -81, -81, - 155, -81, -81, -81 + -50, 4, 107, -50, -50, -50, -20, 3, 11, -50, + -50, -50, -50, 14, -50, 12, 68, -50, 72, 73, + -50, 0, -50, 45, 86, 2, -50, -50, -50, 17, + 95, 96, 32, -50, -50, -50, 16, -50, -50, -50, + 54, -50, -50, -50, -50, 49, -2, -2, 32, 27, + 27, -50, 63, -50, -50, -50, 37, -50, -50, -50, + -50, 101, -50, -50, -50, 103, -50, 104, -50, -50, + -50, -50, -50, -50, -50, -50, 57, -50, 58, 1, + -50, -50, 79, 70, -50, 63, -50, 32, -50, -50, + -2, 64, -2, 32, -50, -50, -50, -50, 27, -50, + -50, 27, -50, -50, -50, -50, -50, -50, -50, -50, + -50, 78, -50, -50, -50, -50, -50, 83, -50, 32, + -50, 143, -50, 145, -50, -50, -50, -50, -50, -50, + -50, -50, -50, 43, 50, -50, -50, 32, 146, 97, + 79, -50, 79, 50, -50, -50, -50, -50, -50 }; - /* YYDEFACT[S] -- default rule to reduce with in state S when YYTABLE - does not specify something else to do. Zero means the default is an - error. */ + /* YYDEFACT[S] -- default reduction number in state S. Performed when + YYTABLE does not specify something else to do. Zero means the default + is an error. */ static const yytype_uint8 yydefact[] = { 3, 0, 0, 1, 49, 47, 0, 0, 0, 53, - 54, 55, 56, 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, 57, 0, - 0, 0, 0, 0, 98, 0, 42, 95, 94, 96, - 10, 12, 13, 14, 0, 17, 18, 19, 21, 0, - 25, 0, 27, 29, 30, 104, 100, 99, 102, 37, - 103, 0, 101, 0, 0, 78, 80, 83, 45, 0, - 58, 0, 71, 76, 50, 72, 48, 51, 63, 68, - 69, 70, 38, 65, 67, 39, 43, 97, 8, 15, - 22, 26, 82, 81, 0, 79, 2, 88, 46, 52, - 59, 61, 77, 73, 74, 64, 66, 106, 84, 85, - 60, 62, 75, 88, 87, 0, 0, 0, 90, 89, - 86, 91, 92, 93 + 54, 55, 56, 0, 40, 0, 9, 11, 0, 0, + 7, 0, 16, 0, 0, 0, 41, 21, 22, 0, + 0, 0, 0, 29, 30, 31, 0, 6, 32, 25, + 44, 4, 5, 36, 35, 57, 0, 0, 0, 0, + 0, 102, 0, 42, 98, 97, 99, 10, 12, 13, + 14, 0, 17, 18, 19, 0, 23, 0, 27, 28, + 108, 104, 103, 106, 37, 107, 0, 105, 0, 0, + 78, 80, 95, 0, 45, 0, 58, 0, 71, 76, + 50, 72, 48, 51, 63, 68, 69, 70, 38, 65, + 67, 39, 43, 101, 100, 8, 15, 20, 24, 82, + 81, 0, 79, 2, 96, 83, 34, 26, 46, 52, + 59, 61, 77, 73, 74, 64, 66, 110, 88, 33, + 60, 62, 75, 84, 85, 88, 87, 0, 0, 0, + 95, 91, 95, 86, 92, 93, 94, 90, 89 }; /* YYPGOTO[NTERM-NUM]. */ -static const yytype_int8 yypgoto[] = +static const yytype_int16 yypgoto[] = { - -81, -81, -81, -81, 100, -81, -81, -81, -81, -81, - -81, -81, -81, -11, -81, 56, -80, -54, 60, -81, - 22, -81, -81, -81, -21, -81, -81, -51, -22, -81, - -36, -76, -81 + -50, -50, -50, -50, -50, -50, 149, -50, -50, -50, + -50, -50, -50, -50, -50, 33, -50, 106, -42, -4, + 112, -50, 74, -50, -50, -50, 19, -45, -50, -50, + -16, -8, -50, -32, -49, -50 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 1, 2, 44, 83, 89, 46, 50, 49, 47, - 48, 91, 119, 120, 97, 102, 103, 93, 94, 84, - 85, 86, 117, 128, 129, 59, 108, 56, 78, 87, - 104, 80, 116 + -1, 1, 2, 41, 83, 117, 78, 85, 43, 47, + 46, 44, 45, 87, 119, 120, 93, 98, 99, 89, + 90, 79, 80, 81, 128, 133, 134, 115, 56, 105, + 53, 73, 82, 100, 75, 113 }; /* 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. */ + number is the opposite. If YYTABLE_NINF, syntax error. */ static const yytype_int16 yytable[] = { - 79, -105, 81, 75, 106, 63, 4, 5, 6, 7, - 8, 9, 10, 11, 12, 98, 68, 57, 13, 124, - 15, 76, 126, 3, 77, 126, 51, 95, 95, 70, - 92, 54, 52, 28, 75, 55, 53, 133, 118, 134, - 122, 36, 122, 75, 123, 76, 60, 132, 77, 64, - 82, 114, 61, 62, 65, 121, 66, 73, 43, 81, - 69, 125, 58, 4, 5, 6, 7, 8, 9, 10, - 11, 12, 95, 71, 95, 13, 76, 15, 67, 77, - 72, 74, 90, 121, 107, 99, 100, 101, 54, 88, - 28, 109, 110, 139, 111, 112, 127, 131, 36, 141, - 113, 75, 45, 142, 139, 143, 115, 82, 130, 105, - 96, 0, 140, 0, 0, 43, 4, 5, 6, 7, - 8, 9, 10, 11, 12, 0, 0, 0, 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, 0, 0, 0, 75, 0, - 0, 40, 0, 41, 42, 0, 0, 0, 43, 135, - 136, 137, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 138, - 76, 0, 0, 77 + 74, -109, 76, 60, 3, 64, 4, 5, 6, 7, + 8, 9, 10, 11, 12, 54, 94, 76, 13, 14, + 66, 4, 5, 6, 7, 8, 9, 10, 11, 12, + 70, 26, 48, 13, 14, 70, 102, 32, 91, 91, + 103, 71, 124, 49, 72, 61, 26, 65, 77, 111, + 88, 50, 32, 70, 51, 121, 126, 40, 55, 126, + 52, 125, 67, 77, 137, 138, 139, 70, 123, 118, + 71, 57, 40, 72, 132, 71, 58, 59, 72, 95, + 96, 97, 91, 104, 91, 62, 122, 121, 122, 63, + 140, 141, 135, 71, 136, 147, 72, 148, 68, 69, + 84, 86, 142, 51, 106, 144, 107, 108, 109, 110, + 116, 142, 4, 5, 6, 7, 8, 9, 10, 11, + 12, 114, 127, 129, 13, 14, 15, 16, 17, 18, + 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, + 29, 30, 31, 32, 33, 34, 35, 131, 70, 146, + 145, 42, 130, 112, 143, 36, 101, 37, 38, 92, + 0, 0, 39, 40 }; static const yytype_int16 yycheck[] = { - 36, 0, 1, 3, 55, 3, 5, 6, 7, 8, - 9, 10, 11, 12, 13, 51, 3, 3, 17, 95, - 19, 45, 102, 0, 48, 105, 54, 49, 50, 3, - 54, 44, 44, 32, 3, 48, 44, 51, 89, 53, - 94, 40, 96, 3, 4, 45, 3, 123, 48, 47, - 49, 50, 4, 4, 44, 91, 3, 3, 57, 1, - 47, 97, 48, 5, 6, 7, 8, 9, 10, 11, - 12, 13, 94, 47, 96, 17, 45, 19, 44, 48, - 44, 3, 54, 119, 3, 54, 55, 56, 44, 48, - 32, 3, 3, 129, 3, 53, 46, 4, 40, 135, - 53, 3, 2, 4, 140, 54, 84, 49, 119, 53, - 50, -1, 133, -1, -1, 57, 5, 6, 7, 8, - 9, 10, 11, 12, 13, -1, -1, -1, 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, -1, -1, -1, 3, -1, - -1, 50, -1, 52, 53, -1, -1, -1, 57, 14, - 15, 16, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 44, - 45, -1, -1, 48 + 32, 0, 1, 3, 0, 3, 5, 6, 7, 8, + 9, 10, 11, 12, 13, 3, 48, 1, 17, 18, + 3, 5, 6, 7, 8, 9, 10, 11, 12, 13, + 3, 30, 52, 17, 18, 3, 52, 36, 46, 47, + 3, 43, 91, 40, 46, 45, 30, 45, 47, 48, + 52, 40, 36, 3, 40, 87, 98, 56, 46, 101, + 46, 93, 45, 47, 14, 15, 16, 3, 4, 85, + 43, 3, 56, 46, 123, 43, 4, 4, 46, 52, + 53, 54, 90, 46, 92, 40, 90, 119, 92, 3, + 40, 41, 49, 43, 51, 140, 46, 142, 3, 3, + 46, 52, 134, 40, 3, 137, 3, 3, 51, 51, + 40, 143, 5, 6, 7, 8, 9, 10, 11, 12, + 13, 42, 44, 40, 17, 18, 19, 20, 21, 22, + 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, + 33, 34, 35, 36, 37, 38, 39, 4, 3, 52, + 4, 2, 119, 79, 135, 48, 50, 50, 51, 47, + -1, -1, 55, 56 }; /* STOS_[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const yytype_uint8 yystos[] = { - 0, 59, 60, 0, 5, 6, 7, 8, 9, 10, + 0, 58, 59, 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, - 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, - 50, 52, 53, 57, 61, 62, 64, 67, 68, 66, - 65, 54, 44, 44, 44, 48, 85, 3, 48, 83, - 3, 4, 4, 3, 47, 44, 3, 44, 3, 47, - 3, 47, 44, 3, 3, 3, 45, 48, 86, 88, - 89, 1, 49, 62, 77, 78, 79, 87, 48, 63, - 54, 69, 54, 75, 76, 86, 76, 72, 88, 54, - 55, 56, 73, 74, 88, 73, 85, 3, 84, 3, - 3, 3, 53, 53, 50, 78, 90, 80, 85, 70, - 71, 88, 75, 4, 89, 88, 74, 46, 81, 82, - 71, 4, 89, 51, 53, 14, 15, 16, 44, 88, - 82, 88, 4, 54 + 34, 35, 36, 37, 38, 39, 48, 50, 51, 55, + 56, 60, 63, 65, 68, 69, 67, 66, 52, 40, + 40, 40, 46, 87, 3, 46, 85, 3, 4, 4, + 3, 45, 40, 3, 3, 45, 3, 45, 3, 3, + 3, 43, 46, 88, 90, 91, 1, 47, 63, 78, + 79, 80, 89, 61, 46, 64, 52, 70, 52, 76, + 77, 88, 77, 73, 90, 52, 53, 54, 74, 75, + 90, 74, 87, 3, 46, 86, 3, 3, 3, 51, + 51, 48, 79, 92, 42, 84, 40, 62, 87, 71, + 72, 90, 76, 4, 91, 90, 75, 44, 81, 40, + 72, 4, 91, 82, 83, 49, 51, 14, 15, 16, + 40, 41, 90, 83, 90, 4, 52, 84, 84 }; /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint8 yyr1[] = { - 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, 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, 86, - 86, 87, 88, 88, 89, 90, 90 + 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, 61, 60, 60, 60, 60, + 60, 60, 60, 62, 62, 63, 63, 63, 63, 63, + 63, 63, 63, 63, 64, 64, 63, 66, 65, 67, + 65, 65, 68, 69, 69, 69, 69, 70, 70, 71, + 71, 72, 72, 73, 73, 74, 74, 75, 75, 75, + 75, 76, 76, 76, 76, 76, 77, 77, 78, 78, + 79, 79, 79, 81, 80, 82, 82, 82, 83, 83, + 83, 83, 83, 83, 83, 84, 84, 85, 85, 86, + 86, 86, 87, 88, 88, 89, 90, 90, 91, 92, + 92 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -832,15 +865,16 @@ 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, 2, - 2, 1, 1, 1, 1, 1, 1, 2, 3, 3, + 3, 1, 1, 2, 3, 0, 3, 2, 2, 1, + 1, 1, 1, 2, 1, 1, 1, 2, 3, 3, 1, 1, 2, 3, 0, 1, 3, 0, 3, 0, 3, 3, 3, 1, 1, 1, 1, 0, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 1, 1, 1, 1, 1, 2, 2, 3, 1, 2, 1, 2, - 1, 2, 2, 0, 3, 1, 3, 2, 0, 2, - 2, 3, 3, 3, 1, 1, 0, 1, 1, 1, - 1, 1, 1, 1, 1, 0, 2 + 1, 2, 2, 0, 4, 1, 3, 2, 0, 3, + 3, 2, 3, 3, 3, 0, 1, 1, 1, 0, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, + 2 }; @@ -856,9 +890,18 @@ static const yytype_uint8 yyr2[] = /* 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) @@ -868,7 +911,6 @@ do \ { \ yychar = (Token); \ yylval = (Value); \ - yytoken = YYTRANSLATE (yychar); \ YYPOPSTACK (1); \ goto yybackup; \ } \ @@ -915,7 +957,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, \ @@ -991,146 +1033,193 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp) { case 3: // "string" -/* Line 647 of yacc.c */ -#line 181 "parse-gram.y" +/* Line 729 of yacc.c */ +#line 175 "src/parse-gram.y" { fputs (quotearg_style (c_quoting_style, ((*yyvaluep).chars)), stderr); } -/* Line 647 of yacc.c */ -#line 999 "../../src/parse-gram.c" +/* Line 729 of yacc.c */ +#line 1041 "src/parse-gram.c" break; case 4: // "integer" -/* Line 647 of yacc.c */ -#line 192 "parse-gram.y" +/* Line 729 of yacc.c */ +#line 188 "src/parse-gram.y" { fprintf (stderr, "%d", ((*yyvaluep).integer)); } -/* Line 647 of yacc.c */ -#line 1008 "../../src/parse-gram.c" +/* Line 729 of yacc.c */ +#line 1050 "src/parse-gram.c" break; - case 44: // "{...}" + case 24: // "%" + +/* Line 729 of yacc.c */ +#line 184 "src/parse-gram.y" + { fprintf (stderr, "%%%s", ((*yyvaluep).uniqstr)); } +/* Line 729 of yacc.c */ +#line 1059 "src/parse-gram.c" + break; -/* Line 647 of yacc.c */ -#line 183 "parse-gram.y" + case 40: // "{...}" + +/* Line 729 of yacc.c */ +#line 177 "src/parse-gram.y" { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).code)); } -/* Line 647 of yacc.c */ -#line 1017 "../../src/parse-gram.c" +/* Line 729 of yacc.c */ +#line 1068 "src/parse-gram.c" break; - case 45: // "char" + case 42: // "[identifier]" -/* Line 647 of yacc.c */ -#line 175 "parse-gram.y" +/* Line 729 of yacc.c */ +#line 182 "src/parse-gram.y" + { fprintf (stderr, "[%s]", ((*yyvaluep).uniqstr)); } +/* Line 729 of yacc.c */ +#line 1077 "src/parse-gram.c" + break; + + case 43: // "char" + +/* Line 729 of yacc.c */ +#line 169 "src/parse-gram.y" { fputs (char_name (((*yyvaluep).character)), stderr); } -/* Line 647 of yacc.c */ -#line 1026 "../../src/parse-gram.c" +/* Line 729 of yacc.c */ +#line 1086 "src/parse-gram.c" break; - case 46: // "epilogue" + case 44: // "epilogue" -/* Line 647 of yacc.c */ -#line 183 "parse-gram.y" +/* Line 729 of yacc.c */ +#line 177 "src/parse-gram.y" { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); } -/* Line 647 of yacc.c */ -#line 1035 "../../src/parse-gram.c" +/* Line 729 of yacc.c */ +#line 1095 "src/parse-gram.c" break; - case 48: // "identifier" + case 46: // "identifier" -/* Line 647 of yacc.c */ -#line 188 "parse-gram.y" +/* Line 729 of yacc.c */ +#line 181 "src/parse-gram.y" { fputs (((*yyvaluep).uniqstr), stderr); } -/* Line 647 of yacc.c */ -#line 1044 "../../src/parse-gram.c" +/* Line 729 of yacc.c */ +#line 1104 "src/parse-gram.c" break; - case 49: // "identifier:" + case 47: // "identifier:" -/* Line 647 of yacc.c */ -#line 189 "parse-gram.y" +/* Line 729 of yacc.c */ +#line 183 "src/parse-gram.y" { fprintf (stderr, "%s:", ((*yyvaluep).uniqstr)); } -/* Line 647 of yacc.c */ -#line 1053 "../../src/parse-gram.c" +/* Line 729 of yacc.c */ +#line 1113 "src/parse-gram.c" break; - case 52: // "%{...%}" + case 50: // "%{...%}" -/* Line 647 of yacc.c */ -#line 183 "parse-gram.y" +/* Line 729 of yacc.c */ +#line 177 "src/parse-gram.y" { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); } -/* Line 647 of yacc.c */ -#line 1062 "../../src/parse-gram.c" +/* Line 729 of yacc.c */ +#line 1122 "src/parse-gram.c" break; - case 54: // "" + case 52: // "" -/* Line 647 of yacc.c */ -#line 187 "parse-gram.y" +/* Line 729 of yacc.c */ +#line 185 "src/parse-gram.y" { fprintf (stderr, "<%s>", ((*yyvaluep).uniqstr)); } -/* Line 647 of yacc.c */ -#line 1071 "../../src/parse-gram.c" +/* Line 729 of yacc.c */ +#line 1131 "src/parse-gram.c" break; - case 83: // variable + case 55: // "%param" -/* Line 647 of yacc.c */ -#line 188 "parse-gram.y" +/* Line 729 of yacc.c */ +#line 231 "src/parse-gram.y" + { + switch (((*yyvaluep).param)) + { +#define CASE(In, Out) \ + case param_ ## In: fputs ("%" #Out, stderr); break + CASE(lex, lex-param); + CASE(parse, parse-param); + CASE(both, param); +#undef CASE + case param_none: aver (false); break; + } +} +/* Line 729 of yacc.c */ +#line 1151 "src/parse-gram.c" + break; + + case 72: // symbol.prec + +/* Line 729 of yacc.c */ +#line 191 "src/parse-gram.y" + { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); } +/* Line 729 of yacc.c */ +#line 1160 "src/parse-gram.c" + break; + + case 85: // variable + +/* Line 729 of yacc.c */ +#line 181 "src/parse-gram.y" { fputs (((*yyvaluep).uniqstr), stderr); } -/* Line 647 of yacc.c */ -#line 1080 "../../src/parse-gram.c" +/* Line 729 of yacc.c */ +#line 1169 "src/parse-gram.c" break; - case 84: // content.opt + case 86: // content.opt -/* Line 647 of yacc.c */ -#line 183 "parse-gram.y" +/* Line 729 of yacc.c */ +#line 177 "src/parse-gram.y" { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); } -/* Line 647 of yacc.c */ -#line 1089 "../../src/parse-gram.c" +/* Line 729 of yacc.c */ +#line 1178 "src/parse-gram.c" break; - case 85: // braceless + case 87: // braceless -/* Line 647 of yacc.c */ -#line 183 "parse-gram.y" +/* Line 729 of yacc.c */ +#line 177 "src/parse-gram.y" { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); } -/* Line 647 of yacc.c */ -#line 1098 "../../src/parse-gram.c" +/* Line 729 of yacc.c */ +#line 1187 "src/parse-gram.c" break; - case 86: // id + case 88: // id -/* Line 647 of yacc.c */ -#line 195 "parse-gram.y" +/* Line 729 of yacc.c */ +#line 191 "src/parse-gram.y" { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); } -/* Line 647 of yacc.c */ -#line 1107 "../../src/parse-gram.c" +/* Line 729 of yacc.c */ +#line 1196 "src/parse-gram.c" break; - case 87: // id_colon + case 89: // id_colon -/* Line 647 of yacc.c */ -#line 196 "parse-gram.y" +/* Line 729 of yacc.c */ +#line 192 "src/parse-gram.y" { fprintf (stderr, "%s:", ((*yyvaluep).symbol)->tag); } -/* Line 647 of yacc.c */ -#line 1116 "../../src/parse-gram.c" +/* Line 729 of yacc.c */ +#line 1205 "src/parse-gram.c" break; - case 88: // symbol + case 90: // symbol -/* Line 647 of yacc.c */ -#line 195 "parse-gram.y" +/* Line 729 of yacc.c */ +#line 191 "src/parse-gram.y" { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); } -/* Line 647 of yacc.c */ -#line 1125 "../../src/parse-gram.c" +/* Line 729 of yacc.c */ +#line 1214 "src/parse-gram.c" break; - case 89: // string_as_id + case 91: // string_as_id -/* Line 647 of yacc.c */ -#line 195 "parse-gram.y" +/* Line 729 of yacc.c */ +#line 191 "src/parse-gram.y" { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); } -/* Line 647 of yacc.c */ -#line 1134 "../../src/parse-gram.c" +/* Line 729 of yacc.c */ +#line 1223 "src/parse-gram.c" break; default: @@ -1369,26 +1458,27 @@ yytnamerr (char *yyres, const char *yystr) } # endif -/* Copy into YYRESULT an error message about the unexpected token - YYTOKEN 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 yytoken) +/* 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 { 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; @@ -1396,7 +1486,8 @@ yysyntax_error (char *yyresult, int yystate, int yytoken) char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; /* 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. */ @@ -1410,7 +1501,8 @@ yysyntax_error (char *yyresult, int yystate, int yytoken) 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) { @@ -1420,11 +1512,17 @@ yysyntax_error (char *yyresult, int yystate, int yytoken) } 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; } - switch (yycount) + switch (yycount) { #define YYCASE_(N, S) \ case N: \ @@ -1439,32 +1537,42 @@ yysyntax_error (char *yyresult, int yystate, int yytoken) } yysize1 = yysize + yystrlen (yyformat); - yysize_overflow |= (yysize1 < yysize); + 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 = *yyformat) != '\0') - if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount) - { - yyp += yytnamerr (yyp, yyarg[yyi++]); - yyformat += 2; - } - else - { - yyp++; - yyformat++; - } - } - 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 */ @@ -1502,6 +1610,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp) } } + /* Prevent warnings from -Wmissing-prototypes. */ #ifdef YYPARSE_PARAM #if (defined __STDC__ || defined __C99__FUNC__ \ @@ -1520,12 +1629,9 @@ int yyparse (); #endif /* ! YYPARSE_PARAM */ - - - -/*-------------------------. -| yyparse or yypush_parse. | -`-------------------------*/ +/*----------. +| yyparse. | +`----------*/ #ifdef YYPARSE_PARAM #if (defined __STDC__ || defined __C99__FUNC__ \ @@ -1589,7 +1695,7 @@ YYLTYPE yylloc; YYLTYPE *yylsp; /* The locations where the error started and ended. */ - YYLTYPE yyerror_range[2]; + YYLTYPE yyerror_range[3]; YYSIZE_T yystacksize; @@ -1636,23 +1742,23 @@ YYLTYPE yylloc; 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. */ -/* Line 1167 of yacc.c */ -#line 84 "parse-gram.y" +/* Line 1214 of yacc.c */ +#line 80 "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 1167 of yacc.c */ -#line 1656 "../../src/parse-gram.c" +/* Line 1214 of yacc.c */ +#line 1762 "src/parse-gram.c" yylsp[0] = yylloc; goto yysetstate; @@ -1751,7 +1857,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. */ @@ -1782,7 +1888,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; @@ -1838,8 +1944,8 @@ yyreduce: switch (yyn) { case 6: -/* Line 1380 of yacc.c */ -#line 219 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 267 "src/parse-gram.y" { code_props plain_code; code_props_plain_init (&plain_code, (yyvsp[0].chars), (yylsp[0])); @@ -1849,103 +1955,107 @@ yyreduce: plain_code.code, (yylsp[0])); code_scanner_last_string_free (); } -/* Line 1380 of yacc.c */ -#line 1854 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 1960 "src/parse-gram.c" break; case 7: -/* Line 1380 of yacc.c */ -#line 228 "parse-gram.y" - { debug_flag = true; } -/* Line 1380 of yacc.c */ -#line 1862 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 277 "src/parse-gram.y" + { + muscle_percent_define_ensure ((yyvsp[0].uniqstr), (yylsp[0]), true); + } +/* Line 1427 of yacc.c */ +#line 1970 "src/parse-gram.c" break; case 8: -/* Line 1380 of yacc.c */ -#line 230 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 281 "src/parse-gram.y" { - muscle_percent_define_insert ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].chars)); + muscle_percent_define_insert ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].chars), + MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE); } -/* Line 1380 of yacc.c */ -#line 1872 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 1981 "src/parse-gram.c" break; case 9: -/* Line 1380 of yacc.c */ -#line 233 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 285 "src/parse-gram.y" { defines_flag = true; } -/* Line 1380 of yacc.c */ -#line 1880 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 1989 "src/parse-gram.c" break; case 10: -/* Line 1380 of yacc.c */ -#line 235 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 287 "src/parse-gram.y" { defines_flag = true; spec_defines_file = xstrdup ((yyvsp[0].chars)); } -/* Line 1380 of yacc.c */ -#line 1891 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2000 "src/parse-gram.c" break; case 11: -/* Line 1380 of yacc.c */ -#line 240 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 292 "src/parse-gram.y" { - muscle_percent_define_insert ("error_verbose", (yyloc), ""); + muscle_percent_define_insert ("parse.error", (yylsp[0]), "verbose", + MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE); } -/* Line 1380 of yacc.c */ -#line 1901 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2011 "src/parse-gram.c" break; case 12: -/* Line 1380 of yacc.c */ -#line 243 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 296 "src/parse-gram.y" { expected_sr_conflicts = (yyvsp[0].integer); } -/* Line 1380 of yacc.c */ -#line 1909 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2019 "src/parse-gram.c" break; case 13: -/* Line 1380 of yacc.c */ -#line 244 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 297 "src/parse-gram.y" { expected_rr_conflicts = (yyvsp[0].integer); } -/* Line 1380 of yacc.c */ -#line 1917 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2027 "src/parse-gram.c" break; case 14: -/* Line 1380 of yacc.c */ -#line 245 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 298 "src/parse-gram.y" { spec_file_prefix = (yyvsp[0].chars); } -/* Line 1380 of yacc.c */ -#line 1925 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2035 "src/parse-gram.c" break; case 15: -/* Line 1380 of yacc.c */ -#line 246 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 299 "src/parse-gram.y" { spec_file_prefix = (yyvsp[0].chars); } -/* Line 1380 of yacc.c */ -#line 1933 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2043 "src/parse-gram.c" break; case 16: -/* Line 1380 of yacc.c */ -#line 248 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 301 "src/parse-gram.y" { nondeterministic_parser = true; glr_parser = true; } -/* Line 1380 of yacc.c */ -#line 1944 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2054 "src/parse-gram.c" break; case 17: -/* Line 1380 of yacc.c */ -#line 253 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 306 "src/parse-gram.y" { code_props action; code_props_symbol_action_init (&action, (yyvsp[0].code), (yylsp[0])); @@ -1954,120 +2064,93 @@ yyreduce: muscle_code_grow ("initial_action", action.code, (yylsp[0])); code_scanner_last_string_free (); } -/* Line 1380 of yacc.c */ -#line 1959 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2069 "src/parse-gram.c" break; case 18: -/* Line 1380 of yacc.c */ -#line 261 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 314 "src/parse-gram.y" { language_argmatch ((yyvsp[0].chars), grammar_prio, (yylsp[-1])); } -/* Line 1380 of yacc.c */ -#line 1967 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2077 "src/parse-gram.c" break; case 19: -/* Line 1380 of yacc.c */ -#line 262 "parse-gram.y" - { add_param ("lex_param", (yyvsp[0].code), (yylsp[0])); } -/* Line 1380 of yacc.c */ -#line 1975 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 315 "src/parse-gram.y" + { spec_name_prefix = (yyvsp[0].chars); } +/* Line 1427 of yacc.c */ +#line 2085 "src/parse-gram.c" break; case 20: -/* Line 1380 of yacc.c */ -#line 263 "parse-gram.y" - { locations_flag = true; } -/* Line 1380 of yacc.c */ -#line 1983 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 316 "src/parse-gram.y" + { spec_name_prefix = (yyvsp[0].chars); } +/* Line 1427 of yacc.c */ +#line 2093 "src/parse-gram.c" break; case 21: -/* Line 1380 of yacc.c */ -#line 264 "parse-gram.y" - { spec_name_prefix = (yyvsp[0].chars); } -/* Line 1380 of yacc.c */ -#line 1991 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 317 "src/parse-gram.y" + { no_lines_flag = true; } +/* Line 1427 of yacc.c */ +#line 2101 "src/parse-gram.c" break; case 22: -/* Line 1380 of yacc.c */ -#line 265 "parse-gram.y" - { spec_name_prefix = (yyvsp[0].chars); } -/* Line 1380 of yacc.c */ -#line 1999 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 318 "src/parse-gram.y" + { nondeterministic_parser = true; } +/* Line 1427 of yacc.c */ +#line 2109 "src/parse-gram.c" break; case 23: -/* Line 1380 of yacc.c */ -#line 266 "parse-gram.y" - { no_lines_flag = true; } -/* Line 1380 of yacc.c */ -#line 2007 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 319 "src/parse-gram.y" + { spec_outfile = (yyvsp[0].chars); } +/* Line 1427 of yacc.c */ +#line 2117 "src/parse-gram.c" break; case 24: -/* Line 1380 of yacc.c */ -#line 267 "parse-gram.y" - { nondeterministic_parser = true; } -/* Line 1380 of yacc.c */ -#line 2015 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 320 "src/parse-gram.y" + { spec_outfile = (yyvsp[0].chars); } +/* Line 1427 of yacc.c */ +#line 2125 "src/parse-gram.c" break; case 25: -/* Line 1380 of yacc.c */ -#line 268 "parse-gram.y" - { spec_outfile = (yyvsp[0].chars); } -/* Line 1380 of yacc.c */ -#line 2023 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 321 "src/parse-gram.y" + { current_param = (yyvsp[0].param); } +/* Line 1427 of yacc.c */ +#line 2133 "src/parse-gram.c" break; case 26: -/* Line 1380 of yacc.c */ -#line 269 "parse-gram.y" - { spec_outfile = (yyvsp[0].chars); } -/* Line 1380 of yacc.c */ -#line 2031 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 321 "src/parse-gram.y" + { current_param = param_none; } +/* Line 1427 of yacc.c */ +#line 2141 "src/parse-gram.c" break; case 27: -/* Line 1380 of yacc.c */ -#line 270 "parse-gram.y" - { add_param ("parse_param", (yyvsp[0].code), (yylsp[0])); } -/* Line 1380 of yacc.c */ -#line 2039 "../../src/parse-gram.c" - break; - - case 28: -/* Line 1380 of yacc.c */ -#line 272 "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[0]), ""); - /* 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[0]), ""); - } -/* Line 1380 of yacc.c */ -#line 2058 "../../src/parse-gram.c" - break; - - case 29: -/* Line 1380 of yacc.c */ -#line 284 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 322 "src/parse-gram.y" { version_check (&(yylsp[0]), (yyvsp[0].chars)); } -/* Line 1380 of yacc.c */ -#line 2066 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2149 "src/parse-gram.c" break; - case 30: -/* Line 1380 of yacc.c */ -#line 286 "parse-gram.y" + case 28: +/* Line 1427 of yacc.c */ +#line 324 "src/parse-gram.y" { char const *skeleton_user = (yyvsp[0].chars); if (strchr (skeleton_user, '/')) @@ -2091,183 +2174,199 @@ yyreduce: } skeleton_arg (skeleton_user, grammar_prio, (yylsp[-1])); } -/* Line 1380 of yacc.c */ -#line 2096 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2179 "src/parse-gram.c" break; - case 31: -/* Line 1380 of yacc.c */ -#line 309 "parse-gram.y" + case 29: +/* Line 1427 of yacc.c */ +#line 347 "src/parse-gram.y" { token_table_flag = true; } -/* Line 1380 of yacc.c */ -#line 2104 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2187 "src/parse-gram.c" break; - case 32: -/* Line 1380 of yacc.c */ -#line 310 "parse-gram.y" + case 30: +/* Line 1427 of yacc.c */ +#line 348 "src/parse-gram.y" { report_flag |= report_states; } -/* Line 1380 of yacc.c */ -#line 2112 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2195 "src/parse-gram.c" break; - case 33: -/* Line 1380 of yacc.c */ -#line 311 "parse-gram.y" + case 31: +/* Line 1427 of yacc.c */ +#line 349 "src/parse-gram.y" { yacc_flag = true; } -/* Line 1380 of yacc.c */ -#line 2120 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2203 "src/parse-gram.c" + break; + + case 33: +/* Line 1427 of yacc.c */ +#line 354 "src/parse-gram.y" + { add_param (current_param, (yyvsp[0].code), (yylsp[0])); } +/* Line 1427 of yacc.c */ +#line 2211 "src/parse-gram.c" + break; + + case 34: +/* Line 1427 of yacc.c */ +#line 355 "src/parse-gram.y" + { add_param (current_param, (yyvsp[0].code), (yylsp[0])); } +/* Line 1427 of yacc.c */ +#line 2219 "src/parse-gram.c" break; case 37: -/* Line 1380 of yacc.c */ -#line 319 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 367 "src/parse-gram.y" { grammar_start_symbol_set ((yyvsp[0].symbol), (yylsp[0])); } -/* Line 1380 of yacc.c */ -#line 2130 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2229 "src/parse-gram.c" break; case 38: -/* Line 1380 of yacc.c */ -#line 323 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 371 "src/parse-gram.y" { symbol_list *list; for (list = (yyvsp[0].list); list; list = list->next) symbol_list_destructor_set (list, (yyvsp[-1].code), (yylsp[-1])); symbol_list_free ((yyvsp[0].list)); } -/* Line 1380 of yacc.c */ -#line 2143 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2242 "src/parse-gram.c" break; case 39: -/* Line 1380 of yacc.c */ -#line 330 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 378 "src/parse-gram.y" { symbol_list *list; for (list = (yyvsp[0].list); list; list = list->next) symbol_list_printer_set (list, (yyvsp[-1].code), (yylsp[-1])); symbol_list_free ((yyvsp[0].list)); } -/* Line 1380 of yacc.c */ -#line 2156 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2255 "src/parse-gram.c" break; case 40: -/* Line 1380 of yacc.c */ -#line 337 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 385 "src/parse-gram.y" { default_prec = true; } -/* Line 1380 of yacc.c */ -#line 2166 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2265 "src/parse-gram.c" break; case 41: -/* Line 1380 of yacc.c */ -#line 341 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 389 "src/parse-gram.y" { default_prec = false; } -/* Line 1380 of yacc.c */ -#line 2176 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2275 "src/parse-gram.c" break; case 42: -/* Line 1380 of yacc.c */ -#line 345 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 393 "src/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[0].chars), (yylsp[0])); code_scanner_last_string_free (); } -/* Line 1380 of yacc.c */ -#line 2189 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2288 "src/parse-gram.c" break; case 43: -/* Line 1380 of yacc.c */ -#line 352 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 400 "src/parse-gram.y" { muscle_percent_code_grow ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].chars), (yylsp[0])); code_scanner_last_string_free (); } -/* Line 1380 of yacc.c */ -#line 2200 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2299 "src/parse-gram.c" break; case 44: -/* Line 1380 of yacc.c */ -#line 366 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 414 "src/parse-gram.y" {} -/* Line 1380 of yacc.c */ -#line 2208 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2307 "src/parse-gram.c" break; case 45: -/* Line 1380 of yacc.c */ -#line 367 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 415 "src/parse-gram.y" { muscle_code_grow ("union_name", (yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1380 of yacc.c */ -#line 2216 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2315 "src/parse-gram.c" break; case 46: -/* Line 1380 of yacc.c */ -#line 372 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 420 "src/parse-gram.y" { union_seen = true; muscle_code_grow ("stype", (yyvsp[0].chars), (yylsp[0])); code_scanner_last_string_free (); } -/* Line 1380 of yacc.c */ -#line 2228 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2327 "src/parse-gram.c" break; case 47: -/* Line 1380 of yacc.c */ -#line 383 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 431 "src/parse-gram.y" { current_class = nterm_sym; } -/* Line 1380 of yacc.c */ -#line 2236 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2335 "src/parse-gram.c" break; case 48: -/* Line 1380 of yacc.c */ -#line 384 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 432 "src/parse-gram.y" { current_class = unknown_sym; current_type = NULL; } -/* Line 1380 of yacc.c */ -#line 2247 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2346 "src/parse-gram.c" break; case 49: -/* Line 1380 of yacc.c */ -#line 388 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 436 "src/parse-gram.y" { current_class = token_sym; } -/* Line 1380 of yacc.c */ -#line 2255 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2354 "src/parse-gram.c" break; case 50: -/* Line 1380 of yacc.c */ -#line 389 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 437 "src/parse-gram.y" { current_class = unknown_sym; current_type = NULL; } -/* Line 1380 of yacc.c */ -#line 2266 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2365 "src/parse-gram.c" break; case 51: -/* Line 1380 of yacc.c */ -#line 394 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 442 "src/parse-gram.y" { symbol_list *list; tag_seen = true; @@ -2275,13 +2374,13 @@ yyreduce: symbol_type_set (list->content.sym, (yyvsp[-1].uniqstr), (yylsp[-1])); symbol_list_free ((yyvsp[0].list)); } -/* Line 1380 of yacc.c */ -#line 2280 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2379 "src/parse-gram.c" break; case 52: -/* Line 1380 of yacc.c */ -#line 405 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 453 "src/parse-gram.y" { symbol_list *list; ++current_prec; @@ -2293,316 +2392,348 @@ yyreduce: symbol_list_free ((yyvsp[0].list)); current_type = NULL; } -/* Line 1380 of yacc.c */ -#line 2298 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2397 "src/parse-gram.c" break; case 53: -/* Line 1380 of yacc.c */ -#line 419 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 467 "src/parse-gram.y" { (yyval.assoc) = left_assoc; } -/* Line 1380 of yacc.c */ -#line 2306 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2405 "src/parse-gram.c" break; case 54: -/* Line 1380 of yacc.c */ -#line 420 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 468 "src/parse-gram.y" { (yyval.assoc) = right_assoc; } -/* Line 1380 of yacc.c */ -#line 2314 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2413 "src/parse-gram.c" break; case 55: -/* Line 1380 of yacc.c */ -#line 421 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 469 "src/parse-gram.y" { (yyval.assoc) = non_assoc; } -/* Line 1380 of yacc.c */ -#line 2322 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2421 "src/parse-gram.c" break; case 56: -/* Line 1380 of yacc.c */ -#line 422 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 470 "src/parse-gram.y" { (yyval.assoc) = precedence_assoc; } -/* Line 1380 of yacc.c */ -#line 2330 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2429 "src/parse-gram.c" break; case 57: -/* Line 1380 of yacc.c */ -#line 426 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 474 "src/parse-gram.y" { current_type = NULL; } -/* Line 1380 of yacc.c */ -#line 2338 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2437 "src/parse-gram.c" break; case 58: -/* Line 1380 of yacc.c */ -#line 427 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 475 "src/parse-gram.y" { current_type = (yyvsp[0].uniqstr); tag_seen = true; } -/* Line 1380 of yacc.c */ -#line 2346 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2445 "src/parse-gram.c" break; case 59: -/* Line 1380 of yacc.c */ -#line 433 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 481 "src/parse-gram.y" { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); } -/* Line 1380 of yacc.c */ -#line 2354 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2453 "src/parse-gram.c" break; case 60: -/* Line 1380 of yacc.c */ -#line 435 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 483 "src/parse-gram.y" { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); } -/* Line 1380 of yacc.c */ -#line 2362 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2461 "src/parse-gram.c" break; case 61: -/* Line 1380 of yacc.c */ -#line 439 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 487 "src/parse-gram.y" { (yyval.symbol) = (yyvsp[0].symbol); } -/* Line 1380 of yacc.c */ -#line 2370 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2469 "src/parse-gram.c" break; case 62: -/* Line 1380 of yacc.c */ -#line 440 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 488 "src/parse-gram.y" { (yyval.symbol) = (yyvsp[-1].symbol); symbol_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer), (yylsp[0])); } -/* Line 1380 of yacc.c */ -#line 2378 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2477 "src/parse-gram.c" break; case 63: -/* Line 1380 of yacc.c */ -#line 446 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 494 "src/parse-gram.y" { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); } -/* Line 1380 of yacc.c */ -#line 2386 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2485 "src/parse-gram.c" break; case 64: -/* Line 1380 of yacc.c */ -#line 448 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 496 "src/parse-gram.y" { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); } -/* Line 1380 of yacc.c */ -#line 2394 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2493 "src/parse-gram.c" break; case 65: -/* Line 1380 of yacc.c */ -#line 452 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 500 "src/parse-gram.y" { (yyval.list) = (yyvsp[0].list); } -/* Line 1380 of yacc.c */ -#line 2402 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2501 "src/parse-gram.c" break; case 66: -/* Line 1380 of yacc.c */ -#line 453 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 501 "src/parse-gram.y" { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), (yyvsp[0].list)); } -/* Line 1380 of yacc.c */ -#line 2410 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2509 "src/parse-gram.c" break; case 67: -/* Line 1380 of yacc.c */ -#line 457 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 505 "src/parse-gram.y" { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); } -/* Line 1380 of yacc.c */ -#line 2418 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2517 "src/parse-gram.c" break; case 68: -/* Line 1380 of yacc.c */ -#line 458 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 506 "src/parse-gram.y" { (yyval.list) = symbol_list_type_new ((yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1380 of yacc.c */ -#line 2426 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2525 "src/parse-gram.c" break; case 69: -/* Line 1380 of yacc.c */ -#line 459 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 507 "src/parse-gram.y" { (yyval.list) = symbol_list_default_tagged_new ((yylsp[0])); } -/* Line 1380 of yacc.c */ -#line 2434 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2533 "src/parse-gram.c" break; case 70: -/* Line 1380 of yacc.c */ -#line 460 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 508 "src/parse-gram.y" { (yyval.list) = symbol_list_default_tagless_new ((yylsp[0])); } -/* Line 1380 of yacc.c */ -#line 2442 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2541 "src/parse-gram.c" break; case 71: -/* Line 1380 of yacc.c */ -#line 466 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 514 "src/parse-gram.y" { current_type = (yyvsp[0].uniqstr); tag_seen = true; } -/* Line 1380 of yacc.c */ -#line 2453 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2552 "src/parse-gram.c" break; case 72: -/* Line 1380 of yacc.c */ -#line 471 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 519 "src/parse-gram.y" { symbol_class_set ((yyvsp[0].symbol), current_class, (yylsp[0]), true); symbol_type_set ((yyvsp[0].symbol), current_type, (yylsp[0])); } -/* Line 1380 of yacc.c */ -#line 2464 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2563 "src/parse-gram.c" break; case 73: -/* Line 1380 of yacc.c */ -#line 476 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 524 "src/parse-gram.y" { symbol_class_set ((yyvsp[-1].symbol), current_class, (yylsp[-1]), true); symbol_type_set ((yyvsp[-1].symbol), current_type, (yylsp[-1])); symbol_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer), (yylsp[0])); } -/* Line 1380 of yacc.c */ -#line 2476 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2575 "src/parse-gram.c" break; case 74: -/* Line 1380 of yacc.c */ -#line 482 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 530 "src/parse-gram.y" { symbol_class_set ((yyvsp[-1].symbol), current_class, (yylsp[-1]), true); symbol_type_set ((yyvsp[-1].symbol), current_type, (yylsp[-1])); symbol_make_alias ((yyvsp[-1].symbol), (yyvsp[0].symbol), (yyloc)); } -/* Line 1380 of yacc.c */ -#line 2488 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2587 "src/parse-gram.c" break; case 75: -/* Line 1380 of yacc.c */ -#line 488 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 536 "src/parse-gram.y" { symbol_class_set ((yyvsp[-2].symbol), current_class, (yylsp[-2]), true); symbol_type_set ((yyvsp[-2].symbol), current_type, (yylsp[-2])); symbol_user_token_number_set ((yyvsp[-2].symbol), (yyvsp[-1].integer), (yylsp[-1])); symbol_make_alias ((yyvsp[-2].symbol), (yyvsp[0].symbol), (yyloc)); } -/* Line 1380 of yacc.c */ -#line 2501 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2600 "src/parse-gram.c" break; case 82: -/* Line 1380 of yacc.c */ -#line 518 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 566 "src/parse-gram.y" { yyerrok; } -/* Line 1380 of yacc.c */ -#line 2511 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2610 "src/parse-gram.c" break; case 83: -/* Line 1380 of yacc.c */ -#line 524 "parse-gram.y" - { current_lhs = (yyvsp[0].symbol); current_lhs_location = (yylsp[0]); } -/* Line 1380 of yacc.c */ -#line 2519 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 572 "src/parse-gram.y" + { current_lhs = (yyvsp[-1].symbol); current_lhs_location = (yylsp[-1]); + current_lhs_named_ref = (yyvsp[0].named_ref); } +/* Line 1427 of yacc.c */ +#line 2619 "src/parse-gram.c" break; case 85: -/* Line 1380 of yacc.c */ -#line 528 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 577 "src/parse-gram.y" { grammar_current_rule_end ((yylsp[0])); } -/* Line 1380 of yacc.c */ -#line 2527 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2627 "src/parse-gram.c" break; case 86: -/* Line 1380 of yacc.c */ -#line 529 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 578 "src/parse-gram.y" { grammar_current_rule_end ((yylsp[0])); } -/* Line 1380 of yacc.c */ -#line 2535 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2635 "src/parse-gram.c" break; case 88: -/* Line 1380 of yacc.c */ -#line 535 "parse-gram.y" - { grammar_current_rule_begin (current_lhs, current_lhs_location); } -/* Line 1380 of yacc.c */ -#line 2543 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 584 "src/parse-gram.y" + { grammar_current_rule_begin (current_lhs, current_lhs_location, + current_lhs_named_ref); } +/* Line 1427 of yacc.c */ +#line 2644 "src/parse-gram.c" break; case 89: -/* Line 1380 of yacc.c */ -#line 537 "parse-gram.y" - { grammar_current_rule_symbol_append ((yyvsp[0].symbol), (yylsp[0])); } -/* Line 1380 of yacc.c */ -#line 2551 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 587 "src/parse-gram.y" + { grammar_current_rule_symbol_append ((yyvsp[-1].symbol), (yylsp[-1]), (yyvsp[0].named_ref)); } +/* Line 1427 of yacc.c */ +#line 2652 "src/parse-gram.c" break; case 90: -/* Line 1380 of yacc.c */ -#line 539 "parse-gram.y" - { grammar_current_rule_action_append ((yyvsp[0].code), (yylsp[0])); } -/* Line 1380 of yacc.c */ -#line 2559 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 589 "src/parse-gram.y" + { grammar_current_rule_action_append ((yyvsp[-1].code), (yylsp[-1]), (yyvsp[0].named_ref), false); } +/* Line 1427 of yacc.c */ +#line 2660 "src/parse-gram.c" break; case 91: -/* Line 1380 of yacc.c */ -#line 541 "parse-gram.y" - { grammar_current_rule_prec_set ((yyvsp[0].symbol), (yylsp[0])); } -/* Line 1380 of yacc.c */ -#line 2567 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 591 "src/parse-gram.y" + { grammar_current_rule_action_append ((yyvsp[0].code), (yylsp[0]), NULL, true); } +/* Line 1427 of yacc.c */ +#line 2668 "src/parse-gram.c" break; case 92: -/* Line 1380 of yacc.c */ -#line 543 "parse-gram.y" - { grammar_current_rule_dprec_set ((yyvsp[0].integer), (yylsp[0])); } -/* Line 1380 of yacc.c */ -#line 2575 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 593 "src/parse-gram.y" + { grammar_current_rule_prec_set ((yyvsp[0].symbol), (yylsp[0])); } +/* Line 1427 of yacc.c */ +#line 2676 "src/parse-gram.c" break; case 93: -/* Line 1380 of yacc.c */ -#line 545 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 595 "src/parse-gram.y" + { grammar_current_rule_dprec_set ((yyvsp[0].integer), (yylsp[0])); } +/* Line 1427 of yacc.c */ +#line 2684 "src/parse-gram.c" + break; + + case 94: +/* Line 1427 of yacc.c */ +#line 597 "src/parse-gram.y" { grammar_current_rule_merge_set ((yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1380 of yacc.c */ -#line 2583 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2692 "src/parse-gram.c" break; case 95: -/* Line 1380 of yacc.c */ -#line 555 "parse-gram.y" - { (yyval.uniqstr) = uniqstr_new ((yyvsp[0].chars)); } -/* Line 1380 of yacc.c */ -#line 2591 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 601 "src/parse-gram.y" + { (yyval.named_ref) = 0; } +/* Line 1427 of yacc.c */ +#line 2700 "src/parse-gram.c" break; case 96: -/* Line 1380 of yacc.c */ -#line 561 "parse-gram.y" - { - (yyval.chars) = ""; - } -/* Line 1380 of yacc.c */ -#line 2601 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 603 "src/parse-gram.y" + { (yyval.named_ref) = named_ref_new((yyvsp[0].uniqstr), (yylsp[0])); } +/* Line 1427 of yacc.c */ +#line 2708 "src/parse-gram.c" break; case 98: -/* Line 1380 of yacc.c */ -#line 574 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 614 "src/parse-gram.y" + { (yyval.uniqstr) = uniqstr_new ((yyvsp[0].chars)); } +/* Line 1427 of yacc.c */ +#line 2716 "src/parse-gram.c" + break; + + case 99: +/* Line 1427 of yacc.c */ +#line 619 "src/parse-gram.y" + { (yyval.chars) = ""; } +/* Line 1427 of yacc.c */ +#line 2724 "src/parse-gram.c" + break; + + case 100: +/* Line 1427 of yacc.c */ +#line 620 "src/parse-gram.y" + { (yyval.chars) = (yyvsp[0].uniqstr); } +/* Line 1427 of yacc.c */ +#line 2732 "src/parse-gram.c" + break; + + case 102: +/* Line 1427 of yacc.c */ +#line 631 "src/parse-gram.y" { code_props plain_code; (yyvsp[0].code)[strlen ((yyvsp[0].code)) - 1] = '\n'; @@ -2611,52 +2742,52 @@ yyreduce: gram_scanner_last_string_free (); (yyval.chars) = plain_code.code; } -/* Line 1380 of yacc.c */ -#line 2616 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2747 "src/parse-gram.c" break; - case 99: -/* Line 1380 of yacc.c */ -#line 594 "parse-gram.y" + case 103: +/* Line 1427 of yacc.c */ +#line 651 "src/parse-gram.y" { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1380 of yacc.c */ -#line 2624 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2755 "src/parse-gram.c" break; - case 100: -/* Line 1380 of yacc.c */ -#line 596 "parse-gram.y" + case 104: +/* Line 1427 of yacc.c */ +#line 653 "src/parse-gram.y" { (yyval.symbol) = symbol_get (char_name ((yyvsp[0].character)), (yylsp[0])); symbol_class_set ((yyval.symbol), token_sym, (yylsp[0]), false); symbol_user_token_number_set ((yyval.symbol), (yyvsp[0].character), (yylsp[0])); } -/* Line 1380 of yacc.c */ -#line 2636 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2767 "src/parse-gram.c" break; - case 101: -/* Line 1380 of yacc.c */ -#line 604 "parse-gram.y" + case 105: +/* Line 1427 of yacc.c */ +#line 661 "src/parse-gram.y" { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1380 of yacc.c */ -#line 2644 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2775 "src/parse-gram.c" break; - case 104: -/* Line 1380 of yacc.c */ -#line 616 "parse-gram.y" + case 108: +/* Line 1427 of yacc.c */ +#line 673 "src/parse-gram.y" { (yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[0].chars)), (yylsp[0])); symbol_class_set ((yyval.symbol), token_sym, (yylsp[0]), false); } -/* Line 1380 of yacc.c */ -#line 2655 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2786 "src/parse-gram.c" break; - case 106: -/* Line 1380 of yacc.c */ -#line 625 "parse-gram.y" + case 110: +/* Line 1427 of yacc.c */ +#line 682 "src/parse-gram.y" { code_props plain_code; code_props_plain_init (&plain_code, (yyvsp[0].chars), (yylsp[0])); @@ -2665,15 +2796,26 @@ yyreduce: muscle_code_grow ("epilogue", plain_code.code, (yylsp[0])); code_scanner_last_string_free (); } -/* Line 1380 of yacc.c */ -#line 2670 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2801 "src/parse-gram.c" break; -/* Line 1380 of yacc.c */ -#line 2675 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2806 "src/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); @@ -2702,6 +2844,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) { @@ -2709,41 +2855,32 @@ yyerrlab: #if ! YYERROR_VERBOSE yyerror (YY_("syntax error")); #else - { - YYSIZE_T yysize = yysyntax_error (0, yystate, yytoken); - 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, yytoken); - 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) { @@ -2780,7 +2917,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); @@ -2799,7 +2936,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) @@ -2814,7 +2951,7 @@ yyerrlab1: if (yyssp == yyss) YYABORT; - yyerror_range[0] = *yylsp; + yyerror_range[1] = *yylsp; yydestruct ("Error: popping", yystos[yystate], yyvsp, yylsp); YYPOPSTACK (1); @@ -2824,10 +2961,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. */ @@ -2863,8 +3000,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); @@ -2887,8 +3029,8 @@ yyreturn: return YYID (yyresult); } -/* Line 1599 of yacc.c */ -#line 635 "parse-gram.y" +/* Line 1657 of yacc.c */ +#line 692 "src/parse-gram.y" @@ -2922,34 +3064,33 @@ lloc_default (YYLTYPE const *rhs, int n) } -/* Add a lex-param or a parse-param (depending on TYPE) with - declaration DECL and location LOC. */ - static void -add_param (char const *type, char *decl, location loc) +add_param (param_type type, char *decl, location loc) { static char const alphanum[26 + 26 + 1 + 10] = "abcdefghijklmnopqrstuvwxyz" "ABCDEFGHIJKLMNOPQRSTUVWXYZ" "_" "0123456789"; + char const *name_start = NULL; - char *p; - - /* Stop on last actual character. */ - for (p = decl; p[1]; p++) - if ((p == decl - || ! memchr (alphanum, p[-1], sizeof alphanum)) - && memchr (alphanum, p[0], sizeof alphanum - 10)) - name_start = p; - - /* Strip the surrounding '{' and '}', and any blanks just inside - the braces. */ - while (*--p == ' ' || *p == '\t') - continue; - p[1] = '\0'; - while (*++decl == ' ' || *decl == '\t') - continue; + { + char *p; + /* Stop on last actual character. */ + for (p = decl; p[1]; p++) + if ((p == decl + || ! memchr (alphanum, p[-1], sizeof alphanum)) + && memchr (alphanum, p[0], sizeof alphanum - 10)) + name_start = p; + + /* Strip the surrounding '{' and '}', and any blanks just inside + the braces. */ + while (*--p == ' ' || *p == '\t') + continue; + p[1] = '\0'; + while (*++decl == ' ' || *decl == '\t') + continue; + } if (! name_start) complain_at (loc, _("missing identifier in parameter declaration")); @@ -2966,7 +3107,10 @@ add_param (char const *type, char *decl, location loc) name = xmalloc (name_len + 1); memcpy (name, name_start, name_len); name[name_len] = '\0'; - muscle_pair_list_grow (type, decl, name); + if (type & param_lex) + muscle_pair_list_grow ("lex_param", decl, name); + if (type & param_parse) + muscle_pair_list_grow ("parse_param", decl, name); free (name); }