X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/279cabb657e5116d9fd4badace040f36f579199a..40a1cd37f31500bec5ddd05692141afca31b176a:/src/parse-gram.c diff --git a/src/parse-gram.c b/src/parse-gram.c index 91e27bfe..148ef761 100644 --- a/src/parse-gram.c +++ b/src/parse-gram.c @@ -1,15 +1,13 @@ +/* A Bison parser, made by GNU Bison 2.6.3.3-b10d3. */ -/* A Bison parser, made by GNU Bison 2.3a+. */ - -/* 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 - Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc. - This program is free software; you can redistribute it and/or modify + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -17,9 +15,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ + along with this program. If not, see . */ /* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work @@ -48,7 +44,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.3a+" +#define YYBISON_VERSION "2.6.3.3-b10d3" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -62,33 +58,29 @@ /* Pull parsers. */ #define YYPULL 1 -/* Using locations. */ -#define YYLSP_NEEDED 1 /* Substitute the variable and function names. */ -#define yyparse gram_parse -#define yylex gram_lex -#define yyerror gram_error -#define yylval gram_lval -#define yychar gram_char -#define yydebug gram_debug -#define yynerrs gram_nerrs -#define yylloc gram_lloc +#define yyparse gram_parse +#define yylex gram_lex +#define yyerror gram_error +#define yylval gram_lval +#define yychar gram_char +#define yydebug gram_debug +#define yynerrs gram_nerrs +#define yylloc gram_lloc /* Copy the first part of user declarations. */ - -/* Line 1537 of yacc.c */ +/* Line 358 of yacc.c */ #line 1 "parse-gram.y" /* Bison Grammar Parser -*- C -*- - Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, - Inc. + Copyright (C) 2002-2012 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. - This program is free software; you can redistribute it and/or modify + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -97,27 +89,25 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301 USA -*/ + along with this program. If not, see . */ #include #include "system.h" -#include - +#include "c-ctype.h" #include "complain.h" #include "conflicts.h" #include "files.h" #include "getargs.h" #include "gram.h" -#include "muscle_tab.h" +#include "muscle-tab.h" +#include "named-ref.h" #include "quotearg.h" #include "reader.h" #include "symlist.h" #include "scan-gram.h" #include "scan-code.h" +#include "xmemdup0.h" #define YYLLOC_DEFAULT(Current, Rhs, N) (Current) = lloc_default (Rhs, N) static YYLTYPE lloc_default (YYLTYPE const *, int); @@ -147,23 +137,45 @@ 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 358 of yacc.c */ +#line 171 "parse-gram.c" -/* Line 1537 of yacc.c */ -#line 162 "parse-gram.c" - -/* Enabling traces. */ -#ifndef YYDEBUG -# define YYDEBUG 1 -#endif +# ifndef YY_NULL +# if defined __cplusplus && 201103L <= __cplusplus +# define YY_NULL nullptr +# else +# define YY_NULL 0 +# endif +# endif /* Enabling verbose error messages. */ #ifdef YYERROR_VERBOSE @@ -173,11 +185,17 @@ static int current_prec = 0; # define YYERROR_VERBOSE 1 #endif -/* Enabling the token table. */ -#ifndef YYTOKEN_TABLE -# define YYTOKEN_TABLE 0 +/* In a future release of Bison, this section will be replaced + by #include "parse-gram.h". */ +#ifndef YY_GRAM_Y_TAB_H_INCLUDED +# define YY_GRAM_Y_TAB_H_INCLUDED +/* Enabling traces. */ +#ifndef YYDEBUG +# define YYDEBUG 1 +#endif +#if YYDEBUG +extern int gram_debug; #endif - /* Tokens. */ #ifndef YYTOKENTYPE @@ -220,28 +238,27 @@ static int current_prec = 0; PERCENT_OUTPUT = 289, PERCENT_PARSE_PARAM = 290, PERCENT_PURE_PARSER = 291, - PERCENT_PUSH_PARSER = 292, - PERCENT_PUSH_PULL_PARSER = 293, - PERCENT_REQUIRE = 294, - PERCENT_SKELETON = 295, - PERCENT_START = 296, - PERCENT_TOKEN_TABLE = 297, - PERCENT_VERBOSE = 298, - PERCENT_YACC = 299, - BRACED_CODE = 300, - CHAR = 301, - EPILOGUE = 302, - EQUAL = 303, - ID = 304, - ID_COLON = 305, - PERCENT_PERCENT = 306, - PIPE = 307, - PROLOGUE = 308, - SEMICOLON = 309, - TYPE = 310, - TYPE_TAG_ANY = 311, - TYPE_TAG_NONE = 312, - PERCENT_UNION = 313 + PERCENT_REQUIRE = 292, + PERCENT_SKELETON = 293, + PERCENT_START = 294, + PERCENT_TOKEN_TABLE = 295, + PERCENT_VERBOSE = 296, + PERCENT_YACC = 297, + BRACED_CODE = 298, + BRACKETED_ID = 299, + CHAR = 300, + EPILOGUE = 301, + EQUAL = 302, + ID = 303, + ID_COLON = 304, + PERCENT_PERCENT = 305, + PIPE = 306, + PROLOGUE = 307, + SEMICOLON = 308, + TYPE = 309, + TYPE_TAG_ANY = 310, + TYPE_TAG_NONE = 311, + PERCENT_UNION = 312 }; #endif /* Tokens. */ @@ -280,38 +297,35 @@ static int current_prec = 0; #define PERCENT_OUTPUT 289 #define PERCENT_PARSE_PARAM 290 #define PERCENT_PURE_PARSER 291 -#define PERCENT_PUSH_PARSER 292 -#define PERCENT_PUSH_PULL_PARSER 293 -#define PERCENT_REQUIRE 294 -#define PERCENT_SKELETON 295 -#define PERCENT_START 296 -#define PERCENT_TOKEN_TABLE 297 -#define PERCENT_VERBOSE 298 -#define PERCENT_YACC 299 -#define BRACED_CODE 300 -#define CHAR 301 -#define EPILOGUE 302 -#define EQUAL 303 -#define ID 304 -#define ID_COLON 305 -#define PERCENT_PERCENT 306 -#define PIPE 307 -#define PROLOGUE 308 -#define SEMICOLON 309 -#define TYPE 310 -#define TYPE_TAG_ANY 311 -#define TYPE_TAG_NONE 312 -#define PERCENT_UNION 313 - +#define PERCENT_REQUIRE 292 +#define PERCENT_SKELETON 293 +#define PERCENT_START 294 +#define PERCENT_TOKEN_TABLE 295 +#define PERCENT_VERBOSE 296 +#define PERCENT_YACC 297 +#define BRACED_CODE 298 +#define BRACKETED_ID 299 +#define CHAR 300 +#define EPILOGUE 301 +#define EQUAL 302 +#define ID 303 +#define ID_COLON 304 +#define PERCENT_PERCENT 305 +#define PIPE 306 +#define PROLOGUE 307 +#define SEMICOLON 308 +#define TYPE 309 +#define TYPE_TAG_ANY 310 +#define TYPE_TAG_NONE 311 +#define PERCENT_UNION 312 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE { - -/* Line 1537 of yacc.c */ -#line 97 "parse-gram.y" +/* Line 374 of yacc.c */ +#line 115 "parse-gram.y" symbol *symbol; symbol_list *list; @@ -321,11 +335,11 @@ typedef union YYSTYPE assoc assoc; uniqstr uniqstr; unsigned char character; + named_ref *named_ref; - -/* Line 1537 of yacc.c */ -#line 329 "parse-gram.c" +/* Line 374 of yacc.c */ +#line 343 "parse-gram.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -346,11 +360,26 @@ typedef struct YYLTYPE #endif -/* Copy the second part of user declarations. */ +#ifdef YYPARSE_PARAM +#if defined __STDC__ || defined __cplusplus +int gram_parse (void *YYPARSE_PARAM); +#else +int gram_parse (); +#endif +#else /* ! YYPARSE_PARAM */ +#if defined __STDC__ || defined __cplusplus +int gram_parse (void); +#else +int gram_parse (); +#endif +#endif /* ! YYPARSE_PARAM */ +#endif /* !YY_GRAM_Y_TAB_H_INCLUDED */ -/* Line 1537 of yacc.c */ -#line 354 "parse-gram.c" +/* Copy the second part of user declarations. */ + +/* Line 377 of yacc.c */ +#line 383 "parse-gram.c" #ifdef short # undef short @@ -400,27 +429,27 @@ 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) +# define YY_(Msgid) dgettext ("bison-runtime", Msgid) # endif # endif # ifndef YY_ -# define YY_(msgid) msgid +# define YY_(Msgid) Msgid # endif #endif /* Suppress unused-variable warnings by "using" E. */ #if ! defined lint || defined __GNUC__ -# define YYUSE(e) ((void) (e)) +# define YYUSE(E) ((void) (E)) #else -# define YYUSE(e) /* empty */ +# define YYUSE(E) /* empty */ #endif /* Identity function, used to suppress warnings about constant conditions. */ #ifndef lint -# define YYID(n) (n) +# define YYID(N) (N) #else #if (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) @@ -436,34 +465,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)) @@ -480,30 +485,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 \ @@ -514,9 +520,9 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */ /* A type that is properly aligned for any stack member. */ union yyalloc { - yytype_int16 yyss; - YYSTYPE yyvs; - YYLTYPE yyls; + yytype_int16 yyss_alloc; + YYSTYPE yyvs_alloc; + YYLTYPE yyls_alloc; }; /* The size of the maximum gap between one aligned stack and the next. */ @@ -528,35 +534,19 @@ 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 elements in the stack, and YYPTR gives the new location of the stack. Advance YYPTR to a properly aligned location for the next stack. */ -# define YYSTACK_RELOCATE(Stack) \ +# define YYSTACK_RELOCATE(Stack_alloc, Stack) \ do \ { \ YYSIZE_T yynewbytes; \ - YYCOPY (&yyptr->Stack, Stack, yysize); \ - Stack = &yyptr->Stack; \ + YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ + Stack = &yyptr->Stack_alloc; \ yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ yyptr += yynewbytes / sizeof (*yyptr); \ } \ @@ -564,23 +554,43 @@ 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 158 +#define YYLAST 160 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 59 +#define YYNTOKENS 58 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 31 +#define YYNNTS 34 /* YYNRULES -- Number of rules. */ -#define YYNRULES 103 +#define YYNRULES 108 /* YYNRULES -- Number of states. */ -#define YYNSTATES 141 +#define YYNSTATES 148 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 313 +#define YYMAXUTOK 312 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -619,7 +629,7 @@ static const yytype_uint8 yytranslate[] = 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, - 55, 56, 57, 58 + 55, 56, 57 }; #if YYDEBUG @@ -630,66 +640,67 @@ static const yytype_uint16 yyprhs[] = 0, 0, 3, 8, 9, 12, 14, 16, 18, 22, 24, 27, 29, 32, 35, 38, 42, 44, 47, 50, 53, 55, 58, 62, 64, 66, 69, 73, 76, 78, - 80, 82, 85, 88, 90, 92, 94, 96, 98, 100, - 103, 107, 111, 113, 115, 118, 122, 123, 125, 129, - 130, 134, 135, 139, 143, 147, 149, 151, 153, 154, - 156, 158, 161, 163, 166, 168, 170, 172, 174, 176, - 178, 181, 184, 188, 190, 193, 195, 198, 200, 203, - 206, 207, 211, 213, 217, 220, 221, 224, 227, 231, - 235, 239, 241, 243, 244, 246, 248, 250, 252, 254, - 256, 258, 260, 261 + 81, 84, 86, 88, 90, 92, 94, 96, 99, 103, + 107, 109, 111, 114, 118, 119, 121, 125, 126, 130, + 131, 135, 139, 143, 145, 147, 149, 150, 152, 154, + 157, 159, 162, 164, 167, 169, 172, 174, 176, 178, + 180, 182, 184, 187, 190, 194, 196, 199, 201, 204, + 206, 209, 212, 213, 218, 220, 224, 227, 228, 232, + 236, 240, 244, 248, 249, 251, 253, 255, 256, 258, + 260, 262, 264, 266, 268, 270, 272, 274, 275 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int8 yyrhs[] = { - 60, 0, -1, 61, 51, 76, 89, -1, -1, 61, - 62, -1, 63, -1, 53, -1, 17, -1, 19, 82, - 83, -1, 20, -1, 20, 3, -1, 21, -1, 22, - 4, -1, 23, 4, -1, 24, 3, -1, 24, 48, - 3, -1, 25, -1, 26, 45, -1, 27, 3, -1, - 28, 45, -1, 29, -1, 30, 3, -1, 30, 48, + 59, 0, -1, 60, 50, 77, 91, -1, -1, 60, + 61, -1, 62, -1, 52, -1, 17, -1, 19, 84, + 85, -1, 20, -1, 20, 3, -1, 21, -1, 22, + 4, -1, 23, 4, -1, 24, 3, -1, 24, 47, + 3, -1, 25, -1, 26, 43, -1, 27, 3, -1, + 28, 43, -1, 29, -1, 30, 3, -1, 30, 47, 3, -1, 32, -1, 33, -1, 34, 3, -1, 34, - 48, 3, -1, 35, 45, -1, 36, -1, 37, -1, - 38, -1, 39, 3, -1, 40, 3, -1, 42, -1, - 43, -1, 44, -1, 54, -1, 68, -1, 65, -1, - 41, 87, -1, 8, 45, 72, -1, 9, 45, 72, - -1, 18, -1, 31, -1, 16, 84, -1, 16, 49, - 84, -1, -1, 49, -1, 58, 64, 84, -1, -1, - 6, 66, 75, -1, -1, 5, 67, 75, -1, 7, - 55, 71, -1, 69, 70, 71, -1, 10, -1, 11, - -1, 12, -1, -1, 55, -1, 87, -1, 71, 87, - -1, 73, -1, 72, 73, -1, 87, -1, 55, -1, - 56, -1, 57, -1, 55, -1, 85, -1, 85, 4, - -1, 85, 88, -1, 85, 4, 88, -1, 74, -1, - 75, 74, -1, 77, -1, 76, 77, -1, 78, -1, - 63, 54, -1, 1, 54, -1, -1, 86, 79, 80, - -1, 81, -1, 80, 52, 81, -1, 80, 54, -1, - -1, 81, 87, -1, 81, 45, -1, 81, 13, 87, - -1, 81, 14, 4, -1, 81, 15, 55, -1, 49, - -1, 3, -1, -1, 3, -1, 45, -1, 49, -1, - 46, -1, 50, -1, 85, -1, 88, -1, 3, -1, - -1, 51, 47, -1 + 47, 3, -1, 35, 43, -1, 36, -1, 37, 3, + -1, 38, 3, -1, 40, -1, 41, -1, 42, -1, + 53, -1, 67, -1, 64, -1, 39, 89, -1, 8, + 43, 73, -1, 9, 43, 73, -1, 18, -1, 31, + -1, 16, 86, -1, 16, 48, 86, -1, -1, 48, + -1, 57, 63, 86, -1, -1, 6, 65, 76, -1, + -1, 5, 66, 76, -1, 7, 54, 72, -1, 68, + 69, 70, -1, 10, -1, 11, -1, 12, -1, -1, + 54, -1, 71, -1, 70, 71, -1, 89, -1, 89, + 4, -1, 89, -1, 72, 89, -1, 74, -1, 73, + 74, -1, 89, -1, 54, -1, 55, -1, 56, -1, + 54, -1, 87, -1, 87, 4, -1, 87, 90, -1, + 87, 4, 90, -1, 75, -1, 76, 75, -1, 78, + -1, 77, 78, -1, 79, -1, 62, 53, -1, 1, + 53, -1, -1, 88, 83, 80, 81, -1, 82, -1, + 81, 51, 82, -1, 81, 53, -1, -1, 82, 89, + 83, -1, 82, 43, 83, -1, 82, 13, 89, -1, + 82, 14, 4, -1, 82, 15, 54, -1, -1, 44, + -1, 48, -1, 3, -1, -1, 48, -1, 3, -1, + 43, -1, 48, -1, 45, -1, 49, -1, 87, -1, + 90, -1, 3, -1, -1, 50, 46, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 210, 210, 218, 220, 224, 225, 235, 236, 250, - 251, 256, 257, 258, 259, 260, 261, 266, 275, 276, - 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, - 287, 288, 289, 290, 291, 292, 293, 297, 298, 299, - 303, 310, 317, 321, 325, 330, 353, 354, 358, 370, - 370, 375, 375, 380, 391, 406, 407, 408, 412, 413, - 418, 420, 425, 426, 430, 431, 432, 433, 438, 443, - 448, 454, 460, 471, 472, 481, 482, 488, 489, 490, - 497, 497, 501, 502, 503, 508, 509, 511, 513, 515, - 517, 527, 528, 534, 538, 547, 567, 569, 578, 583, - 584, 589, 598, 600 + 0, 230, 230, 238, 240, 244, 245, 255, 256, 261, + 262, 267, 268, 269, 270, 271, 272, 277, 286, 287, + 288, 289, 290, 291, 292, 293, 294, 295, 296, 311, + 312, 336, 337, 338, 339, 343, 344, 345, 349, 361, + 373, 377, 381, 388, 403, 404, 408, 420, 420, 425, + 425, 430, 441, 456, 457, 458, 462, 463, 468, 470, + 475, 476, 481, 483, 488, 489, 493, 494, 495, 496, + 501, 506, 511, 517, 523, 534, 535, 544, 545, 551, + 552, 553, 560, 560, 568, 569, 570, 575, 577, 579, + 581, 583, 585, 590, 592, 603, 604, 609, 610, 611, + 620, 640, 642, 651, 656, 657, 662, 669, 671 }; #endif -#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE +#if YYDEBUG || YYERROR_VERBOSE || 1 /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. First, the terminals, then, starting at YYNTOKENS, nonterminals. */ static const char *const yytname[] = @@ -703,19 +714,19 @@ static const char *const yytname[] = "\"%initial-action\"", "\"%language\"", "\"%lex-param\"", "\"%locations\"", "\"%name-prefix\"", "\"%no-default-prec\"", "\"%no-lines\"", "\"%nondeterministic-parser\"", "\"%output\"", - "\"%parse-param\"", "\"%pure-parser\"", "\"%push-parser\"", - "\"%push-pull-parser\"", "\"%require\"", "\"%skeleton\"", "\"%start\"", - "\"%token-table\"", "\"%verbose\"", "\"%yacc\"", "\"{...}\"", "\"char\"", - "\"epilogue\"", "\"=\"", "\"identifier\"", "\"identifier:\"", "\"%%\"", - "\"|\"", "\"%{...%}\"", "\";\"", "\"type\"", "\"<*>\"", "\"<>\"", - "\"%union\"", "$accept", "input", "prologue_declarations", - "prologue_declaration", "grammar_declaration", "union_name", - "symbol_declaration", "$@1", "$@2", "precedence_declaration", - "precedence_declarator", "type.opt", "symbols.1", "generic_symlist", + "\"%parse-param\"", "\"%pure-parser\"", "\"%require\"", "\"%skeleton\"", + "\"%start\"", "\"%token-table\"", "\"%verbose\"", "\"%yacc\"", + "\"{...}\"", "\"[identifier]\"", "\"char\"", "\"epilogue\"", "\"=\"", + "\"identifier\"", "\"identifier:\"", "\"%%\"", "\"|\"", "\"%{...%}\"", + "\";\"", "\"type\"", "\"<*>\"", "\"<>\"", "\"%union\"", "$accept", + "input", "prologue_declarations", "prologue_declaration", + "grammar_declaration", "union_name", "symbol_declaration", "$@1", "$@2", + "precedence_declaration", "precedence_declarator", "type.opt", + "symbols.prec", "symbol.prec", "symbols.1", "generic_symlist", "generic_symlist_item", "symbol_def", "symbol_defs.1", "grammar", "rules_or_grammar_declaration", "rules", "$@3", "rhses.1", "rhs", - "variable", "content.opt", "braceless", "id", "id_colon", "symbol", - "string_as_id", "epilogue.opt", 0 + "named_ref.opt", "variable", "content.opt", "braceless", "id", + "id_colon", "symbol", "string_as_id", "epilogue.opt", YY_NULL }; #endif @@ -729,24 +740,24 @@ static const yytype_uint16 yytoknum[] = 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, - 305, 306, 307, 308, 309, 310, 311, 312, 313 + 305, 306, 307, 308, 309, 310, 311, 312 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint8 yyr1[] = { - 0, 59, 60, 61, 61, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 63, 63, 63, - 63, 63, 63, 63, 63, 63, 64, 64, 63, 66, - 65, 67, 65, 65, 68, 69, 69, 69, 70, 70, - 71, 71, 72, 72, 73, 73, 73, 73, 74, 74, - 74, 74, 74, 75, 75, 76, 76, 77, 77, 77, - 79, 78, 80, 80, 80, 81, 81, 81, 81, 81, - 81, 82, 82, 83, 83, 84, 85, 85, 86, 87, - 87, 88, 89, 89 + 0, 58, 59, 60, 60, 61, 61, 61, 61, 61, + 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, + 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, + 61, 61, 61, 61, 61, 62, 62, 62, 62, 62, + 62, 62, 62, 62, 63, 63, 62, 65, 64, 66, + 64, 64, 67, 68, 68, 68, 69, 69, 70, 70, + 71, 71, 72, 72, 73, 73, 74, 74, 74, 74, + 75, 75, 75, 75, 75, 76, 76, 77, 77, 78, + 78, 78, 80, 79, 81, 81, 81, 82, 82, 82, + 82, 82, 82, 83, 83, 84, 84, 85, 85, 85, + 86, 87, 87, 88, 89, 89, 90, 91, 91 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -754,143 +765,150 @@ static const yytype_uint8 yyr2[] = { 0, 2, 4, 0, 2, 1, 1, 1, 3, 1, 2, 1, 2, 2, 2, 3, 1, 2, 2, 2, - 1, 2, 3, 1, 1, 2, 3, 2, 1, 1, - 1, 2, 2, 1, 1, 1, 1, 1, 1, 2, - 3, 3, 1, 1, 2, 3, 0, 1, 3, 0, - 3, 0, 3, 3, 3, 1, 1, 1, 0, 1, - 1, 2, 1, 2, 1, 1, 1, 1, 1, 1, - 2, 2, 3, 1, 2, 1, 2, 1, 2, 2, - 0, 3, 1, 3, 2, 0, 2, 2, 3, 3, - 3, 1, 1, 0, 1, 1, 1, 1, 1, 1, - 1, 1, 0, 2 + 1, 2, 3, 1, 1, 2, 3, 2, 1, 2, + 2, 1, 1, 1, 1, 1, 1, 2, 3, 3, + 1, 1, 2, 3, 0, 1, 3, 0, 3, 0, + 3, 3, 3, 1, 1, 1, 0, 1, 1, 2, + 1, 2, 1, 2, 1, 2, 1, 1, 1, 1, + 1, 1, 2, 2, 3, 1, 2, 1, 2, 1, + 2, 2, 0, 4, 1, 3, 2, 0, 3, 3, + 3, 3, 3, 0, 1, 1, 1, 0, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 0, 2 }; -/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state - STATE-NUM when YYTABLE doesn't specify something else to do. Zero +/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM. + Performed when YYTABLE doesn't specify something else to do. Zero means the default is an error. */ static const yytype_uint8 yydefact[] = { - 3, 0, 0, 1, 51, 49, 0, 0, 0, 55, - 56, 57, 0, 7, 42, 0, 9, 11, 0, 0, - 0, 16, 0, 0, 0, 20, 0, 43, 23, 24, - 0, 0, 28, 29, 30, 0, 0, 0, 33, 34, - 35, 0, 6, 36, 46, 4, 5, 38, 37, 58, - 0, 0, 0, 0, 0, 95, 0, 44, 92, 91, - 93, 10, 12, 13, 14, 0, 17, 18, 19, 21, - 0, 25, 0, 27, 31, 32, 101, 97, 96, 99, - 39, 100, 0, 98, 0, 0, 75, 77, 80, 47, - 0, 59, 0, 68, 73, 52, 69, 50, 53, 60, - 65, 66, 67, 40, 62, 64, 41, 45, 94, 8, - 15, 22, 26, 79, 78, 0, 76, 2, 85, 48, - 54, 74, 70, 71, 61, 63, 103, 81, 82, 72, - 85, 84, 0, 0, 0, 87, 86, 83, 88, 89, - 90 + 3, 0, 0, 1, 49, 47, 0, 0, 0, 53, + 54, 55, 0, 7, 40, 0, 9, 11, 0, 0, + 0, 16, 0, 0, 0, 20, 0, 41, 23, 24, + 0, 0, 28, 0, 0, 0, 31, 32, 33, 0, + 6, 34, 44, 4, 5, 36, 35, 56, 0, 0, + 0, 0, 0, 100, 0, 42, 96, 95, 97, 10, + 12, 13, 14, 0, 17, 18, 19, 21, 0, 25, + 0, 27, 29, 30, 106, 102, 101, 104, 37, 105, + 0, 103, 0, 0, 77, 79, 93, 45, 0, 57, + 0, 70, 75, 50, 71, 48, 51, 62, 67, 68, + 69, 38, 64, 66, 39, 43, 99, 98, 8, 15, + 22, 26, 81, 80, 0, 78, 2, 94, 82, 46, + 52, 58, 60, 76, 72, 73, 63, 65, 108, 87, + 59, 61, 74, 83, 84, 87, 86, 0, 0, 0, + 93, 93, 85, 90, 91, 92, 89, 88 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 1, 2, 45, 84, 90, 47, 51, 50, 48, - 49, 92, 98, 103, 104, 94, 95, 85, 86, 87, - 118, 127, 128, 60, 109, 57, 79, 88, 105, 81, - 117 + -1, 1, 2, 43, 82, 88, 45, 49, 48, 46, + 47, 90, 120, 121, 96, 101, 102, 92, 93, 83, + 84, 85, 129, 133, 134, 118, 58, 108, 55, 77, + 86, 103, 79, 116 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -79 +#define YYPACT_NINF -91 static const yytype_int16 yypact[] = { - -79, 5, 96, -79, -79, -79, -6, 13, 18, -79, - -79, -79, -8, -79, -79, 27, 66, -79, 74, 82, - 31, -79, 43, 86, 45, -79, 32, -79, -79, -79, - 33, 47, -79, -79, -79, 91, 93, 26, -79, -79, - -79, 15, -79, -79, 48, -79, -79, -79, -79, 44, - 38, 38, 26, 11, 11, -79, 53, -79, -79, -79, - 106, -79, -79, -79, -79, 107, -79, -79, -79, -79, - 108, -79, 138, -79, -79, -79, -79, -79, -79, -79, - -79, -79, 88, -79, 89, 1, -79, -79, -79, -79, - 53, -79, 26, -79, -79, 38, 50, 38, 26, -79, - -79, -79, -79, 11, -79, -79, 11, -79, -79, -79, - -79, -79, -79, -79, -79, 97, -79, -79, -79, -79, - 26, -79, 142, -79, -79, -79, -79, -7, 25, -79, - -79, -79, 26, 144, 98, -79, -79, 25, -79, -79, - -79 + -91, 3, 103, -91, -91, -91, -36, 2, 10, -91, + -91, -91, 9, -91, -91, 32, 60, -91, 65, 67, + 27, -91, 41, 73, 51, -91, 39, -91, -91, -91, + 40, 52, -91, 93, 95, 33, -91, -91, -91, 15, + -91, -91, 53, -91, -91, -91, -91, 46, 43, 43, + 33, 11, 11, -91, 61, -91, -91, -91, 35, -91, + -91, -91, -91, 100, -91, -91, -91, -91, 102, -91, + 113, -91, -91, -91, -91, -91, -91, -91, -91, -91, + 64, -91, 94, 1, -91, -91, 62, -91, 61, -91, + 33, -91, -91, 43, 86, 43, 33, -91, -91, -91, + -91, 11, -91, -91, 11, -91, -91, -91, -91, -91, + -91, -91, -91, -91, 72, -91, -91, -91, -91, -91, + 33, -91, 142, -91, 145, -91, -91, -91, -91, -91, + -91, -91, -91, 17, 34, -91, -91, 33, 146, 97, + 62, 62, 34, -91, -91, -91, -91, -91 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -79, -79, -79, -79, 149, -79, -79, -79, -79, -79, - -79, -79, 54, 101, -21, -33, 105, -79, 67, -79, - -79, -79, 28, -79, -79, -13, -47, -79, -37, -78, - -79 + -91, -91, -91, -91, 147, -91, -91, -91, -91, -91, + -91, -91, -91, 37, -91, 106, -60, -33, 105, -91, + 69, -91, -91, -91, 24, -48, -91, -91, -49, -20, + -91, -35, -90, -91 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If positive, shift that token. If negative, reduce the rule which - number is the opposite. If zero, do what YYDEFACT says. - If YYTABLE_NINF, syntax error. */ -#define YYTABLE_NINF -103 + number is the opposite. If YYTABLE_NINF, syntax error. */ +#define YYTABLE_NINF -108 static const yytype_int16 yytable[] = { - 80, -102, 82, 96, 96, 3, 4, 5, 6, 7, - 8, 9, 10, 11, 76, 99, 82, 12, 123, 14, - 4, 5, 6, 7, 8, 9, 10, 11, 76, 76, - 58, 12, 27, 14, 64, 69, 71, 55, 132, 133, - 134, 56, 37, 107, 129, 130, 27, 131, 96, 52, - 96, 83, 115, 76, 122, 99, 37, 77, 53, 44, - 78, 124, 121, 54, 121, 83, 100, 101, 102, 61, - 135, 77, 77, 44, 78, 78, 59, 119, 62, 65, - 70, 72, 125, 124, 77, 125, 63, 78, 66, 67, - 68, 136, 73, 93, 74, 138, 75, 89, 55, 91, - 136, 4, 5, 6, 7, 8, 9, 10, 11, 108, - 110, 111, 12, 13, 14, 15, 16, 17, 18, 19, - 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, - 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, - 40, 112, 113, 114, 126, 76, 120, 41, 139, 42, - 43, 46, 116, 140, 44, 106, 97, 0, 137 + 78, -107, 80, 3, 125, 105, 4, 5, 6, 7, + 8, 9, 10, 11, 74, 97, 80, 12, 50, 14, + 4, 5, 6, 7, 8, 9, 10, 11, 94, 94, + 62, 12, 27, 14, 132, 56, 74, 74, 106, 119, + 35, 127, 67, 69, 127, 51, 27, 137, 138, 139, + 81, 114, 53, 52, 35, 122, 75, 54, 42, 76, + 123, 126, 123, 59, 81, 98, 99, 100, 135, 60, + 136, 61, 42, 94, 63, 94, 65, 140, 75, 75, + 57, 76, 76, 107, 64, 122, 68, 70, 75, 74, + 124, 76, 146, 147, 66, 71, 72, 91, 73, 141, + 89, 87, 143, 109, 53, 110, 117, 141, 4, 5, + 6, 7, 8, 9, 10, 11, 111, 112, 128, 12, + 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, + 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, + 33, 34, 35, 36, 37, 38, 131, 113, 74, 44, + 144, 145, 115, 39, 95, 40, 41, 130, 104, 142, + 42 }; -static const yytype_int16 yycheck[] = +#define yypact_value_is_default(Yystate) \ + (!!((Yystate) == (-91))) + +#define yytable_value_is_error(Yytable_value) \ + YYID (0) + +static const yytype_uint8 yycheck[] = { - 37, 0, 1, 50, 51, 0, 5, 6, 7, 8, - 9, 10, 11, 12, 3, 52, 1, 16, 96, 18, - 5, 6, 7, 8, 9, 10, 11, 12, 3, 3, - 3, 16, 31, 18, 3, 3, 3, 45, 13, 14, - 15, 49, 41, 56, 122, 52, 31, 54, 95, 55, - 97, 50, 51, 3, 4, 92, 41, 46, 45, 58, - 49, 98, 95, 45, 97, 50, 55, 56, 57, 3, - 45, 46, 46, 58, 49, 49, 49, 90, 4, 48, - 48, 48, 103, 120, 46, 106, 4, 49, 45, 3, - 45, 128, 45, 55, 3, 132, 3, 49, 45, 55, - 137, 5, 6, 7, 8, 9, 10, 11, 12, 3, - 3, 3, 16, 17, 18, 19, 20, 21, 22, 23, - 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, - 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, - 44, 3, 54, 54, 47, 3, 92, 51, 4, 53, - 54, 2, 85, 55, 58, 54, 51, -1, 130 + 35, 0, 1, 0, 94, 54, 5, 6, 7, 8, + 9, 10, 11, 12, 3, 50, 1, 16, 54, 18, + 5, 6, 7, 8, 9, 10, 11, 12, 48, 49, + 3, 16, 31, 18, 124, 3, 3, 3, 3, 88, + 39, 101, 3, 3, 104, 43, 31, 13, 14, 15, + 49, 50, 43, 43, 39, 90, 45, 48, 57, 48, + 93, 96, 95, 3, 49, 54, 55, 56, 51, 4, + 53, 4, 57, 93, 47, 95, 3, 43, 45, 45, + 48, 48, 48, 48, 43, 120, 47, 47, 45, 3, + 4, 48, 140, 141, 43, 43, 3, 54, 3, 134, + 54, 48, 137, 3, 43, 3, 44, 142, 5, 6, + 7, 8, 9, 10, 11, 12, 3, 53, 46, 16, + 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, + 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, + 37, 38, 39, 40, 41, 42, 4, 53, 3, 2, + 4, 54, 83, 50, 49, 52, 53, 120, 52, 135, + 57 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const yytype_uint8 yystos[] = { - 0, 60, 61, 0, 5, 6, 7, 8, 9, 10, + 0, 59, 60, 0, 5, 6, 7, 8, 9, 10, 11, 12, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, - 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, - 44, 51, 53, 54, 58, 62, 63, 65, 68, 69, - 67, 66, 55, 45, 45, 45, 49, 84, 3, 49, - 82, 3, 4, 4, 3, 48, 45, 3, 45, 3, - 48, 3, 48, 45, 3, 3, 3, 46, 49, 85, - 87, 88, 1, 50, 63, 76, 77, 78, 86, 49, - 64, 55, 70, 55, 74, 75, 85, 75, 71, 87, - 55, 56, 57, 72, 73, 87, 72, 84, 3, 83, - 3, 3, 3, 54, 54, 51, 77, 89, 79, 84, - 71, 74, 4, 88, 87, 73, 47, 80, 81, 88, - 52, 54, 13, 14, 15, 45, 87, 81, 87, 4, - 55 + 34, 35, 36, 37, 38, 39, 40, 41, 42, 50, + 52, 53, 57, 61, 62, 64, 67, 68, 66, 65, + 54, 43, 43, 43, 48, 86, 3, 48, 84, 3, + 4, 4, 3, 47, 43, 3, 43, 3, 47, 3, + 47, 43, 3, 3, 3, 45, 48, 87, 89, 90, + 1, 49, 62, 77, 78, 79, 88, 48, 63, 54, + 69, 54, 75, 76, 87, 76, 72, 89, 54, 55, + 56, 73, 74, 89, 73, 86, 3, 48, 85, 3, + 3, 3, 53, 53, 50, 78, 91, 44, 83, 86, + 70, 71, 89, 75, 4, 90, 89, 74, 46, 80, + 71, 4, 90, 81, 82, 51, 53, 13, 14, 15, + 43, 89, 82, 89, 4, 54, 83, 83 }; #define yyerrok (yyerrstatus = 0) @@ -905,24 +923,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; \ } \ @@ -932,39 +960,40 @@ while (YYID (0)) #define YYTERROR 1 #define YYERRCODE 256 - /* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. If N is 0, then set CURRENT to the empty location which ends the previous symbol: RHS[0] (always defined). */ -#define YYRHSLOC(Rhs, K) ((Rhs)[K]) #ifndef YYLLOC_DEFAULT -# 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; \ - } \ +# 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; \ + } \ while (YYID (0)) #endif +#define YYRHSLOC(Rhs, K) ((Rhs)[K]) + + /* YY_LOCATION_PRINT -- Print the location on the stream. This macro was not mandated originally: define only if we know 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, \ @@ -1027,6 +1056,8 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp) YYLTYPE const * const yylocationp; #endif { + FILE *yyo = yyoutput; + YYUSE (yyo); if (!yyvaluep) return; YYUSE (yylocationp); @@ -1038,149 +1069,131 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp) # endif switch (yytype) { - case 3: /* "\"string\"" */ - -/* Line 1537 of yacc.c */ -#line 188 "parse-gram.y" - { fputs (quotearg_style (c_quoting_style, (yyvaluep->chars)), stderr); }; - -/* Line 1537 of yacc.c */ -#line 1049 "parse-gram.c" + case 3: /* "string" */ +/* Line 833 of yacc.c */ +#line 205 "parse-gram.y" + { fputs (quotearg_style (c_quoting_style, ((*yyvaluep).chars)), stderr); }; +/* Line 833 of yacc.c */ +#line 1078 "parse-gram.c" break; - case 4: /* "\"integer\"" */ - -/* Line 1537 of yacc.c */ -#line 199 "parse-gram.y" - { fprintf (stderr, "%d", (yyvaluep->integer)); }; - -/* Line 1537 of yacc.c */ -#line 1058 "parse-gram.c" + case 4: /* "integer" */ +/* Line 833 of yacc.c */ +#line 217 "parse-gram.y" + { fprintf (stderr, "%d", ((*yyvaluep).integer)); }; +/* Line 833 of yacc.c */ +#line 1085 "parse-gram.c" break; - case 45: /* "\"{...}\"" */ - -/* Line 1537 of yacc.c */ -#line 190 "parse-gram.y" - { fprintf (stderr, "{\n%s\n}", (yyvaluep->code)); }; - -/* Line 1537 of yacc.c */ -#line 1067 "parse-gram.c" + case 43: /* "{...}" */ +/* Line 833 of yacc.c */ +#line 207 "parse-gram.y" + { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).code)); }; +/* Line 833 of yacc.c */ +#line 1092 "parse-gram.c" break; - case 46: /* "\"char\"" */ - -/* Line 1537 of yacc.c */ -#line 182 "parse-gram.y" - { fputs (char_name ((yyvaluep->character)), stderr); }; - -/* Line 1537 of yacc.c */ -#line 1076 "parse-gram.c" + case 44: /* "[identifier]" */ +/* Line 833 of yacc.c */ +#line 212 "parse-gram.y" + { fprintf (stderr, "[%s]", ((*yyvaluep).uniqstr)); }; +/* Line 833 of yacc.c */ +#line 1099 "parse-gram.c" break; - case 47: /* "\"epilogue\"" */ - -/* Line 1537 of yacc.c */ -#line 190 "parse-gram.y" - { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; - -/* Line 1537 of yacc.c */ -#line 1085 "parse-gram.c" + case 45: /* "char" */ +/* Line 833 of yacc.c */ +#line 199 "parse-gram.y" + { fputs (char_name (((*yyvaluep).character)), stderr); }; +/* Line 833 of yacc.c */ +#line 1106 "parse-gram.c" break; - case 49: /* "\"identifier\"" */ - -/* Line 1537 of yacc.c */ -#line 195 "parse-gram.y" - { fputs ((yyvaluep->uniqstr), stderr); }; - -/* Line 1537 of yacc.c */ -#line 1094 "parse-gram.c" + case 46: /* "epilogue" */ +/* Line 833 of yacc.c */ +#line 207 "parse-gram.y" + { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }; +/* Line 833 of yacc.c */ +#line 1113 "parse-gram.c" break; - case 50: /* "\"identifier:\"" */ - -/* Line 1537 of yacc.c */ -#line 196 "parse-gram.y" - { fprintf (stderr, "%s:", (yyvaluep->uniqstr)); }; - -/* Line 1537 of yacc.c */ -#line 1103 "parse-gram.c" + case 48: /* "identifier" */ +/* Line 833 of yacc.c */ +#line 211 "parse-gram.y" + { fputs (((*yyvaluep).uniqstr), stderr); }; +/* Line 833 of yacc.c */ +#line 1120 "parse-gram.c" break; - case 53: /* "\"%{...%}\"" */ - -/* Line 1537 of yacc.c */ -#line 190 "parse-gram.y" - { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; - -/* Line 1537 of yacc.c */ -#line 1112 "parse-gram.c" + case 49: /* "identifier:" */ +/* Line 833 of yacc.c */ +#line 213 "parse-gram.y" + { fprintf (stderr, "%s:", ((*yyvaluep).uniqstr)); }; +/* Line 833 of yacc.c */ +#line 1127 "parse-gram.c" break; - case 55: /* "\"type\"" */ - -/* Line 1537 of yacc.c */ -#line 194 "parse-gram.y" - { fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); }; - -/* Line 1537 of yacc.c */ -#line 1121 "parse-gram.c" - break; - case 82: /* "variable" */ - -/* Line 1537 of yacc.c */ -#line 195 "parse-gram.y" - { fputs ((yyvaluep->uniqstr), stderr); }; - -/* Line 1537 of yacc.c */ -#line 1130 "parse-gram.c" + case 52: /* "%{...%}" */ +/* Line 833 of yacc.c */ +#line 207 "parse-gram.y" + { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }; +/* Line 833 of yacc.c */ +#line 1134 "parse-gram.c" break; - case 83: /* "content.opt" */ - -/* Line 1537 of yacc.c */ -#line 190 "parse-gram.y" - { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; - -/* Line 1537 of yacc.c */ -#line 1139 "parse-gram.c" + case 54: /* "type" */ +/* Line 833 of yacc.c */ +#line 214 "parse-gram.y" + { fprintf (stderr, "<%s>", ((*yyvaluep).uniqstr)); }; +/* Line 833 of yacc.c */ +#line 1141 "parse-gram.c" break; - case 84: /* "braceless" */ - -/* Line 1537 of yacc.c */ -#line 190 "parse-gram.y" - { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; - -/* Line 1537 of yacc.c */ + case 71: /* symbol.prec */ +/* Line 833 of yacc.c */ +#line 220 "parse-gram.y" + { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }; +/* Line 833 of yacc.c */ #line 1148 "parse-gram.c" break; - case 85: /* "id" */ - -/* Line 1537 of yacc.c */ -#line 202 "parse-gram.y" - { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; - -/* Line 1537 of yacc.c */ -#line 1157 "parse-gram.c" + case 84: /* variable */ +/* Line 833 of yacc.c */ +#line 211 "parse-gram.y" + { fputs (((*yyvaluep).uniqstr), stderr); }; +/* Line 833 of yacc.c */ +#line 1155 "parse-gram.c" break; - case 86: /* "id_colon" */ - -/* Line 1537 of yacc.c */ -#line 203 "parse-gram.y" - { fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); }; - -/* Line 1537 of yacc.c */ -#line 1166 "parse-gram.c" + case 85: /* content.opt */ +/* Line 833 of yacc.c */ +#line 207 "parse-gram.y" + { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }; +/* Line 833 of yacc.c */ +#line 1162 "parse-gram.c" break; - case 87: /* "symbol" */ - -/* Line 1537 of yacc.c */ -#line 202 "parse-gram.y" - { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; - -/* Line 1537 of yacc.c */ -#line 1175 "parse-gram.c" + case 86: /* braceless */ +/* Line 833 of yacc.c */ +#line 207 "parse-gram.y" + { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }; +/* Line 833 of yacc.c */ +#line 1169 "parse-gram.c" break; - case 88: /* "string_as_id" */ - -/* Line 1537 of yacc.c */ -#line 202 "parse-gram.y" - { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; - -/* Line 1537 of yacc.c */ -#line 1184 "parse-gram.c" + case 87: /* id */ +/* Line 833 of yacc.c */ +#line 220 "parse-gram.y" + { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }; +/* Line 833 of yacc.c */ +#line 1176 "parse-gram.c" + break; + case 88: /* id_colon */ +/* Line 833 of yacc.c */ +#line 221 "parse-gram.y" + { fprintf (stderr, "%s:", ((*yyvaluep).symbol)->tag); }; +/* Line 833 of yacc.c */ +#line 1183 "parse-gram.c" + break; + case 89: /* symbol */ +/* Line 833 of yacc.c */ +#line 220 "parse-gram.y" + { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }; +/* Line 833 of yacc.c */ +#line 1190 "parse-gram.c" + break; + case 90: /* string_as_id */ +/* Line 833 of yacc.c */ +#line 220 "parse-gram.y" + { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }; +/* Line 833 of yacc.c */ +#line 1197 "parse-gram.c" break; default: break; @@ -1272,11 +1285,11 @@ yy_reduce_print (yyvsp, yylsp, yyrule) /* The symbols being reduced. */ for (yyi = 0; yyi < yynrhs; yyi++) { - fprintf (stderr, " $%d = ", yyi + 1); + YYFPRINTF (stderr, " $%d = ", yyi + 1); yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi], &(yyvsp[(yyi + 1) - (yynrhs)]) , &(yylsp[(yyi + 1) - (yynrhs)]) ); - fprintf (stderr, "\n"); + YYFPRINTF (stderr, "\n"); } } @@ -1313,7 +1326,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,115 +1661,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 (YY_NULL, yytname[yytoken]); + YYSIZE_T yysize = yysize0; + YYSIZE_T yysize1; + enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; + /* Internationalized format string. */ + const char *yyformat = YY_NULL; + /* 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 (YY_NULL, 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. */ - 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. | @@ -1558,25 +1835,6 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp) break; } } - - -/* Prevent warnings from -Wmissing-prototypes. */ - -#ifdef YYPARSE_PARAM -#if defined __STDC__ || defined __cplusplus -int yyparse (void *YYPARSE_PARAM); -#else -int yyparse (); -#endif -#else /* ! YYPARSE_PARAM */ -#if defined __STDC__ || defined __cplusplus -int yyparse (void); -#else -int yyparse (); -#endif -#endif /* ! YYPARSE_PARAM */ - - @@ -1607,104 +1865,142 @@ yyparse () #endif #endif { - /* The lookahead symbol. */ +/* The lookahead symbol. */ int yychar; + +#if defined __GNUC__ && (4 < __GNUC__ + (6 <= __GNUC_MINOR__)) +/* Suppress an incorrect diagnostic about yylval being uninitialized. */ +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"") +# define YY_IGNORE_MAYBE_UNINITIALIZED_END \ + _Pragma ("GCC diagnostic pop") +#else +/* Default value used for initialization, for pacifying older GCCs + or non-GCC compilers. */ +static YYSTYPE yyval_default; +# define YYLVAL_INITIALIZE() (yylval = yyval_default) +#endif +#ifndef YYLVAL_INITIALIZE +# define YYLVAL_INITIALIZE() +#endif +#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +# define YY_IGNORE_MAYBE_UNINITIALIZED_END +#endif + /* The semantic value of the lookahead symbol. */ YYSTYPE yylval; -/* Number of syntax errors so far. */ -int yynerrs; /* Location data for the lookahead symbol. */ YYLTYPE yylloc; - int yystate; - int yyn; - int yyresult; - /* Number of tokens to shift before error messages enabled. */ - int yyerrstatus; - /* Lookahead token as an internal (translated) token number. */ - int yytoken = 0; -#if YYERROR_VERBOSE - /* Buffer for error messages, and its allocated size. */ - char yymsgbuf[128]; - char *yymsg = yymsgbuf; - YYSIZE_T yymsg_alloc = sizeof yymsgbuf; -#endif + /* Number of syntax errors so far. */ + int yynerrs; - /* Three stacks and their tools: - `yyss': related to states, - `yyvs': related to semantic values, - `yyls': related to locations. + int yystate; + /* Number of tokens to shift before error messages enabled. */ + int yyerrstatus; - Refer to the stacks thru separate pointers, to allow yyoverflow - to reallocate them elsewhere. */ + /* The stacks and their tools: + `yyss': related to states. + `yyvs': related to semantic values. + `yyls': related to locations. - /* The state stack. */ - yytype_int16 yyssa[YYINITDEPTH]; - yytype_int16 *yyss = yyssa; - yytype_int16 *yyssp; + Refer to the stacks through separate pointers, to allow yyoverflow + to reallocate them elsewhere. */ - /* The semantic value stack. */ - YYSTYPE yyvsa[YYINITDEPTH]; - YYSTYPE *yyvs = yyvsa; - YYSTYPE *yyvsp; + /* The state stack. */ + yytype_int16 yyssa[YYINITDEPTH]; + yytype_int16 *yyss; + yytype_int16 *yyssp; - /* The location stack. */ - YYLTYPE yylsa[YYINITDEPTH]; - YYLTYPE *yyls = yylsa; - YYLTYPE *yylsp; - /* The locations where the error started and ended. */ - YYLTYPE yyerror_range[2]; + /* The semantic value stack. */ + YYSTYPE yyvsa[YYINITDEPTH]; + YYSTYPE *yyvs; + YYSTYPE *yyvsp; -#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N), yylsp -= (N)) + /* The location stack. */ + YYLTYPE yylsa[YYINITDEPTH]; + YYLTYPE *yyls; + YYLTYPE *yylsp; + + /* The locations where the error started and ended. */ + YYLTYPE yyerror_range[3]; - YYSIZE_T yystacksize = YYINITDEPTH; + 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. */ + int yytoken = 0; /* The variables used to return semantic value and location from the action routines. */ YYSTYPE yyval; YYLTYPE yyloc; +#if YYERROR_VERBOSE + /* Buffer for error messages, and its allocated size. */ + char yymsgbuf[128]; + char *yymsg = yymsgbuf; + YYSIZE_T yymsg_alloc = sizeof yymsgbuf; +#endif + +#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N), yylsp -= (N)) + /* The number of symbols on the RHS of the reduced rule. Keep to zero when no symbol should be popped. */ int yylen = 0; + yyss = yyssa; + yyvs = yyvsa; + 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; yyerrstatus = 0; yynerrs = 0; - yychar = YYEMPTY; /* Cause a token to be read. */ + yychar = YYEMPTY; /* Cause a token to be read. */ /* Initialize stack pointers. Waste one element of value and location stack so that they stay on the same level as the state stack. The wasted elements are never initialized. */ - yyssp = yyss; yyvsp = yyvs; yylsp = yyls; -#if YYLTYPE_IS_TRIVIAL + + YYLVAL_INITIALIZE (); +#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 1537 of yacc.c */ -#line 89 "parse-gram.y" +/* User initialization code. */ +/* Line 1596 of yacc.c */ +#line 107 "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 1537 of yacc.c */ -#line 1708 "parse-gram.c" +/* Line 1596 of yacc.c */ +#line 2004 "parse-gram.c" yylsp[0] = yylloc; goto yysetstate; @@ -1742,6 +2038,7 @@ YYLTYPE yylloc; &yyvs1, yysize * sizeof (*yyvsp), &yyls1, yysize * sizeof (*yylsp), &yystacksize); + yyls = yyls1; yyss = yyss1; yyvs = yyvs1; @@ -1763,9 +2060,9 @@ YYLTYPE yylloc; (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); if (! yyptr) goto yyexhaustedlab; - YYSTACK_RELOCATE (yyss); - YYSTACK_RELOCATE (yyvs); - YYSTACK_RELOCATE (yyls); + YYSTACK_RELOCATE (yyss_alloc, yyss); + YYSTACK_RELOCATE (yyvs_alloc, yyvs); + YYSTACK_RELOCATE (yyls_alloc, yyls); # undef YYSTACK_RELOCATE if (yyss1 != yyssa) YYSTACK_FREE (yyss1); @@ -1801,7 +2098,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. */ @@ -1828,12 +2125,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; } @@ -1848,9 +2149,12 @@ yybackup: /* Discard the shifted token. */ yychar = YYEMPTY; + YY_LAC_DISCARD ("shift"); yystate = yyn; + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN *++yyvsp = yylval; + YY_IGNORE_MAYBE_UNINITIALIZED_END *++yylsp = yylloc; goto yynewstate; @@ -1885,12 +2189,13 @@ yyreduce: /* Default location. */ YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen); YY_REDUCE_PRINT (yyn); - switch (yyn) - { - case 6: - -/* Line 1537 of yacc.c */ -#line 226 "parse-gram.y" + { + int yychar_backup = yychar; + switch (yyn) + { + case 6: +/* Line 1813 of yacc.c */ +#line 246 "parse-gram.y" { code_props plain_code; code_props_plain_init (&plain_code, (yyvsp[(1) - (1)].chars), (yylsp[(1) - (1)])); @@ -1903,42 +2208,29 @@ yyreduce: break; case 7: - -/* Line 1537 of yacc.c */ -#line 235 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 255 "parse-gram.y" { debug_flag = true; } break; case 8: - -/* Line 1537 of yacc.c */ -#line 237 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 257 "parse-gram.y" { - char const name_prefix[] = "percent_define("; - size_t length = strlen ((yyvsp[(2) - (3)].uniqstr)); - char *name = xmalloc (sizeof name_prefix + length + 1); - strcpy (name, name_prefix); - strcpy (name + sizeof name_prefix - 1, (yyvsp[(2) - (3)].uniqstr)); - strcpy (name + sizeof name_prefix - 1 + length, ")"); - if (muscle_find_const (name)) - warn_at ((yylsp[(2) - (3)]), _("%s `%s' redefined"), "%define variable", (yyvsp[(2) - (3)].uniqstr)); - MUSCLE_INSERT_STRING (uniqstr_new (name), (yyvsp[(3) - (3)].chars)); - free (name); - muscle_grow_user_name_list ("percent_define_user_variables", (yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)])); + muscle_percent_define_insert ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars), + MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE); } break; case 9: - -/* Line 1537 of yacc.c */ -#line 250 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 261 "parse-gram.y" { defines_flag = true; } break; case 10: - -/* Line 1537 of yacc.c */ -#line 252 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 263 "parse-gram.y" { defines_flag = true; spec_defines_file = xstrdup ((yyvsp[(2) - (2)].chars)); @@ -1946,44 +2238,38 @@ yyreduce: break; case 11: - -/* Line 1537 of yacc.c */ -#line 256 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 267 "parse-gram.y" { error_verbose = true; } break; case 12: - -/* Line 1537 of yacc.c */ -#line 257 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 268 "parse-gram.y" { expected_sr_conflicts = (yyvsp[(2) - (2)].integer); } break; case 13: - -/* Line 1537 of yacc.c */ -#line 258 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 269 "parse-gram.y" { expected_rr_conflicts = (yyvsp[(2) - (2)].integer); } break; case 14: - -/* Line 1537 of yacc.c */ -#line 259 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 270 "parse-gram.y" { spec_file_prefix = (yyvsp[(2) - (2)].chars); } break; case 15: - -/* Line 1537 of yacc.c */ -#line 260 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 271 "parse-gram.y" { spec_file_prefix = (yyvsp[(3) - (3)].chars); } break; case 16: - -/* Line 1537 of yacc.c */ -#line 262 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 273 "parse-gram.y" { nondeterministic_parser = true; glr_parser = true; @@ -1991,9 +2277,8 @@ yyreduce: break; case 17: - -/* Line 1537 of yacc.c */ -#line 267 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 278 "parse-gram.y" { code_props action; code_props_symbol_action_init (&action, (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); @@ -2005,228 +2290,227 @@ yyreduce: break; case 18: - -/* Line 1537 of yacc.c */ -#line 275 "parse-gram.y" - { language_argmatch ((yyvsp[(2) - (2)].chars), 1, &(yylsp[(1) - (2)])); } +/* Line 1813 of yacc.c */ +#line 286 "parse-gram.y" + { language_argmatch ((yyvsp[(2) - (2)].chars), grammar_prio, (yylsp[(1) - (2)])); } break; case 19: - -/* Line 1537 of yacc.c */ -#line 276 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 287 "parse-gram.y" { add_param ("lex_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); } break; case 20: - -/* Line 1537 of yacc.c */ -#line 277 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 288 "parse-gram.y" { locations_flag = true; } break; case 21: - -/* Line 1537 of yacc.c */ -#line 278 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 289 "parse-gram.y" { spec_name_prefix = (yyvsp[(2) - (2)].chars); } break; case 22: - -/* Line 1537 of yacc.c */ -#line 279 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 290 "parse-gram.y" { spec_name_prefix = (yyvsp[(3) - (3)].chars); } break; case 23: - -/* Line 1537 of yacc.c */ -#line 280 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 291 "parse-gram.y" { no_lines_flag = true; } break; case 24: - -/* Line 1537 of yacc.c */ -#line 281 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 292 "parse-gram.y" { nondeterministic_parser = true; } break; case 25: - -/* Line 1537 of yacc.c */ -#line 282 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 293 "parse-gram.y" { spec_outfile = (yyvsp[(2) - (2)].chars); } break; case 26: - -/* Line 1537 of yacc.c */ -#line 283 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 294 "parse-gram.y" { spec_outfile = (yyvsp[(3) - (3)].chars); } break; case 27: - -/* Line 1537 of yacc.c */ -#line 284 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 295 "parse-gram.y" { add_param ("parse_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); } break; case 28: - -/* Line 1537 of yacc.c */ -#line 285 "parse-gram.y" - { pure_parser = true; } +/* Line 1813 of yacc.c */ +#line 297 "parse-gram.y" + { + /* %pure-parser is deprecated in favor of `%define api.pure', so use + `%define api.pure' in a backward-compatible manner here. First, don't + complain if %pure-parser is specified multiple times. */ + if (!muscle_find_const ("percent_define(api.pure)")) + muscle_percent_define_insert ("api.pure", (yylsp[(1) - (1)]), "", + MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE); + /* In all cases, use api.pure now so that the backend doesn't complain if + the skeleton ignores api.pure, but do warn now if there's a previous + conflicting definition from an actual %define. */ + if (!muscle_percent_define_flag_if ("api.pure")) + muscle_percent_define_insert ("api.pure", (yylsp[(1) - (1)]), "", + MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE); + } break; case 29: - -/* Line 1537 of yacc.c */ -#line 286 "parse-gram.y" - { push_parser = true; pull_parser = false; } +/* Line 1813 of yacc.c */ +#line 311 "parse-gram.y" + { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); } break; case 30: - -/* Line 1537 of yacc.c */ -#line 287 "parse-gram.y" - { push_parser = true; pull_parser = true; } +/* Line 1813 of yacc.c */ +#line 313 "parse-gram.y" + { + char const *skeleton_user = (yyvsp[(2) - (2)].chars); + if (mbschr (skeleton_user, '/')) + { + size_t dir_length = strlen (current_file); + char *skeleton_build; + while (dir_length && current_file[dir_length - 1] != '/') + --dir_length; + while (dir_length && current_file[dir_length - 1] == '/') + --dir_length; + skeleton_build = + xmalloc (dir_length + 1 + strlen (skeleton_user) + 1); + if (dir_length > 0) + { + memcpy (skeleton_build, current_file, dir_length); + skeleton_build[dir_length++] = '/'; + } + strcpy (skeleton_build + dir_length, skeleton_user); + skeleton_user = uniqstr_new (skeleton_build); + free (skeleton_build); + } + skeleton_arg (skeleton_user, grammar_prio, (yylsp[(1) - (2)])); + } break; case 31: - -/* Line 1537 of yacc.c */ -#line 288 "parse-gram.y" - { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); } +/* Line 1813 of yacc.c */ +#line 336 "parse-gram.y" + { token_table_flag = true; } break; case 32: - -/* Line 1537 of yacc.c */ -#line 289 "parse-gram.y" - { skeleton_arg ((yyvsp[(2) - (2)].chars), 1, &(yylsp[(1) - (2)])); } +/* Line 1813 of yacc.c */ +#line 337 "parse-gram.y" + { report_flag |= report_states; } break; case 33: - -/* Line 1537 of yacc.c */ -#line 290 "parse-gram.y" - { token_table_flag = true; } - break; - - case 34: - -/* Line 1537 of yacc.c */ -#line 291 "parse-gram.y" - { report_flag = report_states; } - break; - - case 35: - -/* Line 1537 of yacc.c */ -#line 292 "parse-gram.y" +/* Line 1813 of yacc.c */ +#line 338 "parse-gram.y" { yacc_flag = true; } break; - case 39: - -/* Line 1537 of yacc.c */ -#line 300 "parse-gram.y" + case 37: +/* Line 1813 of yacc.c */ +#line 346 "parse-gram.y" { grammar_start_symbol_set ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); } break; - case 40: - -/* Line 1537 of yacc.c */ -#line 304 "parse-gram.y" + case 38: +/* Line 1813 of yacc.c */ +#line 350 "parse-gram.y" { - symbol_list *list; - for (list = (yyvsp[(3) - (3)].list); list; list = list->next) - symbol_list_destructor_set (list, (yyvsp[(2) - (3)].code), (yylsp[(2) - (3)])); - symbol_list_free ((yyvsp[(3) - (3)].list)); + code_props code; + code_props_symbol_action_init (&code, (yyvsp[(2) - (3)].code), (yylsp[(2) - (3)])); + code_props_translate_code (&code); + { + symbol_list *list; + for (list = (yyvsp[(3) - (3)].list); list; list = list->next) + symbol_list_destructor_set (list, &code); + symbol_list_free ((yyvsp[(3) - (3)].list)); + } } break; - case 41: - -/* Line 1537 of yacc.c */ -#line 311 "parse-gram.y" + case 39: +/* Line 1813 of yacc.c */ +#line 362 "parse-gram.y" { - symbol_list *list; - for (list = (yyvsp[(3) - (3)].list); list; list = list->next) - symbol_list_printer_set (list, (yyvsp[(2) - (3)].code), (yylsp[(2) - (3)])); - symbol_list_free ((yyvsp[(3) - (3)].list)); + code_props code; + code_props_symbol_action_init (&code, (yyvsp[(2) - (3)].code), (yylsp[(2) - (3)])); + code_props_translate_code (&code); + { + symbol_list *list; + for (list = (yyvsp[(3) - (3)].list); list; list = list->next) + symbol_list_printer_set (list, &code); + symbol_list_free ((yyvsp[(3) - (3)].list)); + } } break; - case 42: - -/* Line 1537 of yacc.c */ -#line 318 "parse-gram.y" + case 40: +/* Line 1813 of yacc.c */ +#line 374 "parse-gram.y" { default_prec = true; } break; - case 43: - -/* Line 1537 of yacc.c */ -#line 322 "parse-gram.y" + case 41: +/* Line 1813 of yacc.c */ +#line 378 "parse-gram.y" { default_prec = false; } break; - case 44: - -/* Line 1537 of yacc.c */ -#line 326 "parse-gram.y" + case 42: +/* Line 1813 of yacc.c */ +#line 382 "parse-gram.y" { - muscle_code_grow ("percent_code_unqualified", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); + /* Do not invoke muscle_percent_code_grow here since it invokes + muscle_user_name_list_grow. */ + muscle_code_grow ("percent_code()", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); code_scanner_last_string_free (); } break; - case 45: - -/* Line 1537 of yacc.c */ -#line 331 "parse-gram.y" + case 43: +/* Line 1813 of yacc.c */ +#line 389 "parse-gram.y" { - char const name_prefix[] = "percent_code("; - size_t length = strlen ((yyvsp[(2) - (3)].uniqstr)); - char *name = xmalloc (sizeof name_prefix + length + 1); - strcpy (name, name_prefix); - strcpy (name + sizeof name_prefix - 1, (yyvsp[(2) - (3)].uniqstr)); - strcpy (name + sizeof name_prefix - 1 + length, ")"); - muscle_code_grow (uniqstr_new (name), (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)])); - free (name); + muscle_percent_code_grow ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)])); code_scanner_last_string_free (); - muscle_grow_user_name_list ("percent_code_user_qualifiers", (yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)])); } break; - case 46: - -/* Line 1537 of yacc.c */ -#line 353 "parse-gram.y" + case 44: +/* Line 1813 of yacc.c */ +#line 403 "parse-gram.y" {} break; - case 47: - -/* Line 1537 of yacc.c */ -#line 354 "parse-gram.y" + case 45: +/* Line 1813 of yacc.c */ +#line 404 "parse-gram.y" { muscle_code_grow ("union_name", (yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; - case 48: - -/* Line 1537 of yacc.c */ -#line 359 "parse-gram.y" + case 46: +/* Line 1813 of yacc.c */ +#line 409 "parse-gram.y" { union_seen = true; muscle_code_grow ("stype", (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)])); @@ -2234,44 +2518,39 @@ yyreduce: } break; - case 49: - -/* Line 1537 of yacc.c */ -#line 370 "parse-gram.y" + case 47: +/* Line 1813 of yacc.c */ +#line 420 "parse-gram.y" { current_class = nterm_sym; } break; - case 50: - -/* Line 1537 of yacc.c */ -#line 371 "parse-gram.y" + case 48: +/* Line 1813 of yacc.c */ +#line 421 "parse-gram.y" { current_class = unknown_sym; current_type = NULL; } break; - case 51: - -/* Line 1537 of yacc.c */ -#line 375 "parse-gram.y" + case 49: +/* Line 1813 of yacc.c */ +#line 425 "parse-gram.y" { current_class = token_sym; } break; - case 52: - -/* Line 1537 of yacc.c */ -#line 376 "parse-gram.y" + case 50: +/* Line 1813 of yacc.c */ +#line 426 "parse-gram.y" { current_class = unknown_sym; current_type = NULL; } break; - case 53: - -/* Line 1537 of yacc.c */ -#line 381 "parse-gram.y" + case 51: +/* Line 1813 of yacc.c */ +#line 431 "parse-gram.y" { symbol_list *list; tag_seen = true; @@ -2281,10 +2560,9 @@ yyreduce: } break; - case 54: - -/* Line 1537 of yacc.c */ -#line 392 "parse-gram.y" + case 52: +/* Line 1813 of yacc.c */ +#line 442 "parse-gram.y" { symbol_list *list; ++current_prec; @@ -2298,121 +2576,129 @@ yyreduce: } break; - case 55: - -/* Line 1537 of yacc.c */ -#line 406 "parse-gram.y" + case 53: +/* Line 1813 of yacc.c */ +#line 456 "parse-gram.y" { (yyval.assoc) = left_assoc; } break; - case 56: - -/* Line 1537 of yacc.c */ -#line 407 "parse-gram.y" + case 54: +/* Line 1813 of yacc.c */ +#line 457 "parse-gram.y" { (yyval.assoc) = right_assoc; } break; - case 57: - -/* Line 1537 of yacc.c */ -#line 408 "parse-gram.y" + case 55: +/* Line 1813 of yacc.c */ +#line 458 "parse-gram.y" { (yyval.assoc) = non_assoc; } break; - case 58: - -/* Line 1537 of yacc.c */ -#line 412 "parse-gram.y" + case 56: +/* Line 1813 of yacc.c */ +#line 462 "parse-gram.y" { current_type = NULL; } break; - case 59: - -/* Line 1537 of yacc.c */ -#line 413 "parse-gram.y" + case 57: +/* Line 1813 of yacc.c */ +#line 463 "parse-gram.y" { current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; } break; - case 60: - -/* Line 1537 of yacc.c */ -#line 419 "parse-gram.y" + case 58: +/* Line 1813 of yacc.c */ +#line 469 "parse-gram.y" { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); } break; - case 61: - -/* Line 1537 of yacc.c */ -#line 421 "parse-gram.y" + case 59: +/* Line 1813 of yacc.c */ +#line 471 "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 62: + case 60: +/* Line 1813 of yacc.c */ +#line 475 "parse-gram.y" + { (yyval.symbol) = (yyvsp[(1) - (1)].symbol); } + break; -/* Line 1537 of yacc.c */ -#line 425 "parse-gram.y" - { (yyval.list) = (yyvsp[(1) - (1)].list); } + case 61: +/* Line 1813 of yacc.c */ +#line 476 "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 63: + case 62: +/* Line 1813 of yacc.c */ +#line 482 "parse-gram.y" + { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); } + break; -/* Line 1537 of yacc.c */ -#line 426 "parse-gram.y" - { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); } + case 63: +/* Line 1813 of yacc.c */ +#line 484 "parse-gram.y" + { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); } break; case 64: - -/* Line 1537 of yacc.c */ -#line 430 "parse-gram.y" - { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); } +/* Line 1813 of yacc.c */ +#line 488 "parse-gram.y" + { (yyval.list) = (yyvsp[(1) - (1)].list); } break; case 65: - -/* Line 1537 of yacc.c */ -#line 431 "parse-gram.y" - { (yyval.list) = symbol_list_type_new ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } +/* Line 1813 of yacc.c */ +#line 489 "parse-gram.y" + { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); } break; case 66: - -/* Line 1537 of yacc.c */ -#line 432 "parse-gram.y" - { (yyval.list) = symbol_list_default_tagged_new ((yylsp[(1) - (1)])); } +/* Line 1813 of yacc.c */ +#line 493 "parse-gram.y" + { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); } break; case 67: - -/* Line 1537 of yacc.c */ -#line 433 "parse-gram.y" - { (yyval.list) = symbol_list_default_tagless_new ((yylsp[(1) - (1)])); } +/* Line 1813 of yacc.c */ +#line 494 "parse-gram.y" + { (yyval.list) = symbol_list_type_new ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; case 68: +/* Line 1813 of yacc.c */ +#line 495 "parse-gram.y" + { (yyval.list) = symbol_list_default_tagged_new ((yylsp[(1) - (1)])); } + break; -/* Line 1537 of yacc.c */ -#line 439 "parse-gram.y" + case 69: +/* Line 1813 of yacc.c */ +#line 496 "parse-gram.y" + { (yyval.list) = symbol_list_default_tagless_new ((yylsp[(1) - (1)])); } + break; + + case 70: +/* Line 1813 of yacc.c */ +#line 502 "parse-gram.y" { current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; } break; - case 69: - -/* Line 1537 of yacc.c */ -#line 444 "parse-gram.y" + case 71: +/* Line 1813 of yacc.c */ +#line 507 "parse-gram.y" { symbol_class_set ((yyvsp[(1) - (1)].symbol), current_class, (yylsp[(1) - (1)]), true); symbol_type_set ((yyvsp[(1) - (1)].symbol), current_type, (yylsp[(1) - (1)])); } break; - case 70: - -/* Line 1537 of yacc.c */ -#line 449 "parse-gram.y" + case 72: +/* Line 1813 of yacc.c */ +#line 512 "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)])); @@ -2420,10 +2706,9 @@ yyreduce: } break; - case 71: - -/* Line 1537 of yacc.c */ -#line 455 "parse-gram.y" + case 73: +/* Line 1813 of yacc.c */ +#line 518 "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)])); @@ -2431,10 +2716,9 @@ yyreduce: } break; - case 72: - -/* Line 1537 of yacc.c */ -#line 461 "parse-gram.y" + case 74: +/* Line 1813 of yacc.c */ +#line 524 "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)])); @@ -2443,99 +2727,111 @@ yyreduce: } break; - case 79: - -/* Line 1537 of yacc.c */ -#line 491 "parse-gram.y" + case 81: +/* Line 1813 of yacc.c */ +#line 554 "parse-gram.y" { yyerrok; } break; - case 80: - -/* Line 1537 of yacc.c */ -#line 497 "parse-gram.y" - { current_lhs = (yyvsp[(1) - (1)].symbol); current_lhs_location = (yylsp[(1) - (1)]); } - break; - case 82: - -/* Line 1537 of yacc.c */ -#line 501 "parse-gram.y" - { grammar_current_rule_end ((yylsp[(1) - (1)])); } +/* Line 1813 of yacc.c */ +#line 560 "parse-gram.y" + { current_lhs ((yyvsp[(1) - (2)].symbol), (yylsp[(1) - (2)]), (yyvsp[(2) - (2)].named_ref)); } break; case 83: - -/* Line 1537 of yacc.c */ -#line 502 "parse-gram.y" - { grammar_current_rule_end ((yylsp[(3) - (3)])); } +/* Line 1813 of yacc.c */ +#line 561 "parse-gram.y" + { + /* Free the current lhs. */ + current_lhs (0, (yylsp[(1) - (4)]), 0); + } break; - case 85: - -/* Line 1537 of yacc.c */ -#line 508 "parse-gram.y" - { grammar_current_rule_begin (current_lhs, current_lhs_location); } + case 84: +/* Line 1813 of yacc.c */ +#line 568 "parse-gram.y" + { grammar_current_rule_end ((yylsp[(1) - (1)])); } break; - case 86: - -/* Line 1537 of yacc.c */ -#line 510 "parse-gram.y" - { grammar_current_rule_symbol_append ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); } + case 85: +/* Line 1813 of yacc.c */ +#line 569 "parse-gram.y" + { grammar_current_rule_end ((yylsp[(3) - (3)])); } break; case 87: - -/* Line 1537 of yacc.c */ -#line 512 "parse-gram.y" - { grammar_current_rule_action_append ((yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); } +/* Line 1813 of yacc.c */ +#line 575 "parse-gram.y" + { grammar_current_rule_begin (current_lhs_symbol, current_lhs_location, + current_lhs_named_ref); } break; case 88: - -/* Line 1537 of yacc.c */ -#line 514 "parse-gram.y" - { grammar_current_rule_prec_set ((yyvsp[(3) - (3)].symbol), (yylsp[(3) - (3)])); } +/* Line 1813 of yacc.c */ +#line 578 "parse-gram.y" + { grammar_current_rule_symbol_append ((yyvsp[(2) - (3)].symbol), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].named_ref)); } break; case 89: - -/* Line 1537 of yacc.c */ -#line 516 "parse-gram.y" - { grammar_current_rule_dprec_set ((yyvsp[(3) - (3)].integer), (yylsp[(3) - (3)])); } +/* Line 1813 of yacc.c */ +#line 580 "parse-gram.y" + { grammar_current_rule_action_append ((yyvsp[(2) - (3)].code), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].named_ref)); } break; case 90: +/* Line 1813 of yacc.c */ +#line 582 "parse-gram.y" + { grammar_current_rule_prec_set ((yyvsp[(3) - (3)].symbol), (yylsp[(3) - (3)])); } + break; -/* Line 1537 of yacc.c */ -#line 518 "parse-gram.y" - { grammar_current_rule_merge_set ((yyvsp[(3) - (3)].uniqstr), (yylsp[(3) - (3)])); } + case 91: +/* Line 1813 of yacc.c */ +#line 584 "parse-gram.y" + { grammar_current_rule_dprec_set ((yyvsp[(3) - (3)].integer), (yylsp[(3) - (3)])); } break; case 92: - -/* Line 1537 of yacc.c */ -#line 528 "parse-gram.y" - { (yyval.uniqstr) = uniqstr_new ((yyvsp[(1) - (1)].chars)); } +/* Line 1813 of yacc.c */ +#line 586 "parse-gram.y" + { grammar_current_rule_merge_set ((yyvsp[(3) - (3)].uniqstr), (yylsp[(3) - (3)])); } break; case 93: +/* Line 1813 of yacc.c */ +#line 590 "parse-gram.y" + { (yyval.named_ref) = 0; } + break; -/* Line 1537 of yacc.c */ -#line 534 "parse-gram.y" - { - static char one[] = "1"; - (yyval.chars) = one; - } + case 94: +/* Line 1813 of yacc.c */ +#line 592 "parse-gram.y" + { (yyval.named_ref) = named_ref_new((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; - case 95: + case 96: +/* Line 1813 of yacc.c */ +#line 604 "parse-gram.y" + { (yyval.uniqstr) = uniqstr_new ((yyvsp[(1) - (1)].chars)); } + break; -/* Line 1537 of yacc.c */ -#line 548 "parse-gram.y" + case 97: +/* Line 1813 of yacc.c */ +#line 609 "parse-gram.y" + { (yyval.chars) = ""; } + break; + + case 98: +/* Line 1813 of yacc.c */ +#line 610 "parse-gram.y" + { (yyval.chars) = (yyvsp[(1) - (1)].uniqstr); } + break; + + case 100: +/* Line 1813 of yacc.c */ +#line 621 "parse-gram.y" { code_props plain_code; (yyvsp[(1) - (1)].code)[strlen ((yyvsp[(1) - (1)].code)) - 1] = '\n'; @@ -2546,17 +2842,15 @@ yyreduce: } break; - case 96: - -/* Line 1537 of yacc.c */ -#line 568 "parse-gram.y" + case 101: +/* Line 1813 of yacc.c */ +#line 641 "parse-gram.y" { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; - case 97: - -/* Line 1537 of yacc.c */ -#line 570 "parse-gram.y" + case 102: +/* Line 1813 of yacc.c */ +#line 643 "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); @@ -2564,29 +2858,24 @@ yyreduce: } break; - case 98: - -/* Line 1537 of yacc.c */ -#line 578 "parse-gram.y" + case 103: +/* Line 1813 of yacc.c */ +#line 651 "parse-gram.y" { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; - case 101: - -/* Line 1537 of yacc.c */ -#line 590 "parse-gram.y" + case 106: +/* Line 1813 of yacc.c */ +#line 663 "parse-gram.y" { (yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[(1) - (1)].chars)), (yylsp[(1) - (1)])); - symbol_class_set ((yyval.symbol), - current_class == unknown_sym - ? token_sym : current_class, (yylsp[(1) - (1)]), false); + symbol_class_set ((yyval.symbol), token_sym, (yylsp[(1) - (1)]), false); } break; - case 103: - -/* Line 1537 of yacc.c */ -#line 601 "parse-gram.y" + case 108: +/* Line 1813 of yacc.c */ +#line 672 "parse-gram.y" { code_props plain_code; code_props_plain_init (&plain_code, (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); @@ -2598,11 +2887,24 @@ yyreduce: break; - -/* Line 1537 of yacc.c */ -#line 2604 "parse-gram.c" - default: break; - } +/* Line 1813 of yacc.c */ +#line 2892 "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); @@ -2631,6 +2933,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) { @@ -2638,41 +2944,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) { @@ -2709,7 +3017,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); @@ -2728,7 +3036,7 @@ yyerrlab1: for (;;) { yyn = yypact[yystate]; - if (yyn != YYPACT_NINF) + if (!yypact_value_is_default (yyn)) { yyn += YYTERROR; if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) @@ -2743,7 +3051,7 @@ yyerrlab1: if (yyssp == yyss) YYABORT; - yyerror_range[0] = *yylsp; + yyerror_range[1] = *yylsp; yydestruct ("Error: popping", yystos[yystate], yyvsp, yylsp); YYPOPSTACK (1); @@ -2751,12 +3059,18 @@ 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"); + + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN *++yyvsp = yylval; + YY_IGNORE_MAYBE_UNINITIALIZED_END - 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. */ @@ -2780,7 +3094,7 @@ yyabortlab: yyresult = 1; goto yyreturn; -#ifndef yyoverflow +#if 1 /*-------------------------------------------------. | yyexhaustedlab -- memory exhaustion comes here. | `-------------------------------------------------*/ @@ -2792,8 +3106,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); @@ -2808,6 +3127,8 @@ yyreturn: if (yyss != yyssa) YYSTACK_FREE (yyss); #endif + if (yyes != yyesa) + YYSTACK_FREE (yyes); #if YYERROR_VERBOSE if (yymsg != yymsgbuf) YYSTACK_FREE (yymsg); @@ -2817,9 +3138,8 @@ yyreturn: } - -/* Line 1537 of yacc.c */ -#line 611 "parse-gram.y" +/* Line 2076 of yacc.c */ +#line 682 "parse-gram.y" @@ -2839,7 +3159,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++) @@ -2876,27 +3196,19 @@ add_param (char const *type, char *decl, location loc) /* Strip the surrounding '{' and '}', and any blanks just inside the braces. */ - while (*--p == ' ' || *p == '\t') - continue; + --p; + while (c_isspace ((unsigned char) *p)) + --p; p[1] = '\0'; - while (*++decl == ' ' || *decl == '\t') - continue; + ++decl; + while (c_isspace ((unsigned char) *decl)) + ++decl; if (! name_start) complain_at (loc, _("missing identifier in parameter declaration")); else { - char *name; - size_t name_len; - - for (name_len = 1; - 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'; + char *name = xmemdup0 (name_start, strspn (name_start, alphanum)); muscle_pair_list_grow (type, decl, name); free (name); } @@ -2911,8 +3223,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); } } @@ -2940,4 +3252,3 @@ char_name (char c) return quotearg_style (escape_quoting_style, buf); } } -