X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/f7c0fe197b6b1ed24f55d5ea6fd740fb46290e62..2a2b7485698370ef54856a4dafd5283042fd4665:/src/parse-gram.c diff --git a/src/parse-gram.c b/src/parse-gram.c index 2f9e10eb..e0194348 100644 --- a/src/parse-gram.c +++ b/src/parse-gram.c @@ -1,9 +1,8 @@ -/* A Bison parser, made by GNU Bison 2.4.343-83ea. */ +/* A Bison parser, made by GNU Bison 2.4.579-a4d1b. */ -/* Implementation for Bison's Yacc-like parsers in C +/* Bison implementation for 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-2011 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.343-83ea" +#define YYBISON_VERSION "2.4.579-a4d1b" /* 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 269 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-2011 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -115,7 +113,7 @@ static YYLTYPE lloc_default (YYLTYPE const *, int); #define YY_LOCATION_PRINT(File, Loc) \ - location_print (File, Loc) + location_print (File, Loc) static void version_check (location const *loc, char const *version); @@ -123,34 +121,13 @@ static void version_check (location const *loc, char const *version); FIXME: depends on the undocumented availability of YYLLOC. */ #undef yyerror #define yyerror(Msg) \ - gram_error (&yylloc, Msg) + gram_error (&yylloc, Msg) 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 named_ref *current_lhs_named_ref; -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 154 "../master/src/parse-gram.c" +/* Line 269 of yacc.c */ +#line 131 "src/parse-gram.c" /* Enabling traces. */ #ifndef YYDEBUG @@ -170,6 +147,24 @@ static int current_prec = 0; # define YYTOKEN_TABLE 0 #endif +/* "%code requires" blocks. */ +/* Line 289 of yacc.c */ +#line 220 "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 289 of yacc.c */ +#line 168 "src/parse-gram.c" /* Tokens. */ #ifndef YYTOKENTYPE @@ -204,20 +199,20 @@ static int current_prec = 0; PERCENT_GLR_PARSER = 281, PERCENT_INITIAL_ACTION = 282, PERCENT_LANGUAGE = 283, - PERCENT_LEX_PARAM = 284, - PERCENT_NAME_PREFIX = 285, - PERCENT_NO_DEFAULT_PREC = 286, - PERCENT_NO_LINES = 287, - PERCENT_NONDETERMINISTIC_PARSER = 288, - PERCENT_OUTPUT = 289, - PERCENT_PARSE_PARAM = 290, - PERCENT_REQUIRE = 291, - PERCENT_SKELETON = 292, - PERCENT_START = 293, - PERCENT_TOKEN_TABLE = 294, - PERCENT_VERBOSE = 295, - PERCENT_YACC = 296, - BRACED_CODE = 297, + 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, @@ -230,7 +225,7 @@ static int current_prec = 0; TAG = 307, TAG_ANY = 308, TAG_NONE = 309, - BRACKETED_ID = 310, + PERCENT_PARAM = 310, PERCENT_UNION = 311 }; #endif @@ -262,20 +257,20 @@ 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_NAME_PREFIX 285 -#define PERCENT_NO_DEFAULT_PREC 286 -#define PERCENT_NO_LINES 287 -#define PERCENT_NONDETERMINISTIC_PARSER 288 -#define PERCENT_OUTPUT 289 -#define PERCENT_PARSE_PARAM 290 -#define PERCENT_REQUIRE 291 -#define PERCENT_SKELETON 292 -#define PERCENT_START 293 -#define PERCENT_TOKEN_TABLE 294 -#define PERCENT_VERBOSE 295 -#define PERCENT_YACC 296 -#define BRACED_CODE 297 +#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 @@ -288,7 +283,7 @@ static int current_prec = 0; #define TAG 307 #define TAG_ANY 308 #define TAG_NONE 309 -#define BRACKETED_ID 310 +#define PERCENT_PARAM 310 #define PERCENT_UNION 311 @@ -297,22 +292,27 @@ static int current_prec = 0; #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE { -/* Line 216 of yacc.c */ -#line 94 "parse-gram.y" +/* Line 294 of yacc.c */ +#line 106 "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; - named_ref *named_ref; +/* Line 294 of yacc.c */ +#line 244 "src/parse-gram.y" + + param_type param; -/* Line 216 of yacc.c */ -#line 316 "../master/src/parse-gram.c" + +/* Line 294 of yacc.c */ +#line 316 "src/parse-gram.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -335,8 +335,57 @@ typedef struct YYLTYPE /* Copy the second part of user declarations. */ -/* Line 266 of yacc.c */ -#line 340 "../master/src/parse-gram.c" +/* Line 344 of yacc.c */ +#line 340 "src/parse-gram.c" +/* Unqualified %code blocks. */ +/* Line 345 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_symbol; + static symbol_class current_class = unknown_sym; + static uniqstr current_type = NULL; + + /** Set the new current left-hand side symbol, possibly common + * to several right-hand side parts of rule. + */ + static + void + current_lhs(symbol *sym, location loc, named_ref *ref) + { + current_lhs_symbol = sym; + current_lhs_location = loc; + /* In order to simplify memory management, named references for lhs + are always assigned by deep copy into the current symbol_list + node. This is because a single named-ref in the grammar may + result in several uses when the user factors lhs between several + rules using "|". Therefore free the parser's original copy. */ + free (current_lhs_named_ref); + current_lhs_named_ref = ref; + } + + #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 345 of yacc.c */ +#line 233 "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 345 of yacc.c */ +#line 389 "src/parse-gram.c" #ifdef short # undef short @@ -386,7 +435,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) @@ -422,34 +471,10 @@ YYID (yyi) } #endif -#if ! defined yyoverflow || YYERROR_VERBOSE +#if 1 /* The parser invokes alloca or malloc; define the necessary symbols. */ -# ifdef YYSTACK_USE_ALLOCA -# if YYSTACK_USE_ALLOCA -# ifdef __GNUC__ -# define YYSTACK_ALLOC __builtin_alloca -# elif defined __BUILTIN_VA_ARG_INCR -# include /* INFRINGES ON USER NAME SPACE */ -# elif defined _AIX -# define YYSTACK_ALLOC __alloca -# elif defined _MSC_VER -# include /* INFRINGES ON USER NAME SPACE */ -# define alloca _alloca -# else -# define YYSTACK_ALLOC alloca -# if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -# include /* INFRINGES ON USER NAME SPACE */ -# ifndef _STDLIB_H -# define _STDLIB_H 1 -# endif -# endif -# endif -# endif -# endif - # ifdef YYSTACK_ALLOC /* Pacify GCC's `empty if-body' warning. */ # define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0)) @@ -466,36 +491,37 @@ YYID (yyi) # ifndef YYSTACK_ALLOC_MAXIMUM # define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM # endif -# if (defined __cplusplus && ! defined _STDLIB_H \ +# if (defined __cplusplus && ! defined EXIT_SUCCESS \ && ! ((defined YYMALLOC || defined malloc) \ - && (defined YYFREE || defined free))) + && (defined YYFREE || defined free))) # include /* INFRINGES ON USER NAME SPACE */ -# ifndef _STDLIB_H -# define _STDLIB_H 1 +# ifndef EXIT_SUCCESS +# define EXIT_SUCCESS 0 # endif # endif # ifndef YYMALLOC # define YYMALLOC malloc -# if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ +# if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ # endif # endif # ifndef YYFREE # define YYFREE free -# if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ +# if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) void free (void *); /* INFRINGES ON USER NAME SPACE */ # endif # endif # endif -#endif /* ! defined yyoverflow || YYERROR_VERBOSE */ +# define YYCOPY_NEEDED 1 +#endif #if (! defined yyoverflow \ && (! defined __cplusplus \ - || (defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL \ - && defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) + || (defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL \ + && defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) /* A type that is properly aligned for any stack member. */ union yyalloc @@ -514,6 +540,27 @@ union yyalloc ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE) + sizeof (YYLTYPE)) \ + 2 * YYSTACK_GAP_MAXIMUM) +# define YYCOPY_NEEDED 1 + +/* Relocate STACK from its old location to the new one. The + local variables YYSIZE and YYSTACKSIZE give the old and new number of + elements in the stack, and YYPTR gives the new location of the + stack. Advance YYPTR to a properly aligned location for the next + stack. */ +# define YYSTACK_RELOCATE(Stack_alloc, Stack) \ + do \ + { \ + YYSIZE_T yynewbytes; \ + YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ + Stack = &yyptr->Stack_alloc; \ + yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ + yyptr += yynewbytes / sizeof (*yyptr); \ + } \ + while (YYID (0)) + +#endif + +#if defined YYCOPY_NEEDED && YYCOPY_NEEDED /* Copy COUNT objects from FROM to TO. The source and destination do not overlap. */ # ifndef YYCOPY @@ -521,55 +568,38 @@ union yyalloc # define YYCOPY(To, From, Count) \ __builtin_memcpy (To, From, (Count) * sizeof (*(From))) # else -# define YYCOPY(To, From, Count) \ - do \ - { \ - YYSIZE_T yyi; \ - for (yyi = 0; yyi < (Count); yyi++) \ - (To)[yyi] = (From)[yyi]; \ - } \ +# define YYCOPY(To, From, Count) \ + do \ + { \ + YYSIZE_T yyi; \ + for (yyi = 0; yyi < (Count); yyi++) \ + (To)[yyi] = (From)[yyi]; \ + } \ while (YYID (0)) # endif # endif - -/* Relocate STACK from its old location to the new one. The - local variables YYSIZE and YYSTACKSIZE give the old and new number of - elements in the stack, and YYPTR gives the new location of the - stack. Advance YYPTR to a properly aligned location for the next - stack. */ -# define YYSTACK_RELOCATE(Stack_alloc, Stack) \ - do \ - { \ - YYSIZE_T yynewbytes; \ - YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ - Stack = &yyptr->Stack_alloc; \ - yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ - yyptr += yynewbytes / sizeof (*yyptr); \ - } \ - while (YYID (0)) - -#endif +#endif /* !YYCOPY_NEEDED */ /* YYFINAL -- State number of the termination state. */ #define YYFINAL 3 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 160 +#define YYLAST 163 /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 57 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 34 +#define YYNNTS 36 /* YYNRULES -- Number of rules. */ -#define YYNRULES 106 +#define YYNRULES 110 /* YYNSTATES -- Number of states. */ -#define YYNSTATES 146 +#define YYNSTATES 149 /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned by yylex, with out-of-bounds checking. */ #define YYUNDEFTOK 2 #define YYMAXUTOK 311 -#define YYTRANSLATE(YYX) \ +#define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) /* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM @@ -614,17 +644,18 @@ static const yytype_uint8 yytranslate[] = /* YYRLINEYYN -- Source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 207, 207, 215, 217, 221, 222, 232, 236, 241, - 242, 247, 252, 253, 254, 255, 256, 261, 270, 271, - 272, 273, 274, 275, 276, 277, 278, 279, 280, 304, - 305, 306, 307, 311, 312, 313, 317, 324, 331, 335, - 339, 346, 361, 362, 366, 378, 378, 383, 383, 388, - 399, 414, 415, 416, 417, 421, 422, 427, 429, 434, - 435, 440, 442, 447, 448, 452, 453, 454, 455, 460, - 465, 470, 476, 482, 493, 494, 503, 504, 510, 511, - 512, 519, 519, 524, 525, 526, 531, 533, 535, 537, - 539, 541, 546, 548, 559, 560, 565, 566, 575, 595, - 597, 606, 611, 612, 617, 624, 626 + 0, 269, 269, 277, 279, 283, 284, 294, 298, 303, + 304, 309, 314, 315, 316, 317, 318, 323, 332, 333, + 334, 335, 336, 337, 338, 339, 339, 340, 341, 365, + 366, 367, 368, 372, 373, 382, 383, 384, 388, 395, + 402, 406, 410, 417, 432, 433, 437, 449, 449, 454, + 454, 459, 470, 485, 486, 487, 488, 492, 493, 498, + 500, 505, 506, 511, 513, 518, 519, 523, 524, 525, + 526, 531, 536, 541, 547, 553, 564, 565, 574, 575, + 581, 582, 583, 590, 590, 598, 599, 600, 605, 607, + 609, 611, 613, 615, 617, 622, 624, 634, 635, 640, + 641, 642, 651, 671, 673, 682, 687, 688, 693, 700, + 702 }; #endif @@ -640,19 +671,19 @@ static const char *const yytname[] = "\"%default-prec\"", "\"%define\"", "\"%defines\"", "\"%error-verbose\"", "\"%expect\"", "\"%expect-rr\"", "\"%\"", "\"%file-prefix\"", "\"%glr-parser\"", "\"%initial-action\"", "\"%language\"", - "\"%lex-param\"", "\"%name-prefix\"", "\"%no-default-prec\"", - "\"%no-lines\"", "\"%nondeterministic-parser\"", "\"%output\"", - "\"%parse-param\"", "\"%require\"", "\"%skeleton\"", "\"%start\"", - "\"%token-table\"", "\"%verbose\"", "\"%yacc\"", "\"{...}\"", "\"char\"", + "\"%name-prefix\"", "\"%no-default-prec\"", "\"%no-lines\"", + "\"%nondeterministic-parser\"", "\"%output\"", "\"%require\"", + "\"%skeleton\"", "\"%start\"", "\"%token-table\"", "\"%verbose\"", + "\"%yacc\"", "\"{...}\"", "\"%?{...}\"", "\"[identifier]\"", "\"char\"", "\"epilogue\"", "\"=\"", "\"identifier\"", "\"identifier:\"", "\"%%\"", "\"|\"", "\"%{...%}\"", "\";\"", "\"\"", "\"<*>\"", "\"<>\"", - "\"[identifier]\"", "\"%union\"", "$accept", "input", - "prologue_declarations", "prologue_declaration", "grammar_declaration", - "union_name", "symbol_declaration", "$@1", "$@2", + "\"%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", + "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 }; @@ -672,29 +703,35 @@ static const yytype_uint16 yytoknum[] = }; # endif -#define YYPACT_NINF -53 +#define YYPACT_NINF -50 -#define YYTABLE_NINF -106 +#define yypact_value_is_default(yystate) \ + ((yystate) == (-50)) + +#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[] = { - -53, 5, 102, -53, -53, -53, -10, 8, 27, -53, - -53, -53, -53, 18, -53, 32, 55, -53, 70, 77, - -53, 17, -53, 43, 91, 53, 41, -53, -53, -53, - 42, 54, 94, 96, 0, -53, -53, -53, 16, -53, - -53, 56, -53, -53, -53, -53, 48, 30, 30, 0, - 13, 13, -53, 61, -53, -53, -53, 101, -53, -53, - -53, -53, 113, -53, -53, -53, -53, 114, -53, 115, - -53, -53, -53, -53, -53, -53, -53, -53, -53, 93, - -53, 95, 1, -53, -53, 50, -53, 61, -53, 0, - -53, -53, 30, 33, 30, 0, -53, -53, -53, -53, - 13, -53, -53, 13, -53, -53, -53, -53, -53, -53, - -53, -53, 103, -53, -53, -53, -53, -53, 0, -53, - 141, -53, 145, -53, -53, -53, -53, -53, -53, -53, - -53, 39, 37, -53, -53, 0, 147, 97, 50, 50, - 37, -53, -53, -53, -53, -53 + -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 reduction number in state S. Performed when @@ -702,85 +739,84 @@ static const yytype_int16 yypact[] = 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, 11, 0, 0, - 7, 0, 16, 0, 0, 0, 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, 98, 0, 40, 95, 94, 96, 10, 12, - 13, 14, 0, 17, 18, 19, 20, 0, 24, 0, - 26, 27, 28, 104, 100, 99, 102, 35, 103, 0, - 101, 0, 0, 76, 78, 92, 43, 0, 56, 0, - 69, 74, 48, 70, 46, 49, 61, 66, 67, 68, - 36, 63, 65, 37, 41, 97, 8, 15, 21, 25, - 80, 79, 0, 77, 2, 93, 81, 44, 50, 57, - 59, 75, 71, 72, 62, 64, 106, 86, 58, 60, - 73, 82, 83, 86, 85, 0, 0, 0, 92, 92, - 84, 89, 90, 91, 88, 87 + 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, 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_int16 yypgoto[] = { - -53, -53, -53, -53, 152, -53, -53, -53, -53, -53, - -53, -53, -53, 38, -53, 104, -32, -3, 109, -53, - 78, -53, -53, -53, 26, -46, -53, -53, -49, -17, - -53, -34, -52, -53 + -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, 42, 81, 87, 44, 48, 47, 45, - 46, 89, 118, 119, 95, 100, 101, 91, 92, 82, - 83, 84, 127, 131, 132, 116, 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, -105, 79, 73, 104, 3, 4, 5, 6, 7, - 8, 9, 10, 11, 12, 96, 73, 79, 13, 14, - 61, 4, 5, 6, 7, 8, 9, 10, 11, 12, - 93, 93, 27, 13, 14, 55, 73, 122, 117, 34, - 73, 123, 49, 74, 66, 68, 75, 27, 80, 112, - 50, 135, 136, 137, 34, 120, 74, 41, 58, 75, - 52, 124, 62, 80, 53, 97, 98, 99, 125, 51, - 130, 125, 41, 74, 59, 93, 75, 93, 56, 138, - 74, 60, 90, 75, 120, 63, 67, 69, 133, 121, - 134, 121, 144, 145, 64, 65, 70, 71, 139, 72, - 88, 141, 86, 52, 105, 115, 139, 4, 5, 6, - 7, 8, 9, 10, 11, 12, 107, 108, 109, 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, 110, 129, 111, 126, 73, 143, - 38, 142, 39, 40, 43, 103, 128, 94, 41, 140, - 113 + 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_uint8 yycheck[] = +static const yytype_int16 yycheck[] = { - 34, 0, 1, 3, 53, 0, 5, 6, 7, 8, - 9, 10, 11, 12, 13, 49, 3, 1, 17, 18, + 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, - 47, 48, 31, 17, 18, 3, 3, 4, 87, 38, - 3, 93, 52, 43, 3, 3, 46, 31, 47, 48, - 42, 14, 15, 16, 38, 89, 43, 56, 3, 46, - 42, 95, 45, 47, 46, 52, 53, 54, 100, 42, - 122, 103, 56, 43, 4, 92, 46, 94, 46, 42, - 43, 4, 52, 46, 118, 42, 45, 45, 49, 92, - 51, 94, 138, 139, 3, 42, 42, 3, 132, 3, - 52, 135, 46, 42, 3, 55, 140, 5, 6, 7, - 8, 9, 10, 11, 12, 13, 3, 3, 3, 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, 51, 4, 51, 44, 3, 52, - 48, 4, 50, 51, 2, 51, 118, 48, 56, 133, - 82 + 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 @@ -790,18 +826,18 @@ static const yytype_uint8 yystos[] = 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, 48, 50, - 51, 56, 60, 61, 63, 66, 67, 65, 64, 52, - 42, 42, 42, 46, 85, 3, 46, 83, 3, 4, - 4, 3, 45, 42, 3, 42, 3, 45, 3, 45, - 42, 3, 3, 3, 43, 46, 86, 88, 89, 1, - 47, 61, 76, 77, 78, 87, 46, 62, 52, 68, - 52, 74, 75, 86, 75, 71, 88, 52, 53, 54, - 72, 73, 88, 72, 85, 3, 84, 3, 3, 3, - 51, 51, 48, 77, 90, 55, 82, 85, 69, 70, - 88, 74, 4, 89, 88, 73, 44, 79, 70, 4, - 89, 80, 81, 49, 51, 14, 15, 16, 42, 88, - 81, 88, 4, 52, 82, 82 + 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. */ @@ -809,15 +845,16 @@ static const yytype_uint8 yyr1[] = { 0, 57, 58, 59, 59, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 61, 61, 61, 61, 61, 61, 61, - 61, 61, 62, 62, 61, 64, 63, 65, 63, 63, - 66, 67, 67, 67, 67, 68, 68, 69, 69, 70, - 70, 71, 71, 72, 72, 73, 73, 73, 73, 74, - 74, 74, 74, 74, 75, 75, 76, 76, 77, 77, - 77, 79, 78, 80, 80, 80, 81, 81, 81, 81, - 81, 81, 82, 82, 83, 83, 84, 84, 85, 86, - 86, 87, 88, 88, 89, 90, 90 + 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. */ @@ -825,56 +862,66 @@ 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, - 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, 4, 1, 3, 2, 0, 3, 3, 3, - 3, 3, 0, 1, 1, 1, 0, 1, 1, 1, - 1, 1, 1, 1, 1, 0, 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, 2, 3, 3, 3, 0, 1, 1, 1, 0, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, + 2 }; -#define yyerrok (yyerrstatus = 0) -#define yyclearin (yychar = YYEMPTY) -#define YYEMPTY (-2) -#define YYEOF 0 +#define yyerrok (yyerrstatus = 0) +#define yyclearin (yychar = YYEMPTY) +#define YYEMPTY (-2) +#define YYEOF 0 -#define YYACCEPT goto yyacceptlab -#define YYABORT goto yyabortlab -#define YYERROR goto yyerrorlab +#define YYACCEPT goto yyacceptlab +#define YYABORT goto yyabortlab +#define YYERROR goto yyerrorlab /* 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. */ - -#define YYFAIL goto yyerrlab + 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) -#define YYBACKUP(Token, Value) \ -do \ - if (yychar == YYEMPTY && yylen == 1) \ - { \ - yychar = (Token); \ - yylval = (Value); \ - yytoken = YYTRANSLATE (yychar); \ - YYPOPSTACK (1); \ - goto yybackup; \ - } \ - else \ - { \ +#define YYBACKUP(Token, Value) \ +do \ + if (yychar == YYEMPTY && yylen == 1) \ + { \ + yychar = (Token); \ + yylval = (Value); \ + YYPOPSTACK (1); \ + YY_LAC_DISCARD ("YYBACKUP"); \ + goto yybackup; \ + } \ + else \ + { \ yyerror (YY_("syntax error: cannot back up")); \ - YYERROR; \ - } \ + YYERROR; \ + } \ while (YYID (0)) -#define YYTERROR 1 -#define YYERRCODE 256 +#define YYTERROR 1 +#define YYERRCODE 256 /* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. @@ -883,22 +930,22 @@ while (YYID (0)) #define YYRHSLOC(Rhs, K) ((Rhs)[K]) #ifndef YYLLOC_DEFAULT -# define YYLLOC_DEFAULT(Current, Rhs, N) \ - do \ +# define YYLLOC_DEFAULT(Current, Rhs, N) \ + do \ if (YYID (N)) \ - { \ - (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ - (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ - (Current).last_line = YYRHSLOC (Rhs, N).last_line; \ - (Current).last_column = YYRHSLOC (Rhs, N).last_column; \ - } \ - else \ - { \ - (Current).first_line = (Current).last_line = \ - YYRHSLOC (Rhs, 0).last_line; \ - (Current).first_column = (Current).last_column = \ - YYRHSLOC (Rhs, 0).last_column; \ - } \ + { \ + (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ + (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ + (Current).last_line = YYRHSLOC (Rhs, N).last_line; \ + (Current).last_column = YYRHSLOC (Rhs, N).last_column; \ + } \ + else \ + { \ + (Current).first_line = (Current).last_line = \ + YYRHSLOC (Rhs, 0).last_line; \ + (Current).first_column = (Current).last_column = \ + YYRHSLOC (Rhs, 0).last_column; \ + } \ while (YYID (0)) #endif @@ -908,11 +955,11 @@ while (YYID (0)) we won't break user code: when these are the locations we know. */ #ifndef YY_LOCATION_PRINT -# if YYLTYPE_IS_TRIVIAL -# define YY_LOCATION_PRINT(File, Loc) \ - fprintf (File, "%d.%d-%d.%d", \ - (Loc).first_line, (Loc).first_column, \ - (Loc).last_line, (Loc).last_column) +# 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, \ + (Loc).last_line, (Loc).last_column) # else # define YY_LOCATION_PRINT(File, Loc) ((void) 0) # endif @@ -935,21 +982,21 @@ while (YYID (0)) # define YYFPRINTF fprintf # endif -# define YYDPRINTF(Args) \ -do { \ - if (yydebug) \ - YYFPRINTF Args; \ +# define YYDPRINTF(Args) \ +do { \ + if (yydebug) \ + YYFPRINTF Args; \ } while (YYID (0)) -# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ -do { \ - if (yydebug) \ - { \ - YYFPRINTF (stderr, "%s ", Title); \ - yy_symbol_print (stderr, \ - Type, Value, Location); \ - YYFPRINTF (stderr, "\n"); \ - } \ +# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ +do { \ + if (yydebug) \ + { \ + YYFPRINTF (stderr, "%s ", Title); \ + yy_symbol_print (stderr, \ + Type, Value, Location); \ + YYFPRINTF (stderr, "\n"); \ + } \ } while (YYID (0)) @@ -984,159 +1031,197 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp) { case 3: // "string" -/* Line 647 of yacc.c */ -#line 183 "parse-gram.y" +/* Line 751 of yacc.c */ +#line 193 "src/parse-gram.y" { fputs (quotearg_style (c_quoting_style, ((*yyvaluep).chars)), stderr); } -/* Line 647 of yacc.c */ -#line 992 "../master/src/parse-gram.c" +/* Line 751 of yacc.c */ +#line 1039 "src/parse-gram.c" break; case 4: // "integer" -/* Line 647 of yacc.c */ -#line 196 "parse-gram.y" +/* Line 751 of yacc.c */ +#line 206 "src/parse-gram.y" { fprintf (stderr, "%d", ((*yyvaluep).integer)); } -/* Line 647 of yacc.c */ -#line 1001 "../master/src/parse-gram.c" +/* Line 751 of yacc.c */ +#line 1048 "src/parse-gram.c" break; case 24: // "%" -/* Line 647 of yacc.c */ -#line 192 "parse-gram.y" +/* Line 751 of yacc.c */ +#line 202 "src/parse-gram.y" { fprintf (stderr, "%%%s", ((*yyvaluep).uniqstr)); } -/* Line 647 of yacc.c */ -#line 1010 "../master/src/parse-gram.c" +/* Line 751 of yacc.c */ +#line 1057 "src/parse-gram.c" break; - case 42: // "{...}" + case 40: // "{...}" -/* Line 647 of yacc.c */ -#line 185 "parse-gram.y" +/* Line 751 of yacc.c */ +#line 195 "src/parse-gram.y" { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).code)); } -/* Line 647 of yacc.c */ -#line 1019 "../master/src/parse-gram.c" +/* Line 751 of yacc.c */ +#line 1066 "src/parse-gram.c" + break; + + case 42: // "[identifier]" + +/* Line 751 of yacc.c */ +#line 200 "src/parse-gram.y" + { fprintf (stderr, "[%s]", ((*yyvaluep).uniqstr)); } +/* Line 751 of yacc.c */ +#line 1075 "src/parse-gram.c" break; case 43: // "char" -/* Line 647 of yacc.c */ -#line 177 "parse-gram.y" +/* Line 751 of yacc.c */ +#line 187 "src/parse-gram.y" { fputs (char_name (((*yyvaluep).character)), stderr); } -/* Line 647 of yacc.c */ -#line 1028 "../master/src/parse-gram.c" +/* Line 751 of yacc.c */ +#line 1084 "src/parse-gram.c" break; case 44: // "epilogue" -/* Line 647 of yacc.c */ -#line 185 "parse-gram.y" +/* Line 751 of yacc.c */ +#line 195 "src/parse-gram.y" { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); } -/* Line 647 of yacc.c */ -#line 1037 "../master/src/parse-gram.c" +/* Line 751 of yacc.c */ +#line 1093 "src/parse-gram.c" break; case 46: // "identifier" -/* Line 647 of yacc.c */ -#line 190 "parse-gram.y" +/* Line 751 of yacc.c */ +#line 199 "src/parse-gram.y" { fputs (((*yyvaluep).uniqstr), stderr); } -/* Line 647 of yacc.c */ -#line 1046 "../master/src/parse-gram.c" +/* Line 751 of yacc.c */ +#line 1102 "src/parse-gram.c" break; case 47: // "identifier:" -/* Line 647 of yacc.c */ -#line 191 "parse-gram.y" +/* Line 751 of yacc.c */ +#line 201 "src/parse-gram.y" { fprintf (stderr, "%s:", ((*yyvaluep).uniqstr)); } -/* Line 647 of yacc.c */ -#line 1055 "../master/src/parse-gram.c" +/* Line 751 of yacc.c */ +#line 1111 "src/parse-gram.c" break; case 50: // "%{...%}" -/* Line 647 of yacc.c */ -#line 185 "parse-gram.y" +/* Line 751 of yacc.c */ +#line 195 "src/parse-gram.y" { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); } -/* Line 647 of yacc.c */ -#line 1064 "../master/src/parse-gram.c" +/* Line 751 of yacc.c */ +#line 1120 "src/parse-gram.c" break; case 52: // "" -/* Line 647 of yacc.c */ -#line 193 "parse-gram.y" +/* Line 751 of yacc.c */ +#line 203 "src/parse-gram.y" { fprintf (stderr, "<%s>", ((*yyvaluep).uniqstr)); } -/* Line 647 of yacc.c */ -#line 1073 "../master/src/parse-gram.c" +/* Line 751 of yacc.c */ +#line 1129 "src/parse-gram.c" break; - case 83: // variable + case 55: // "%param" + +/* Line 751 of yacc.c */ +#line 249 "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 751 of yacc.c */ +#line 1149 "src/parse-gram.c" + break; -/* Line 647 of yacc.c */ -#line 190 "parse-gram.y" + case 72: // symbol.prec + +/* Line 751 of yacc.c */ +#line 209 "src/parse-gram.y" + { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); } +/* Line 751 of yacc.c */ +#line 1158 "src/parse-gram.c" + break; + + case 85: // variable + +/* Line 751 of yacc.c */ +#line 199 "src/parse-gram.y" { fputs (((*yyvaluep).uniqstr), stderr); } -/* Line 647 of yacc.c */ -#line 1082 "../master/src/parse-gram.c" +/* Line 751 of yacc.c */ +#line 1167 "src/parse-gram.c" break; - case 84: // content.opt + case 86: // content.opt -/* Line 647 of yacc.c */ -#line 185 "parse-gram.y" +/* Line 751 of yacc.c */ +#line 195 "src/parse-gram.y" { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); } -/* Line 647 of yacc.c */ -#line 1091 "../master/src/parse-gram.c" +/* Line 751 of yacc.c */ +#line 1176 "src/parse-gram.c" break; - case 85: // braceless + case 87: // braceless -/* Line 647 of yacc.c */ -#line 185 "parse-gram.y" +/* Line 751 of yacc.c */ +#line 195 "src/parse-gram.y" { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); } -/* Line 647 of yacc.c */ -#line 1100 "../master/src/parse-gram.c" +/* Line 751 of yacc.c */ +#line 1185 "src/parse-gram.c" break; - case 86: // id + case 88: // id -/* Line 647 of yacc.c */ -#line 199 "parse-gram.y" +/* Line 751 of yacc.c */ +#line 209 "src/parse-gram.y" { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); } -/* Line 647 of yacc.c */ -#line 1109 "../master/src/parse-gram.c" +/* Line 751 of yacc.c */ +#line 1194 "src/parse-gram.c" break; - case 87: // id_colon + case 89: // id_colon -/* Line 647 of yacc.c */ -#line 200 "parse-gram.y" +/* Line 751 of yacc.c */ +#line 210 "src/parse-gram.y" { fprintf (stderr, "%s:", ((*yyvaluep).symbol)->tag); } -/* Line 647 of yacc.c */ -#line 1118 "../master/src/parse-gram.c" +/* Line 751 of yacc.c */ +#line 1203 "src/parse-gram.c" break; - case 88: // symbol + case 90: // symbol -/* Line 647 of yacc.c */ -#line 199 "parse-gram.y" +/* Line 751 of yacc.c */ +#line 209 "src/parse-gram.y" { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); } -/* Line 647 of yacc.c */ -#line 1127 "../master/src/parse-gram.c" +/* Line 751 of yacc.c */ +#line 1212 "src/parse-gram.c" break; - case 89: // string_as_id + case 91: // string_as_id -/* Line 647 of yacc.c */ -#line 199 "parse-gram.y" +/* Line 751 of yacc.c */ +#line 209 "src/parse-gram.y" { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); } -/* Line 647 of yacc.c */ -#line 1136 "../master/src/parse-gram.c" +/* Line 751 of yacc.c */ +#line 1221 "src/parse-gram.c" break; default: - break; + break; } } @@ -1194,10 +1279,10 @@ yy_stack_print (yybottom, yytop) YYFPRINTF (stderr, "\n"); } -# define YY_STACK_PRINT(Bottom, Top) \ -do { \ - if (yydebug) \ - yy_stack_print ((Bottom), (Top)); \ +# define YY_STACK_PRINT(Bottom, Top) \ +do { \ + if (yydebug) \ + yy_stack_print ((Bottom), (Top)); \ } while (YYID (0)) @@ -1235,9 +1320,9 @@ yy_reduce_print (yyssp, yyvsp, yylsp, yyrule) } } -# define YY_REDUCE_PRINT(Rule) \ -do { \ - if (yydebug) \ +# define YY_REDUCE_PRINT(Rule) \ +do { \ + if (yydebug) \ yy_reduce_print (yyssp, yyvsp, yylsp, Rule); \ } while (YYID (0)) @@ -1253,7 +1338,7 @@ int yydebug; /* YYINITDEPTH -- initial size of the parser's stacks. */ -#ifndef YYINITDEPTH +#ifndef YYINITDEPTH # define YYINITDEPTH 200 #endif @@ -1268,7 +1353,239 @@ int yydebug; # define YYMAXDEPTH 10000 #endif - +/* Given a state stack such that *YYBOTTOM is its bottom, such that + *YYTOP is either its top or is YYTOP_EMPTY to indicate an empty + stack, and such that *YYCAPACITY is the maximum number of elements it + can hold without a reallocation, make sure there is enough room to + store YYADD more elements. If not, allocate a new stack using + YYSTACK_ALLOC, copy the existing elements, and adjust *YYBOTTOM, + *YYTOP, and *YYCAPACITY to reflect the new capacity and memory + location. If *YYBOTTOM != YYBOTTOM_NO_FREE, then free the old stack + using YYSTACK_FREE. Return 0 if successful or if no reallocation is + required. Return 1 if memory is exhausted. */ +static int +yy_lac_stack_realloc (YYSIZE_T *yycapacity, YYSIZE_T yyadd, +#if YYDEBUG + char const *yydebug_prefix, + char const *yydebug_suffix, +#endif + yytype_int16 **yybottom, + yytype_int16 *yybottom_no_free, + yytype_int16 **yytop, yytype_int16 *yytop_empty) +{ + YYSIZE_T yysize_old = + *yytop == yytop_empty ? 0 : *yytop - *yybottom + 1; + YYSIZE_T yysize_new = yysize_old + yyadd; + if (*yycapacity < yysize_new) + { + YYSIZE_T yyalloc = 2 * yysize_new; + yytype_int16 *yybottom_new; + /* Use YYMAXDEPTH for maximum stack size given that the stack + should never need to grow larger than the main state stack + needs to grow without LAC. */ + if (YYMAXDEPTH < yysize_new) + { + YYDPRINTF ((stderr, "%smax size exceeded%s", yydebug_prefix, + yydebug_suffix)); + return 1; + } + if (YYMAXDEPTH < yyalloc) + yyalloc = YYMAXDEPTH; + yybottom_new = + (yytype_int16*) YYSTACK_ALLOC (yyalloc * sizeof *yybottom_new); + if (!yybottom_new) + { + YYDPRINTF ((stderr, "%srealloc failed%s", yydebug_prefix, + yydebug_suffix)); + return 1; + } + if (*yytop != yytop_empty) + { + YYCOPY (yybottom_new, *yybottom, yysize_old); + *yytop = yybottom_new + (yysize_old - 1); + } + if (*yybottom != yybottom_no_free) + YYSTACK_FREE (*yybottom); + *yybottom = yybottom_new; + *yycapacity = yyalloc; + } + return 0; +} + +/* Establish the initial context for the current lookahead if no initial + context is currently established. + + We define a context as a snapshot of the parser stacks. We define + the initial context for a lookahead as the context in which the + parser initially examines that lookahead in order to select a + syntactic action. Thus, if the lookahead eventually proves + syntactically unacceptable (possibly in a later context reached via a + series of reductions), the initial context can be used to determine + the exact set of tokens that would be syntactically acceptable in the + lookahead's place. Moreover, it is the context after which any + further semantic actions would be erroneous because they would be + determined by a syntactically unacceptable token. + + YY_LAC_ESTABLISH should be invoked when a reduction is about to be + performed in an inconsistent state (which, for the purposes of LAC, + includes consistent states that don't know they're consistent because + their default reductions have been disabled). Iff there is a + lookahead token, it should also be invoked before reporting a syntax + error. This latter case is for the sake of the debugging output. + + For parse.lac=full, the implementation of YY_LAC_ESTABLISH is as + follows. If no initial context is currently established for the + current lookahead, then check if that lookahead can eventually be + shifted if syntactic actions continue from the current context. + Report a syntax error if it cannot. */ +#define YY_LAC_ESTABLISH \ +do { \ + if (!yy_lac_established) \ + { \ + YYDPRINTF ((stderr, \ + "LAC: initial context established for %s\n", \ + yytname[yytoken])); \ + yy_lac_established = 1; \ + { \ + int yy_lac_status = \ + yy_lac (yyesa, &yyes, &yyes_capacity, yyssp, yytoken); \ + if (yy_lac_status == 2) \ + goto yyexhaustedlab; \ + if (yy_lac_status == 1) \ + goto yyerrlab; \ + } \ + } \ +} while (YYID (0)) + +/* Discard any previous initial lookahead context because of Event, + which may be a lookahead change or an invalidation of the currently + established initial context for the current lookahead. + + The most common example of a lookahead change is a shift. An example + of both cases is syntax error recovery. That is, a syntax error + occurs when the lookahead is syntactically erroneous for the + currently established initial context, so error recovery manipulates + the parser stacks to try to find a new initial context in which the + current lookahead is syntactically acceptable. If it fails to find + such a context, it discards the lookahead. */ +#if YYDEBUG +# define YY_LAC_DISCARD(Event) \ +do { \ + if (yy_lac_established) \ + { \ + if (yydebug) \ + YYFPRINTF (stderr, "LAC: initial context discarded due to " \ + Event "\n"); \ + yy_lac_established = 0; \ + } \ +} while (YYID (0)) +#else +# define YY_LAC_DISCARD(Event) yy_lac_established = 0 +#endif + +/* Given the stack whose top is *YYSSP, return 0 iff YYTOKEN can + eventually (after perhaps some reductions) be shifted, return 1 if + not, or return 2 if memory is exhausted. As preconditions and + postconditions: *YYES_CAPACITY is the allocated size of the array to + which *YYES points, and either *YYES = YYESA or *YYES points to an + array allocated with YYSTACK_ALLOC. yy_lac may overwrite the + contents of either array, alter *YYES and *YYES_CAPACITY, and free + any old *YYES other than YYESA. */ +static int +yy_lac (yytype_int16 *yyesa, yytype_int16 **yyes, + YYSIZE_T *yyes_capacity, yytype_int16 *yyssp, int yytoken) +{ + yytype_int16 *yyes_prev = yyssp; + yytype_int16 *yyesp = yyes_prev; + YYDPRINTF ((stderr, "LAC: checking lookahead %s:", yytname[yytoken])); + if (yytoken == YYUNDEFTOK) + { + YYDPRINTF ((stderr, " Always Err\n")); + return 1; + } + while (1) + { + int yyrule = yypact[*yyesp]; + if (yypact_value_is_default (yyrule) + || (yyrule += yytoken) < 0 || YYLAST < yyrule + || yycheck[yyrule] != yytoken) + { + yyrule = yydefact[*yyesp]; + if (yyrule == 0) + { + YYDPRINTF ((stderr, " Err\n")); + return 1; + } + } + else + { + yyrule = yytable[yyrule]; + if (yytable_value_is_error (yyrule)) + { + YYDPRINTF ((stderr, " Err\n")); + return 1; + } + if (0 < yyrule) + { + YYDPRINTF ((stderr, " S%d\n", yyrule)); + return 0; + } + yyrule = -yyrule; + } + { + YYSIZE_T yylen = yyr2[yyrule]; + YYDPRINTF ((stderr, " R%d", yyrule - 1)); + if (yyesp != yyes_prev) + { + YYSIZE_T yysize = yyesp - *yyes + 1; + if (yylen < yysize) + { + yyesp -= yylen; + yylen = 0; + } + else + { + yylen -= yysize; + yyesp = yyes_prev; + } + } + if (yylen) + yyesp = yyes_prev -= yylen; + } + { + int yystate; + { + int yylhs = yyr1[yyrule] - YYNTOKENS; + yystate = yypgoto[yylhs] + *yyesp; + if (yystate < 0 || YYLAST < yystate + || yycheck[yystate] != *yyesp) + yystate = yydefgoto[yylhs]; + else + yystate = yytable[yystate]; + } + if (yyesp == yyes_prev) + { + yyesp = *yyes; + *yyesp = yystate; + } + else + { + if (yy_lac_stack_realloc (yyes_capacity, 1, +#if YYDEBUG + " (", ")", +#endif + yyes, yyesa, &yyesp, yyes_prev)) + { + YYDPRINTF ((stderr, "\n")); + return 2; + } + *++yyesp = yystate; + } + YYDPRINTF ((stderr, " G%d", yystate)); + } + } +} + #if YYERROR_VERBOSE @@ -1340,27 +1657,27 @@ yytnamerr (char *yyres, const char *yystr) char const *yyp = yystr; for (;;) - switch (*++yyp) - { - case '\'': - case ',': - goto do_not_strip_quotes; - - case '\\': - if (*++yyp != '\\') - goto do_not_strip_quotes; - /* Fall through. */ - default: - if (yyres) - yyres[yyn] = *yyp; - yyn++; - break; - - case '"': - if (yyres) - yyres[yyn] = '\0'; - return yyn; - } + switch (*++yyp) + { + case '\'': + case ',': + goto do_not_strip_quotes; + + case '\\': + if (*++yyp != '\\') + goto do_not_strip_quotes; + /* Fall through. */ + default: + if (yyres) + yyres[yyn] = *yyp; + yyn++; + break; + + case '"': + if (yyres) + yyres[yyn] = '\0'; + return yyn; + } do_not_strip_quotes: ; } @@ -1371,106 +1688,147 @@ 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) -{ - int yyn = yypact[yystate]; +/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message + about the unexpected token YYTOKEN for the state stack whose top is + YYSSP. In order to see if a particular token T is a + valid looakhead, invoke yy_lac (YYESA, YYES, YYES_CAPACITY, YYSSP, T). - if (! (YYPACT_NINF < yyn && yyn <= YYLAST)) - return 0; - else + Return 0 if *YYMSG was successfully written. Return 1 if *YYMSG is + not large enough to hold the message. In that case, also set + *YYMSG_ALLOC to the required number of bytes. Return 2 if the + required number of bytes is too large to store or if + yy_lac returned 2. */ +static int +yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, + yytype_int16 *yyesa, yytype_int16 **yyes, + YYSIZE_T *yyes_capacity, yytype_int16 *yyssp, int yytoken) +{ + YYSIZE_T yysize0 = yytnamerr (0, yytname[yytoken]); + YYSIZE_T yysize = yysize0; + YYSIZE_T yysize1; + enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; + /* Internationalized format string. */ + const char *yyformat = 0; + /* Arguments of yyformat. */ + char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; + /* Number of reported tokens (one for the "unexpected", one per + "expected"). */ + int yycount = 0; + + /* There are many possibilities here to consider: + - Assume YYFAIL is not used. It's too flawed to consider. See + + for details. YYERROR is fine as it does not invoke this + function. + - If this state is a consistent state with a default action, then + the only way this function was invoked is if the default action + is an error action. In that case, don't check for expected + tokens because there are none. + - The only way there can be no lookahead present (in yychar) is if + this state is a consistent state with a default action. Thus, + detecting the absence of a lookahead is sufficient to determine + that there is no unexpected or expected token to report. In that + case, just report a simple "syntax error". + - Don't assume there isn't a lookahead just because this state is a + consistent state with a default action. There might have been a + previous inconsistent state, consistent state with a non-default + action, or user semantic action that manipulated yychar. + In the first two cases, it might appear that the current syntax + error should have been detected in the previous state when yy_lac + was invoked. However, at that time, there might have been a + different syntax error that discarded a different initial context + during error recovery, leaving behind the current lookahead. + */ + if (yytoken != YYEMPTY) { - YYSIZE_T yysize0 = yytnamerr (0, yytname[yytoken]); - YYSIZE_T yysize = yysize0; - YYSIZE_T yysize1; - int yysize_overflow = 0; - enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; - /* Internationalized format string. */ - const char *yyformat = 0; - /* Arguments of yyformat. */ - char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; - - /* Start YYX at -YYN if negative to avoid negative indexes in - YYCHECK. */ - int yyxbegin = yyn < 0 ? -yyn : 0; - - /* Stay within bounds of both yycheck and yytname. */ - int yychecklim = YYLAST - yyn + 1; - int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; - /* Number of reported tokens (one for the "unexpected", one per - "expected"). */ - int yycount = 0; - int yyx; - + int yyn = yypact[*yyssp]; + YYDPRINTF ((stderr, "Constructing syntax error message\n")); yyarg[yycount++] = yytname[yytoken]; - - for (yyx = yyxbegin; yyx < yyxend; ++yyx) - if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) - { - if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) - { - yycount = 1; - yysize = yysize0; - break; - } - yyarg[yycount++] = yytname[yyx]; - yysize1 = yysize + yytnamerr (0, yytname[yyx]); - yysize_overflow |= (yysize1 < yysize); - yysize = yysize1; - } - - switch (yycount) + if (!yypact_value_is_default (yyn)) { -#define YYCASE_(N, S) \ - case N: \ - yyformat = S; \ - break - YYCASE_(1, YY_("syntax error, unexpected %s")); - YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s")); - YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s")); - YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s")); - YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s")); -#undef YYCASE_ - } + int yyx; - yysize1 = yysize + yystrlen (yyformat); - yysize_overflow |= (yysize1 < yysize); - yysize = yysize1; - - if (yysize_overflow) - return YYSIZE_MAXIMUM; - - 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) + for (yyx = 0; yyx < YYNTOKENS; ++yyx) + if (yyx != YYTERROR && yyx != YYUNDEFTOK) { - yyp += yytnamerr (yyp, yyarg[yyi++]); - yyformat += 2; + { + int yy_lac_status = yy_lac (yyesa, yyes, yyes_capacity, + yyssp, yyx); + if (yy_lac_status == 2) + return 2; + if (yy_lac_status == 1) + continue; + } + if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) + { + yycount = 1; + yysize = yysize0; + break; + } + yyarg[yycount++] = yytname[yyx]; + yysize1 = yysize + yytnamerr (0, yytname[yyx]); + if (! (yysize <= yysize1 + && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + return 2; + yysize = yysize1; } - else - { - yyp++; - yyformat++; - } - } - return yysize; + } +# if YYDEBUG + else if (yydebug) + YYFPRINTF (stderr, "No expected tokens.\n"); +# endif + } + + switch (yycount) + { +# define YYCASE_(N, S) \ + case N: \ + yyformat = S; \ + break + YYCASE_(0, YY_("syntax error")); + YYCASE_(1, YY_("syntax error, unexpected %s")); + YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s")); + YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s")); + YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s")); + YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s")); +# undef YYCASE_ } + + yysize1 = yysize + yystrlen (yyformat); + if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + return 2; + yysize = yysize1; + + if (*yymsg_alloc < yysize) + { + *yymsg_alloc = 2 * yysize; + if (! (yysize <= *yymsg_alloc + && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM)) + *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM; + return 1; + } + + /* 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 */ - /*-----------------------------------------------. | Release the memory associated to this symbol. | @@ -1500,10 +1858,11 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp) switch (yytype) { default: - break; + break; } } + /* Prevent warnings from -Wmissing-prototypes. */ #ifdef YYPARSE_PARAM #if (defined __STDC__ || defined __C99__FUNC__ \ @@ -1522,12 +1881,9 @@ int yyparse (); #endif /* ! YYPARSE_PARAM */ - - - -/*-------------------------. -| yyparse or yypush_parse. | -`-------------------------*/ +/*----------. +| yyparse. | +`----------*/ #ifdef YYPARSE_PARAM #if (defined __STDC__ || defined __C99__FUNC__ \ @@ -1591,10 +1947,15 @@ YYLTYPE yylloc; YYLTYPE *yylsp; /* The locations where the error started and ended. */ - YYLTYPE yyerror_range[2]; + YYLTYPE yyerror_range[3]; YYSIZE_T yystacksize; + yytype_int16 yyesa[20]; + yytype_int16 *yyes; + YYSIZE_T yyes_capacity; + + int yy_lac_established = 0; int yyn; int yyresult; /* Lookahead token as an internal (translated) token number. */ @@ -1623,6 +1984,11 @@ YYLTYPE yylloc; yyls = yylsa; yystacksize = YYINITDEPTH; + yyes = yyesa; + yyes_capacity = sizeof yyesa / sizeof *yyes; + if (YYMAXDEPTH < yyes_capacity) + yyes_capacity = YYMAXDEPTH; + YYDPRINTF ((stderr, "Starting parse\n")); yystate = 0; @@ -1638,23 +2004,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 86 "parse-gram.y" +/* Line 1524 of yacc.c */ +#line 98 "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 1658 "../master/src/parse-gram.c" +/* Line 1524 of yacc.c */ +#line 2024 "src/parse-gram.c" yylsp[0] = yylloc; goto yysetstate; @@ -1677,26 +2043,26 @@ YYLTYPE yylloc; #ifdef yyoverflow { - /* Give user a chance to reallocate the stack. Use copies of - these so that the &'s don't force the real ones into - memory. */ - YYSTYPE *yyvs1 = yyvs; - yytype_int16 *yyss1 = yyss; - YYLTYPE *yyls1 = yyls; - - /* Each stack pointer address is followed by the size of the - data in use in that stack, in bytes. This used to be a - conditional around just the two extra args, but that might - be undefined if yyoverflow is a macro. */ - yyoverflow (YY_("memory exhausted"), - &yyss1, yysize * sizeof (*yyssp), - &yyvs1, yysize * sizeof (*yyvsp), - &yyls1, yysize * sizeof (*yylsp), - &yystacksize); - - yyls = yyls1; - yyss = yyss1; - yyvs = yyvs1; + /* Give user a chance to reallocate the stack. Use copies of + these so that the &'s don't force the real ones into + memory. */ + YYSTYPE *yyvs1 = yyvs; + yytype_int16 *yyss1 = yyss; + YYLTYPE *yyls1 = yyls; + + /* Each stack pointer address is followed by the size of the + data in use in that stack, in bytes. This used to be a + conditional around just the two extra args, but that might + be undefined if yyoverflow is a macro. */ + yyoverflow (YY_("memory exhausted"), + &yyss1, yysize * sizeof (*yyssp), + &yyvs1, yysize * sizeof (*yyvsp), + &yyls1, yysize * sizeof (*yylsp), + &yystacksize); + + yyls = yyls1; + yyss = yyss1; + yyvs = yyvs1; } #else /* no yyoverflow */ # ifndef YYSTACK_RELOCATE @@ -1704,23 +2070,23 @@ YYLTYPE yylloc; # else /* Extend the stack our own way. */ if (YYMAXDEPTH <= yystacksize) - goto yyexhaustedlab; + goto yyexhaustedlab; yystacksize *= 2; if (YYMAXDEPTH < yystacksize) - yystacksize = YYMAXDEPTH; + yystacksize = YYMAXDEPTH; { - yytype_int16 *yyss1 = yyss; - union yyalloc *yyptr = - (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); - if (! yyptr) - goto yyexhaustedlab; - YYSTACK_RELOCATE (yyss_alloc, yyss); - YYSTACK_RELOCATE (yyvs_alloc, yyvs); - YYSTACK_RELOCATE (yyls_alloc, yyls); + yytype_int16 *yyss1 = yyss; + union yyalloc *yyptr = + (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); + if (! yyptr) + goto yyexhaustedlab; + YYSTACK_RELOCATE (yyss_alloc, yyss); + YYSTACK_RELOCATE (yyvs_alloc, yyvs); + YYSTACK_RELOCATE (yyls_alloc, yyls); # undef YYSTACK_RELOCATE - if (yyss1 != yyssa) - YYSTACK_FREE (yyss1); + if (yyss1 != yyssa) + YYSTACK_FREE (yyss1); } # endif #endif /* no yyoverflow */ @@ -1730,10 +2096,10 @@ YYLTYPE yylloc; yylsp = yyls + yysize - 1; YYDPRINTF ((stderr, "Stack size increased to %lu\n", - (unsigned long int) yystacksize)); + (unsigned long int) yystacksize)); if (yyss + yystacksize - 1 <= yyssp) - YYABORT; + YYABORT; } YYDPRINTF ((stderr, "Entering state %d\n", yystate)); @@ -1753,7 +2119,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. */ @@ -1780,12 +2146,16 @@ yybackup: detect an error, take that action. */ yyn += yytoken; if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken) - goto yydefault; + { + YY_LAC_ESTABLISH; + goto yydefault; + } yyn = yytable[yyn]; if (yyn <= 0) { - if (yyn == 0 || yyn == YYTABLE_NINF) - goto yyerrlab; + if (yytable_value_is_error (yyn)) + goto yyerrlab; + YY_LAC_ESTABLISH; yyn = -yyn; goto yyreduce; } @@ -1800,6 +2170,7 @@ yybackup: /* Discard the shifted token. */ yychar = YYEMPTY; + YY_LAC_DISCARD ("shift"); yystate = yyn; *++yyvsp = yylval; @@ -1837,11 +2208,13 @@ yyreduce: /* Default location. */ YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen); YY_REDUCE_PRINT (yyn); - switch (yyn) - { - case 6: -/* Line 1380 of yacc.c */ -#line 223 "parse-gram.y" + { + int yychar_backup = yychar; + switch (yyn) + { + case 6: +/* Line 1740 of yacc.c */ +#line 285 "src/parse-gram.y" { code_props plain_code; code_props_plain_init (&plain_code, (yyvsp[0].chars), (yylsp[0])); @@ -1851,107 +2224,107 @@ yyreduce: plain_code.code, (yylsp[0])); code_scanner_last_string_free (); } -/* Line 1380 of yacc.c */ -#line 1856 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2229 "src/parse-gram.c" break; case 7: -/* Line 1380 of yacc.c */ -#line 233 "parse-gram.y" +/* Line 1740 of yacc.c */ +#line 295 "src/parse-gram.y" { muscle_percent_define_ensure ((yyvsp[0].uniqstr), (yylsp[0]), true); } -/* Line 1380 of yacc.c */ -#line 1866 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2239 "src/parse-gram.c" break; case 8: -/* Line 1380 of yacc.c */ -#line 237 "parse-gram.y" +/* Line 1740 of yacc.c */ +#line 299 "src/parse-gram.y" { muscle_percent_define_insert ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].chars), MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE); } -/* Line 1380 of yacc.c */ -#line 1877 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2250 "src/parse-gram.c" break; case 9: -/* Line 1380 of yacc.c */ -#line 241 "parse-gram.y" +/* Line 1740 of yacc.c */ +#line 303 "src/parse-gram.y" { defines_flag = true; } -/* Line 1380 of yacc.c */ -#line 1885 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2258 "src/parse-gram.c" break; case 10: -/* Line 1380 of yacc.c */ -#line 243 "parse-gram.y" +/* Line 1740 of yacc.c */ +#line 305 "src/parse-gram.y" { defines_flag = true; spec_defines_file = xstrdup ((yyvsp[0].chars)); } -/* Line 1380 of yacc.c */ -#line 1896 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2269 "src/parse-gram.c" break; case 11: -/* Line 1380 of yacc.c */ -#line 248 "parse-gram.y" +/* Line 1740 of yacc.c */ +#line 310 "src/parse-gram.y" { muscle_percent_define_insert ("parse.error", (yylsp[0]), "verbose", MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE); } -/* Line 1380 of yacc.c */ -#line 1907 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2280 "src/parse-gram.c" break; case 12: -/* Line 1380 of yacc.c */ -#line 252 "parse-gram.y" +/* Line 1740 of yacc.c */ +#line 314 "src/parse-gram.y" { expected_sr_conflicts = (yyvsp[0].integer); } -/* Line 1380 of yacc.c */ -#line 1915 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2288 "src/parse-gram.c" break; case 13: -/* Line 1380 of yacc.c */ -#line 253 "parse-gram.y" +/* Line 1740 of yacc.c */ +#line 315 "src/parse-gram.y" { expected_rr_conflicts = (yyvsp[0].integer); } -/* Line 1380 of yacc.c */ -#line 1923 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2296 "src/parse-gram.c" break; case 14: -/* Line 1380 of yacc.c */ -#line 254 "parse-gram.y" +/* Line 1740 of yacc.c */ +#line 316 "src/parse-gram.y" { spec_file_prefix = (yyvsp[0].chars); } -/* Line 1380 of yacc.c */ -#line 1931 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2304 "src/parse-gram.c" break; case 15: -/* Line 1380 of yacc.c */ -#line 255 "parse-gram.y" +/* Line 1740 of yacc.c */ +#line 317 "src/parse-gram.y" { spec_file_prefix = (yyvsp[0].chars); } -/* Line 1380 of yacc.c */ -#line 1939 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2312 "src/parse-gram.c" break; case 16: -/* Line 1380 of yacc.c */ -#line 257 "parse-gram.y" +/* Line 1740 of yacc.c */ +#line 319 "src/parse-gram.y" { nondeterministic_parser = true; glr_parser = true; } -/* Line 1380 of yacc.c */ -#line 1950 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2323 "src/parse-gram.c" break; case 17: -/* Line 1380 of yacc.c */ -#line 262 "parse-gram.y" +/* Line 1740 of yacc.c */ +#line 324 "src/parse-gram.y" { code_props action; code_props_symbol_action_init (&action, (yyvsp[0].code), (yylsp[0])); @@ -1960,96 +2333,96 @@ yyreduce: muscle_code_grow ("initial_action", action.code, (yylsp[0])); code_scanner_last_string_free (); } -/* Line 1380 of yacc.c */ -#line 1965 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2338 "src/parse-gram.c" break; case 18: -/* Line 1380 of yacc.c */ -#line 270 "parse-gram.y" +/* Line 1740 of yacc.c */ +#line 332 "src/parse-gram.y" { language_argmatch ((yyvsp[0].chars), grammar_prio, (yylsp[-1])); } -/* Line 1380 of yacc.c */ -#line 1973 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2346 "src/parse-gram.c" break; case 19: -/* Line 1380 of yacc.c */ -#line 271 "parse-gram.y" - { add_param ("lex_param", (yyvsp[0].code), (yylsp[0])); } -/* Line 1380 of yacc.c */ -#line 1981 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 333 "src/parse-gram.y" + { spec_name_prefix = (yyvsp[0].chars); } +/* Line 1740 of yacc.c */ +#line 2354 "src/parse-gram.c" break; case 20: -/* Line 1380 of yacc.c */ -#line 272 "parse-gram.y" +/* Line 1740 of yacc.c */ +#line 334 "src/parse-gram.y" { spec_name_prefix = (yyvsp[0].chars); } -/* Line 1380 of yacc.c */ -#line 1989 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2362 "src/parse-gram.c" break; case 21: -/* Line 1380 of yacc.c */ -#line 273 "parse-gram.y" - { spec_name_prefix = (yyvsp[0].chars); } -/* Line 1380 of yacc.c */ -#line 1997 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 335 "src/parse-gram.y" + { no_lines_flag = true; } +/* Line 1740 of yacc.c */ +#line 2370 "src/parse-gram.c" break; case 22: -/* Line 1380 of yacc.c */ -#line 274 "parse-gram.y" - { no_lines_flag = true; } -/* Line 1380 of yacc.c */ -#line 2005 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 336 "src/parse-gram.y" + { nondeterministic_parser = true; } +/* Line 1740 of yacc.c */ +#line 2378 "src/parse-gram.c" break; case 23: -/* Line 1380 of yacc.c */ -#line 275 "parse-gram.y" - { nondeterministic_parser = true; } -/* Line 1380 of yacc.c */ -#line 2013 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 337 "src/parse-gram.y" + { spec_outfile = (yyvsp[0].chars); } +/* Line 1740 of yacc.c */ +#line 2386 "src/parse-gram.c" break; case 24: -/* Line 1380 of yacc.c */ -#line 276 "parse-gram.y" +/* Line 1740 of yacc.c */ +#line 338 "src/parse-gram.y" { spec_outfile = (yyvsp[0].chars); } -/* Line 1380 of yacc.c */ -#line 2021 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2394 "src/parse-gram.c" break; case 25: -/* Line 1380 of yacc.c */ -#line 277 "parse-gram.y" - { spec_outfile = (yyvsp[0].chars); } -/* Line 1380 of yacc.c */ -#line 2029 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 339 "src/parse-gram.y" + { current_param = (yyvsp[0].param); } +/* Line 1740 of yacc.c */ +#line 2402 "src/parse-gram.c" break; case 26: -/* Line 1380 of yacc.c */ -#line 278 "parse-gram.y" - { add_param ("parse_param", (yyvsp[0].code), (yylsp[0])); } -/* Line 1380 of yacc.c */ -#line 2037 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 339 "src/parse-gram.y" + { current_param = param_none; } +/* Line 1740 of yacc.c */ +#line 2410 "src/parse-gram.c" break; case 27: -/* Line 1380 of yacc.c */ -#line 279 "parse-gram.y" +/* Line 1740 of yacc.c */ +#line 340 "src/parse-gram.y" { version_check (&(yylsp[0]), (yyvsp[0].chars)); } -/* Line 1380 of yacc.c */ -#line 2045 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2418 "src/parse-gram.c" break; case 28: -/* Line 1380 of yacc.c */ -#line 281 "parse-gram.y" +/* Line 1740 of yacc.c */ +#line 342 "src/parse-gram.y" { char const *skeleton_user = (yyvsp[0].chars); - if (strchr (skeleton_user, '/')) + if (mbschr (skeleton_user, '/')) { size_t dir_length = strlen (current_file); char *skeleton_build; @@ -2070,534 +2443,576 @@ yyreduce: } skeleton_arg (skeleton_user, grammar_prio, (yylsp[-1])); } -/* Line 1380 of yacc.c */ -#line 2075 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2448 "src/parse-gram.c" break; case 29: -/* Line 1380 of yacc.c */ -#line 304 "parse-gram.y" +/* Line 1740 of yacc.c */ +#line 365 "src/parse-gram.y" { token_table_flag = true; } -/* Line 1380 of yacc.c */ -#line 2083 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2456 "src/parse-gram.c" break; case 30: -/* Line 1380 of yacc.c */ -#line 305 "parse-gram.y" +/* Line 1740 of yacc.c */ +#line 366 "src/parse-gram.y" { report_flag |= report_states; } -/* Line 1380 of yacc.c */ -#line 2091 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2464 "src/parse-gram.c" break; case 31: -/* Line 1380 of yacc.c */ -#line 306 "parse-gram.y" +/* Line 1740 of yacc.c */ +#line 367 "src/parse-gram.y" { yacc_flag = true; } -/* Line 1380 of yacc.c */ -#line 2099 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2472 "src/parse-gram.c" + break; + + case 33: +/* Line 1740 of yacc.c */ +#line 372 "src/parse-gram.y" + { add_param (current_param, (yyvsp[0].code), (yylsp[0])); } +/* Line 1740 of yacc.c */ +#line 2480 "src/parse-gram.c" + break; + + case 34: +/* Line 1740 of yacc.c */ +#line 373 "src/parse-gram.y" + { add_param (current_param, (yyvsp[0].code), (yylsp[0])); } +/* Line 1740 of yacc.c */ +#line 2488 "src/parse-gram.c" break; - case 35: -/* Line 1380 of yacc.c */ -#line 314 "parse-gram.y" + case 37: +/* Line 1740 of yacc.c */ +#line 385 "src/parse-gram.y" { grammar_start_symbol_set ((yyvsp[0].symbol), (yylsp[0])); } -/* Line 1380 of yacc.c */ -#line 2109 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2498 "src/parse-gram.c" break; - case 36: -/* Line 1380 of yacc.c */ -#line 318 "parse-gram.y" + case 38: +/* Line 1740 of yacc.c */ +#line 389 "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_destructor_set (list, (yyvsp[-1].code), (yylsp[-1])); symbol_list_free ((yyvsp[0].list)); } -/* Line 1380 of yacc.c */ -#line 2122 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2511 "src/parse-gram.c" break; - case 37: -/* Line 1380 of yacc.c */ -#line 325 "parse-gram.y" + case 39: +/* Line 1740 of yacc.c */ +#line 396 "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_printer_set (list, (yyvsp[-1].code), (yylsp[-1])); symbol_list_free ((yyvsp[0].list)); } -/* Line 1380 of yacc.c */ -#line 2135 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2524 "src/parse-gram.c" break; - case 38: -/* Line 1380 of yacc.c */ -#line 332 "parse-gram.y" + case 40: +/* Line 1740 of yacc.c */ +#line 403 "src/parse-gram.y" { default_prec = true; } -/* Line 1380 of yacc.c */ -#line 2145 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2534 "src/parse-gram.c" break; - case 39: -/* Line 1380 of yacc.c */ -#line 336 "parse-gram.y" + case 41: +/* Line 1740 of yacc.c */ +#line 407 "src/parse-gram.y" { default_prec = false; } -/* Line 1380 of yacc.c */ -#line 2155 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2544 "src/parse-gram.c" break; - case 40: -/* Line 1380 of yacc.c */ -#line 340 "parse-gram.y" + case 42: +/* Line 1740 of yacc.c */ +#line 411 "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 2168 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2557 "src/parse-gram.c" break; - case 41: -/* Line 1380 of yacc.c */ -#line 347 "parse-gram.y" + case 43: +/* Line 1740 of yacc.c */ +#line 418 "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 2179 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2568 "src/parse-gram.c" break; - case 42: -/* Line 1380 of yacc.c */ -#line 361 "parse-gram.y" + case 44: +/* Line 1740 of yacc.c */ +#line 432 "src/parse-gram.y" {} -/* Line 1380 of yacc.c */ -#line 2187 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2576 "src/parse-gram.c" break; - case 43: -/* Line 1380 of yacc.c */ -#line 362 "parse-gram.y" + case 45: +/* Line 1740 of yacc.c */ +#line 433 "src/parse-gram.y" { muscle_code_grow ("union_name", (yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1380 of yacc.c */ -#line 2195 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2584 "src/parse-gram.c" break; - case 44: -/* Line 1380 of yacc.c */ -#line 367 "parse-gram.y" + case 46: +/* Line 1740 of yacc.c */ +#line 438 "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 2207 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2596 "src/parse-gram.c" break; - case 45: -/* Line 1380 of yacc.c */ -#line 378 "parse-gram.y" + case 47: +/* Line 1740 of yacc.c */ +#line 449 "src/parse-gram.y" { current_class = nterm_sym; } -/* Line 1380 of yacc.c */ -#line 2215 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2604 "src/parse-gram.c" break; - case 46: -/* Line 1380 of yacc.c */ -#line 379 "parse-gram.y" + case 48: +/* Line 1740 of yacc.c */ +#line 450 "src/parse-gram.y" { current_class = unknown_sym; current_type = NULL; } -/* Line 1380 of yacc.c */ -#line 2226 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2615 "src/parse-gram.c" break; - case 47: -/* Line 1380 of yacc.c */ -#line 383 "parse-gram.y" + case 49: +/* Line 1740 of yacc.c */ +#line 454 "src/parse-gram.y" { current_class = token_sym; } -/* Line 1380 of yacc.c */ -#line 2234 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2623 "src/parse-gram.c" break; - case 48: -/* Line 1380 of yacc.c */ -#line 384 "parse-gram.y" + case 50: +/* Line 1740 of yacc.c */ +#line 455 "src/parse-gram.y" { current_class = unknown_sym; current_type = NULL; } -/* Line 1380 of yacc.c */ -#line 2245 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2634 "src/parse-gram.c" break; - case 49: -/* Line 1380 of yacc.c */ -#line 389 "parse-gram.y" + case 51: +/* Line 1740 of yacc.c */ +#line 460 "src/parse-gram.y" { symbol_list *list; tag_seen = true; for (list = (yyvsp[0].list); list; list = list->next) - symbol_type_set (list->content.sym, (yyvsp[-1].uniqstr), (yylsp[-1])); + symbol_type_set (list->content.sym, (yyvsp[-1].uniqstr), (yylsp[-1])); symbol_list_free ((yyvsp[0].list)); } -/* Line 1380 of yacc.c */ -#line 2259 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2648 "src/parse-gram.c" break; - case 50: -/* Line 1380 of yacc.c */ -#line 400 "parse-gram.y" + case 52: +/* Line 1740 of yacc.c */ +#line 471 "src/parse-gram.y" { symbol_list *list; ++current_prec; for (list = (yyvsp[0].list); list; list = list->next) - { - symbol_type_set (list->content.sym, current_type, (yylsp[-1])); - symbol_precedence_set (list->content.sym, current_prec, (yyvsp[-2].assoc), (yylsp[-2])); - } + { + symbol_type_set (list->content.sym, current_type, (yylsp[-1])); + symbol_precedence_set (list->content.sym, current_prec, (yyvsp[-2].assoc), (yylsp[-2])); + } symbol_list_free ((yyvsp[0].list)); current_type = NULL; } -/* Line 1380 of yacc.c */ -#line 2277 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2666 "src/parse-gram.c" break; - case 51: -/* Line 1380 of yacc.c */ -#line 414 "parse-gram.y" + case 53: +/* Line 1740 of yacc.c */ +#line 485 "src/parse-gram.y" { (yyval.assoc) = left_assoc; } -/* Line 1380 of yacc.c */ -#line 2285 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2674 "src/parse-gram.c" break; - case 52: -/* Line 1380 of yacc.c */ -#line 415 "parse-gram.y" + case 54: +/* Line 1740 of yacc.c */ +#line 486 "src/parse-gram.y" { (yyval.assoc) = right_assoc; } -/* Line 1380 of yacc.c */ -#line 2293 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2682 "src/parse-gram.c" break; - case 53: -/* Line 1380 of yacc.c */ -#line 416 "parse-gram.y" + case 55: +/* Line 1740 of yacc.c */ +#line 487 "src/parse-gram.y" { (yyval.assoc) = non_assoc; } -/* Line 1380 of yacc.c */ -#line 2301 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2690 "src/parse-gram.c" break; - case 54: -/* Line 1380 of yacc.c */ -#line 417 "parse-gram.y" + case 56: +/* Line 1740 of yacc.c */ +#line 488 "src/parse-gram.y" { (yyval.assoc) = precedence_assoc; } -/* Line 1380 of yacc.c */ -#line 2309 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2698 "src/parse-gram.c" break; - case 55: -/* Line 1380 of yacc.c */ -#line 421 "parse-gram.y" + case 57: +/* Line 1740 of yacc.c */ +#line 492 "src/parse-gram.y" { current_type = NULL; } -/* Line 1380 of yacc.c */ -#line 2317 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2706 "src/parse-gram.c" break; - case 56: -/* Line 1380 of yacc.c */ -#line 422 "parse-gram.y" + case 58: +/* Line 1740 of yacc.c */ +#line 493 "src/parse-gram.y" { current_type = (yyvsp[0].uniqstr); tag_seen = true; } -/* Line 1380 of yacc.c */ -#line 2325 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2714 "src/parse-gram.c" break; - case 57: -/* Line 1380 of yacc.c */ -#line 428 "parse-gram.y" + case 59: +/* Line 1740 of yacc.c */ +#line 499 "src/parse-gram.y" { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); } -/* Line 1380 of yacc.c */ -#line 2333 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2722 "src/parse-gram.c" break; - case 58: -/* Line 1380 of yacc.c */ -#line 430 "parse-gram.y" + case 60: +/* Line 1740 of yacc.c */ +#line 501 "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 2341 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2730 "src/parse-gram.c" break; - case 59: -/* Line 1380 of yacc.c */ -#line 434 "parse-gram.y" + case 61: +/* Line 1740 of yacc.c */ +#line 505 "src/parse-gram.y" { (yyval.symbol) = (yyvsp[0].symbol); } -/* Line 1380 of yacc.c */ -#line 2349 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2738 "src/parse-gram.c" break; - case 60: -/* Line 1380 of yacc.c */ -#line 435 "parse-gram.y" + case 62: +/* Line 1740 of yacc.c */ +#line 506 "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 2357 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2746 "src/parse-gram.c" break; - case 61: -/* Line 1380 of yacc.c */ -#line 441 "parse-gram.y" + case 63: +/* Line 1740 of yacc.c */ +#line 512 "src/parse-gram.y" { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); } -/* Line 1380 of yacc.c */ -#line 2365 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2754 "src/parse-gram.c" break; - case 62: -/* Line 1380 of yacc.c */ -#line 443 "parse-gram.y" + case 64: +/* Line 1740 of yacc.c */ +#line 514 "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 2373 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2762 "src/parse-gram.c" break; - case 63: -/* Line 1380 of yacc.c */ -#line 447 "parse-gram.y" + case 65: +/* Line 1740 of yacc.c */ +#line 518 "src/parse-gram.y" { (yyval.list) = (yyvsp[0].list); } -/* Line 1380 of yacc.c */ -#line 2381 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2770 "src/parse-gram.c" break; - case 64: -/* Line 1380 of yacc.c */ -#line 448 "parse-gram.y" + case 66: +/* Line 1740 of yacc.c */ +#line 519 "src/parse-gram.y" { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), (yyvsp[0].list)); } -/* Line 1380 of yacc.c */ -#line 2389 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2778 "src/parse-gram.c" break; - case 65: -/* Line 1380 of yacc.c */ -#line 452 "parse-gram.y" + case 67: +/* Line 1740 of yacc.c */ +#line 523 "src/parse-gram.y" { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); } -/* Line 1380 of yacc.c */ -#line 2397 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2786 "src/parse-gram.c" break; - case 66: -/* Line 1380 of yacc.c */ -#line 453 "parse-gram.y" + case 68: +/* Line 1740 of yacc.c */ +#line 524 "src/parse-gram.y" { (yyval.list) = symbol_list_type_new ((yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1380 of yacc.c */ -#line 2405 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2794 "src/parse-gram.c" break; - case 67: -/* Line 1380 of yacc.c */ -#line 454 "parse-gram.y" + case 69: +/* Line 1740 of yacc.c */ +#line 525 "src/parse-gram.y" { (yyval.list) = symbol_list_default_tagged_new ((yylsp[0])); } -/* Line 1380 of yacc.c */ -#line 2413 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2802 "src/parse-gram.c" break; - case 68: -/* Line 1380 of yacc.c */ -#line 455 "parse-gram.y" + case 70: +/* Line 1740 of yacc.c */ +#line 526 "src/parse-gram.y" { (yyval.list) = symbol_list_default_tagless_new ((yylsp[0])); } -/* Line 1380 of yacc.c */ -#line 2421 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2810 "src/parse-gram.c" break; - case 69: -/* Line 1380 of yacc.c */ -#line 461 "parse-gram.y" + case 71: +/* Line 1740 of yacc.c */ +#line 532 "src/parse-gram.y" { current_type = (yyvsp[0].uniqstr); tag_seen = true; } -/* Line 1380 of yacc.c */ -#line 2432 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2821 "src/parse-gram.c" break; - case 70: -/* Line 1380 of yacc.c */ -#line 466 "parse-gram.y" + case 72: +/* Line 1740 of yacc.c */ +#line 537 "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 2443 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2832 "src/parse-gram.c" break; - case 71: -/* Line 1380 of yacc.c */ -#line 471 "parse-gram.y" + case 73: +/* Line 1740 of yacc.c */ +#line 542 "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 2455 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2844 "src/parse-gram.c" break; - case 72: -/* Line 1380 of yacc.c */ -#line 477 "parse-gram.y" + case 74: +/* Line 1740 of yacc.c */ +#line 548 "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 2467 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2856 "src/parse-gram.c" break; - case 73: -/* Line 1380 of yacc.c */ -#line 483 "parse-gram.y" + case 75: +/* Line 1740 of yacc.c */ +#line 554 "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 2480 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2869 "src/parse-gram.c" break; - case 80: -/* Line 1380 of yacc.c */ -#line 513 "parse-gram.y" + case 82: +/* Line 1740 of yacc.c */ +#line 584 "src/parse-gram.y" { yyerrok; } -/* Line 1380 of yacc.c */ -#line 2490 "../master/src/parse-gram.c" - break; - - case 81: -/* Line 1380 of yacc.c */ -#line 519 "parse-gram.y" - { current_lhs = (yyvsp[-1].symbol); current_lhs_location = (yylsp[-1]); - current_lhs_named_ref = (yyvsp[0].named_ref); } -/* Line 1380 of yacc.c */ -#line 2499 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2879 "src/parse-gram.c" break; case 83: -/* Line 1380 of yacc.c */ -#line 524 "parse-gram.y" - { grammar_current_rule_end ((yylsp[0])); } -/* Line 1380 of yacc.c */ -#line 2507 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 590 "src/parse-gram.y" + { current_lhs ((yyvsp[-1].symbol), (yylsp[-1]), (yyvsp[0].named_ref)); } +/* Line 1740 of yacc.c */ +#line 2887 "src/parse-gram.c" break; case 84: -/* Line 1380 of yacc.c */ -#line 525 "parse-gram.y" +/* Line 1740 of yacc.c */ +#line 591 "src/parse-gram.y" + { + /* Free the current lhs. */ + current_lhs (0, (yylsp[-3]), 0); + } +/* Line 1740 of yacc.c */ +#line 2898 "src/parse-gram.c" + break; + + case 85: +/* Line 1740 of yacc.c */ +#line 598 "src/parse-gram.y" { grammar_current_rule_end ((yylsp[0])); } -/* Line 1380 of yacc.c */ -#line 2515 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2906 "src/parse-gram.c" break; case 86: -/* Line 1380 of yacc.c */ -#line 531 "parse-gram.y" - { grammar_current_rule_begin (current_lhs, current_lhs_location, - current_lhs_named_ref); } -/* Line 1380 of yacc.c */ -#line 2524 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 599 "src/parse-gram.y" + { grammar_current_rule_end ((yylsp[0])); } +/* Line 1740 of yacc.c */ +#line 2914 "src/parse-gram.c" break; - case 87: -/* Line 1380 of yacc.c */ -#line 534 "parse-gram.y" + case 88: +/* Line 1740 of yacc.c */ +#line 605 "src/parse-gram.y" + { grammar_current_rule_begin (current_lhs_symbol, current_lhs_location, + current_lhs_named_ref); } +/* Line 1740 of yacc.c */ +#line 2923 "src/parse-gram.c" + break; + + case 89: +/* Line 1740 of yacc.c */ +#line 608 "src/parse-gram.y" { grammar_current_rule_symbol_append ((yyvsp[-1].symbol), (yylsp[-1]), (yyvsp[0].named_ref)); } -/* Line 1380 of yacc.c */ -#line 2532 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2931 "src/parse-gram.c" break; - case 88: -/* Line 1380 of yacc.c */ -#line 536 "parse-gram.y" - { grammar_current_rule_action_append ((yyvsp[-1].code), (yylsp[-1]), (yyvsp[0].named_ref)); } -/* Line 1380 of yacc.c */ -#line 2540 "../master/src/parse-gram.c" + case 90: +/* Line 1740 of yacc.c */ +#line 610 "src/parse-gram.y" + { grammar_current_rule_action_append ((yyvsp[-1].code), (yylsp[-1]), (yyvsp[0].named_ref), false); } +/* Line 1740 of yacc.c */ +#line 2939 "src/parse-gram.c" break; - case 89: -/* Line 1380 of yacc.c */ -#line 538 "parse-gram.y" + case 91: +/* Line 1740 of yacc.c */ +#line 612 "src/parse-gram.y" + { grammar_current_rule_action_append ((yyvsp[0].code), (yylsp[0]), NULL, true); } +/* Line 1740 of yacc.c */ +#line 2947 "src/parse-gram.c" + break; + + case 92: +/* Line 1740 of yacc.c */ +#line 614 "src/parse-gram.y" { grammar_current_rule_prec_set ((yyvsp[0].symbol), (yylsp[0])); } -/* Line 1380 of yacc.c */ -#line 2548 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2955 "src/parse-gram.c" break; - case 90: -/* Line 1380 of yacc.c */ -#line 540 "parse-gram.y" + case 93: +/* Line 1740 of yacc.c */ +#line 616 "src/parse-gram.y" { grammar_current_rule_dprec_set ((yyvsp[0].integer), (yylsp[0])); } -/* Line 1380 of yacc.c */ -#line 2556 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2963 "src/parse-gram.c" break; - case 91: -/* Line 1380 of yacc.c */ -#line 542 "parse-gram.y" + case 94: +/* Line 1740 of yacc.c */ +#line 618 "src/parse-gram.y" { grammar_current_rule_merge_set ((yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1380 of yacc.c */ -#line 2564 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2971 "src/parse-gram.c" break; - case 92: -/* Line 1380 of yacc.c */ -#line 546 "parse-gram.y" + case 95: +/* Line 1740 of yacc.c */ +#line 622 "src/parse-gram.y" { (yyval.named_ref) = 0; } -/* Line 1380 of yacc.c */ -#line 2572 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2979 "src/parse-gram.c" break; - case 93: -/* Line 1380 of yacc.c */ -#line 548 "parse-gram.y" + case 96: +/* Line 1740 of yacc.c */ +#line 624 "src/parse-gram.y" { (yyval.named_ref) = named_ref_new((yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1380 of yacc.c */ -#line 2580 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2987 "src/parse-gram.c" break; - case 95: -/* Line 1380 of yacc.c */ -#line 560 "parse-gram.y" + case 98: +/* Line 1740 of yacc.c */ +#line 635 "src/parse-gram.y" { (yyval.uniqstr) = uniqstr_new ((yyvsp[0].chars)); } -/* Line 1380 of yacc.c */ -#line 2588 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2995 "src/parse-gram.c" break; - case 96: -/* Line 1380 of yacc.c */ -#line 565 "parse-gram.y" + case 99: +/* Line 1740 of yacc.c */ +#line 640 "src/parse-gram.y" { (yyval.chars) = ""; } -/* Line 1380 of yacc.c */ -#line 2596 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 3003 "src/parse-gram.c" break; - case 98: -/* Line 1380 of yacc.c */ -#line 576 "parse-gram.y" + case 100: +/* Line 1740 of yacc.c */ +#line 641 "src/parse-gram.y" + { (yyval.chars) = (yyvsp[0].uniqstr); } +/* Line 1740 of yacc.c */ +#line 3011 "src/parse-gram.c" + break; + + case 102: +/* Line 1740 of yacc.c */ +#line 652 "src/parse-gram.y" { code_props plain_code; (yyvsp[0].code)[strlen ((yyvsp[0].code)) - 1] = '\n'; @@ -2606,52 +3021,52 @@ yyreduce: gram_scanner_last_string_free (); (yyval.chars) = plain_code.code; } -/* Line 1380 of yacc.c */ -#line 2611 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 3026 "src/parse-gram.c" break; - case 99: -/* Line 1380 of yacc.c */ -#line 596 "parse-gram.y" + case 103: +/* Line 1740 of yacc.c */ +#line 672 "src/parse-gram.y" { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1380 of yacc.c */ -#line 2619 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 3034 "src/parse-gram.c" break; - case 100: -/* Line 1380 of yacc.c */ -#line 598 "parse-gram.y" + case 104: +/* Line 1740 of yacc.c */ +#line 674 "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 2631 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 3046 "src/parse-gram.c" break; - case 101: -/* Line 1380 of yacc.c */ -#line 606 "parse-gram.y" + case 105: +/* Line 1740 of yacc.c */ +#line 682 "src/parse-gram.y" { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1380 of yacc.c */ -#line 2639 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 3054 "src/parse-gram.c" break; - case 104: -/* Line 1380 of yacc.c */ -#line 618 "parse-gram.y" + case 108: +/* Line 1740 of yacc.c */ +#line 694 "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 2650 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 3065 "src/parse-gram.c" break; - case 106: -/* Line 1380 of yacc.c */ -#line 627 "parse-gram.y" + case 110: +/* Line 1740 of yacc.c */ +#line 703 "src/parse-gram.y" { code_props plain_code; code_props_plain_init (&plain_code, (yyvsp[0].chars), (yylsp[0])); @@ -2660,15 +3075,29 @@ yyreduce: muscle_code_grow ("epilogue", plain_code.code, (yylsp[0])); code_scanner_last_string_free (); } -/* Line 1380 of yacc.c */ -#line 2665 "../master/src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 3080 "src/parse-gram.c" break; -/* Line 1380 of yacc.c */ -#line 2670 "../master/src/parse-gram.c" - default: break; - } +/* Line 1740 of yacc.c */ +#line 3085 "src/parse-gram.c" + default: break; + } + if (yychar_backup != yychar) + YY_LAC_DISCARD ("yychar change"); + } + /* 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); @@ -2697,6 +3126,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 = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar); + /* If not already recovering from an error, report this error. */ if (!yyerrstatus) { @@ -2704,59 +3137,61 @@ yyerrlab: #if ! YYERROR_VERBOSE yyerror (YY_("syntax error")); #else +# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \ + yyesa, &yyes, &yyes_capacity, \ + yyssp, yytoken) { - 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; - } + char const *yymsgp = YY_("syntax error"); + int yysyntax_error_status; + if (yychar != YYEMPTY) + YY_LAC_ESTABLISH; + yysyntax_error_status = YYSYNTAX_ERROR; + if (yysyntax_error_status == 0) + yymsgp = yymsg; + else if (yysyntax_error_status == 1) + { + if (yymsg != yymsgbuf) + YYSTACK_FREE (yymsg); + yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc); + if (!yymsg) + { + yymsg = yymsgbuf; + yymsg_alloc = sizeof yymsgbuf; + yysyntax_error_status = 2; + } + else + { + yysyntax_error_status = YYSYNTAX_ERROR; + yymsgp = yymsg; + } + } + yyerror (yymsgp); + if (yysyntax_error_status == 2) + goto yyexhaustedlab; } +# undef YYSYNTAX_ERROR #endif } - yyerror_range[0] = yylloc; + yyerror_range[1] = yylloc; if (yyerrstatus == 3) { /* If just tried and failed to reuse lookahead token after an - error, discard it. */ + error, discard it. */ if (yychar <= YYEOF) - { - /* Return failure if at end of input. */ - if (yychar == YYEOF) - YYABORT; - } + { + /* Return failure if at end of input. */ + if (yychar == YYEOF) + YYABORT; + } else - { - yydestruct ("Error: discarding", - yytoken, &yylval, &yylloc); - yychar = YYEMPTY; - } + { + yydestruct ("Error: discarding", + yytoken, &yylval, &yylloc); + yychar = YYEMPTY; + } } /* Else will try to reuse lookahead token after shifting the error @@ -2775,7 +3210,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); @@ -2789,40 +3224,44 @@ yyerrorlab: | yyerrlab1 -- common code for both syntax error and YYERROR. | `-------------------------------------------------------------*/ yyerrlab1: - yyerrstatus = 3; /* Each real token shifted decrements this. */ + yyerrstatus = 3; /* Each real token shifted decrements this. */ for (;;) { yyn = yypact[yystate]; - if (yyn != YYPACT_NINF) - { - yyn += YYTERROR; - if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) - { - yyn = yytable[yyn]; - if (0 < yyn) - break; - } - } + if (!yypact_value_is_default (yyn)) + { + yyn += YYTERROR; + if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) + { + yyn = yytable[yyn]; + if (0 < yyn) + break; + } + } /* Pop the current state because it cannot handle the error token. */ if (yyssp == yyss) - YYABORT; + YYABORT; - yyerror_range[0] = *yylsp; + yyerror_range[1] = *yylsp; yydestruct ("Error: popping", - yystos[yystate], yyvsp, yylsp); + yystos[yystate], yyvsp, yylsp); YYPOPSTACK (1); yystate = *yyssp; YY_STACK_PRINT (yyss, yyssp); } + /* If the stack popping above didn't lose the initial context for the + current lookahead token, the shift below will for sure. */ + YY_LAC_DISCARD ("error recovery"); + *++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. */ @@ -2846,7 +3285,7 @@ yyabortlab: yyresult = 1; goto yyreturn; -#if !defined(yyoverflow) || YYERROR_VERBOSE +#if 1 /*-------------------------------------------------. | yyexhaustedlab -- memory exhaustion comes here. | `-------------------------------------------------*/ @@ -2858,8 +3297,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); @@ -2867,13 +3311,15 @@ yyreturn: while (yyssp != yyss) { yydestruct ("Cleanup: popping", - yystos[*yyssp], yyvsp, yylsp); + yystos[*yyssp], yyvsp, yylsp); YYPOPSTACK (1); } #ifndef yyoverflow if (yyss != yyssa) YYSTACK_FREE (yyss); #endif + if (yyes != yyesa) + YYSTACK_FREE (yyes); #if YYERROR_VERBOSE if (yymsg != yymsgbuf) YYSTACK_FREE (yymsg); @@ -2882,8 +3328,8 @@ yyreturn: return YYID (yyresult); } -/* Line 1599 of yacc.c */ -#line 637 "parse-gram.y" +/* Line 2000 of yacc.c */ +#line 713 "src/parse-gram.y" @@ -2909,42 +3355,41 @@ lloc_default (YYLTYPE const *rhs, int n) for (i = 1; i <= n; i++) if (! equal_boundaries (rhs[i].start, rhs[i].end)) { - loc.start = rhs[i].start; - break; + loc.start = rhs[i].start; + break; } return loc; } -/* 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")); @@ -2954,14 +3399,17 @@ add_param (char const *type, char *decl, location loc) size_t name_len; for (name_len = 1; - memchr (alphanum, name_start[name_len], sizeof alphanum); - name_len++) - continue; + memchr (alphanum, name_start[name_len], sizeof alphanum); + name_len++) + continue; 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); } @@ -2975,7 +3423,7 @@ version_check (location const *loc, char const *version) if (strverscmp (version, PACKAGE_VERSION) > 0) { complain_at (*loc, "require bison %s, but have %s", - version, PACKAGE_VERSION); + version, PACKAGE_VERSION); exit (63); } }