X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/697c912fa481306891adb2d0737def95b8545097..c826013fb38c98861ef0fc5d4dc3fb3fb4f555be:/src/parse-gram.c diff --git a/src/parse-gram.c b/src/parse-gram.c index d2f19bb4..4fef5a2f 100644 --- a/src/parse-gram.c +++ b/src/parse-gram.c @@ -1,9 +1,8 @@ -/* A Bison parser, made by GNU Bison 2.4.266-78f6. */ +/* A Bison parser, made by GNU Bison 2.4.483-4ad39-dirty. */ /* Implementation for Bison's Yacc-like parsers in C - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006, - 2007, 2008, 2009 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 it under the terms of the GNU General Public License as published by @@ -45,7 +44,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.4.266-78f6" +#define YYBISON_VERSION "2.4.483-4ad39-dirty" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -73,12 +72,11 @@ #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-2010 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -103,7 +101,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 +126,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 131 "src/parse-gram.c" /* Enabling traces. */ #ifndef YYDEBUG @@ -168,6 +147,24 @@ static int current_prec = 0; # define YYTOKEN_TABLE 0 #endif +/* "%code requires" blocks. */ +/* Line 272 of yacc.c */ +#line 201 "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 168 "src/parse-gram.c" /* Tokens. */ #ifndef YYTOKENTYPE @@ -202,35 +199,33 @@ static int current_prec = 0; 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, + BRACKETED_ID = 296, + CHAR = 297, + EPILOGUE = 298, + EQUAL = 299, + ID = 300, + ID_COLON = 301, + PERCENT_PERCENT = 302, + PIPE = 303, + PROLOGUE = 304, + SEMICOLON = 305, + TAG = 306, + TAG_ANY = 307, + TAG_NONE = 308, + PERCENT_PARAM = 309, + PERCENT_UNION = 310 }; #endif /* Tokens. */ @@ -261,35 +256,33 @@ static int current_prec = 0; #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 BRACKETED_ID 296 +#define CHAR 297 +#define EPILOGUE 298 +#define EQUAL 299 +#define ID 300 +#define ID_COLON 301 +#define PERCENT_PERCENT 302 +#define PIPE 303 +#define PROLOGUE 304 +#define SEMICOLON 305 +#define TAG 306 +#define TAG_ANY 307 +#define TAG_NONE 308 +#define PERCENT_PARAM 309 +#define PERCENT_UNION 310 @@ -297,21 +290,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 87 "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 225 "src/parse-gram.y" -/* Line 216 of yacc.c */ -#line 315 "../../src/parse-gram.c" + param_type param; + + +/* Line 277 of yacc.c */ +#line 314 "src/parse-gram.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -334,8 +333,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 338 "src/parse-gram.c" +/* Unqualified %code blocks. */ +/* Line 328 of yacc.c */ +#line 55 "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 214 "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 369 "src/parse-gram.c" #ifdef short # undef short @@ -385,7 +415,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 +582,21 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 3 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 203 +#define YYLAST 162 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 58 +#define YYNTOKENS 56 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 33 +#define YYNNTS 36 /* YYNRULES -- Number of rules. */ -#define YYNRULES 104 +#define YYNRULES 109 /* YYNSTATES -- Number of states. */ -#define YYNSTATES 142 +#define YYNSTATES 148 /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned by yylex, with out-of-bounds checking. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 312 +#define YYMAXUTOK 310 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -606,24 +636,24 @@ 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 }; #if YYDEBUG /* YYRLINEYYN -- Source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 204, 204, 212, 214, 218, 219, 229, 233, 237, - 238, 243, 244, 245, 246, 247, 252, 261, 262, 263, - 264, 265, 266, 267, 268, 269, 270, 271, 272, 296, - 297, 298, 299, 303, 304, 305, 309, 316, 323, 327, - 331, 338, 353, 354, 358, 370, 370, 375, 375, 380, - 391, 406, 407, 408, 409, 413, 414, 419, 421, 426, - 427, 432, 434, 439, 440, 444, 445, 446, 447, 452, - 457, 462, 468, 474, 485, 486, 495, 496, 502, 503, - 504, 511, 511, 515, 516, 517, 522, 523, 525, 527, - 529, 531, 541, 542, 548, 551, 560, 580, 582, 591, - 596, 597, 602, 609, 611 + 0, 250, 250, 258, 260, 264, 265, 275, 279, 284, + 285, 290, 295, 296, 297, 298, 299, 304, 313, 314, + 315, 316, 317, 318, 319, 320, 320, 321, 322, 346, + 347, 348, 349, 353, 354, 363, 364, 365, 369, 376, + 383, 387, 391, 398, 413, 414, 418, 430, 430, 435, + 435, 440, 451, 466, 467, 468, 469, 473, 474, 479, + 481, 486, 487, 492, 494, 499, 500, 504, 505, 506, + 507, 512, 517, 522, 528, 534, 545, 546, 555, 556, + 562, 563, 564, 571, 571, 576, 577, 578, 583, 585, + 587, 589, 591, 593, 598, 600, 611, 612, 617, 618, + 619, 628, 648, 650, 659, 664, 665, 670, 677, 679 }; #endif @@ -639,21 +669,21 @@ static const char *const yytname[] = "\"%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\"", + "\"%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,180 +697,177 @@ 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 }; # endif -#define YYPACT_NINF -81 +#define YYPACT_NINF -137 + +#define yypact_value_is_default(yystate) \ + ((yystate) == (-137)) -#define YYTABLE_NINF -104 +#define YYTABLE_NINF -109 + +#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, 21, 111, -81, -81, -81, -14, -8, 3, -81, - -81, -81, -81, -18, -81, 14, 41, 42, 49, -81, - 2, -81, 10, 53, 34, -81, 13, -81, -81, -81, - 26, 35, 54, 78, 0, -81, -81, -81, 58, -81, - -81, 36, -81, -81, -81, -81, 28, -23, -23, 0, - 32, 32, -81, 45, -81, -81, -81, 82, -81, -81, - -81, -81, 88, -81, -81, -81, -81, 89, -81, 91, - -81, -81, -81, -81, -81, -81, -81, -81, -81, 43, - -81, 44, 1, -81, -81, -81, -81, 45, -81, 0, - -81, -81, -23, 39, -23, 0, -81, -81, -81, -81, - 32, -81, -81, 32, -81, -81, -81, -81, -81, -81, - -81, -81, 55, -81, -81, -81, -81, 0, -81, 96, - -81, 92, -81, -81, -81, -81, -19, 155, -81, -81, - -81, -81, -81, 0, 98, 51, -81, -81, 155, -81, - -81, -81 + -137, 20, 106, -137, -137, -137, 19, -1, 36, -137, + -137, -137, -137, 13, -137, 0, 79, -137, 89, 90, + -137, 41, -137, 55, 93, 46, -137, -137, -137, 47, + 94, 95, 35, -137, -137, -137, 16, -137, -137, -137, + 54, -137, -137, -137, -137, 49, 33, 33, 35, 12, + 12, -137, 61, -137, -137, -137, 29, -137, -137, -137, + -137, 100, -137, -137, -137, 101, -137, 103, -137, -137, + -137, -137, -137, -137, -137, -137, 57, -137, 58, 1, + -137, -137, 68, 80, -137, 61, -137, 35, -137, -137, + 33, 56, 33, 35, -137, -137, -137, -137, 12, -137, + -137, 12, -137, -137, -137, -137, -137, -137, -137, -137, + -137, 78, -137, -137, -137, -137, -137, 82, -137, 35, + -137, 142, -137, 144, -137, -137, -137, -137, -137, -137, + -137, -137, -137, 18, 27, -137, -137, 35, 145, 97, + 68, 68, 27, -137, -137, -137, -137, -137 }; - /* 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, 47, 45, 0, 0, 0, 51, - 52, 53, 54, 0, 38, 0, 9, 0, 0, 7, - 0, 15, 0, 0, 0, 19, 0, 39, 22, 23, - 0, 0, 0, 0, 0, 29, 30, 31, 0, 6, - 32, 42, 4, 5, 34, 33, 55, 0, 0, 0, - 0, 0, 96, 0, 40, 93, 92, 94, 10, 11, - 12, 13, 0, 16, 17, 18, 20, 0, 24, 0, - 26, 27, 28, 102, 98, 97, 100, 35, 101, 0, - 99, 0, 0, 76, 78, 81, 43, 0, 56, 0, - 69, 74, 48, 70, 46, 49, 61, 66, 67, 68, - 36, 63, 65, 37, 41, 95, 8, 14, 21, 25, - 80, 79, 0, 77, 2, 86, 44, 50, 57, 59, - 75, 71, 72, 62, 64, 104, 82, 83, 58, 60, - 73, 86, 85, 0, 0, 0, 88, 87, 84, 89, - 90, 91 + 3, 0, 0, 1, 49, 47, 0, 0, 0, 53, + 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, 101, 0, 42, 97, 96, 98, 10, 12, 13, + 14, 0, 17, 18, 19, 0, 23, 0, 27, 28, + 107, 103, 102, 105, 37, 106, 0, 104, 0, 0, + 78, 80, 94, 0, 45, 0, 58, 0, 71, 76, + 50, 72, 48, 51, 63, 68, 69, 70, 38, 65, + 67, 39, 43, 100, 99, 8, 15, 20, 24, 82, + 81, 0, 79, 2, 95, 83, 34, 26, 46, 52, + 59, 61, 77, 73, 74, 64, 66, 109, 88, 33, + 60, 62, 75, 84, 85, 88, 87, 0, 0, 0, + 94, 94, 86, 91, 92, 93, 90, 89 }; /* YYPGOTO[NTERM-NUM]. */ -static const yytype_int8 yypgoto[] = +static const yytype_int16 yypgoto[] = { - -81, -81, -81, -81, 101, -81, -81, -81, -81, -81, - -81, -81, -81, -11, -81, 57, -80, -55, 61, -81, - 29, -81, -81, -81, -21, -81, -81, -49, -20, -81, - -34, -69, -81 + -137, -137, -137, -137, -137, -137, 148, -137, -137, -137, + -137, -137, -137, -137, -137, 32, -137, 102, -9, -4, + 107, -137, 83, -137, -137, -137, 22, -136, -137, -137, + -12, -11, -137, -32, -40, -137 }; /* YYDEFGOTO[NTERM-NUM]. */ -static const yytype_int8 yydefgoto[] = +static const yytype_int16 yydefgoto[] = { - -1, 1, 2, 42, 81, 87, 44, 48, 47, 45, - 46, 89, 117, 118, 95, 100, 101, 91, 92, 82, - 83, 84, 115, 126, 127, 57, 106, 54, 76, 85, - 102, 78, 114 + -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[] = { - 77, -103, 79, 73, 104, 61, 4, 5, 6, 7, - 8, 9, 10, 11, 12, 96, 66, 55, 13, 14, - 124, 3, 74, 124, 122, 75, 52, 93, 93, 68, - 53, 90, 131, 27, 132, 73, 50, 120, 116, 120, - 49, 34, 73, 121, 58, 74, 59, 51, 75, 62, - 80, 112, 130, 60, 63, 119, 64, 71, 41, 79, - 67, 123, 56, 4, 5, 6, 7, 8, 9, 10, - 11, 12, 93, 69, 93, 13, 14, 74, 65, 70, - 75, 72, 88, 119, 86, 105, 97, 98, 99, 52, - 27, 107, 108, 137, 109, 73, 110, 111, 34, 139, - 129, 125, 140, 43, 137, 141, 128, 80, 103, 94, - 138, 113, 0, 0, 0, 41, 4, 5, 6, 7, - 8, 9, 10, 11, 12, 0, 0, 0, 13, 14, - 15, 16, 0, 17, 18, 19, 20, 21, 22, 23, - 24, 25, 26, 27, 28, 29, 30, 31, 0, 32, - 33, 34, 35, 36, 37, 0, 0, 0, 73, 0, - 0, 38, 0, 39, 40, 0, 0, 0, 41, 133, - 134, 135, 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, 136, - 74, 0, 0, 75 + 74, -108, 76, 54, 146, 147, 4, 5, 6, 7, + 8, 9, 10, 11, 12, 70, 94, 76, 13, 14, + 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, + 70, 26, 103, 13, 14, 91, 91, 32, 70, 49, + 102, 137, 138, 139, 60, 55, 26, 77, 111, 64, + 66, 124, 32, 51, 71, 121, 40, 72, 52, 70, + 123, 125, 77, 95, 96, 97, 135, 140, 136, 71, + 48, 40, 72, 118, 104, 71, 50, 71, 72, 91, + 72, 91, 57, 132, 88, 61, 122, 121, 122, 126, + 65, 67, 126, 58, 59, 62, 63, 68, 69, 84, + 86, 51, 141, 106, 107, 143, 108, 109, 110, 114, + 141, 4, 5, 6, 7, 8, 9, 10, 11, 12, + 116, 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, 145, 144, + 42, 130, 101, 36, 92, 37, 38, 142, 0, 0, + 39, 40, 112 }; static const yytype_int16 yycheck[] = { - 34, 0, 1, 3, 53, 3, 5, 6, 7, 8, - 9, 10, 11, 12, 13, 49, 3, 3, 17, 18, - 100, 0, 45, 103, 93, 48, 44, 47, 48, 3, - 48, 54, 51, 32, 53, 3, 44, 92, 87, 94, - 54, 40, 3, 4, 3, 45, 4, 44, 48, 47, - 49, 50, 121, 4, 44, 89, 3, 3, 57, 1, - 47, 95, 48, 5, 6, 7, 8, 9, 10, 11, - 12, 13, 92, 47, 94, 17, 18, 45, 44, 44, - 48, 3, 54, 117, 48, 3, 54, 55, 56, 44, - 32, 3, 3, 127, 3, 3, 53, 53, 40, 133, - 4, 46, 4, 2, 138, 54, 117, 49, 51, 48, - 131, 82, -1, -1, -1, 57, 5, 6, 7, 8, - 9, 10, 11, 12, 13, -1, -1, -1, 17, 18, - 19, 20, -1, 22, 23, 24, 25, 26, 27, 28, - 29, 30, 31, 32, 33, 34, 35, 36, -1, 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, 140, 141, 5, 6, 7, 8, + 9, 10, 11, 12, 13, 3, 48, 1, 17, 18, + 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, + 3, 30, 3, 17, 18, 46, 47, 36, 3, 40, + 52, 14, 15, 16, 3, 45, 30, 46, 47, 3, + 3, 91, 36, 40, 42, 87, 55, 45, 45, 3, + 4, 93, 46, 51, 52, 53, 48, 40, 50, 42, + 51, 55, 45, 85, 45, 42, 40, 42, 45, 90, + 45, 92, 3, 123, 51, 44, 90, 119, 92, 98, + 44, 44, 101, 4, 4, 40, 3, 3, 3, 45, + 51, 40, 134, 3, 3, 137, 3, 50, 50, 41, + 142, 5, 6, 7, 8, 9, 10, 11, 12, 13, + 40, 43, 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, 51, 4, + 2, 119, 50, 47, 47, 49, 50, 135, -1, -1, + 54, 55, 79 }; /* 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, - 11, 12, 13, 17, 18, 19, 20, 22, 23, 24, - 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, - 35, 36, 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 + 0, 57, 58, 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, 47, 49, 50, 54, + 55, 59, 62, 64, 67, 68, 66, 65, 51, 40, + 40, 40, 45, 86, 3, 45, 84, 3, 4, 4, + 3, 44, 40, 3, 3, 44, 3, 44, 3, 3, + 3, 42, 45, 87, 89, 90, 1, 46, 62, 77, + 78, 79, 88, 60, 45, 63, 51, 69, 51, 75, + 76, 87, 76, 72, 89, 51, 52, 53, 73, 74, + 89, 73, 86, 3, 45, 85, 3, 3, 3, 50, + 50, 47, 78, 91, 41, 83, 40, 61, 86, 70, + 71, 89, 75, 4, 90, 89, 74, 43, 80, 40, + 71, 4, 90, 81, 82, 48, 50, 14, 15, 16, + 40, 89, 82, 89, 4, 51, 83, 83 }; /* 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, 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, 56, 57, 58, 58, 59, 59, 59, 59, 59, + 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, + 59, 59, 59, 59, 59, 60, 59, 59, 59, 59, + 59, 59, 59, 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, 85, + 85, 86, 87, 87, 88, 89, 89, 90, 91, 91 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ static const yytype_uint8 yyr2[] = { 0, 2, 4, 0, 2, 1, 1, 1, 3, 1, - 2, 2, 2, 2, 3, 1, 2, 2, 2, 1, - 2, 3, 1, 1, 2, 3, 2, 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, 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 + 2, 1, 2, 2, 2, 3, 1, 2, 2, 2, + 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, 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 }; @@ -856,9 +883,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 +904,6 @@ do \ { \ yychar = (Token); \ yylval = (Value); \ - yytoken = YYTRANSLATE (yychar); \ YYPOPSTACK (1); \ goto yybackup; \ } \ @@ -915,7 +950,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,155 +1026,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 174 "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 1034 "src/parse-gram.c" break; case 4: // "integer" -/* Line 647 of yacc.c */ -#line 193 "parse-gram.y" +/* Line 729 of yacc.c */ +#line 187 "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 1043 "src/parse-gram.c" break; case 24: // "%" -/* 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 1017 "../../src/parse-gram.c" +/* Line 729 of yacc.c */ +#line 1052 "src/parse-gram.c" break; - case 44: // "{...}" + case 40: // "{...}" -/* Line 647 of yacc.c */ -#line 183 "parse-gram.y" +/* Line 729 of yacc.c */ +#line 176 "src/parse-gram.y" { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).code)); } -/* Line 647 of yacc.c */ -#line 1026 "../../src/parse-gram.c" +/* Line 729 of yacc.c */ +#line 1061 "src/parse-gram.c" break; - case 45: // "char" + case 41: // "[identifier]" + +/* Line 729 of yacc.c */ +#line 181 "src/parse-gram.y" + { fprintf (stderr, "[%s]", ((*yyvaluep).uniqstr)); } +/* Line 729 of yacc.c */ +#line 1070 "src/parse-gram.c" + break; -/* Line 647 of yacc.c */ -#line 175 "parse-gram.y" + case 42: // "char" + +/* Line 729 of yacc.c */ +#line 168 "src/parse-gram.y" { fputs (char_name (((*yyvaluep).character)), stderr); } -/* Line 647 of yacc.c */ -#line 1035 "../../src/parse-gram.c" +/* Line 729 of yacc.c */ +#line 1079 "src/parse-gram.c" break; - case 46: // "epilogue" + case 43: // "epilogue" -/* Line 647 of yacc.c */ -#line 183 "parse-gram.y" +/* Line 729 of yacc.c */ +#line 176 "src/parse-gram.y" { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); } -/* Line 647 of yacc.c */ -#line 1044 "../../src/parse-gram.c" +/* Line 729 of yacc.c */ +#line 1088 "src/parse-gram.c" break; - case 48: // "identifier" + case 45: // "identifier" -/* Line 647 of yacc.c */ -#line 187 "parse-gram.y" +/* Line 729 of yacc.c */ +#line 180 "src/parse-gram.y" { fputs (((*yyvaluep).uniqstr), stderr); } -/* Line 647 of yacc.c */ -#line 1053 "../../src/parse-gram.c" +/* Line 729 of yacc.c */ +#line 1097 "src/parse-gram.c" break; - case 49: // "identifier:" + case 46: // "identifier:" -/* Line 647 of yacc.c */ -#line 188 "parse-gram.y" +/* Line 729 of yacc.c */ +#line 182 "src/parse-gram.y" { fprintf (stderr, "%s:", ((*yyvaluep).uniqstr)); } -/* Line 647 of yacc.c */ -#line 1062 "../../src/parse-gram.c" +/* Line 729 of yacc.c */ +#line 1106 "src/parse-gram.c" break; - case 52: // "%{...%}" + case 49: // "%{...%}" -/* Line 647 of yacc.c */ -#line 183 "parse-gram.y" +/* Line 729 of yacc.c */ +#line 176 "src/parse-gram.y" { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); } -/* Line 647 of yacc.c */ -#line 1071 "../../src/parse-gram.c" +/* Line 729 of yacc.c */ +#line 1115 "src/parse-gram.c" break; - case 54: // "" + case 51: // "" -/* Line 647 of yacc.c */ -#line 190 "parse-gram.y" +/* Line 729 of yacc.c */ +#line 184 "src/parse-gram.y" { fprintf (stderr, "<%s>", ((*yyvaluep).uniqstr)); } -/* Line 647 of yacc.c */ -#line 1080 "../../src/parse-gram.c" +/* Line 729 of yacc.c */ +#line 1124 "src/parse-gram.c" + break; + + case 54: // "%param" + +/* Line 729 of yacc.c */ +#line 230 "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 1144 "src/parse-gram.c" break; - case 83: // variable + case 71: // symbol.prec + +/* Line 729 of yacc.c */ +#line 190 "src/parse-gram.y" + { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); } +/* Line 729 of yacc.c */ +#line 1153 "src/parse-gram.c" + break; -/* Line 647 of yacc.c */ -#line 187 "parse-gram.y" + case 84: // variable + +/* Line 729 of yacc.c */ +#line 180 "src/parse-gram.y" { fputs (((*yyvaluep).uniqstr), stderr); } -/* Line 647 of yacc.c */ -#line 1089 "../../src/parse-gram.c" +/* Line 729 of yacc.c */ +#line 1162 "src/parse-gram.c" break; - case 84: // content.opt + case 85: // content.opt -/* Line 647 of yacc.c */ -#line 183 "parse-gram.y" +/* Line 729 of yacc.c */ +#line 176 "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 1171 "src/parse-gram.c" break; - case 85: // braceless + case 86: // braceless -/* Line 647 of yacc.c */ -#line 183 "parse-gram.y" +/* Line 729 of yacc.c */ +#line 176 "src/parse-gram.y" { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); } -/* Line 647 of yacc.c */ -#line 1107 "../../src/parse-gram.c" +/* Line 729 of yacc.c */ +#line 1180 "src/parse-gram.c" break; - case 86: // id + case 87: // id -/* Line 647 of yacc.c */ -#line 196 "parse-gram.y" +/* Line 729 of yacc.c */ +#line 190 "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 1189 "src/parse-gram.c" break; - case 87: // id_colon + case 88: // id_colon -/* Line 647 of yacc.c */ -#line 197 "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 1198 "src/parse-gram.c" break; - case 88: // symbol + case 89: // symbol -/* Line 647 of yacc.c */ -#line 196 "parse-gram.y" +/* Line 729 of yacc.c */ +#line 190 "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 1207 "src/parse-gram.c" break; - case 89: // string_as_id + case 90: // string_as_id -/* Line 647 of yacc.c */ -#line 196 "parse-gram.y" +/* Line 729 of yacc.c */ +#line 190 "src/parse-gram.y" { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); } -/* Line 647 of yacc.c */ -#line 1143 "../../src/parse-gram.c" +/* Line 729 of yacc.c */ +#line 1216 "src/parse-gram.c" break; default: @@ -1378,26 +1451,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; @@ -1405,7 +1479,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. */ @@ -1419,7 +1494,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) { @@ -1429,11 +1505,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: \ @@ -1448,32 +1530,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 */ @@ -1511,6 +1603,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp) } } + /* Prevent warnings from -Wmissing-prototypes. */ #ifdef YYPARSE_PARAM #if (defined __STDC__ || defined __C99__FUNC__ \ @@ -1529,12 +1622,9 @@ int yyparse (); #endif /* ! YYPARSE_PARAM */ - - - -/*-------------------------. -| yyparse or yypush_parse. | -`-------------------------*/ +/*----------. +| yyparse. | +`----------*/ #ifdef YYPARSE_PARAM #if (defined __STDC__ || defined __C99__FUNC__ \ @@ -1598,7 +1688,7 @@ YYLTYPE yylloc; YYLTYPE *yylsp; /* The locations where the error started and ended. */ - YYLTYPE yyerror_range[2]; + YYLTYPE yyerror_range[3]; YYSIZE_T yystacksize; @@ -1645,23 +1735,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 79 "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 1665 "../../src/parse-gram.c" +/* Line 1214 of yacc.c */ +#line 1755 "src/parse-gram.c" yylsp[0] = yylloc; goto yysetstate; @@ -1760,7 +1850,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. */ @@ -1791,7 +1881,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; @@ -1847,8 +1937,8 @@ yyreduce: switch (yyn) { case 6: -/* Line 1380 of yacc.c */ -#line 220 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 266 "src/parse-gram.y" { code_props plain_code; code_props_plain_init (&plain_code, (yyvsp[0].chars), (yylsp[0])); @@ -1858,95 +1948,107 @@ yyreduce: plain_code.code, (yylsp[0])); code_scanner_last_string_free (); } -/* Line 1380 of yacc.c */ -#line 1863 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 1953 "src/parse-gram.c" break; case 7: -/* Line 1380 of yacc.c */ -#line 230 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 276 "src/parse-gram.y" { muscle_percent_define_ensure ((yyvsp[0].uniqstr), (yylsp[0]), true); } -/* Line 1380 of yacc.c */ -#line 1873 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 1963 "src/parse-gram.c" break; case 8: -/* Line 1380 of yacc.c */ -#line 234 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 280 "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 1883 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 1974 "src/parse-gram.c" break; case 9: -/* Line 1380 of yacc.c */ -#line 237 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 284 "src/parse-gram.y" { defines_flag = true; } -/* Line 1380 of yacc.c */ -#line 1891 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 1982 "src/parse-gram.c" break; case 10: -/* Line 1380 of yacc.c */ -#line 239 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 286 "src/parse-gram.y" { defines_flag = true; spec_defines_file = xstrdup ((yyvsp[0].chars)); } -/* Line 1380 of yacc.c */ -#line 1902 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 1993 "src/parse-gram.c" break; case 11: -/* Line 1380 of yacc.c */ -#line 243 "parse-gram.y" - { expected_sr_conflicts = (yyvsp[0].integer); } -/* Line 1380 of yacc.c */ -#line 1910 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 291 "src/parse-gram.y" + { + muscle_percent_define_insert ("parse.error", (yylsp[0]), "verbose", + MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE); + } +/* Line 1427 of yacc.c */ +#line 2004 "src/parse-gram.c" break; case 12: -/* Line 1380 of yacc.c */ -#line 244 "parse-gram.y" - { expected_rr_conflicts = (yyvsp[0].integer); } -/* Line 1380 of yacc.c */ -#line 1918 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 295 "src/parse-gram.y" + { expected_sr_conflicts = (yyvsp[0].integer); } +/* Line 1427 of yacc.c */ +#line 2012 "src/parse-gram.c" break; case 13: -/* Line 1380 of yacc.c */ -#line 245 "parse-gram.y" - { spec_file_prefix = (yyvsp[0].chars); } -/* Line 1380 of yacc.c */ -#line 1926 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 296 "src/parse-gram.y" + { expected_rr_conflicts = (yyvsp[0].integer); } +/* Line 1427 of yacc.c */ +#line 2020 "src/parse-gram.c" break; case 14: -/* Line 1380 of yacc.c */ -#line 246 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 297 "src/parse-gram.y" { spec_file_prefix = (yyvsp[0].chars); } -/* Line 1380 of yacc.c */ -#line 1934 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2028 "src/parse-gram.c" break; case 15: -/* Line 1380 of yacc.c */ -#line 248 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 298 "src/parse-gram.y" + { spec_file_prefix = (yyvsp[0].chars); } +/* Line 1427 of yacc.c */ +#line 2036 "src/parse-gram.c" + break; + + case 16: +/* Line 1427 of yacc.c */ +#line 300 "src/parse-gram.y" { nondeterministic_parser = true; glr_parser = true; } -/* Line 1380 of yacc.c */ -#line 1945 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2047 "src/parse-gram.c" break; - case 16: -/* Line 1380 of yacc.c */ -#line 253 "parse-gram.y" + case 17: +/* Line 1427 of yacc.c */ +#line 305 "src/parse-gram.y" { code_props action; code_props_symbol_action_init (&action, (yyvsp[0].code), (yylsp[0])); @@ -1955,101 +2057,93 @@ yyreduce: muscle_code_grow ("initial_action", action.code, (yylsp[0])); code_scanner_last_string_free (); } -/* Line 1380 of yacc.c */ -#line 1960 "../../src/parse-gram.c" - break; - - case 17: -/* Line 1380 of yacc.c */ -#line 261 "parse-gram.y" - { language_argmatch ((yyvsp[0].chars), grammar_prio, (yylsp[-1])); } -/* Line 1380 of yacc.c */ -#line 1968 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2062 "src/parse-gram.c" break; case 18: -/* 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 1976 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 313 "src/parse-gram.y" + { language_argmatch ((yyvsp[0].chars), grammar_prio, (yylsp[-1])); } +/* Line 1427 of yacc.c */ +#line 2070 "src/parse-gram.c" break; case 19: -/* Line 1380 of yacc.c */ -#line 263 "parse-gram.y" - { locations_flag = true; } -/* Line 1380 of yacc.c */ -#line 1984 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 314 "src/parse-gram.y" + { spec_name_prefix = (yyvsp[0].chars); } +/* Line 1427 of yacc.c */ +#line 2078 "src/parse-gram.c" break; case 20: -/* Line 1380 of yacc.c */ -#line 264 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 315 "src/parse-gram.y" { spec_name_prefix = (yyvsp[0].chars); } -/* Line 1380 of yacc.c */ -#line 1992 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2086 "src/parse-gram.c" break; case 21: -/* Line 1380 of yacc.c */ -#line 265 "parse-gram.y" - { spec_name_prefix = (yyvsp[0].chars); } -/* Line 1380 of yacc.c */ -#line 2000 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 316 "src/parse-gram.y" + { no_lines_flag = true; } +/* Line 1427 of yacc.c */ +#line 2094 "src/parse-gram.c" break; case 22: -/* Line 1380 of yacc.c */ -#line 266 "parse-gram.y" - { no_lines_flag = true; } -/* Line 1380 of yacc.c */ -#line 2008 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 317 "src/parse-gram.y" + { nondeterministic_parser = true; } +/* Line 1427 of yacc.c */ +#line 2102 "src/parse-gram.c" break; case 23: -/* Line 1380 of yacc.c */ -#line 267 "parse-gram.y" - { nondeterministic_parser = true; } -/* Line 1380 of yacc.c */ -#line 2016 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 318 "src/parse-gram.y" + { spec_outfile = (yyvsp[0].chars); } +/* Line 1427 of yacc.c */ +#line 2110 "src/parse-gram.c" break; case 24: -/* Line 1380 of yacc.c */ -#line 268 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 319 "src/parse-gram.y" { spec_outfile = (yyvsp[0].chars); } -/* Line 1380 of yacc.c */ -#line 2024 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2118 "src/parse-gram.c" break; case 25: -/* Line 1380 of yacc.c */ -#line 269 "parse-gram.y" - { spec_outfile = (yyvsp[0].chars); } -/* Line 1380 of yacc.c */ -#line 2032 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 320 "src/parse-gram.y" + { current_param = (yyvsp[0].param); } +/* Line 1427 of yacc.c */ +#line 2126 "src/parse-gram.c" break; case 26: -/* 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 2040 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 320 "src/parse-gram.y" + { current_param = param_none; } +/* Line 1427 of yacc.c */ +#line 2134 "src/parse-gram.c" break; case 27: -/* Line 1380 of yacc.c */ -#line 271 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 321 "src/parse-gram.y" { version_check (&(yylsp[0]), (yyvsp[0].chars)); } -/* Line 1380 of yacc.c */ -#line 2048 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2142 "src/parse-gram.c" break; case 28: -/* Line 1380 of yacc.c */ -#line 273 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 323 "src/parse-gram.y" { char const *skeleton_user = (yyvsp[0].chars); if (strchr (skeleton_user, '/')) @@ -2073,183 +2167,199 @@ yyreduce: } skeleton_arg (skeleton_user, grammar_prio, (yylsp[-1])); } -/* Line 1380 of yacc.c */ -#line 2078 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2172 "src/parse-gram.c" break; case 29: -/* Line 1380 of yacc.c */ -#line 296 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 346 "src/parse-gram.y" { token_table_flag = true; } -/* Line 1380 of yacc.c */ -#line 2086 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2180 "src/parse-gram.c" break; case 30: -/* Line 1380 of yacc.c */ -#line 297 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 347 "src/parse-gram.y" { report_flag |= report_states; } -/* Line 1380 of yacc.c */ -#line 2094 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2188 "src/parse-gram.c" break; case 31: -/* Line 1380 of yacc.c */ -#line 298 "parse-gram.y" +/* Line 1427 of yacc.c */ +#line 348 "src/parse-gram.y" { yacc_flag = true; } -/* Line 1380 of yacc.c */ -#line 2102 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2196 "src/parse-gram.c" + break; + + case 33: +/* Line 1427 of yacc.c */ +#line 353 "src/parse-gram.y" + { add_param (current_param, (yyvsp[0].code), (yylsp[0])); } +/* Line 1427 of yacc.c */ +#line 2204 "src/parse-gram.c" + break; + + case 34: +/* 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 2212 "src/parse-gram.c" break; - case 35: -/* Line 1380 of yacc.c */ -#line 306 "parse-gram.y" + case 37: +/* Line 1427 of yacc.c */ +#line 366 "src/parse-gram.y" { grammar_start_symbol_set ((yyvsp[0].symbol), (yylsp[0])); } -/* Line 1380 of yacc.c */ -#line 2112 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2222 "src/parse-gram.c" break; - case 36: -/* Line 1380 of yacc.c */ -#line 310 "parse-gram.y" + case 38: +/* Line 1427 of yacc.c */ +#line 370 "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 2125 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2235 "src/parse-gram.c" break; - case 37: -/* Line 1380 of yacc.c */ -#line 317 "parse-gram.y" + case 39: +/* Line 1427 of yacc.c */ +#line 377 "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 2138 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2248 "src/parse-gram.c" break; - case 38: -/* Line 1380 of yacc.c */ -#line 324 "parse-gram.y" + case 40: +/* Line 1427 of yacc.c */ +#line 384 "src/parse-gram.y" { default_prec = true; } -/* Line 1380 of yacc.c */ -#line 2148 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2258 "src/parse-gram.c" break; - case 39: -/* Line 1380 of yacc.c */ -#line 328 "parse-gram.y" + case 41: +/* Line 1427 of yacc.c */ +#line 388 "src/parse-gram.y" { default_prec = false; } -/* Line 1380 of yacc.c */ -#line 2158 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2268 "src/parse-gram.c" break; - case 40: -/* Line 1380 of yacc.c */ -#line 332 "parse-gram.y" + case 42: +/* Line 1427 of yacc.c */ +#line 392 "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 2171 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2281 "src/parse-gram.c" break; - case 41: -/* Line 1380 of yacc.c */ -#line 339 "parse-gram.y" + case 43: +/* Line 1427 of yacc.c */ +#line 399 "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 2182 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2292 "src/parse-gram.c" break; - case 42: -/* Line 1380 of yacc.c */ -#line 353 "parse-gram.y" + case 44: +/* Line 1427 of yacc.c */ +#line 413 "src/parse-gram.y" {} -/* Line 1380 of yacc.c */ -#line 2190 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2300 "src/parse-gram.c" break; - case 43: -/* Line 1380 of yacc.c */ -#line 354 "parse-gram.y" + case 45: +/* Line 1427 of yacc.c */ +#line 414 "src/parse-gram.y" { muscle_code_grow ("union_name", (yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1380 of yacc.c */ -#line 2198 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2308 "src/parse-gram.c" break; - case 44: -/* Line 1380 of yacc.c */ -#line 359 "parse-gram.y" + case 46: +/* Line 1427 of yacc.c */ +#line 419 "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 2210 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2320 "src/parse-gram.c" break; - case 45: -/* Line 1380 of yacc.c */ -#line 370 "parse-gram.y" + case 47: +/* Line 1427 of yacc.c */ +#line 430 "src/parse-gram.y" { current_class = nterm_sym; } -/* Line 1380 of yacc.c */ -#line 2218 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2328 "src/parse-gram.c" break; - case 46: -/* Line 1380 of yacc.c */ -#line 371 "parse-gram.y" + case 48: +/* Line 1427 of yacc.c */ +#line 431 "src/parse-gram.y" { current_class = unknown_sym; current_type = NULL; } -/* Line 1380 of yacc.c */ -#line 2229 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2339 "src/parse-gram.c" break; - case 47: -/* Line 1380 of yacc.c */ -#line 375 "parse-gram.y" + case 49: +/* Line 1427 of yacc.c */ +#line 435 "src/parse-gram.y" { current_class = token_sym; } -/* Line 1380 of yacc.c */ -#line 2237 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2347 "src/parse-gram.c" break; - case 48: -/* Line 1380 of yacc.c */ -#line 376 "parse-gram.y" + case 50: +/* Line 1427 of yacc.c */ +#line 436 "src/parse-gram.y" { current_class = unknown_sym; current_type = NULL; } -/* Line 1380 of yacc.c */ -#line 2248 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2358 "src/parse-gram.c" break; - case 49: -/* Line 1380 of yacc.c */ -#line 381 "parse-gram.y" + case 51: +/* Line 1427 of yacc.c */ +#line 441 "src/parse-gram.y" { symbol_list *list; tag_seen = true; @@ -2257,13 +2367,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 2262 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2372 "src/parse-gram.c" break; - case 50: -/* Line 1380 of yacc.c */ -#line 392 "parse-gram.y" + case 52: +/* Line 1427 of yacc.c */ +#line 452 "src/parse-gram.y" { symbol_list *list; ++current_prec; @@ -2275,316 +2385,340 @@ yyreduce: symbol_list_free ((yyvsp[0].list)); current_type = NULL; } -/* Line 1380 of yacc.c */ -#line 2280 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2390 "src/parse-gram.c" break; - case 51: -/* Line 1380 of yacc.c */ -#line 406 "parse-gram.y" + case 53: +/* Line 1427 of yacc.c */ +#line 466 "src/parse-gram.y" { (yyval.assoc) = left_assoc; } -/* Line 1380 of yacc.c */ -#line 2288 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2398 "src/parse-gram.c" break; - case 52: -/* Line 1380 of yacc.c */ -#line 407 "parse-gram.y" + case 54: +/* Line 1427 of yacc.c */ +#line 467 "src/parse-gram.y" { (yyval.assoc) = right_assoc; } -/* Line 1380 of yacc.c */ -#line 2296 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2406 "src/parse-gram.c" break; - case 53: -/* Line 1380 of yacc.c */ -#line 408 "parse-gram.y" + case 55: +/* Line 1427 of yacc.c */ +#line 468 "src/parse-gram.y" { (yyval.assoc) = non_assoc; } -/* Line 1380 of yacc.c */ -#line 2304 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2414 "src/parse-gram.c" break; - case 54: -/* Line 1380 of yacc.c */ -#line 409 "parse-gram.y" + case 56: +/* Line 1427 of yacc.c */ +#line 469 "src/parse-gram.y" { (yyval.assoc) = precedence_assoc; } -/* Line 1380 of yacc.c */ -#line 2312 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2422 "src/parse-gram.c" break; - case 55: -/* Line 1380 of yacc.c */ -#line 413 "parse-gram.y" + case 57: +/* Line 1427 of yacc.c */ +#line 473 "src/parse-gram.y" { current_type = NULL; } -/* Line 1380 of yacc.c */ -#line 2320 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2430 "src/parse-gram.c" break; - case 56: -/* Line 1380 of yacc.c */ -#line 414 "parse-gram.y" + case 58: +/* Line 1427 of yacc.c */ +#line 474 "src/parse-gram.y" { current_type = (yyvsp[0].uniqstr); tag_seen = true; } -/* Line 1380 of yacc.c */ -#line 2328 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2438 "src/parse-gram.c" break; - case 57: -/* Line 1380 of yacc.c */ -#line 420 "parse-gram.y" + case 59: +/* Line 1427 of yacc.c */ +#line 480 "src/parse-gram.y" { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); } -/* Line 1380 of yacc.c */ -#line 2336 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2446 "src/parse-gram.c" break; - case 58: -/* Line 1380 of yacc.c */ -#line 422 "parse-gram.y" + case 60: +/* Line 1427 of yacc.c */ +#line 482 "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 2344 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2454 "src/parse-gram.c" break; - case 59: -/* Line 1380 of yacc.c */ -#line 426 "parse-gram.y" + case 61: +/* Line 1427 of yacc.c */ +#line 486 "src/parse-gram.y" { (yyval.symbol) = (yyvsp[0].symbol); } -/* Line 1380 of yacc.c */ -#line 2352 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2462 "src/parse-gram.c" break; - case 60: -/* Line 1380 of yacc.c */ -#line 427 "parse-gram.y" + case 62: +/* Line 1427 of yacc.c */ +#line 487 "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 2360 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2470 "src/parse-gram.c" break; - case 61: -/* Line 1380 of yacc.c */ -#line 433 "parse-gram.y" + case 63: +/* Line 1427 of yacc.c */ +#line 493 "src/parse-gram.y" { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); } -/* Line 1380 of yacc.c */ -#line 2368 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2478 "src/parse-gram.c" break; - case 62: -/* Line 1380 of yacc.c */ -#line 435 "parse-gram.y" + case 64: +/* Line 1427 of yacc.c */ +#line 495 "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 2376 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2486 "src/parse-gram.c" break; - case 63: -/* Line 1380 of yacc.c */ -#line 439 "parse-gram.y" + case 65: +/* Line 1427 of yacc.c */ +#line 499 "src/parse-gram.y" { (yyval.list) = (yyvsp[0].list); } -/* Line 1380 of yacc.c */ -#line 2384 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2494 "src/parse-gram.c" break; - case 64: -/* Line 1380 of yacc.c */ -#line 440 "parse-gram.y" + case 66: +/* Line 1427 of yacc.c */ +#line 500 "src/parse-gram.y" { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), (yyvsp[0].list)); } -/* Line 1380 of yacc.c */ -#line 2392 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2502 "src/parse-gram.c" break; - case 65: -/* Line 1380 of yacc.c */ -#line 444 "parse-gram.y" + case 67: +/* Line 1427 of yacc.c */ +#line 504 "src/parse-gram.y" { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); } -/* Line 1380 of yacc.c */ -#line 2400 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2510 "src/parse-gram.c" break; - case 66: -/* Line 1380 of yacc.c */ -#line 445 "parse-gram.y" + case 68: +/* Line 1427 of yacc.c */ +#line 505 "src/parse-gram.y" { (yyval.list) = symbol_list_type_new ((yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1380 of yacc.c */ -#line 2408 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2518 "src/parse-gram.c" break; - case 67: -/* Line 1380 of yacc.c */ -#line 446 "parse-gram.y" + case 69: +/* Line 1427 of yacc.c */ +#line 506 "src/parse-gram.y" { (yyval.list) = symbol_list_default_tagged_new ((yylsp[0])); } -/* Line 1380 of yacc.c */ -#line 2416 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2526 "src/parse-gram.c" break; - case 68: -/* Line 1380 of yacc.c */ -#line 447 "parse-gram.y" + case 70: +/* Line 1427 of yacc.c */ +#line 507 "src/parse-gram.y" { (yyval.list) = symbol_list_default_tagless_new ((yylsp[0])); } -/* Line 1380 of yacc.c */ -#line 2424 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2534 "src/parse-gram.c" break; - case 69: -/* Line 1380 of yacc.c */ -#line 453 "parse-gram.y" + case 71: +/* Line 1427 of yacc.c */ +#line 513 "src/parse-gram.y" { current_type = (yyvsp[0].uniqstr); tag_seen = true; } -/* Line 1380 of yacc.c */ -#line 2435 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2545 "src/parse-gram.c" break; - case 70: -/* Line 1380 of yacc.c */ -#line 458 "parse-gram.y" + case 72: +/* Line 1427 of yacc.c */ +#line 518 "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 2446 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2556 "src/parse-gram.c" break; - case 71: -/* Line 1380 of yacc.c */ -#line 463 "parse-gram.y" + case 73: +/* Line 1427 of yacc.c */ +#line 523 "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 2458 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2568 "src/parse-gram.c" break; - case 72: -/* Line 1380 of yacc.c */ -#line 469 "parse-gram.y" + case 74: +/* Line 1427 of yacc.c */ +#line 529 "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 2470 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2580 "src/parse-gram.c" break; - case 73: -/* Line 1380 of yacc.c */ -#line 475 "parse-gram.y" + case 75: +/* Line 1427 of yacc.c */ +#line 535 "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 2483 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2593 "src/parse-gram.c" break; - case 80: -/* Line 1380 of yacc.c */ -#line 505 "parse-gram.y" + case 82: +/* Line 1427 of yacc.c */ +#line 565 "src/parse-gram.y" { yyerrok; } -/* Line 1380 of yacc.c */ -#line 2493 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2603 "src/parse-gram.c" break; - case 81: -/* Line 1380 of yacc.c */ -#line 511 "parse-gram.y" - { current_lhs = (yyvsp[0].symbol); current_lhs_location = (yylsp[0]); } -/* Line 1380 of yacc.c */ -#line 2501 "../../src/parse-gram.c" + case 83: +/* Line 1427 of yacc.c */ +#line 571 "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 2612 "src/parse-gram.c" break; - case 83: -/* Line 1380 of yacc.c */ -#line 515 "parse-gram.y" + case 85: +/* Line 1427 of yacc.c */ +#line 576 "src/parse-gram.y" { grammar_current_rule_end ((yylsp[0])); } -/* Line 1380 of yacc.c */ -#line 2509 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2620 "src/parse-gram.c" break; - case 84: -/* Line 1380 of yacc.c */ -#line 516 "parse-gram.y" + case 86: +/* Line 1427 of yacc.c */ +#line 577 "src/parse-gram.y" { grammar_current_rule_end ((yylsp[0])); } -/* Line 1380 of yacc.c */ -#line 2517 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2628 "src/parse-gram.c" break; - case 86: -/* Line 1380 of yacc.c */ -#line 522 "parse-gram.y" - { grammar_current_rule_begin (current_lhs, current_lhs_location); } -/* Line 1380 of yacc.c */ -#line 2525 "../../src/parse-gram.c" + case 88: +/* Line 1427 of yacc.c */ +#line 583 "src/parse-gram.y" + { grammar_current_rule_begin (current_lhs, current_lhs_location, + current_lhs_named_ref); } +/* Line 1427 of yacc.c */ +#line 2637 "src/parse-gram.c" break; - case 87: -/* Line 1380 of yacc.c */ -#line 524 "parse-gram.y" - { grammar_current_rule_symbol_append ((yyvsp[0].symbol), (yylsp[0])); } -/* Line 1380 of yacc.c */ -#line 2533 "../../src/parse-gram.c" + case 89: +/* Line 1427 of yacc.c */ +#line 586 "src/parse-gram.y" + { grammar_current_rule_symbol_append ((yyvsp[-1].symbol), (yylsp[-1]), (yyvsp[0].named_ref)); } +/* Line 1427 of yacc.c */ +#line 2645 "src/parse-gram.c" break; - case 88: -/* Line 1380 of yacc.c */ -#line 526 "parse-gram.y" - { grammar_current_rule_action_append ((yyvsp[0].code), (yylsp[0])); } -/* Line 1380 of yacc.c */ -#line 2541 "../../src/parse-gram.c" + case 90: +/* Line 1427 of yacc.c */ +#line 588 "src/parse-gram.y" + { grammar_current_rule_action_append ((yyvsp[-1].code), (yylsp[-1]), (yyvsp[0].named_ref)); } +/* Line 1427 of yacc.c */ +#line 2653 "src/parse-gram.c" break; - case 89: -/* Line 1380 of yacc.c */ -#line 528 "parse-gram.y" + case 91: +/* Line 1427 of yacc.c */ +#line 590 "src/parse-gram.y" { grammar_current_rule_prec_set ((yyvsp[0].symbol), (yylsp[0])); } -/* Line 1380 of yacc.c */ -#line 2549 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2661 "src/parse-gram.c" break; - case 90: -/* Line 1380 of yacc.c */ -#line 530 "parse-gram.y" + case 92: +/* Line 1427 of yacc.c */ +#line 592 "src/parse-gram.y" { grammar_current_rule_dprec_set ((yyvsp[0].integer), (yylsp[0])); } -/* Line 1380 of yacc.c */ -#line 2557 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2669 "src/parse-gram.c" break; - case 91: -/* Line 1380 of yacc.c */ -#line 532 "parse-gram.y" + case 93: +/* Line 1427 of yacc.c */ +#line 594 "src/parse-gram.y" { grammar_current_rule_merge_set ((yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1380 of yacc.c */ -#line 2565 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2677 "src/parse-gram.c" break; - case 93: -/* Line 1380 of yacc.c */ -#line 542 "parse-gram.y" + case 94: +/* Line 1427 of yacc.c */ +#line 598 "src/parse-gram.y" + { (yyval.named_ref) = 0; } +/* Line 1427 of yacc.c */ +#line 2685 "src/parse-gram.c" + break; + + case 95: +/* Line 1427 of yacc.c */ +#line 600 "src/parse-gram.y" + { (yyval.named_ref) = named_ref_new((yyvsp[0].uniqstr), (yylsp[0])); } +/* Line 1427 of yacc.c */ +#line 2693 "src/parse-gram.c" + break; + + case 97: +/* Line 1427 of yacc.c */ +#line 612 "src/parse-gram.y" { (yyval.uniqstr) = uniqstr_new ((yyvsp[0].chars)); } -/* Line 1380 of yacc.c */ -#line 2573 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2701 "src/parse-gram.c" break; - case 94: -/* Line 1380 of yacc.c */ -#line 548 "parse-gram.y" - { - (yyval.chars) = ""; - } -/* Line 1380 of yacc.c */ -#line 2583 "../../src/parse-gram.c" + case 98: +/* Line 1427 of yacc.c */ +#line 617 "src/parse-gram.y" + { (yyval.chars) = ""; } +/* Line 1427 of yacc.c */ +#line 2709 "src/parse-gram.c" break; - case 96: -/* Line 1380 of yacc.c */ -#line 561 "parse-gram.y" + case 99: +/* Line 1427 of yacc.c */ +#line 618 "src/parse-gram.y" + { (yyval.chars) = (yyvsp[0].uniqstr); } +/* Line 1427 of yacc.c */ +#line 2717 "src/parse-gram.c" + break; + + case 101: +/* Line 1427 of yacc.c */ +#line 629 "src/parse-gram.y" { code_props plain_code; (yyvsp[0].code)[strlen ((yyvsp[0].code)) - 1] = '\n'; @@ -2593,52 +2727,52 @@ yyreduce: gram_scanner_last_string_free (); (yyval.chars) = plain_code.code; } -/* Line 1380 of yacc.c */ -#line 2598 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2732 "src/parse-gram.c" break; - case 97: -/* Line 1380 of yacc.c */ -#line 581 "parse-gram.y" + case 102: +/* Line 1427 of yacc.c */ +#line 649 "src/parse-gram.y" { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1380 of yacc.c */ -#line 2606 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2740 "src/parse-gram.c" break; - case 98: -/* Line 1380 of yacc.c */ -#line 583 "parse-gram.y" + case 103: +/* Line 1427 of yacc.c */ +#line 651 "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 2618 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2752 "src/parse-gram.c" break; - case 99: -/* Line 1380 of yacc.c */ -#line 591 "parse-gram.y" + case 104: +/* Line 1427 of yacc.c */ +#line 659 "src/parse-gram.y" { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1380 of yacc.c */ -#line 2626 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2760 "src/parse-gram.c" break; - case 102: -/* Line 1380 of yacc.c */ -#line 603 "parse-gram.y" + case 107: +/* Line 1427 of yacc.c */ +#line 671 "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 2637 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2771 "src/parse-gram.c" break; - case 104: -/* Line 1380 of yacc.c */ -#line 612 "parse-gram.y" + case 109: +/* Line 1427 of yacc.c */ +#line 680 "src/parse-gram.y" { code_props plain_code; code_props_plain_init (&plain_code, (yyvsp[0].chars), (yylsp[0])); @@ -2647,15 +2781,26 @@ yyreduce: muscle_code_grow ("epilogue", plain_code.code, (yylsp[0])); code_scanner_last_string_free (); } -/* Line 1380 of yacc.c */ -#line 2652 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2786 "src/parse-gram.c" break; -/* Line 1380 of yacc.c */ -#line 2657 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2791 "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); @@ -2684,6 +2829,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) { @@ -2691,41 +2840,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) { @@ -2762,7 +2902,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); @@ -2781,7 +2921,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) @@ -2796,7 +2936,7 @@ yyerrlab1: if (yyssp == yyss) YYABORT; - yyerror_range[0] = *yylsp; + yyerror_range[1] = *yylsp; yydestruct ("Error: popping", yystos[yystate], yyvsp, yylsp); YYPOPSTACK (1); @@ -2806,10 +2946,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. */ @@ -2845,8 +2985,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); @@ -2869,8 +3014,8 @@ yyreturn: return YYID (yyresult); } -/* Line 1599 of yacc.c */ -#line 622 "parse-gram.y" +/* Line 1657 of yacc.c */ +#line 690 "src/parse-gram.y" @@ -2904,34 +3049,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")); @@ -2948,7 +3092,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); }