X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/77373efad24be4ed77391c9e8ab2f85285810311..d834eca014bd545fb359d20687b4ce2c6875219d:/src/parse-gram.c diff --git a/src/parse-gram.c b/src/parse-gram.c index 692631d7..9d1427db 100644 --- a/src/parse-gram.c +++ b/src/parse-gram.c @@ -1,9 +1,8 @@ -/* A Bison parser, made by GNU Bison 2.4.1.120-890ab. */ +/* A Bison parser, made by GNU Bison 2.5.66-427a. */ -/* Skeleton 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.1.120-890ab" +#define YYBISON_VERSION "2.5.66-427a" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -74,12 +73,11 @@ /* Copy the first part of user declarations. */ -/* Line 190 of yacc.c */ +/* Line 268 of yacc.c */ #line 1 "parse-gram.y" /* Bison Grammar Parser -*- C -*- - Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free - Software Foundation, Inc. + Copyright (C) 2002-2012 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -104,7 +102,7 @@ #include "files.h" #include "getargs.h" #include "gram.h" -#include "muscle_tab.h" +#include "muscle-tab.h" #include "named-ref.h" #include "quotearg.h" #include "reader.h" @@ -140,19 +138,38 @@ 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 symbol *current_lhs_symbol; static location current_lhs_location; static named_ref *current_lhs_named_ref; static int current_prec = 0; +/** 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 190 of yacc.c */ -#line 156 "parse-gram.c" +/* Line 268 of yacc.c */ +#line 173 "../../../src/parse-gram.c" /* Enabling traces. */ #ifndef YYDEBUG @@ -221,19 +238,19 @@ static int current_prec = 0; PERCENT_VERBOSE = 296, PERCENT_YACC = 297, BRACED_CODE = 298, - CHAR = 299, - EPILOGUE = 300, - EQUAL = 301, - ID = 302, - ID_COLON = 303, - PERCENT_PERCENT = 304, - PIPE = 305, - PROLOGUE = 306, - SEMICOLON = 307, - TYPE = 308, - TYPE_TAG_ANY = 309, - TYPE_TAG_NONE = 310, - BRACKETED_ID = 311, + BRACKETED_ID = 299, + CHAR = 300, + EPILOGUE = 301, + EQUAL = 302, + ID = 303, + ID_COLON = 304, + PERCENT_PERCENT = 305, + PIPE = 306, + PROLOGUE = 307, + SEMICOLON = 308, + TYPE = 309, + TYPE_TAG_ANY = 310, + TYPE_TAG_NONE = 311, PERCENT_UNION = 312 }; #endif @@ -280,19 +297,19 @@ static int current_prec = 0; #define PERCENT_VERBOSE 296 #define PERCENT_YACC 297 #define BRACED_CODE 298 -#define CHAR 299 -#define EPILOGUE 300 -#define EQUAL 301 -#define ID 302 -#define ID_COLON 303 -#define PERCENT_PERCENT 304 -#define PIPE 305 -#define PROLOGUE 306 -#define SEMICOLON 307 -#define TYPE 308 -#define TYPE_TAG_ANY 309 -#define TYPE_TAG_NONE 310 -#define BRACKETED_ID 311 +#define BRACKETED_ID 299 +#define CHAR 300 +#define EPILOGUE 301 +#define EQUAL 302 +#define ID 303 +#define ID_COLON 304 +#define PERCENT_PERCENT 305 +#define PIPE 306 +#define PROLOGUE 307 +#define SEMICOLON 308 +#define TYPE 309 +#define TYPE_TAG_ANY 310 +#define TYPE_TAG_NONE 311 #define PERCENT_UNION 312 @@ -302,8 +319,8 @@ static int current_prec = 0; typedef union YYSTYPE { -/* Line 215 of yacc.c */ -#line 94 "parse-gram.y" +/* Line 293 of yacc.c */ +#line 113 "parse-gram.y" symbol *symbol; symbol_list *list; @@ -317,8 +334,8 @@ typedef union YYSTYPE -/* Line 215 of yacc.c */ -#line 322 "parse-gram.c" +/* Line 293 of yacc.c */ +#line 339 "../../../src/parse-gram.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -342,8 +359,8 @@ typedef struct YYLTYPE /* Copy the second part of user declarations. */ -/* Line 265 of yacc.c */ -#line 347 "parse-gram.c" +/* Line 343 of yacc.c */ +#line 364 "../../../src/parse-gram.c" #ifdef short # undef short @@ -393,7 +410,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) @@ -429,34 +446,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)) @@ -473,30 +466,31 @@ 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))) # 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 \ @@ -521,23 +515,7 @@ union yyalloc ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE) + sizeof (YYLTYPE)) \ + 2 * YYSTACK_GAP_MAXIMUM) -/* Copy COUNT objects from FROM to TO. The source and destination do - not overlap. */ -# ifndef YYCOPY -# if defined __GNUC__ && 1 < __GNUC__ -# 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]; \ - } \ - while (YYID (0)) -# endif -# endif +# 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 @@ -557,19 +535,39 @@ union yyalloc #endif +#if defined YYCOPY_NEEDED && YYCOPY_NEEDED +/* Copy COUNT objects from SRC to DST. The source and destination do + not overlap. */ +# ifndef YYCOPY +# if defined __GNUC__ && 1 < __GNUC__ +# define YYCOPY(Dst, Src, Count) \ + __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src))) +# else +# define YYCOPY(Dst, Src, Count) \ + do \ + { \ + YYSIZE_T yyi; \ + for (yyi = 0; yyi < (Count); yyi++) \ + (Dst)[yyi] = (Src)[yyi]; \ + } \ + while (YYID (0)) +# endif +# endif +#endif /* !YYCOPY_NEEDED */ + /* YYFINAL -- State number of the termination state. */ #define YYFINAL 3 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 159 +#define YYLAST 160 /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 58 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 34 /* YYNRULES -- Number of rules. */ -#define YYNRULES 107 +#define YYNRULES 108 /* YYNRULES -- Number of states. */ -#define YYNSTATES 147 +#define YYNSTATES 148 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 @@ -630,56 +628,56 @@ static const yytype_uint16 yyprhs[] = 180, 182, 184, 187, 190, 194, 196, 199, 201, 204, 206, 209, 212, 213, 218, 220, 224, 227, 228, 232, 236, 240, 244, 248, 249, 251, 253, 255, 256, 258, - 260, 262, 264, 266, 268, 270, 272, 273 + 260, 262, 264, 266, 268, 270, 272, 274, 275 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int8 yyrhs[] = { - 59, 0, -1, 60, 49, 77, 91, -1, -1, 60, - 61, -1, 62, -1, 51, -1, 17, -1, 19, 84, + 59, 0, -1, 60, 50, 77, 91, -1, -1, 60, + 61, -1, 62, -1, 52, -1, 17, -1, 19, 84, 85, -1, 20, -1, 20, 3, -1, 21, -1, 22, - 4, -1, 23, 4, -1, 24, 3, -1, 24, 46, + 4, -1, 23, 4, -1, 24, 3, -1, 24, 47, 3, -1, 25, -1, 26, 43, -1, 27, 3, -1, - 28, 43, -1, 29, -1, 30, 3, -1, 30, 46, + 28, 43, -1, 29, -1, 30, 3, -1, 30, 47, 3, -1, 32, -1, 33, -1, 34, 3, -1, 34, - 46, 3, -1, 35, 43, -1, 36, -1, 37, 3, + 47, 3, -1, 35, 43, -1, 36, -1, 37, 3, -1, 38, 3, -1, 40, -1, 41, -1, 42, -1, - 52, -1, 67, -1, 64, -1, 39, 89, -1, 8, + 53, -1, 67, -1, 64, -1, 39, 89, -1, 8, 43, 73, -1, 9, 43, 73, -1, 18, -1, 31, - -1, 16, 86, -1, 16, 47, 86, -1, -1, 47, + -1, 16, 86, -1, 16, 48, 86, -1, -1, 48, -1, 57, 63, 86, -1, -1, 6, 65, 76, -1, - -1, 5, 66, 76, -1, 7, 53, 72, -1, 68, + -1, 5, 66, 76, -1, 7, 54, 72, -1, 68, 69, 70, -1, 10, -1, 11, -1, 12, -1, -1, - 53, -1, 71, -1, 70, 71, -1, 89, -1, 89, + 54, -1, 71, -1, 70, 71, -1, 89, -1, 89, 4, -1, 89, -1, 72, 89, -1, 74, -1, 73, - 74, -1, 89, -1, 53, -1, 54, -1, 55, -1, - 53, -1, 87, -1, 87, 4, -1, 87, 90, -1, + 74, -1, 89, -1, 54, -1, 55, -1, 56, -1, + 54, -1, 87, -1, 87, 4, -1, 87, 90, -1, 87, 4, 90, -1, 75, -1, 76, 75, -1, 78, - -1, 77, 78, -1, 79, -1, 62, 52, -1, 1, - 52, -1, -1, 88, 83, 80, 81, -1, 82, -1, - 81, 50, 82, -1, 81, 52, -1, -1, 82, 89, + -1, 77, 78, -1, 79, -1, 62, 53, -1, 1, + 53, -1, -1, 88, 83, 80, 81, -1, 82, -1, + 81, 51, 82, -1, 81, 53, -1, -1, 82, 89, 83, -1, 82, 43, 83, -1, 82, 13, 89, -1, - 82, 14, 4, -1, 82, 15, 53, -1, -1, 56, - -1, 47, -1, 3, -1, -1, 3, -1, 43, -1, - 47, -1, 44, -1, 48, -1, 87, -1, 90, -1, - 3, -1, -1, 49, 45, -1 + 82, 14, 4, -1, 82, 15, 54, -1, -1, 44, + -1, 48, -1, 3, -1, -1, 48, -1, 3, -1, + 43, -1, 48, -1, 45, -1, 49, -1, 87, -1, + 90, -1, 3, -1, -1, 50, 46, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 207, 207, 215, 217, 221, 222, 232, 233, 238, - 239, 244, 245, 246, 247, 248, 249, 254, 263, 264, - 265, 266, 267, 268, 269, 270, 271, 272, 273, 288, - 289, 313, 314, 315, 316, 320, 321, 322, 326, 333, - 340, 344, 348, 355, 370, 371, 375, 387, 387, 392, - 392, 397, 408, 423, 424, 425, 429, 430, 435, 437, - 442, 443, 448, 450, 455, 456, 460, 461, 462, 463, - 468, 473, 478, 484, 490, 501, 502, 511, 512, 518, - 519, 520, 527, 527, 532, 533, 534, 539, 541, 543, - 545, 547, 549, 554, 556, 567, 568, 573, 574, 583, - 603, 605, 614, 619, 620, 625, 632, 634 + 0, 228, 228, 236, 238, 242, 243, 253, 254, 259, + 260, 265, 266, 267, 268, 269, 270, 275, 284, 285, + 286, 287, 288, 289, 290, 291, 292, 293, 294, 309, + 310, 334, 335, 336, 337, 341, 342, 343, 347, 354, + 361, 365, 369, 376, 391, 392, 396, 408, 408, 413, + 413, 418, 429, 444, 445, 446, 450, 451, 456, 458, + 463, 464, 469, 471, 476, 477, 481, 482, 483, 484, + 489, 494, 499, 505, 511, 522, 523, 532, 533, 539, + 540, 541, 548, 548, 556, 557, 558, 563, 565, 567, + 569, 571, 573, 578, 580, 591, 592, 597, 598, 599, + 608, 628, 630, 639, 644, 645, 650, 657, 659 }; #endif @@ -699,9 +697,9 @@ static const char *const yytname[] = "\"%no-lines\"", "\"%nondeterministic-parser\"", "\"%output\"", "\"%parse-param\"", "\"%pure-parser\"", "\"%require\"", "\"%skeleton\"", "\"%start\"", "\"%token-table\"", "\"%verbose\"", "\"%yacc\"", - "\"{...}\"", "\"char\"", "\"epilogue\"", "\"=\"", "\"identifier\"", - "\"identifier:\"", "\"%%\"", "\"|\"", "\"%{...%}\"", "\";\"", "\"type\"", - "\"<*>\"", "\"<>\"", "\"[identifier]\"", "\"%union\"", "$accept", + "\"{...}\"", "\"[identifier]\"", "\"char\"", "\"epilogue\"", "\"=\"", + "\"identifier\"", "\"identifier:\"", "\"%%\"", "\"|\"", "\"%{...%}\"", + "\";\"", "\"type\"", "\"<*>\"", "\"<>\"", "\"%union\"", "$accept", "input", "prologue_declarations", "prologue_declaration", "grammar_declaration", "union_name", "symbol_declaration", "$@1", "$@2", "precedence_declaration", "precedence_declarator", "type.opt", @@ -739,8 +737,8 @@ static const yytype_uint8 yyr1[] = 71, 71, 72, 72, 73, 73, 74, 74, 74, 74, 75, 75, 75, 75, 75, 76, 76, 77, 77, 78, 78, 78, 80, 79, 81, 81, 81, 82, 82, 82, - 82, 82, 82, 83, 83, 84, 84, 85, 85, 86, - 87, 87, 88, 89, 89, 90, 91, 91 + 82, 82, 82, 83, 83, 84, 84, 85, 85, 85, + 86, 87, 87, 88, 89, 89, 90, 91, 91 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -756,7 +754,7 @@ static const yytype_uint8 yyr2[] = 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 + 1, 1, 1, 1, 1, 1, 1, 0, 2 }; /* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM. @@ -769,109 +767,110 @@ static const yytype_uint8 yydefact[] = 0, 16, 0, 0, 0, 20, 0, 41, 23, 24, 0, 0, 28, 0, 0, 0, 31, 32, 33, 0, 6, 34, 44, 4, 5, 36, 35, 56, 0, 0, - 0, 0, 0, 99, 0, 42, 96, 95, 97, 10, + 0, 0, 0, 100, 0, 42, 96, 95, 97, 10, 12, 13, 14, 0, 17, 18, 19, 21, 0, 25, - 0, 27, 29, 30, 105, 101, 100, 103, 37, 104, - 0, 102, 0, 0, 77, 79, 93, 45, 0, 57, + 0, 27, 29, 30, 106, 102, 101, 104, 37, 105, + 0, 103, 0, 0, 77, 79, 93, 45, 0, 57, 0, 70, 75, 50, 71, 48, 51, 62, 67, 68, - 69, 38, 64, 66, 39, 43, 98, 8, 15, 22, - 26, 81, 80, 0, 78, 2, 94, 82, 46, 52, - 58, 60, 76, 72, 73, 63, 65, 107, 87, 59, - 61, 74, 83, 84, 87, 86, 0, 0, 0, 93, - 93, 85, 90, 91, 92, 89, 88 + 69, 38, 64, 66, 39, 43, 99, 98, 8, 15, + 22, 26, 81, 80, 0, 78, 2, 94, 82, 46, + 52, 58, 60, 76, 72, 73, 63, 65, 108, 87, + 59, 61, 74, 83, 84, 87, 86, 0, 0, 0, + 93, 93, 85, 90, 91, 92, 89, 88 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { -1, 1, 2, 43, 82, 88, 45, 49, 48, 46, - 47, 90, 119, 120, 96, 101, 102, 92, 93, 83, - 84, 85, 128, 132, 133, 117, 58, 107, 55, 77, - 86, 103, 79, 115 + 47, 90, 120, 121, 96, 101, 102, 92, 93, 83, + 84, 85, 129, 133, 134, 118, 58, 108, 55, 77, + 86, 103, 79, 116 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -60 +#define YYPACT_NINF -91 static const yytype_int16 yypact[] = { - -60, 4, 102, -60, -60, -60, 7, 10, 22, -60, - -60, -60, -6, -60, -60, 27, 40, -60, 65, 72, - 2, -60, 35, 79, 47, -60, 11, -60, -60, -60, - 25, 48, -60, 89, 90, 0, -60, -60, -60, 15, - -60, -60, 52, -60, -60, -60, -60, 41, -2, -2, - 0, 26, 26, -60, 59, -60, -60, -60, 92, -60, - -60, -60, -60, 100, -60, -60, -60, -60, 101, -60, - 112, -60, -60, -60, -60, -60, -60, -60, -60, -60, - 64, -60, 93, 1, -60, -60, 49, -60, 59, -60, - 0, -60, -60, -2, 83, -2, 0, -60, -60, -60, - -60, 26, -60, -60, 26, -60, -60, -60, -60, -60, - -60, -60, -60, 103, -60, -60, -60, -60, -60, 0, - -60, 113, -60, 143, -60, -60, -60, -60, -60, -60, - -60, -60, -16, 53, -60, -60, 0, 145, 94, 49, - 49, 53, -60, -60, -60, -60, -60 + -91, 3, 103, -91, -91, -91, -36, 2, 10, -91, + -91, -91, 9, -91, -91, 32, 60, -91, 65, 67, + 27, -91, 41, 73, 51, -91, 39, -91, -91, -91, + 40, 52, -91, 93, 95, 33, -91, -91, -91, 15, + -91, -91, 53, -91, -91, -91, -91, 46, 43, 43, + 33, 11, 11, -91, 61, -91, -91, -91, 35, -91, + -91, -91, -91, 100, -91, -91, -91, -91, 102, -91, + 113, -91, -91, -91, -91, -91, -91, -91, -91, -91, + 64, -91, 94, 1, -91, -91, 62, -91, 61, -91, + 33, -91, -91, 43, 86, 43, 33, -91, -91, -91, + -91, 11, -91, -91, 11, -91, -91, -91, -91, -91, + -91, -91, -91, -91, 72, -91, -91, -91, -91, -91, + 33, -91, 142, -91, 145, -91, -91, -91, -91, -91, + -91, -91, -91, 17, 34, -91, -91, 33, 146, 97, + 62, 62, 34, -91, -91, -91, -91, -91 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -60, -60, -60, -60, 148, -60, -60, -60, -60, -60, - -60, -60, -60, 33, -60, 104, -42, -18, 106, -60, - 74, -60, -60, -60, 24, -51, -60, -60, -36, -10, - -60, -35, -59, -60 + -91, -91, -91, -91, 147, -91, -91, -91, -91, -91, + -91, -91, -91, 37, -91, 106, -60, -33, 105, -91, + 69, -91, -91, -91, 24, -48, -91, -91, -49, -20, + -91, -35, -90, -91 }; -#define yyis_pact_ninf(yystate) \ - ((yystate) == (-60)) - /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If positive, shift that token. If negative, reduce the rule which - number is the opposite. If zero, do what YYDEFACT says. - If YYTABLE_NINF, syntax error. */ -#define YYTABLE_NINF -107 + number is the opposite. If YYTABLE_NINF, syntax error. */ +#define YYTABLE_NINF -108 static const yytype_int16 yytable[] = { - 78, -106, 80, 74, 3, 62, 4, 5, 6, 7, - 8, 9, 10, 11, 67, 97, 80, 12, 105, 14, - 4, 5, 6, 7, 8, 9, 10, 11, 69, 74, - 56, 12, 27, 14, 134, 124, 135, 53, 94, 94, - 35, 54, 75, 59, 75, 76, 27, 76, 63, 81, - 113, 91, 118, 51, 35, 121, 74, 68, 42, 126, - 50, 125, 126, 81, 131, 52, 136, 137, 138, 60, - 75, 70, 42, 76, 57, 122, 61, 122, 64, 98, - 99, 100, 65, 94, 121, 94, 74, 123, 145, 146, - 66, 71, 72, 73, 89, 106, 139, 75, 140, 87, - 76, 142, 53, 108, 109, 116, 140, 4, 5, 6, - 7, 8, 9, 10, 11, 110, 111, 130, 12, 13, - 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, - 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, - 34, 35, 36, 37, 38, 112, 74, 144, 127, 143, - 44, 39, 129, 40, 41, 95, 104, 114, 141, 42 + 78, -107, 80, 3, 125, 105, 4, 5, 6, 7, + 8, 9, 10, 11, 74, 97, 80, 12, 50, 14, + 4, 5, 6, 7, 8, 9, 10, 11, 94, 94, + 62, 12, 27, 14, 132, 56, 74, 74, 106, 119, + 35, 127, 67, 69, 127, 51, 27, 137, 138, 139, + 81, 114, 53, 52, 35, 122, 75, 54, 42, 76, + 123, 126, 123, 59, 81, 98, 99, 100, 135, 60, + 136, 61, 42, 94, 63, 94, 65, 140, 75, 75, + 57, 76, 76, 107, 64, 122, 68, 70, 75, 74, + 124, 76, 146, 147, 66, 71, 72, 91, 73, 141, + 89, 87, 143, 109, 53, 110, 117, 141, 4, 5, + 6, 7, 8, 9, 10, 11, 111, 112, 128, 12, + 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, + 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, + 33, 34, 35, 36, 37, 38, 131, 113, 74, 44, + 144, 145, 115, 39, 95, 40, 41, 130, 104, 142, + 42 }; +#define yypact_value_is_default(yystate) \ + ((yystate) == (-91)) + +#define yytable_value_is_error(yytable_value) \ + YYID (0) + static const yytype_uint8 yycheck[] = { - 35, 0, 1, 3, 0, 3, 5, 6, 7, 8, + 35, 0, 1, 0, 94, 54, 5, 6, 7, 8, 9, 10, 11, 12, 3, 50, 1, 16, 54, 18, - 5, 6, 7, 8, 9, 10, 11, 12, 3, 3, - 3, 16, 31, 18, 50, 94, 52, 43, 48, 49, - 39, 47, 44, 3, 44, 47, 31, 47, 46, 48, - 49, 53, 88, 43, 39, 90, 3, 46, 57, 101, - 53, 96, 104, 48, 123, 43, 13, 14, 15, 4, - 44, 46, 57, 47, 47, 93, 4, 95, 43, 53, - 54, 55, 3, 93, 119, 95, 3, 4, 139, 140, - 43, 43, 3, 3, 53, 3, 43, 44, 133, 47, - 47, 136, 43, 3, 3, 56, 141, 5, 6, 7, - 8, 9, 10, 11, 12, 3, 52, 4, 16, 17, - 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, - 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, - 38, 39, 40, 41, 42, 52, 3, 53, 45, 4, - 2, 49, 119, 51, 52, 49, 52, 83, 134, 57 + 5, 6, 7, 8, 9, 10, 11, 12, 48, 49, + 3, 16, 31, 18, 124, 3, 3, 3, 3, 88, + 39, 101, 3, 3, 104, 43, 31, 13, 14, 15, + 49, 50, 43, 43, 39, 90, 45, 48, 57, 48, + 93, 96, 95, 3, 49, 54, 55, 56, 51, 4, + 53, 4, 57, 93, 47, 95, 3, 43, 45, 45, + 48, 48, 48, 48, 43, 120, 47, 47, 45, 3, + 4, 48, 140, 141, 43, 43, 3, 54, 3, 134, + 54, 48, 137, 3, 43, 3, 44, 142, 5, 6, + 7, 8, 9, 10, 11, 12, 3, 53, 46, 16, + 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, + 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, + 37, 38, 39, 40, 41, 42, 4, 53, 3, 2, + 4, 54, 83, 50, 49, 52, 53, 120, 52, 135, + 57 }; -#define yyis_table_ninf(yytable_value) \ - YYID (0) - /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const yytype_uint8 yystos[] = @@ -879,18 +878,18 @@ static const yytype_uint8 yystos[] = 0, 59, 60, 0, 5, 6, 7, 8, 9, 10, 11, 12, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, - 34, 35, 36, 37, 38, 39, 40, 41, 42, 49, - 51, 52, 57, 61, 62, 64, 67, 68, 66, 65, - 53, 43, 43, 43, 47, 86, 3, 47, 84, 3, - 4, 4, 3, 46, 43, 3, 43, 3, 46, 3, - 46, 43, 3, 3, 3, 44, 47, 87, 89, 90, - 1, 48, 62, 77, 78, 79, 88, 47, 63, 53, - 69, 53, 75, 76, 87, 76, 72, 89, 53, 54, - 55, 73, 74, 89, 73, 86, 3, 85, 3, 3, - 3, 52, 52, 49, 78, 91, 56, 83, 86, 70, - 71, 89, 75, 4, 90, 89, 74, 45, 80, 71, - 4, 90, 81, 82, 50, 52, 13, 14, 15, 43, - 89, 82, 89, 4, 53, 83, 83 + 34, 35, 36, 37, 38, 39, 40, 41, 42, 50, + 52, 53, 57, 61, 62, 64, 67, 68, 66, 65, + 54, 43, 43, 43, 48, 86, 3, 48, 84, 3, + 4, 4, 3, 47, 43, 3, 43, 3, 47, 3, + 47, 43, 3, 3, 3, 45, 48, 87, 89, 90, + 1, 49, 62, 77, 78, 79, 88, 48, 63, 54, + 69, 54, 75, 76, 87, 76, 72, 89, 54, 55, + 56, 73, 74, 89, 73, 86, 3, 48, 85, 3, + 3, 3, 53, 53, 50, 78, 91, 44, 83, 86, + 70, 71, 89, 75, 4, 90, 89, 74, 46, 80, + 71, 4, 90, 81, 82, 51, 53, 13, 14, 15, + 43, 89, 82, 89, 4, 54, 83, 83 }; #define yyerrok (yyerrstatus = 0) @@ -905,24 +904,34 @@ static const yytype_uint8 yystos[] = /* Like YYERROR except do call yyerror. This remains here temporarily to ease the transition to the new meaning of YYERROR, for GCC. - Once GCC version 2 has supplanted version 1, this can go. */ + Once GCC version 2 has supplanted version 1, this can go. However, + YYFAIL appears to be in use. Nevertheless, it is formally deprecated + in Bison 2.4.2's NEWS entry, where a plan to phase it out is + discussed. */ #define YYFAIL goto yyerrlab +#if defined YYFAIL + /* This is here to suppress warnings from the GCC cpp's + -Wunused-macros. Normally we don't worry about that warning, but + some users do, and we want to make it easy for users to remove + YYFAIL uses, which will produce warnings from Bison 2.5. */ +#endif #define YYRECOVERING() (!!yyerrstatus) -#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) \ + { \ + yychar = (Token); \ + yylval = (Value); \ + YYPOPSTACK (yylen); \ + yystate = *yyssp; \ + YY_LAC_DISCARD ("YYBACKUP"); \ + goto yybackup; \ + } \ + else \ + { \ yyerror (YY_("syntax error: cannot back up")); \ YYERROR; \ } \ @@ -964,7 +973,7 @@ while (YYID (0)) we won't break user code: when these are the locations we know. */ #ifndef YY_LOCATION_PRINT -# if YYLTYPE_IS_TRIVIAL +# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL # define YY_LOCATION_PRINT(File, Loc) \ fprintf (File, "%d.%d-%d.%d", \ (Loc).first_line, (Loc).first_column, \ @@ -1040,147 +1049,165 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp) { case 3: /* "\"string\"" */ -/* Line 722 of yacc.c */ -#line 184 "parse-gram.y" +/* Line 821 of yacc.c */ +#line 203 "parse-gram.y" { fputs (quotearg_style (c_quoting_style, (yyvaluep->chars)), stderr); }; -/* Line 722 of yacc.c */ -#line 1049 "parse-gram.c" +/* Line 821 of yacc.c */ +#line 1058 "../../../src/parse-gram.c" break; case 4: /* "\"integer\"" */ -/* Line 722 of yacc.c */ -#line 196 "parse-gram.y" +/* Line 821 of yacc.c */ +#line 215 "parse-gram.y" { fprintf (stderr, "%d", (yyvaluep->integer)); }; -/* Line 722 of yacc.c */ -#line 1058 "parse-gram.c" +/* Line 821 of yacc.c */ +#line 1067 "../../../src/parse-gram.c" break; case 43: /* "\"{...}\"" */ -/* Line 722 of yacc.c */ -#line 186 "parse-gram.y" +/* Line 821 of yacc.c */ +#line 205 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->code)); }; -/* Line 722 of yacc.c */ -#line 1067 "parse-gram.c" +/* Line 821 of yacc.c */ +#line 1076 "../../../src/parse-gram.c" + break; + case 44: /* "\"[identifier]\"" */ + +/* Line 821 of yacc.c */ +#line 210 "parse-gram.y" + { fprintf (stderr, "[%s]", (yyvaluep->uniqstr)); }; + +/* Line 821 of yacc.c */ +#line 1085 "../../../src/parse-gram.c" break; - case 44: /* "\"char\"" */ + case 45: /* "\"char\"" */ -/* Line 722 of yacc.c */ -#line 178 "parse-gram.y" +/* Line 821 of yacc.c */ +#line 197 "parse-gram.y" { fputs (char_name ((yyvaluep->character)), stderr); }; -/* Line 722 of yacc.c */ -#line 1076 "parse-gram.c" +/* Line 821 of yacc.c */ +#line 1094 "../../../src/parse-gram.c" break; - case 45: /* "\"epilogue\"" */ + case 46: /* "\"epilogue\"" */ -/* Line 722 of yacc.c */ -#line 186 "parse-gram.y" +/* Line 821 of yacc.c */ +#line 205 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -/* Line 722 of yacc.c */ -#line 1085 "parse-gram.c" +/* Line 821 of yacc.c */ +#line 1103 "../../../src/parse-gram.c" break; - case 47: /* "\"identifier\"" */ + case 48: /* "\"identifier\"" */ -/* Line 722 of yacc.c */ -#line 192 "parse-gram.y" +/* Line 821 of yacc.c */ +#line 209 "parse-gram.y" { fputs ((yyvaluep->uniqstr), stderr); }; -/* Line 722 of yacc.c */ -#line 1094 "parse-gram.c" +/* Line 821 of yacc.c */ +#line 1112 "../../../src/parse-gram.c" break; - case 48: /* "\"identifier:\"" */ + case 49: /* "\"identifier:\"" */ -/* Line 722 of yacc.c */ -#line 193 "parse-gram.y" +/* Line 821 of yacc.c */ +#line 211 "parse-gram.y" { fprintf (stderr, "%s:", (yyvaluep->uniqstr)); }; -/* Line 722 of yacc.c */ -#line 1103 "parse-gram.c" +/* Line 821 of yacc.c */ +#line 1121 "../../../src/parse-gram.c" break; - case 51: /* "\"%{...%}\"" */ + case 52: /* "\"%{...%}\"" */ -/* Line 722 of yacc.c */ -#line 186 "parse-gram.y" +/* Line 821 of yacc.c */ +#line 205 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -/* Line 722 of yacc.c */ -#line 1112 "parse-gram.c" +/* Line 821 of yacc.c */ +#line 1130 "../../../src/parse-gram.c" break; - case 53: /* "\"type\"" */ + case 54: /* "\"type\"" */ -/* Line 722 of yacc.c */ -#line 191 "parse-gram.y" +/* Line 821 of yacc.c */ +#line 212 "parse-gram.y" { fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); }; -/* Line 722 of yacc.c */ -#line 1121 "parse-gram.c" +/* Line 821 of yacc.c */ +#line 1139 "../../../src/parse-gram.c" + break; + case 71: /* "symbol.prec" */ + +/* Line 821 of yacc.c */ +#line 218 "parse-gram.y" + { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; + +/* Line 821 of yacc.c */ +#line 1148 "../../../src/parse-gram.c" break; case 84: /* "variable" */ -/* Line 722 of yacc.c */ -#line 192 "parse-gram.y" +/* Line 821 of yacc.c */ +#line 209 "parse-gram.y" { fputs ((yyvaluep->uniqstr), stderr); }; -/* Line 722 of yacc.c */ -#line 1130 "parse-gram.c" +/* Line 821 of yacc.c */ +#line 1157 "../../../src/parse-gram.c" break; case 85: /* "content.opt" */ -/* Line 722 of yacc.c */ -#line 186 "parse-gram.y" +/* Line 821 of yacc.c */ +#line 205 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -/* Line 722 of yacc.c */ -#line 1139 "parse-gram.c" +/* Line 821 of yacc.c */ +#line 1166 "../../../src/parse-gram.c" break; case 86: /* "braceless" */ -/* Line 722 of yacc.c */ -#line 186 "parse-gram.y" +/* Line 821 of yacc.c */ +#line 205 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -/* Line 722 of yacc.c */ -#line 1148 "parse-gram.c" +/* Line 821 of yacc.c */ +#line 1175 "../../../src/parse-gram.c" break; case 87: /* "id" */ -/* Line 722 of yacc.c */ -#line 199 "parse-gram.y" +/* Line 821 of yacc.c */ +#line 218 "parse-gram.y" { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; -/* Line 722 of yacc.c */ -#line 1157 "parse-gram.c" +/* Line 821 of yacc.c */ +#line 1184 "../../../src/parse-gram.c" break; case 88: /* "id_colon" */ -/* Line 722 of yacc.c */ -#line 200 "parse-gram.y" +/* Line 821 of yacc.c */ +#line 219 "parse-gram.y" { fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); }; -/* Line 722 of yacc.c */ -#line 1166 "parse-gram.c" +/* Line 821 of yacc.c */ +#line 1193 "../../../src/parse-gram.c" break; case 89: /* "symbol" */ -/* Line 722 of yacc.c */ -#line 199 "parse-gram.y" +/* Line 821 of yacc.c */ +#line 218 "parse-gram.y" { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; -/* Line 722 of yacc.c */ -#line 1175 "parse-gram.c" +/* Line 821 of yacc.c */ +#line 1202 "../../../src/parse-gram.c" break; case 90: /* "string_as_id" */ -/* Line 722 of yacc.c */ -#line 199 "parse-gram.y" +/* Line 821 of yacc.c */ +#line 218 "parse-gram.y" { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; -/* Line 722 of yacc.c */ -#line 1184 "parse-gram.c" +/* Line 821 of yacc.c */ +#line 1211 "../../../src/parse-gram.c" break; default: break; @@ -1313,7 +1340,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 @@ -1416,116 +1675,147 @@ yytnamerr (char *yyres, const char *yystr) } # endif -/* Copy into YYRESULT an error message about the unexpected token - YYCHAR while in state YYSTATE. Return the number of bytes copied, - including the terminating null byte. If YYRESULT is null, do not - copy anything; just return the number of bytes that would be - copied. As a special case, return 0 if an ordinary "syntax error" - message will do. Return YYSIZE_MAXIMUM if overflow occurs during - size calculation. */ -static YYSIZE_T -yysyntax_error (char *yyresult, int yystate, int yychar) -{ - 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) { - int yytype = YYTRANSLATE (yychar); - YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]); - YYSIZE_T yysize = yysize0; - YYSIZE_T yysize1; - int yysize_overflow = 0; - enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; - char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; - int yyx; - -# if 0 - /* This is so xgettext sees the translatable formats that are - constructed on the fly. */ - YY_("syntax error, unexpected %s"); - YY_("syntax error, unexpected %s, expecting %s"); - YY_("syntax error, unexpected %s, expecting %s or %s"); - YY_("syntax error, unexpected %s, expecting %s or %s or %s"); - YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"); + int yyn = yypact[*yyssp]; + YYDPRINTF ((stderr, "Constructing syntax error message\n")); + yyarg[yycount++] = yytname[yytoken]; + if (!yypact_value_is_default (yyn)) + { + int yyx; + + for (yyx = 0; yyx < YYNTOKENS; ++yyx) + if (yyx != YYTERROR && yyx != YYUNDEFTOK) + { + { + 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; + } + } +# if YYDEBUG + else if (yydebug) + YYFPRINTF (stderr, "No expected tokens.\n"); # endif - char *yyfmt; - char const *yyf; - static char const yyunexpected[] = "syntax error, unexpected %s"; - static char const yyexpecting[] = ", expecting %s"; - static char const yyor[] = " or %s"; - char yyformat[sizeof yyunexpected - + sizeof yyexpecting - 1 - + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2) - * (sizeof yyor - 1))]; - char const *yyprefix = yyexpecting; - - /* Start YYX at -YYN if negative to avoid negative indexes in - YYCHECK. In other words, skip the first -YYN actions for this - state because they are default actions. */ - int yyxbegin = yyn < 0 ? -yyn : 0; - - /* Stay within bounds of both yycheck and yytname. */ - int yychecklim = YYLAST - yyn + 1; - int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; - int yycount = 1; - - yyarg[0] = yytname[yytype]; - yyfmt = yystpcpy (yyformat, yyunexpected); - - for (yyx = yyxbegin; yyx < yyxend; ++yyx) - if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) - { - if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) - { - yycount = 1; - yysize = yysize0; - yyformat[sizeof yyunexpected - 1] = '\0'; - break; - } - yyarg[yycount++] = yytname[yyx]; - yysize1 = yysize + yytnamerr (0, yytname[yyx]); - yysize_overflow |= (yysize1 < yysize); - yysize = yysize1; - yyfmt = yystpcpy (yyfmt, yyprefix); - yyprefix = yyor; - } + } - yyf = YY_(yyformat); - yysize1 = yysize + yystrlen (yyf); - yysize_overflow |= (yysize1 < yysize); - yysize = yysize1; + 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_ + } - if (yysize_overflow) - return YYSIZE_MAXIMUM; + yysize1 = yysize + yystrlen (yyformat); + if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + return 2; + yysize = yysize1; - if (yyresult) - { - /* Avoid sprintf, as that infringes on the user's name space. - Don't have undefined behavior even if the translation - produced a string with the wrong number of "%s"s. */ - char *yyp = yyresult; - int yyi = 0; - while ((*yyp = *yyf) != '\0') - { - if (*yyp == '%' && yyf[1] == 's' && yyi < yycount) - { - yyp += yytnamerr (yyp, yyarg[yyi++]); - yyf += 2; - } - else - { - yyp++; - yyf++; - } - } - } - return yysize; + 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. | @@ -1560,6 +1850,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp) } } + /* Prevent warnings from -Wmissing-prototypes. */ #ifdef YYPARSE_PARAM #if defined __STDC__ || defined __cplusplus @@ -1576,12 +1867,9 @@ int yyparse (); #endif /* ! YYPARSE_PARAM */ - - - -/*-------------------------. -| yyparse or yypush_parse. | -`-------------------------*/ +/*----------. +| yyparse. | +`----------*/ #ifdef YYPARSE_PARAM #if (defined __STDC__ || defined __C99__FUNC__ \ @@ -1645,10 +1933,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. */ @@ -1677,6 +1970,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; @@ -1692,7 +1990,7 @@ 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; @@ -1700,8 +1998,8 @@ YYLTYPE yylloc; /* User initialization code. */ -/* Line 1250 of yacc.c */ -#line 86 "parse-gram.y" +/* Line 1592 of yacc.c */ +#line 105 "parse-gram.y" { /* Bison's grammar can initial empty locations, hence a default location is needed. */ @@ -1709,8 +2007,8 @@ YYLTYPE yylloc; boundary_set (&yylloc.end, current_file, 1, 1); } -/* Line 1250 of yacc.c */ -#line 1714 "parse-gram.c" +/* Line 1592 of yacc.c */ +#line 2012 "../../../src/parse-gram.c" yylsp[0] = yylloc; goto yysetstate; @@ -1809,7 +2107,7 @@ yybackup: /* First try to decide what to do without reference to lookahead token. */ yyn = yypact[yystate]; - if (yyis_pact_ninf (yyn)) + if (yypact_value_is_default (yyn)) goto yydefault; /* Not known => get a lookahead token if don't already have one. */ @@ -1836,12 +2134,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 || yyis_table_ninf (yyn)) - goto yyerrlab; + if (yytable_value_is_error (yyn)) + goto yyerrlab; + YY_LAC_ESTABLISH; yyn = -yyn; goto yyreduce; } @@ -1856,6 +2158,7 @@ yybackup: /* Discard the shifted token. */ yychar = YYEMPTY; + YY_LAC_DISCARD ("shift"); yystate = yyn; *++yyvsp = yylval; @@ -1893,12 +2196,14 @@ yyreduce: /* Default location. */ YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen); YY_REDUCE_PRINT (yyn); - switch (yyn) - { - case 6: + { + int yychar_backup = yychar; + switch (yyn) + { + case 6: -/* Line 1463 of yacc.c */ -#line 223 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 244 "parse-gram.y" { code_props plain_code; code_props_plain_init (&plain_code, (yyvsp[(1) - (1)].chars), (yylsp[(1) - (1)])); @@ -1912,15 +2217,15 @@ yyreduce: case 7: -/* Line 1463 of yacc.c */ -#line 232 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 253 "parse-gram.y" { debug_flag = true; } break; case 8: -/* Line 1463 of yacc.c */ -#line 234 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 255 "parse-gram.y" { muscle_percent_define_insert ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars), MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE); @@ -1929,15 +2234,15 @@ yyreduce: case 9: -/* Line 1463 of yacc.c */ -#line 238 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 259 "parse-gram.y" { defines_flag = true; } break; case 10: -/* Line 1463 of yacc.c */ -#line 240 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 261 "parse-gram.y" { defines_flag = true; spec_defines_file = xstrdup ((yyvsp[(2) - (2)].chars)); @@ -1946,43 +2251,43 @@ yyreduce: case 11: -/* Line 1463 of yacc.c */ -#line 244 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 265 "parse-gram.y" { error_verbose = true; } break; case 12: -/* Line 1463 of yacc.c */ -#line 245 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 266 "parse-gram.y" { expected_sr_conflicts = (yyvsp[(2) - (2)].integer); } break; case 13: -/* Line 1463 of yacc.c */ -#line 246 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 267 "parse-gram.y" { expected_rr_conflicts = (yyvsp[(2) - (2)].integer); } break; case 14: -/* Line 1463 of yacc.c */ -#line 247 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 268 "parse-gram.y" { spec_file_prefix = (yyvsp[(2) - (2)].chars); } break; case 15: -/* Line 1463 of yacc.c */ -#line 248 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 269 "parse-gram.y" { spec_file_prefix = (yyvsp[(3) - (3)].chars); } break; case 16: -/* Line 1463 of yacc.c */ -#line 250 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 271 "parse-gram.y" { nondeterministic_parser = true; glr_parser = true; @@ -1991,8 +2296,8 @@ yyreduce: case 17: -/* Line 1463 of yacc.c */ -#line 255 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 276 "parse-gram.y" { code_props action; code_props_symbol_action_init (&action, (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); @@ -2005,78 +2310,78 @@ yyreduce: case 18: -/* Line 1463 of yacc.c */ -#line 263 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 284 "parse-gram.y" { language_argmatch ((yyvsp[(2) - (2)].chars), grammar_prio, (yylsp[(1) - (2)])); } break; case 19: -/* Line 1463 of yacc.c */ -#line 264 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 285 "parse-gram.y" { add_param ("lex_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); } break; case 20: -/* Line 1463 of yacc.c */ -#line 265 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 286 "parse-gram.y" { locations_flag = true; } break; case 21: -/* Line 1463 of yacc.c */ -#line 266 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 287 "parse-gram.y" { spec_name_prefix = (yyvsp[(2) - (2)].chars); } break; case 22: -/* Line 1463 of yacc.c */ -#line 267 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 288 "parse-gram.y" { spec_name_prefix = (yyvsp[(3) - (3)].chars); } break; case 23: -/* Line 1463 of yacc.c */ -#line 268 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 289 "parse-gram.y" { no_lines_flag = true; } break; case 24: -/* Line 1463 of yacc.c */ -#line 269 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 290 "parse-gram.y" { nondeterministic_parser = true; } break; case 25: -/* Line 1463 of yacc.c */ -#line 270 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 291 "parse-gram.y" { spec_outfile = (yyvsp[(2) - (2)].chars); } break; case 26: -/* Line 1463 of yacc.c */ -#line 271 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 292 "parse-gram.y" { spec_outfile = (yyvsp[(3) - (3)].chars); } break; case 27: -/* Line 1463 of yacc.c */ -#line 272 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 293 "parse-gram.y" { add_param ("parse_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); } break; case 28: -/* Line 1463 of yacc.c */ -#line 274 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 295 "parse-gram.y" { /* %pure-parser is deprecated in favor of `%define api.pure', so use `%define api.pure' in a backward-compatible manner here. First, don't @@ -2095,18 +2400,18 @@ yyreduce: case 29: -/* Line 1463 of yacc.c */ -#line 288 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 309 "parse-gram.y" { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); } break; case 30: -/* Line 1463 of yacc.c */ -#line 290 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 311 "parse-gram.y" { char const *skeleton_user = (yyvsp[(2) - (2)].chars); - if (strchr (skeleton_user, '/')) + if (mbschr (skeleton_user, '/')) { size_t dir_length = strlen (current_file); char *skeleton_build; @@ -2131,29 +2436,29 @@ yyreduce: case 31: -/* Line 1463 of yacc.c */ -#line 313 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 334 "parse-gram.y" { token_table_flag = true; } break; case 32: -/* Line 1463 of yacc.c */ -#line 314 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 335 "parse-gram.y" { report_flag |= report_states; } break; case 33: -/* Line 1463 of yacc.c */ -#line 315 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 336 "parse-gram.y" { yacc_flag = true; } break; case 37: -/* Line 1463 of yacc.c */ -#line 323 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 344 "parse-gram.y" { grammar_start_symbol_set ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); } @@ -2161,8 +2466,8 @@ yyreduce: case 38: -/* Line 1463 of yacc.c */ -#line 327 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 348 "parse-gram.y" { symbol_list *list; for (list = (yyvsp[(3) - (3)].list); list; list = list->next) @@ -2173,8 +2478,8 @@ yyreduce: case 39: -/* Line 1463 of yacc.c */ -#line 334 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 355 "parse-gram.y" { symbol_list *list; for (list = (yyvsp[(3) - (3)].list); list; list = list->next) @@ -2185,8 +2490,8 @@ yyreduce: case 40: -/* Line 1463 of yacc.c */ -#line 341 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 362 "parse-gram.y" { default_prec = true; } @@ -2194,8 +2499,8 @@ yyreduce: case 41: -/* Line 1463 of yacc.c */ -#line 345 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 366 "parse-gram.y" { default_prec = false; } @@ -2203,8 +2508,8 @@ yyreduce: case 42: -/* Line 1463 of yacc.c */ -#line 349 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 370 "parse-gram.y" { /* Do not invoke muscle_percent_code_grow here since it invokes muscle_user_name_list_grow. */ @@ -2215,8 +2520,8 @@ yyreduce: case 43: -/* Line 1463 of yacc.c */ -#line 356 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 377 "parse-gram.y" { muscle_percent_code_grow ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)])); code_scanner_last_string_free (); @@ -2225,22 +2530,22 @@ yyreduce: case 44: -/* Line 1463 of yacc.c */ -#line 370 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 391 "parse-gram.y" {} break; case 45: -/* Line 1463 of yacc.c */ -#line 371 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 392 "parse-gram.y" { muscle_code_grow ("union_name", (yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; case 46: -/* Line 1463 of yacc.c */ -#line 376 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 397 "parse-gram.y" { union_seen = true; muscle_code_grow ("stype", (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)])); @@ -2250,15 +2555,15 @@ yyreduce: case 47: -/* Line 1463 of yacc.c */ -#line 387 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 408 "parse-gram.y" { current_class = nterm_sym; } break; case 48: -/* Line 1463 of yacc.c */ -#line 388 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 409 "parse-gram.y" { current_class = unknown_sym; current_type = NULL; @@ -2267,15 +2572,15 @@ yyreduce: case 49: -/* Line 1463 of yacc.c */ -#line 392 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 413 "parse-gram.y" { current_class = token_sym; } break; case 50: -/* Line 1463 of yacc.c */ -#line 393 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 414 "parse-gram.y" { current_class = unknown_sym; current_type = NULL; @@ -2284,8 +2589,8 @@ yyreduce: case 51: -/* Line 1463 of yacc.c */ -#line 398 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 419 "parse-gram.y" { symbol_list *list; tag_seen = true; @@ -2297,8 +2602,8 @@ yyreduce: case 52: -/* Line 1463 of yacc.c */ -#line 409 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 430 "parse-gram.y" { symbol_list *list; ++current_prec; @@ -2314,127 +2619,127 @@ yyreduce: case 53: -/* Line 1463 of yacc.c */ -#line 423 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 444 "parse-gram.y" { (yyval.assoc) = left_assoc; } break; case 54: -/* Line 1463 of yacc.c */ -#line 424 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 445 "parse-gram.y" { (yyval.assoc) = right_assoc; } break; case 55: -/* Line 1463 of yacc.c */ -#line 425 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 446 "parse-gram.y" { (yyval.assoc) = non_assoc; } break; case 56: -/* Line 1463 of yacc.c */ -#line 429 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 450 "parse-gram.y" { current_type = NULL; } break; case 57: -/* Line 1463 of yacc.c */ -#line 430 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 451 "parse-gram.y" { current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; } break; case 58: -/* Line 1463 of yacc.c */ -#line 436 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 457 "parse-gram.y" { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); } break; case 59: -/* Line 1463 of yacc.c */ -#line 438 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 459 "parse-gram.y" { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); } break; case 60: -/* Line 1463 of yacc.c */ -#line 442 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 463 "parse-gram.y" { (yyval.symbol) = (yyvsp[(1) - (1)].symbol); } break; case 61: -/* Line 1463 of yacc.c */ -#line 443 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 464 "parse-gram.y" { (yyval.symbol) = (yyvsp[(1) - (2)].symbol); symbol_user_token_number_set ((yyvsp[(1) - (2)].symbol), (yyvsp[(2) - (2)].integer), (yylsp[(2) - (2)])); } break; case 62: -/* Line 1463 of yacc.c */ -#line 449 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 470 "parse-gram.y" { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); } break; case 63: -/* Line 1463 of yacc.c */ -#line 451 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 472 "parse-gram.y" { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); } break; case 64: -/* Line 1463 of yacc.c */ -#line 455 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 476 "parse-gram.y" { (yyval.list) = (yyvsp[(1) - (1)].list); } break; case 65: -/* Line 1463 of yacc.c */ -#line 456 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 477 "parse-gram.y" { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); } break; case 66: -/* Line 1463 of yacc.c */ -#line 460 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 481 "parse-gram.y" { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); } break; case 67: -/* Line 1463 of yacc.c */ -#line 461 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 482 "parse-gram.y" { (yyval.list) = symbol_list_type_new ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; case 68: -/* Line 1463 of yacc.c */ -#line 462 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 483 "parse-gram.y" { (yyval.list) = symbol_list_default_tagged_new ((yylsp[(1) - (1)])); } break; case 69: -/* Line 1463 of yacc.c */ -#line 463 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 484 "parse-gram.y" { (yyval.list) = symbol_list_default_tagless_new ((yylsp[(1) - (1)])); } break; case 70: -/* Line 1463 of yacc.c */ -#line 469 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 490 "parse-gram.y" { current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; @@ -2443,8 +2748,8 @@ yyreduce: case 71: -/* Line 1463 of yacc.c */ -#line 474 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 495 "parse-gram.y" { symbol_class_set ((yyvsp[(1) - (1)].symbol), current_class, (yylsp[(1) - (1)]), true); symbol_type_set ((yyvsp[(1) - (1)].symbol), current_type, (yylsp[(1) - (1)])); @@ -2453,8 +2758,8 @@ yyreduce: case 72: -/* Line 1463 of yacc.c */ -#line 479 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 500 "parse-gram.y" { symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true); symbol_type_set ((yyvsp[(1) - (2)].symbol), current_type, (yylsp[(1) - (2)])); @@ -2464,8 +2769,8 @@ yyreduce: case 73: -/* Line 1463 of yacc.c */ -#line 485 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 506 "parse-gram.y" { symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true); symbol_type_set ((yyvsp[(1) - (2)].symbol), current_type, (yylsp[(1) - (2)])); @@ -2475,8 +2780,8 @@ yyreduce: case 74: -/* Line 1463 of yacc.c */ -#line 491 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 512 "parse-gram.y" { symbol_class_set ((yyvsp[(1) - (3)].symbol), current_class, (yylsp[(1) - (3)]), true); symbol_type_set ((yyvsp[(1) - (3)].symbol), current_type, (yylsp[(1) - (3)])); @@ -2487,8 +2792,8 @@ yyreduce: case 81: -/* Line 1463 of yacc.c */ -#line 521 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 542 "parse-gram.y" { yyerrok; } @@ -2496,101 +2801,117 @@ yyreduce: case 82: -/* Line 1463 of yacc.c */ -#line 527 "parse-gram.y" - { current_lhs = (yyvsp[(1) - (2)].symbol); current_lhs_location = (yylsp[(1) - (2)]); - current_lhs_named_ref = (yyvsp[(2) - (2)].named_ref); } +/* Line 1808 of yacc.c */ +#line 548 "parse-gram.y" + { current_lhs ((yyvsp[(1) - (2)].symbol), (yylsp[(1) - (2)]), (yyvsp[(2) - (2)].named_ref)); } + break; + + case 83: + +/* Line 1808 of yacc.c */ +#line 549 "parse-gram.y" + { + /* Free the current lhs. */ + current_lhs (0, (yylsp[(1) - (4)]), 0); + } break; case 84: -/* Line 1463 of yacc.c */ -#line 532 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 556 "parse-gram.y" { grammar_current_rule_end ((yylsp[(1) - (1)])); } break; case 85: -/* Line 1463 of yacc.c */ -#line 533 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 557 "parse-gram.y" { grammar_current_rule_end ((yylsp[(3) - (3)])); } break; case 87: -/* Line 1463 of yacc.c */ -#line 539 "parse-gram.y" - { grammar_current_rule_begin (current_lhs, current_lhs_location, +/* Line 1808 of yacc.c */ +#line 563 "parse-gram.y" + { grammar_current_rule_begin (current_lhs_symbol, current_lhs_location, current_lhs_named_ref); } break; case 88: -/* Line 1463 of yacc.c */ -#line 542 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 566 "parse-gram.y" { grammar_current_rule_symbol_append ((yyvsp[(2) - (3)].symbol), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].named_ref)); } break; case 89: -/* Line 1463 of yacc.c */ -#line 544 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 568 "parse-gram.y" { grammar_current_rule_action_append ((yyvsp[(2) - (3)].code), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].named_ref)); } break; case 90: -/* Line 1463 of yacc.c */ -#line 546 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 570 "parse-gram.y" { grammar_current_rule_prec_set ((yyvsp[(3) - (3)].symbol), (yylsp[(3) - (3)])); } break; case 91: -/* Line 1463 of yacc.c */ -#line 548 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 572 "parse-gram.y" { grammar_current_rule_dprec_set ((yyvsp[(3) - (3)].integer), (yylsp[(3) - (3)])); } break; case 92: -/* Line 1463 of yacc.c */ -#line 550 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 574 "parse-gram.y" { grammar_current_rule_merge_set ((yyvsp[(3) - (3)].uniqstr), (yylsp[(3) - (3)])); } break; case 93: -/* Line 1463 of yacc.c */ -#line 554 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 578 "parse-gram.y" { (yyval.named_ref) = 0; } break; case 94: -/* Line 1463 of yacc.c */ -#line 556 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 580 "parse-gram.y" { (yyval.named_ref) = named_ref_new((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; case 96: -/* Line 1463 of yacc.c */ -#line 568 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 592 "parse-gram.y" { (yyval.uniqstr) = uniqstr_new ((yyvsp[(1) - (1)].chars)); } break; case 97: -/* Line 1463 of yacc.c */ -#line 573 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 597 "parse-gram.y" { (yyval.chars) = ""; } break; - case 99: + case 98: -/* Line 1463 of yacc.c */ -#line 584 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 598 "parse-gram.y" + { (yyval.chars) = (yyvsp[(1) - (1)].uniqstr); } + break; + + case 100: + +/* Line 1808 of yacc.c */ +#line 609 "parse-gram.y" { code_props plain_code; (yyvsp[(1) - (1)].code)[strlen ((yyvsp[(1) - (1)].code)) - 1] = '\n'; @@ -2601,17 +2922,17 @@ yyreduce: } break; - case 100: + case 101: -/* Line 1463 of yacc.c */ -#line 604 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 629 "parse-gram.y" { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; - case 101: + case 102: -/* Line 1463 of yacc.c */ -#line 606 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 631 "parse-gram.y" { (yyval.symbol) = symbol_get (char_name ((yyvsp[(1) - (1)].character)), (yylsp[(1) - (1)])); symbol_class_set ((yyval.symbol), token_sym, (yylsp[(1) - (1)]), false); @@ -2619,27 +2940,27 @@ yyreduce: } break; - case 102: + case 103: -/* Line 1463 of yacc.c */ -#line 614 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 639 "parse-gram.y" { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; - case 105: + case 106: -/* Line 1463 of yacc.c */ -#line 626 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 651 "parse-gram.y" { (yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[(1) - (1)].chars)), (yylsp[(1) - (1)])); symbol_class_set ((yyval.symbol), token_sym, (yylsp[(1) - (1)]), false); } break; - case 107: + case 108: -/* Line 1463 of yacc.c */ -#line 635 "parse-gram.y" +/* Line 1808 of yacc.c */ +#line 660 "parse-gram.y" { code_props plain_code; code_props_plain_init (&plain_code, (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); @@ -2652,10 +2973,24 @@ yyreduce: -/* Line 1463 of yacc.c */ -#line 2657 "parse-gram.c" - default: break; - } +/* Line 1808 of yacc.c */ +#line 2978 "../../../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); @@ -2684,6 +3019,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) { @@ -2691,41 +3030,43 @@ 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, yychar); - if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM) - { - YYSIZE_T yyalloc = 2 * yysize; - if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM)) - yyalloc = YYSTACK_ALLOC_MAXIMUM; - if (yymsg != yymsgbuf) - YYSTACK_FREE (yymsg); - yymsg = (char *) YYSTACK_ALLOC (yyalloc); - if (yymsg) - yymsg_alloc = yyalloc; - else - { - yymsg = yymsgbuf; - yymsg_alloc = sizeof yymsgbuf; - } - } - - if (0 < yysize && yysize <= yymsg_alloc) - { - (void) yysyntax_error (yymsg, yystate, yychar); - yyerror (yymsg); - } - else - { - yyerror (YY_("syntax error")); - if (yysize != 0) - goto yyexhaustedlab; - } + 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) { @@ -2762,7 +3103,7 @@ yyerrorlab: if (/*CONSTCOND*/ 0) goto yyerrorlab; - yyerror_range[0] = yylsp[1-yylen]; + yyerror_range[1] = yylsp[1-yylen]; /* Do not reclaim the symbols of the rule which action triggered this YYERROR. */ YYPOPSTACK (yylen); @@ -2781,7 +3122,7 @@ yyerrlab1: for (;;) { yyn = yypact[yystate]; - if (!yyis_pact_ninf (yyn)) + if (!yypact_value_is_default (yyn)) { yyn += YYTERROR; if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) @@ -2796,7 +3137,7 @@ yyerrlab1: if (yyssp == yyss) YYABORT; - yyerror_range[0] = *yylsp; + yyerror_range[1] = *yylsp; yydestruct ("Error: popping", yystos[yystate], yyvsp, yylsp); YYPOPSTACK (1); @@ -2804,12 +3145,16 @@ yyerrlab1: 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. */ @@ -2833,7 +3178,7 @@ yyabortlab: yyresult = 1; goto yyreturn; -#if !defined(yyoverflow) || YYERROR_VERBOSE +#if 1 /*-------------------------------------------------. | yyexhaustedlab -- memory exhaustion comes here. | `-------------------------------------------------*/ @@ -2845,8 +3190,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); @@ -2861,6 +3211,8 @@ yyreturn: if (yyss != yyssa) YYSTACK_FREE (yyss); #endif + if (yyes != yyesa) + YYSTACK_FREE (yyes); #if YYERROR_VERBOSE if (yymsg != yymsgbuf) YYSTACK_FREE (yymsg); @@ -2871,8 +3223,8 @@ yyreturn: -/* Line 1683 of yacc.c */ -#line 645 "parse-gram.y" +/* Line 2069 of yacc.c */ +#line 670 "parse-gram.y" @@ -2892,7 +3244,7 @@ lloc_default (YYLTYPE const *rhs, int n) loc.start = rhs[n].end; loc.end = rhs[n].end; - /* Ignore empty nonterminals the start of the the right-hand side. + /* Ignore empty nonterminals the start of the right-hand side. Do not bother to ignore them at the end of the right-hand side, since empty nonterminals have the same end as their predecessors. */ for (i = 1; i <= n; i++) @@ -2964,8 +3316,8 @@ 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); - exit (63); + version, PACKAGE_VERSION); + exit (EX_MISMATCH); } }