X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/69a2ab11cf39c253cd6a879915445de18171b739..2ead0fb793977e5ae62c75855c4ba74e7ba4c8ca:/src/parse-gram.c diff --git a/src/parse-gram.c b/src/parse-gram.c index 5f661a0f..c2711ac3 100644 --- a/src/parse-gram.c +++ b/src/parse-gram.c @@ -1,9 +1,8 @@ -/* A Bison parser, made by GNU Bison 2.4.1.144-419e. */ +/* A Bison parser, made by GNU Bison 2.6.4.37-63951. */ -/* Skeleton implementation for Bison's Yacc-like parsers in C +/* Bison implementation for Yacc-like parsers in C - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006, - 2007, 2008, 2009 Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -45,7 +44,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.4.1.144-419e" +#define YYBISON_VERSION "2.6.4.37-63951" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -59,9 +58,9 @@ /* Pull parsers. */ #define YYPULL 1 -/* Using locations. */ -#define YYLSP_NEEDED 1 - +/* Substitute the type names. */ +#define YYSTYPE GRAM_STYPE +#define YYLTYPE GRAM_LTYPE /* Substitute the variable and function names. */ #define yyparse gram_parse #define yylex gram_lex @@ -73,13 +72,11 @@ #define yylloc gram_lloc /* Copy the first part of user declarations. */ - -/* Line 252 of yacc.c */ +/* Line 360 of yacc.c */ #line 1 "parse-gram.y" /* Bison Grammar Parser -*- C -*- - Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free - Software Foundation, Inc. + Copyright (C) 2002-2012 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -99,18 +96,20 @@ #include #include "system.h" +#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); @@ -140,24 +139,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 360 of yacc.c */ +#line 173 "parse-gram.c" -/* Line 252 of yacc.c */ -#line 156 "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 @@ -167,18 +187,32 @@ 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 GRAM_DEBUG +# if defined YYDEBUG +# if YYDEBUG +# define GRAM_DEBUG 1 +# else +# define GRAM_DEBUG 0 +# endif +# else /* ! defined YYDEBUG */ +# define GRAM_DEBUG 1 +# endif /* ! defined YYDEBUG */ +#endif /* ! defined GRAM_DEBUG */ +#if GRAM_DEBUG +extern int gram_debug; #endif - /* Tokens. */ -#ifndef YYTOKENTYPE -# define YYTOKENTYPE +#ifndef GRAM_TOKENTYPE +# define GRAM_TOKENTYPE /* Put the tokens into the symbol table, so that GDB and other debuggers know about them. */ - enum yytokentype { + enum gram_tokentype { GRAM_EOF = 0, STRING = 258, INT = 259, @@ -221,19 +255,19 @@ static int current_prec = 0; PERCENT_VERBOSE = 296, PERCENT_YACC = 297, BRACED_CODE = 298, - CHAR = 299, - EPILOGUE = 300, - EQUAL = 301, - ID = 302, - ID_COLON = 303, - PERCENT_PERCENT = 304, - PIPE = 305, - PROLOGUE = 306, - SEMICOLON = 307, - TYPE = 308, - TYPE_TAG_ANY = 309, - TYPE_TAG_NONE = 310, - BRACKETED_ID = 311, + BRACKETED_ID = 299, + CHAR = 300, + EPILOGUE = 301, + EQUAL = 302, + ID = 303, + ID_COLON = 304, + PERCENT_PERCENT = 305, + PIPE = 306, + PROLOGUE = 307, + SEMICOLON = 308, + TYPE = 309, + TYPE_TAG_ANY = 310, + TYPE_TAG_NONE = 311, PERCENT_UNION = 312 }; #endif @@ -280,30 +314,28 @@ static int current_prec = 0; #define PERCENT_VERBOSE 296 #define PERCENT_YACC 297 #define BRACED_CODE 298 -#define CHAR 299 -#define EPILOGUE 300 -#define EQUAL 301 -#define ID 302 -#define ID_COLON 303 -#define PERCENT_PERCENT 304 -#define PIPE 305 -#define PROLOGUE 306 -#define SEMICOLON 307 -#define TYPE 308 -#define TYPE_TAG_ANY 309 -#define TYPE_TAG_NONE 310 -#define BRACKETED_ID 311 +#define BRACKETED_ID 299 +#define CHAR 300 +#define EPILOGUE 301 +#define EQUAL 302 +#define ID 303 +#define ID_COLON 304 +#define PERCENT_PERCENT 305 +#define PIPE 306 +#define PROLOGUE 307 +#define SEMICOLON 308 +#define TYPE 309 +#define TYPE_TAG_ANY 310 +#define TYPE_TAG_NONE 311 #define PERCENT_UNION 312 - -#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED -typedef union YYSTYPE +#if ! defined GRAM_STYPE && ! defined GRAM_STYPE_IS_DECLARED +typedef union GRAM_STYPE { - -/* Line 277 of yacc.c */ -#line 94 "parse-gram.y" +/* Line 376 of yacc.c */ +#line 115 "parse-gram.y" symbol *symbol; symbol_list *list; @@ -316,34 +348,48 @@ typedef union YYSTYPE named_ref *named_ref; - -/* Line 277 of yacc.c */ -#line 322 "parse-gram.c" -} YYSTYPE; -# define YYSTYPE_IS_TRIVIAL 1 -# define yystype YYSTYPE /* obsolescent; will be withdrawn */ -# define YYSTYPE_IS_DECLARED 1 +/* Line 376 of yacc.c */ +#line 353 "parse-gram.c" +} GRAM_STYPE; +# define GRAM_STYPE_IS_TRIVIAL 1 +# define gram_stype GRAM_STYPE /* obsolescent; will be withdrawn */ +# define GRAM_STYPE_IS_DECLARED 1 #endif -#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED -typedef struct YYLTYPE +#if ! defined GRAM_LTYPE && ! defined GRAM_LTYPE_IS_DECLARED +typedef struct GRAM_LTYPE { int first_line; int first_column; int last_line; int last_column; -} YYLTYPE; -# define yyltype YYLTYPE /* obsolescent; will be withdrawn */ -# define YYLTYPE_IS_DECLARED 1 -# define YYLTYPE_IS_TRIVIAL 1 +} GRAM_LTYPE; +# define gram_ltype GRAM_LTYPE /* obsolescent; will be withdrawn */ +# define GRAM_LTYPE_IS_DECLARED 1 +# define GRAM_LTYPE_IS_TRIVIAL 1 #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 */ +/* Copy the second part of user declarations. */ -/* Line 327 of yacc.c */ -#line 347 "parse-gram.c" +/* Line 379 of yacc.c */ +#line 393 "parse-gram.c" #ifdef short # undef short @@ -393,27 +439,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) @@ -429,34 +475,10 @@ YYID (yyi) } #endif -#if ! defined yyoverflow || YYERROR_VERBOSE +#if 1 /* The parser invokes alloca or malloc; define the necessary symbols. */ -# ifdef YYSTACK_USE_ALLOCA -# if YYSTACK_USE_ALLOCA -# ifdef __GNUC__ -# define YYSTACK_ALLOC __builtin_alloca -# elif defined __BUILTIN_VA_ARG_INCR -# include /* INFRINGES ON USER NAME SPACE */ -# elif defined _AIX -# define YYSTACK_ALLOC __alloca -# elif defined _MSC_VER -# include /* INFRINGES ON USER NAME SPACE */ -# define alloca _alloca -# else -# define YYSTACK_ALLOC alloca -# if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -# include /* INFRINGES ON USER NAME SPACE */ -# ifndef _STDLIB_H -# define _STDLIB_H 1 -# endif -# endif -# endif -# endif -# endif - # ifdef YYSTACK_ALLOC /* Pacify GCC's `empty if-body' warning. */ # define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0)) @@ -473,36 +495,37 @@ YYID (yyi) # ifndef YYSTACK_ALLOC_MAXIMUM # define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM # endif -# if (defined __cplusplus && ! defined _STDLIB_H \ +# if (defined __cplusplus && ! defined EXIT_SUCCESS \ && ! ((defined YYMALLOC || defined malloc) \ && (defined YYFREE || defined free))) # include /* INFRINGES ON USER NAME SPACE */ -# ifndef _STDLIB_H -# define _STDLIB_H 1 +# ifndef EXIT_SUCCESS +# define EXIT_SUCCESS 0 # endif # endif # ifndef YYMALLOC # define YYMALLOC malloc -# if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ +# if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ # endif # endif # ifndef YYFREE # define YYFREE free -# if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ +# if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) void free (void *); /* INFRINGES ON USER NAME SPACE */ # endif # endif # endif -#endif /* ! defined yyoverflow || YYERROR_VERBOSE */ +# define YYCOPY_NEEDED 1 +#endif #if (! defined yyoverflow \ && (! defined __cplusplus \ - || (defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL \ - && defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) + || (defined GRAM_LTYPE_IS_TRIVIAL && GRAM_LTYPE_IS_TRIVIAL \ + && defined GRAM_STYPE_IS_TRIVIAL && GRAM_STYPE_IS_TRIVIAL))) /* A type that is properly aligned for any stack member. */ union yyalloc @@ -521,23 +544,7 @@ union yyalloc ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE) + sizeof (YYLTYPE)) \ + 2 * YYSTACK_GAP_MAXIMUM) -/* Copy COUNT objects from FROM to TO. The source and destination do - not overlap. */ -# ifndef YYCOPY -# if defined __GNUC__ && 1 < __GNUC__ -# define YYCOPY(To, From, Count) \ - __builtin_memcpy (To, From, (Count) * sizeof (*(From))) -# else -# define YYCOPY(To, From, Count) \ - do \ - { \ - YYSIZE_T yyi; \ - for (yyi = 0; yyi < (Count); yyi++) \ - (To)[yyi] = (From)[yyi]; \ - } \ - while (YYID (0)) -# endif -# endif +# define YYCOPY_NEEDED 1 /* Relocate STACK from its old location to the new one. The local variables YYSIZE and YYSTACKSIZE give the old and new number of @@ -557,6 +564,26 @@ 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. */ @@ -615,7 +642,7 @@ static const yytype_uint8 yytranslate[] = 55, 56, 57 }; -#if YYDEBUG +#if GRAM_DEBUG /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in YYRHS. */ static const yytype_uint16 yyprhs[] = @@ -636,54 +663,54 @@ static const yytype_uint16 yyprhs[] = /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int8 yyrhs[] = { - 59, 0, -1, 60, 49, 77, 91, -1, -1, 60, - 61, -1, 62, -1, 51, -1, 17, -1, 19, 84, + 59, 0, -1, 60, 50, 77, 91, -1, -1, 60, + 61, -1, 62, -1, 52, -1, 17, -1, 19, 84, 85, -1, 20, -1, 20, 3, -1, 21, -1, 22, - 4, -1, 23, 4, -1, 24, 3, -1, 24, 46, + 4, -1, 23, 4, -1, 24, 3, -1, 24, 47, 3, -1, 25, -1, 26, 43, -1, 27, 3, -1, - 28, 43, -1, 29, -1, 30, 3, -1, 30, 46, + 28, 43, -1, 29, -1, 30, 3, -1, 30, 47, 3, -1, 32, -1, 33, -1, 34, 3, -1, 34, - 46, 3, -1, 35, 43, -1, 36, -1, 37, 3, + 47, 3, -1, 35, 43, -1, 36, -1, 37, 3, -1, 38, 3, -1, 40, -1, 41, -1, 42, -1, - 52, -1, 67, -1, 64, -1, 39, 89, -1, 8, + 53, -1, 67, -1, 64, -1, 39, 89, -1, 8, 43, 73, -1, 9, 43, 73, -1, 18, -1, 31, - -1, 16, 86, -1, 16, 47, 86, -1, -1, 47, + -1, 16, 86, -1, 16, 48, 86, -1, -1, 48, -1, 57, 63, 86, -1, -1, 6, 65, 76, -1, - -1, 5, 66, 76, -1, 7, 53, 72, -1, 68, + -1, 5, 66, 76, -1, 7, 54, 72, -1, 68, 69, 70, -1, 10, -1, 11, -1, 12, -1, -1, - 53, -1, 71, -1, 70, 71, -1, 89, -1, 89, + 54, -1, 71, -1, 70, 71, -1, 89, -1, 89, 4, -1, 89, -1, 72, 89, -1, 74, -1, 73, - 74, -1, 89, -1, 53, -1, 54, -1, 55, -1, - 53, -1, 87, -1, 87, 4, -1, 87, 90, -1, + 74, -1, 89, -1, 54, -1, 55, -1, 56, -1, + 54, -1, 87, -1, 87, 4, -1, 87, 90, -1, 87, 4, 90, -1, 75, -1, 76, 75, -1, 78, - -1, 77, 78, -1, 79, -1, 62, 52, -1, 1, - 52, -1, -1, 88, 83, 80, 81, -1, 82, -1, - 81, 50, 82, -1, 81, 52, -1, -1, 82, 89, + -1, 77, 78, -1, 79, -1, 62, 53, -1, 1, + 53, -1, -1, 88, 83, 80, 81, -1, 82, -1, + 81, 51, 82, -1, 81, 53, -1, -1, 82, 89, 83, -1, 82, 43, 83, -1, 82, 13, 89, -1, - 82, 14, 4, -1, 82, 15, 53, -1, -1, 56, - -1, 47, -1, 3, -1, -1, 47, -1, 3, -1, - 43, -1, 47, -1, 44, -1, 48, -1, 87, -1, - 90, -1, 3, -1, -1, 49, 45, -1 + 82, 14, 4, -1, 82, 15, 54, -1, -1, 44, + -1, 48, -1, 3, -1, -1, 48, -1, 3, -1, + 43, -1, 48, -1, 45, -1, 49, -1, 87, -1, + 90, -1, 3, -1, -1, 50, 46, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 207, 207, 215, 217, 221, 222, 232, 233, 238, - 239, 244, 245, 246, 247, 248, 249, 254, 263, 264, - 265, 266, 267, 268, 269, 270, 271, 272, 273, 288, - 289, 313, 314, 315, 316, 320, 321, 322, 326, 333, - 340, 344, 348, 355, 370, 371, 375, 387, 387, 392, - 392, 397, 408, 423, 424, 425, 429, 430, 435, 437, - 442, 443, 448, 450, 455, 456, 460, 461, 462, 463, - 468, 473, 478, 484, 490, 501, 502, 511, 512, 518, - 519, 520, 527, 527, 532, 533, 534, 539, 541, 543, - 545, 547, 549, 554, 556, 567, 568, 573, 574, 575, - 584, 604, 606, 615, 620, 621, 626, 633, 635 + 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 GRAM_DEBUG || 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[] = @@ -699,9 +726,9 @@ static const char *const yytname[] = "\"%no-lines\"", "\"%nondeterministic-parser\"", "\"%output\"", "\"%parse-param\"", "\"%pure-parser\"", "\"%require\"", "\"%skeleton\"", "\"%start\"", "\"%token-table\"", "\"%verbose\"", "\"%yacc\"", - "\"{...}\"", "\"char\"", "\"epilogue\"", "\"=\"", "\"identifier\"", - "\"identifier:\"", "\"%%\"", "\"|\"", "\"%{...%}\"", "\";\"", "\"type\"", - "\"<*>\"", "\"<>\"", "\"[identifier]\"", "\"%union\"", "$accept", + "\"{...}\"", "\"[identifier]\"", "\"char\"", "\"epilogue\"", "\"=\"", + "\"identifier\"", "\"identifier:\"", "\"%%\"", "\"|\"", "\"%{...%}\"", + "\";\"", "\"type\"", "\"<*>\"", "\"<>\"", "\"%union\"", "$accept", "input", "prologue_declarations", "prologue_declaration", "grammar_declaration", "union_name", "symbol_declaration", "$@1", "$@2", "precedence_declaration", "precedence_declarator", "type.opt", @@ -709,7 +736,7 @@ static const char *const yytname[] = "generic_symlist_item", "symbol_def", "symbol_defs.1", "grammar", "rules_or_grammar_declaration", "rules", "$@3", "rhses.1", "rhs", "named_ref.opt", "variable", "content.opt", "braceless", "id", - "id_colon", "symbol", "string_as_id", "epilogue.opt", 0 + "id_colon", "symbol", "string_as_id", "epilogue.opt", YY_NULL }; #endif @@ -792,33 +819,33 @@ static const yytype_int16 yydefgoto[] = /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -60 +#define YYPACT_NINF -91 static const yytype_int16 yypact[] = { - -60, 4, 103, -60, -60, -60, -2, -1, 10, -60, - -60, -60, 17, -60, -60, 27, 66, -60, 72, 79, - 2, -60, 47, 88, 49, -60, 11, -60, -60, -60, - 25, 50, -60, 91, 92, 0, -60, -60, -60, 15, - -60, -60, 51, -60, -60, -60, -60, 48, -8, -8, - 0, 26, 26, -60, 60, -60, -60, -60, 31, -60, - -60, -60, -60, 101, -60, -60, -60, -60, 102, -60, - 113, -60, -60, -60, -60, -60, -60, -60, -60, -60, - 54, -60, 65, 1, -60, -60, 62, -60, 60, -60, - 0, -60, -60, -8, 83, -8, 0, -60, -60, -60, - -60, 26, -60, -60, 26, -60, -60, -60, -60, -60, - -60, -60, -60, -60, 104, -60, -60, -60, -60, -60, - 0, -60, 142, -60, 144, -60, -60, -60, -60, -60, - -60, -60, -60, -9, 53, -60, -60, 0, 146, 95, - 62, 62, 53, -60, -60, -60, -60, -60 + -91, 3, 103, -91, -91, -91, -36, 2, 10, -91, + -91, -91, 9, -91, -91, 32, 60, -91, 65, 67, + 27, -91, 41, 73, 51, -91, 39, -91, -91, -91, + 40, 52, -91, 93, 95, 33, -91, -91, -91, 15, + -91, -91, 53, -91, -91, -91, -91, 46, 43, 43, + 33, 11, 11, -91, 61, -91, -91, -91, 35, -91, + -91, -91, -91, 100, -91, -91, -91, -91, 102, -91, + 113, -91, -91, -91, -91, -91, -91, -91, -91, -91, + 64, -91, 94, 1, -91, -91, 62, -91, 61, -91, + 33, -91, -91, 43, 86, 43, 33, -91, -91, -91, + -91, 11, -91, -91, 11, -91, -91, -91, -91, -91, + -91, -91, -91, -91, 72, -91, -91, -91, -91, -91, + 33, -91, 142, -91, 145, -91, -91, -91, -91, -91, + -91, -91, -91, 17, 34, -91, -91, 33, 146, 97, + 62, 62, 34, -91, -91, -91, -91, -91 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -60, -60, -60, -60, 149, -60, -60, -60, -60, -60, - -60, -60, -60, 33, -60, 105, -42, -18, 107, -60, - 75, -60, -60, -60, 24, -52, -60, -60, -36, -11, - -60, -35, -59, -60 + -91, -91, -91, -91, 147, -91, -91, -91, -91, -91, + -91, -91, -91, 37, -91, 106, -60, -33, 105, -91, + 69, -91, -91, -91, 24, -48, -91, -91, -49, -20, + -91, -35, -90, -91 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -827,49 +854,49 @@ static const yytype_int16 yypgoto[] = #define YYTABLE_NINF -108 static const yytype_int16 yytable[] = { - 78, -107, 80, 74, 3, 62, 4, 5, 6, 7, - 8, 9, 10, 11, 67, 97, 80, 12, 105, 14, - 4, 5, 6, 7, 8, 9, 10, 11, 69, 74, - 56, 12, 27, 14, 106, 125, 75, 94, 94, 76, - 35, 135, 51, 136, 75, 91, 27, 76, 63, 81, - 114, 50, 119, 52, 35, 122, 74, 68, 42, 127, - 53, 126, 127, 81, 54, 132, 137, 138, 139, 59, - 75, 70, 42, 76, 57, 123, 60, 123, 107, 98, - 99, 100, 94, 61, 94, 122, 74, 124, 146, 147, - 64, 65, 66, 71, 72, 73, 140, 75, 87, 141, - 76, 89, 143, 53, 109, 110, 112, 141, 4, 5, - 6, 7, 8, 9, 10, 11, 111, 113, 117, 12, + 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, 74, 145, 128, - 144, 44, 39, 130, 40, 41, 95, 104, 115, 142, + 33, 34, 35, 36, 37, 38, 131, 113, 74, 44, + 144, 145, 115, 39, 95, 40, 41, 130, 104, 142, 42 }; -#define yypact_value_is_default(yystate) \ - ((yystate) == (-60)) +#define yypact_value_is_default(Yystate) \ + (!!((Yystate) == (-91))) -#define yytable_value_is_error(yytable_value) \ +#define yytable_value_is_error(Yytable_value) \ YYID (0) static const yytype_uint8 yycheck[] = { - 35, 0, 1, 3, 0, 3, 5, 6, 7, 8, + 35, 0, 1, 0, 94, 54, 5, 6, 7, 8, 9, 10, 11, 12, 3, 50, 1, 16, 54, 18, - 5, 6, 7, 8, 9, 10, 11, 12, 3, 3, - 3, 16, 31, 18, 3, 94, 44, 48, 49, 47, - 39, 50, 43, 52, 44, 53, 31, 47, 46, 48, - 49, 53, 88, 43, 39, 90, 3, 46, 57, 101, - 43, 96, 104, 48, 47, 124, 13, 14, 15, 3, - 44, 46, 57, 47, 47, 93, 4, 95, 47, 53, - 54, 55, 93, 4, 95, 120, 3, 4, 140, 141, - 43, 3, 43, 43, 3, 3, 43, 44, 47, 134, - 47, 53, 137, 43, 3, 3, 52, 142, 5, 6, - 7, 8, 9, 10, 11, 12, 3, 52, 56, 16, + 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, 3, 53, 45, - 4, 2, 49, 120, 51, 52, 49, 52, 83, 135, + 37, 38, 39, 40, 41, 42, 4, 53, 3, 2, + 4, 54, 83, 50, 49, 52, 53, 120, 52, 135, 57 }; @@ -880,18 +907,18 @@ static const yytype_uint8 yystos[] = 0, 59, 60, 0, 5, 6, 7, 8, 9, 10, 11, 12, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, - 34, 35, 36, 37, 38, 39, 40, 41, 42, 49, - 51, 52, 57, 61, 62, 64, 67, 68, 66, 65, - 53, 43, 43, 43, 47, 86, 3, 47, 84, 3, - 4, 4, 3, 46, 43, 3, 43, 3, 46, 3, - 46, 43, 3, 3, 3, 44, 47, 87, 89, 90, - 1, 48, 62, 77, 78, 79, 88, 47, 63, 53, - 69, 53, 75, 76, 87, 76, 72, 89, 53, 54, - 55, 73, 74, 89, 73, 86, 3, 47, 85, 3, - 3, 3, 52, 52, 49, 78, 91, 56, 83, 86, - 70, 71, 89, 75, 4, 90, 89, 74, 45, 80, - 71, 4, 90, 81, 82, 50, 52, 13, 14, 15, - 43, 89, 82, 89, 4, 53, 83, 83 + 34, 35, 36, 37, 38, 39, 40, 41, 42, 50, + 52, 53, 57, 61, 62, 64, 67, 68, 66, 65, + 54, 43, 43, 43, 48, 86, 3, 48, 84, 3, + 4, 4, 3, 47, 43, 3, 43, 3, 47, 3, + 47, 43, 3, 3, 3, 45, 48, 87, 89, 90, + 1, 49, 62, 77, 78, 79, 88, 48, 63, 54, + 69, 54, 75, 76, 87, 76, 72, 89, 54, 55, + 56, 73, 74, 89, 73, 86, 3, 48, 85, 3, + 3, 3, 53, 53, 50, 78, 91, 44, 83, 86, + 70, 71, 89, 75, 4, 90, 89, 74, 46, 80, + 71, 4, 90, 81, 82, 51, 53, 13, 14, 15, + 43, 89, 82, 89, 4, 54, 83, 83 }; #define yyerrok (yyerrstatus = 0) @@ -906,30 +933,40 @@ 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; \ } \ while (YYID (0)) - +/* Error token number */ #define YYTERROR 1 #define YYERRCODE 256 @@ -938,38 +975,43 @@ while (YYID (0)) 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 -# define YY_LOCATION_PRINT(File, Loc) \ - fprintf (File, "%d.%d-%d.%d", \ - (Loc).first_line, (Loc).first_column, \ - (Loc).last_line, (Loc).last_column) +# if defined GRAM_LTYPE_IS_TRIVIAL && GRAM_LTYPE_IS_TRIVIAL +# define YY_LOCATION_PRINT(File, Loc) \ + do { \ + fprintf (File, "%d.%d", (Loc).first_line, (Loc).first_column); \ + if ((Loc).first_line < (Loc).last_line) \ + fprintf (File, "-%d.%d", (Loc).last_line, (Loc).last_column - 1); \ + else if ((Loc).first_column < (Loc).last_column - 1) \ + fprintf (File, "-%d", (Loc).last_column - 1); \ + } while (0) # else # define YY_LOCATION_PRINT(File, Loc) ((void) 0) # endif @@ -977,7 +1019,6 @@ while (YYID (0)) /* YYLEX -- calling `yylex' with the right arguments. */ - #ifdef YYLEX_PARAM # define YYLEX yylex (&yylval, &yylloc, YYLEX_PARAM) #else @@ -985,7 +1026,7 @@ while (YYID (0)) #endif /* Enable debugging if requested. */ -#if YYDEBUG +#if GRAM_DEBUG # ifndef YYFPRINTF # include /* INFRINGES ON USER NAME SPACE */ @@ -1028,6 +1069,8 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp) YYLTYPE const * const yylocationp; #endif { + FILE *yyo = yyoutput; + YYUSE (yyo); if (!yyvaluep) return; YYUSE (yylocationp); @@ -1039,149 +1082,131 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp) # endif switch (yytype) { - case 3: /* "\"string\"" */ - -/* Line 783 of yacc.c */ -#line 184 "parse-gram.y" - { fputs (quotearg_style (c_quoting_style, (yyvaluep->chars)), stderr); }; - -/* Line 783 of yacc.c */ -#line 1050 "parse-gram.c" + case 3: /* "string" */ +/* Line 812 of yacc.c */ +#line 205 "parse-gram.y" + { fputs (quotearg_style (c_quoting_style, ((*yyvaluep).chars)), stderr); }; +/* Line 812 of yacc.c */ +#line 1091 "parse-gram.c" break; - case 4: /* "\"integer\"" */ - -/* Line 783 of yacc.c */ -#line 196 "parse-gram.y" - { fprintf (stderr, "%d", (yyvaluep->integer)); }; - -/* Line 783 of yacc.c */ -#line 1059 "parse-gram.c" + case 4: /* "integer" */ +/* Line 812 of yacc.c */ +#line 217 "parse-gram.y" + { fprintf (stderr, "%d", ((*yyvaluep).integer)); }; +/* Line 812 of yacc.c */ +#line 1098 "parse-gram.c" break; - case 43: /* "\"{...}\"" */ - -/* Line 783 of yacc.c */ -#line 186 "parse-gram.y" - { fprintf (stderr, "{\n%s\n}", (yyvaluep->code)); }; - -/* Line 783 of yacc.c */ -#line 1068 "parse-gram.c" + case 43: /* "{...}" */ +/* Line 812 of yacc.c */ +#line 207 "parse-gram.y" + { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).code)); }; +/* Line 812 of yacc.c */ +#line 1105 "parse-gram.c" break; - case 44: /* "\"char\"" */ - -/* Line 783 of yacc.c */ -#line 178 "parse-gram.y" - { fputs (char_name ((yyvaluep->character)), stderr); }; - -/* Line 783 of yacc.c */ -#line 1077 "parse-gram.c" + case 44: /* "[identifier]" */ +/* Line 812 of yacc.c */ +#line 212 "parse-gram.y" + { fprintf (stderr, "[%s]", ((*yyvaluep).uniqstr)); }; +/* Line 812 of yacc.c */ +#line 1112 "parse-gram.c" break; - case 45: /* "\"epilogue\"" */ - -/* Line 783 of yacc.c */ -#line 186 "parse-gram.y" - { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; - -/* Line 783 of yacc.c */ -#line 1086 "parse-gram.c" + case 45: /* "char" */ +/* Line 812 of yacc.c */ +#line 199 "parse-gram.y" + { fputs (char_name (((*yyvaluep).character)), stderr); }; +/* Line 812 of yacc.c */ +#line 1119 "parse-gram.c" break; - case 47: /* "\"identifier\"" */ - -/* Line 783 of yacc.c */ -#line 192 "parse-gram.y" - { fputs ((yyvaluep->uniqstr), stderr); }; - -/* Line 783 of yacc.c */ -#line 1095 "parse-gram.c" + case 46: /* "epilogue" */ +/* Line 812 of yacc.c */ +#line 207 "parse-gram.y" + { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }; +/* Line 812 of yacc.c */ +#line 1126 "parse-gram.c" break; - case 48: /* "\"identifier:\"" */ - -/* Line 783 of yacc.c */ -#line 193 "parse-gram.y" - { fprintf (stderr, "%s:", (yyvaluep->uniqstr)); }; - -/* Line 783 of yacc.c */ -#line 1104 "parse-gram.c" + case 48: /* "identifier" */ +/* Line 812 of yacc.c */ +#line 211 "parse-gram.y" + { fputs (((*yyvaluep).uniqstr), stderr); }; +/* Line 812 of yacc.c */ +#line 1133 "parse-gram.c" break; - case 51: /* "\"%{...%}\"" */ - -/* Line 783 of yacc.c */ -#line 186 "parse-gram.y" - { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; - -/* Line 783 of yacc.c */ -#line 1113 "parse-gram.c" + case 49: /* "identifier:" */ +/* Line 812 of yacc.c */ +#line 213 "parse-gram.y" + { fprintf (stderr, "%s:", ((*yyvaluep).uniqstr)); }; +/* Line 812 of yacc.c */ +#line 1140 "parse-gram.c" break; - case 53: /* "\"type\"" */ - -/* Line 783 of yacc.c */ -#line 191 "parse-gram.y" - { fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); }; - -/* Line 783 of yacc.c */ -#line 1122 "parse-gram.c" + case 52: /* "%{...%}" */ +/* Line 812 of yacc.c */ +#line 207 "parse-gram.y" + { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }; +/* Line 812 of yacc.c */ +#line 1147 "parse-gram.c" break; - case 84: /* "variable" */ - -/* Line 783 of yacc.c */ -#line 192 "parse-gram.y" - { fputs ((yyvaluep->uniqstr), stderr); }; - -/* Line 783 of yacc.c */ -#line 1131 "parse-gram.c" + case 54: /* "type" */ +/* Line 812 of yacc.c */ +#line 214 "parse-gram.y" + { fprintf (stderr, "<%s>", ((*yyvaluep).uniqstr)); }; +/* Line 812 of yacc.c */ +#line 1154 "parse-gram.c" break; - case 85: /* "content.opt" */ - -/* Line 783 of yacc.c */ -#line 186 "parse-gram.y" - { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; - -/* Line 783 of yacc.c */ -#line 1140 "parse-gram.c" + case 71: /* symbol.prec */ +/* Line 812 of yacc.c */ +#line 220 "parse-gram.y" + { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }; +/* Line 812 of yacc.c */ +#line 1161 "parse-gram.c" break; - case 86: /* "braceless" */ - -/* Line 783 of yacc.c */ -#line 186 "parse-gram.y" - { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; - -/* Line 783 of yacc.c */ -#line 1149 "parse-gram.c" + case 84: /* variable */ +/* Line 812 of yacc.c */ +#line 211 "parse-gram.y" + { fputs (((*yyvaluep).uniqstr), stderr); }; +/* Line 812 of yacc.c */ +#line 1168 "parse-gram.c" break; - case 87: /* "id" */ - -/* Line 783 of yacc.c */ -#line 199 "parse-gram.y" - { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; - -/* Line 783 of yacc.c */ -#line 1158 "parse-gram.c" + case 85: /* content.opt */ +/* Line 812 of yacc.c */ +#line 207 "parse-gram.y" + { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }; +/* Line 812 of yacc.c */ +#line 1175 "parse-gram.c" break; - case 88: /* "id_colon" */ - -/* Line 783 of yacc.c */ -#line 200 "parse-gram.y" - { fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); }; - -/* Line 783 of yacc.c */ -#line 1167 "parse-gram.c" + case 86: /* braceless */ +/* Line 812 of yacc.c */ +#line 207 "parse-gram.y" + { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }; +/* Line 812 of yacc.c */ +#line 1182 "parse-gram.c" break; - case 89: /* "symbol" */ - -/* Line 783 of yacc.c */ -#line 199 "parse-gram.y" - { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; - -/* Line 783 of yacc.c */ -#line 1176 "parse-gram.c" + case 87: /* id */ +/* Line 812 of yacc.c */ +#line 220 "parse-gram.y" + { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }; +/* Line 812 of yacc.c */ +#line 1189 "parse-gram.c" break; - case 90: /* "string_as_id" */ - -/* Line 783 of yacc.c */ -#line 199 "parse-gram.y" - { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; - -/* Line 783 of yacc.c */ -#line 1185 "parse-gram.c" + case 88: /* id_colon */ +/* Line 812 of yacc.c */ +#line 221 "parse-gram.y" + { fprintf (stderr, "%s:", ((*yyvaluep).symbol)->tag); }; +/* Line 812 of yacc.c */ +#line 1196 "parse-gram.c" + break; + case 89: /* symbol */ +/* Line 812 of yacc.c */ +#line 220 "parse-gram.y" + { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }; +/* Line 812 of yacc.c */ +#line 1203 "parse-gram.c" + break; + case 90: /* string_as_id */ +/* Line 812 of yacc.c */ +#line 220 "parse-gram.y" + { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }; +/* Line 812 of yacc.c */ +#line 1210 "parse-gram.c" break; default: break; @@ -1290,12 +1315,12 @@ do { \ /* Nonzero means print parse trace. It is left uninitialized so that multiple parsers can coexist. */ int yydebug; -#else /* !YYDEBUG */ +#else /* !GRAM_DEBUG */ # define YYDPRINTF(Args) # define YY_SYMBOL_PRINT(Title, Type, Value, Location) # define YY_STACK_PRINT(Bottom, Top) # define YY_REDUCE_PRINT(Rule) -#endif /* !YYDEBUG */ +#endif /* !GRAM_DEBUG */ /* YYINITDEPTH -- initial size of the parser's stacks. */ @@ -1314,7 +1339,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 GRAM_DEBUG + 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 GRAM_DEBUG +# 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 GRAM_DEBUG + " (", ")", +#endif + yyes, yyesa, &yyesp, yyes_prev)) + { + YYDPRINTF ((stderr, "\n")); + return 2; + } + *++yyesp = yystate; + } + YYDPRINTF ((stderr, " G%d", yystate)); + } + } +} + #if YYERROR_VERBOSE @@ -1418,124 +1675,146 @@ yytnamerr (char *yyres, const char *yystr) # endif /* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message - about the unexpected token YYTOKEN while in state YYSTATE. - - Return 0 if *YYMSG was successfully written. Return 1 if an ordinary - "syntax error" message will suffice instead. Return 2 if *YYMSG is - not large enough to hold the message. In the last case, also set - *YYMSG_ALLOC to either (a) the required number of bytes or (b) zero - if the required number of bytes is too large to store. */ + 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). + + 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, - int yystate, int yytoken) + yytype_int16 *yyesa, yytype_int16 **yyes, + YYSIZE_T *yyes_capacity, yytype_int16 *yyssp, int yytoken) { - int yyn = yypact[yystate]; - - if (! (YYPACT_NINF < yyn && yyn <= YYLAST)) - return 1; - else + 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) { - YYSIZE_T yysize0 = yytnamerr (0, yytname[yytoken]); - YYSIZE_T yysize = yysize0; - YYSIZE_T yysize1; - enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; - /* Internationalized format string. */ - const char *yyformat = 0; - /* Arguments of yyformat. */ - char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; - - /* Start YYX at -YYN if negative to avoid negative indexes in - YYCHECK. In other words, skip the first -YYN actions for this - state because they are default actions. */ - int yyxbegin = yyn < 0 ? -yyn : 0; - - /* Stay within bounds of both yycheck and yytname. */ - int yychecklim = YYLAST - yyn + 1; - int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; - /* Number of reported tokens (one for the "unexpected", one per - "expected"). */ - int yycount = 0; - int yyx; - + int yyn = yypact[*yyssp]; + YYDPRINTF ((stderr, "Constructing syntax error message\n")); yyarg[yycount++] = yytname[yytoken]; - - for (yyx = yyxbegin; yyx < yyxend; ++yyx) - if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR - && !yytable_value_is_error (yytable[yyx + yyn])) - { - if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) - { - yycount = 1; - yysize = yysize0; - break; - } - yyarg[yycount++] = yytname[yyx]; - yysize1 = yysize + yytnamerr (0, yytname[yyx]); - if (! (yysize <= yysize1 - && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) - { - /* Overflow. */ - *yymsg_alloc = 0; - return 2; - } - yysize = yysize1; - } - - switch (yycount) + if (!yypact_value_is_default (yyn)) { -#define YYCASE_(N, S) \ - case N: \ - yyformat = S; \ - break - YYCASE_(1, YY_("syntax error, unexpected %s")); - YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s")); - YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s")); - YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s")); - YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s")); -#undef YYCASE_ + int yyx; + + 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 GRAM_DEBUG + else if (yydebug) + YYFPRINTF (stderr, "No expected tokens.\n"); +# endif + } + + switch (yycount) + { +# define YYCASE_(N, S) \ + case N: \ + yyformat = S; \ + break + YYCASE_(0, YY_("syntax error")); + YYCASE_(1, YY_("syntax error, unexpected %s")); + YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s")); + YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s")); + YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s")); + YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s")); +# undef YYCASE_ + } + + yysize1 = yysize + yystrlen (yyformat); + if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + return 2; + yysize = yysize1; + + if (*yymsg_alloc < yysize) + { + *yymsg_alloc = 2 * yysize; + if (! (yysize <= *yymsg_alloc + && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM)) + *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM; + return 1; + } - yysize1 = yysize + yystrlen (yyformat); - if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + /* 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) { - /* Overflow. */ - *yymsg_alloc = 0; - return 2; + yyp += yytnamerr (yyp, yyarg[yyi++]); + yyformat += 2; } - yysize = yysize1; - - if (*yymsg_alloc < yysize) + else { - *yymsg_alloc = 2 * yysize; - if (! (yysize <= *yymsg_alloc - && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM)) - *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM; - return 2; + yyp++; + yyformat++; } - - /* 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; - } + } + return 0; } #endif /* YYERROR_VERBOSE */ - /*-----------------------------------------------. | Release the memory associated to this symbol. | @@ -1571,20 +1850,6 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp) } -/* 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 */ /*----------. @@ -1616,11 +1881,39 @@ yyparse () /* The lookahead symbol. */ int yychar; + +#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__ +/* Suppress an incorrect diagnostic about yylval being uninitialized. */ +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\ + _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 YY_INITIAL_VALUE(Value) = Value +#endif +#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +# define YY_IGNORE_MAYBE_UNINITIALIZED_END +#endif +#ifndef YY_INITIAL_VALUE +# define YY_INITIAL_VALUE(Value) /* Nothing. */ +#endif + /* The semantic value of the lookahead symbol. */ -YYSTYPE yylval; +YYSTYPE yylval YY_INITIAL_VALUE(yyval_default); /* Location data for the lookahead symbol. */ -YYLTYPE yylloc; +YYLTYPE yylloc +# if defined GRAM_LTYPE_IS_TRIVIAL && GRAM_LTYPE_IS_TRIVIAL + = { 1, 1, 1, 1 } +# endif +; + /* Number of syntax errors so far. */ int yynerrs; @@ -1634,7 +1927,7 @@ YYLTYPE yylloc; `yyvs': related to semantic values. `yyls': related to locations. - Refer to the stacks thru separate pointers, to allow yyoverflow + Refer to the stacks through separate pointers, to allow yyoverflow to reallocate them elsewhere. */ /* The state stack. */ @@ -1653,14 +1946,19 @@ YYLTYPE yylloc; YYLTYPE *yylsp; /* The locations where the error started and ended. */ - YYLTYPE yyerror_range[2]; + YYLTYPE yyerror_range[3]; YYSIZE_T yystacksize; + yytype_int16 yyesa[20]; + yytype_int16 *yyes; + YYSIZE_T yyes_capacity; + + int yy_lac_established = 0; int yyn; int yyresult; /* Lookahead token as an internal (translated) token number. */ - int yytoken; + int yytoken = 0; /* The variables used to return semantic value and location from the action routines. */ YYSTYPE yyval; @@ -1679,12 +1977,16 @@ YYLTYPE yylloc; Keep to zero when no symbol should be popped. */ int yylen = 0; - yytoken = 0; - yyss = yyssa; - yyvs = yyvsa; - yyls = yylsa; + yyssp = yyss = yyssa; + yyvsp = yyvs = yyvsa; + yylsp = yyls = yylsa; yystacksize = YYINITDEPTH; + yyes = yyesa; + yyes_capacity = sizeof yyesa / sizeof *yyes; + if (YYMAXDEPTH < yyes_capacity) + yyes_capacity = YYMAXDEPTH; + YYDPRINTF ((stderr, "Starting parse\n")); yystate = 0; @@ -1692,35 +1994,18 @@ YYLTYPE yylloc; yynerrs = 0; 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 - /* 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 1266 of yacc.c */ -#line 86 "parse-gram.y" +/* Line 1560 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 1266 of yacc.c */ -#line 1722 "parse-gram.c" +/* Line 1560 of yacc.c */ +#line 2008 "parse-gram.c" yylsp[0] = yylloc; - goto yysetstate; /*------------------------------------------------------------. @@ -1844,12 +2129,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 (yytable_value_is_error (yyn)) - goto yyerrlab; + goto yyerrlab; + YY_LAC_ESTABLISH; yyn = -yyn; goto yyreduce; } @@ -1864,9 +2153,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; @@ -1901,12 +2193,13 @@ yyreduce: /* Default location. */ YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen); YY_REDUCE_PRINT (yyn); - switch (yyn) - { - case 6: - -/* Line 1479 of yacc.c */ -#line 223 "parse-gram.y" + { + int yychar_backup = yychar; + switch (yyn) + { + case 6: +/* Line 1778 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)])); @@ -1919,16 +2212,14 @@ yyreduce: break; case 7: - -/* Line 1479 of yacc.c */ -#line 232 "parse-gram.y" - { debug_flag = true; } +/* Line 1778 of yacc.c */ +#line 255 "parse-gram.y" + { debug = true; } break; case 8: - -/* Line 1479 of yacc.c */ -#line 234 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 257 "parse-gram.y" { muscle_percent_define_insert ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars), MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE); @@ -1936,16 +2227,14 @@ yyreduce: break; case 9: - -/* Line 1479 of yacc.c */ -#line 238 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 261 "parse-gram.y" { defines_flag = true; } break; case 10: - -/* Line 1479 of yacc.c */ -#line 240 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 263 "parse-gram.y" { defines_flag = true; spec_defines_file = xstrdup ((yyvsp[(2) - (2)].chars)); @@ -1953,44 +2242,38 @@ yyreduce: break; case 11: - -/* Line 1479 of yacc.c */ -#line 244 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 267 "parse-gram.y" { error_verbose = true; } break; case 12: - -/* Line 1479 of yacc.c */ -#line 245 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 268 "parse-gram.y" { expected_sr_conflicts = (yyvsp[(2) - (2)].integer); } break; case 13: - -/* Line 1479 of yacc.c */ -#line 246 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 269 "parse-gram.y" { expected_rr_conflicts = (yyvsp[(2) - (2)].integer); } break; case 14: - -/* Line 1479 of yacc.c */ -#line 247 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 270 "parse-gram.y" { spec_file_prefix = (yyvsp[(2) - (2)].chars); } break; case 15: - -/* Line 1479 of yacc.c */ -#line 248 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 271 "parse-gram.y" { spec_file_prefix = (yyvsp[(3) - (3)].chars); } break; case 16: - -/* Line 1479 of yacc.c */ -#line 250 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 273 "parse-gram.y" { nondeterministic_parser = true; glr_parser = true; @@ -1998,9 +2281,8 @@ yyreduce: break; case 17: - -/* Line 1479 of yacc.c */ -#line 255 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 278 "parse-gram.y" { code_props action; code_props_symbol_action_init (&action, (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); @@ -2012,79 +2294,68 @@ yyreduce: break; case 18: - -/* Line 1479 of yacc.c */ -#line 263 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 286 "parse-gram.y" { language_argmatch ((yyvsp[(2) - (2)].chars), grammar_prio, (yylsp[(1) - (2)])); } break; case 19: - -/* Line 1479 of yacc.c */ -#line 264 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 287 "parse-gram.y" { add_param ("lex_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); } break; case 20: - -/* Line 1479 of yacc.c */ -#line 265 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 288 "parse-gram.y" { locations_flag = true; } break; case 21: - -/* Line 1479 of yacc.c */ -#line 266 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 289 "parse-gram.y" { spec_name_prefix = (yyvsp[(2) - (2)].chars); } break; case 22: - -/* Line 1479 of yacc.c */ -#line 267 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 290 "parse-gram.y" { spec_name_prefix = (yyvsp[(3) - (3)].chars); } break; case 23: - -/* Line 1479 of yacc.c */ -#line 268 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 291 "parse-gram.y" { no_lines_flag = true; } break; case 24: - -/* Line 1479 of yacc.c */ -#line 269 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 292 "parse-gram.y" { nondeterministic_parser = true; } break; case 25: - -/* Line 1479 of yacc.c */ -#line 270 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 293 "parse-gram.y" { spec_outfile = (yyvsp[(2) - (2)].chars); } break; case 26: - -/* Line 1479 of yacc.c */ -#line 271 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 294 "parse-gram.y" { spec_outfile = (yyvsp[(3) - (3)].chars); } break; case 27: - -/* Line 1479 of yacc.c */ -#line 272 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 295 "parse-gram.y" { add_param ("parse_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); } break; case 28: - -/* Line 1479 of yacc.c */ -#line 274 "parse-gram.y" +/* Line 1778 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 @@ -2102,19 +2373,17 @@ yyreduce: break; case 29: - -/* Line 1479 of yacc.c */ -#line 288 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 311 "parse-gram.y" { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); } break; case 30: - -/* Line 1479 of yacc.c */ -#line 290 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 313 "parse-gram.y" { char const *skeleton_user = (yyvsp[(2) - (2)].chars); - if (strchr (skeleton_user, '/')) + if (mbschr (skeleton_user, '/')) { size_t dir_length = strlen (current_file); char *skeleton_build; @@ -2126,7 +2395,7 @@ yyreduce: xmalloc (dir_length + 1 + strlen (skeleton_user) + 1); if (dir_length > 0) { - strncpy (skeleton_build, current_file, dir_length); + memcpy (skeleton_build, current_file, dir_length); skeleton_build[dir_length++] = '/'; } strcpy (skeleton_build + dir_length, skeleton_user); @@ -2138,81 +2407,82 @@ yyreduce: break; case 31: - -/* Line 1479 of yacc.c */ -#line 313 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 336 "parse-gram.y" { token_table_flag = true; } break; case 32: - -/* Line 1479 of yacc.c */ -#line 314 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 337 "parse-gram.y" { report_flag |= report_states; } break; case 33: - -/* Line 1479 of yacc.c */ -#line 315 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 338 "parse-gram.y" { yacc_flag = true; } break; case 37: - -/* Line 1479 of yacc.c */ -#line 323 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 346 "parse-gram.y" { grammar_start_symbol_set ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); } break; case 38: - -/* Line 1479 of yacc.c */ -#line 327 "parse-gram.y" +/* Line 1778 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 39: - -/* Line 1479 of yacc.c */ -#line 334 "parse-gram.y" +/* Line 1778 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 40: - -/* Line 1479 of yacc.c */ -#line 341 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 374 "parse-gram.y" { default_prec = true; } break; case 41: - -/* Line 1479 of yacc.c */ -#line 345 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 378 "parse-gram.y" { default_prec = false; } break; case 42: - -/* Line 1479 of yacc.c */ -#line 349 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 382 "parse-gram.y" { /* Do not invoke muscle_percent_code_grow here since it invokes muscle_user_name_list_grow. */ @@ -2222,9 +2492,8 @@ yyreduce: break; case 43: - -/* Line 1479 of yacc.c */ -#line 356 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 389 "parse-gram.y" { muscle_percent_code_grow ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)])); code_scanner_last_string_free (); @@ -2232,23 +2501,20 @@ yyreduce: break; case 44: - -/* Line 1479 of yacc.c */ -#line 370 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 403 "parse-gram.y" {} break; case 45: - -/* Line 1479 of yacc.c */ -#line 371 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 404 "parse-gram.y" { muscle_code_grow ("union_name", (yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; case 46: - -/* Line 1479 of yacc.c */ -#line 376 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 409 "parse-gram.y" { union_seen = true; muscle_code_grow ("stype", (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)])); @@ -2257,16 +2523,14 @@ yyreduce: break; case 47: - -/* Line 1479 of yacc.c */ -#line 387 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 420 "parse-gram.y" { current_class = nterm_sym; } break; case 48: - -/* Line 1479 of yacc.c */ -#line 388 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 421 "parse-gram.y" { current_class = unknown_sym; current_type = NULL; @@ -2274,16 +2538,14 @@ yyreduce: break; case 49: - -/* Line 1479 of yacc.c */ -#line 392 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 425 "parse-gram.y" { current_class = token_sym; } break; case 50: - -/* Line 1479 of yacc.c */ -#line 393 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 426 "parse-gram.y" { current_class = unknown_sym; current_type = NULL; @@ -2291,9 +2553,8 @@ yyreduce: break; case 51: - -/* Line 1479 of yacc.c */ -#line 398 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 431 "parse-gram.y" { symbol_list *list; tag_seen = true; @@ -2304,9 +2565,8 @@ yyreduce: break; case 52: - -/* Line 1479 of yacc.c */ -#line 409 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 442 "parse-gram.y" { symbol_list *list; ++current_prec; @@ -2321,128 +2581,110 @@ yyreduce: break; case 53: - -/* Line 1479 of yacc.c */ -#line 423 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 456 "parse-gram.y" { (yyval.assoc) = left_assoc; } break; case 54: - -/* Line 1479 of yacc.c */ -#line 424 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 457 "parse-gram.y" { (yyval.assoc) = right_assoc; } break; case 55: - -/* Line 1479 of yacc.c */ -#line 425 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 458 "parse-gram.y" { (yyval.assoc) = non_assoc; } break; case 56: - -/* Line 1479 of yacc.c */ -#line 429 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 462 "parse-gram.y" { current_type = NULL; } break; case 57: - -/* Line 1479 of yacc.c */ -#line 430 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 463 "parse-gram.y" { current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; } break; case 58: - -/* Line 1479 of yacc.c */ -#line 436 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 469 "parse-gram.y" { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); } break; case 59: - -/* Line 1479 of yacc.c */ -#line 438 "parse-gram.y" +/* Line 1778 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 60: - -/* Line 1479 of yacc.c */ -#line 442 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 475 "parse-gram.y" { (yyval.symbol) = (yyvsp[(1) - (1)].symbol); } break; case 61: - -/* Line 1479 of yacc.c */ -#line 443 "parse-gram.y" +/* Line 1778 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 62: - -/* Line 1479 of yacc.c */ -#line 449 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 482 "parse-gram.y" { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); } break; case 63: - -/* Line 1479 of yacc.c */ -#line 451 "parse-gram.y" +/* Line 1778 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 1479 of yacc.c */ -#line 455 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 488 "parse-gram.y" { (yyval.list) = (yyvsp[(1) - (1)].list); } break; case 65: - -/* Line 1479 of yacc.c */ -#line 456 "parse-gram.y" +/* Line 1778 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 1479 of yacc.c */ -#line 460 "parse-gram.y" +/* Line 1778 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 1479 of yacc.c */ -#line 461 "parse-gram.y" +/* Line 1778 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 1479 of yacc.c */ -#line 462 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 495 "parse-gram.y" { (yyval.list) = symbol_list_default_tagged_new ((yylsp[(1) - (1)])); } break; case 69: - -/* Line 1479 of yacc.c */ -#line 463 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 496 "parse-gram.y" { (yyval.list) = symbol_list_default_tagless_new ((yylsp[(1) - (1)])); } break; case 70: - -/* Line 1479 of yacc.c */ -#line 469 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 502 "parse-gram.y" { current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; @@ -2450,9 +2692,8 @@ yyreduce: break; case 71: - -/* Line 1479 of yacc.c */ -#line 474 "parse-gram.y" +/* Line 1778 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)])); @@ -2460,9 +2701,8 @@ yyreduce: break; case 72: - -/* Line 1479 of yacc.c */ -#line 479 "parse-gram.y" +/* Line 1778 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)])); @@ -2471,9 +2711,8 @@ yyreduce: break; case 73: - -/* Line 1479 of yacc.c */ -#line 485 "parse-gram.y" +/* Line 1778 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)])); @@ -2482,9 +2721,8 @@ yyreduce: break; case 74: - -/* Line 1479 of yacc.c */ -#line 491 "parse-gram.y" +/* Line 1778 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)])); @@ -2494,118 +2732,110 @@ yyreduce: break; case 81: - -/* Line 1479 of yacc.c */ -#line 521 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 554 "parse-gram.y" { yyerrok; } break; case 82: +/* Line 1778 of yacc.c */ +#line 560 "parse-gram.y" + { current_lhs ((yyvsp[(1) - (2)].symbol), (yylsp[(1) - (2)]), (yyvsp[(2) - (2)].named_ref)); } + break; -/* Line 1479 of yacc.c */ -#line 527 "parse-gram.y" - { current_lhs = (yyvsp[(1) - (2)].symbol); current_lhs_location = (yylsp[(1) - (2)]); - current_lhs_named_ref = (yyvsp[(2) - (2)].named_ref); } + case 83: +/* Line 1778 of yacc.c */ +#line 561 "parse-gram.y" + { + /* Free the current lhs. */ + current_lhs (0, (yylsp[(1) - (4)]), 0); + } break; case 84: - -/* Line 1479 of yacc.c */ -#line 532 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 568 "parse-gram.y" { grammar_current_rule_end ((yylsp[(1) - (1)])); } break; case 85: - -/* Line 1479 of yacc.c */ -#line 533 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 569 "parse-gram.y" { grammar_current_rule_end ((yylsp[(3) - (3)])); } break; case 87: - -/* Line 1479 of yacc.c */ -#line 539 "parse-gram.y" - { grammar_current_rule_begin (current_lhs, current_lhs_location, +/* Line 1778 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 1479 of yacc.c */ -#line 542 "parse-gram.y" +/* Line 1778 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 1479 of yacc.c */ -#line 544 "parse-gram.y" +/* Line 1778 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 1479 of yacc.c */ -#line 546 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 582 "parse-gram.y" { grammar_current_rule_prec_set ((yyvsp[(3) - (3)].symbol), (yylsp[(3) - (3)])); } break; case 91: - -/* Line 1479 of yacc.c */ -#line 548 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 584 "parse-gram.y" { grammar_current_rule_dprec_set ((yyvsp[(3) - (3)].integer), (yylsp[(3) - (3)])); } break; case 92: - -/* Line 1479 of yacc.c */ -#line 550 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 586 "parse-gram.y" { grammar_current_rule_merge_set ((yyvsp[(3) - (3)].uniqstr), (yylsp[(3) - (3)])); } break; case 93: - -/* Line 1479 of yacc.c */ -#line 554 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 590 "parse-gram.y" { (yyval.named_ref) = 0; } break; case 94: - -/* Line 1479 of yacc.c */ -#line 556 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 592 "parse-gram.y" { (yyval.named_ref) = named_ref_new((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; case 96: - -/* Line 1479 of yacc.c */ -#line 568 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 604 "parse-gram.y" { (yyval.uniqstr) = uniqstr_new ((yyvsp[(1) - (1)].chars)); } break; case 97: - -/* Line 1479 of yacc.c */ -#line 573 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 609 "parse-gram.y" { (yyval.chars) = ""; } break; case 98: - -/* Line 1479 of yacc.c */ -#line 574 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 610 "parse-gram.y" { (yyval.chars) = (yyvsp[(1) - (1)].uniqstr); } break; case 100: - -/* Line 1479 of yacc.c */ -#line 585 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 621 "parse-gram.y" { code_props plain_code; (yyvsp[(1) - (1)].code)[strlen ((yyvsp[(1) - (1)].code)) - 1] = '\n'; @@ -2617,16 +2847,14 @@ yyreduce: break; case 101: - -/* Line 1479 of yacc.c */ -#line 605 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 641 "parse-gram.y" { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; case 102: - -/* Line 1479 of yacc.c */ -#line 607 "parse-gram.y" +/* Line 1778 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); @@ -2635,16 +2863,14 @@ yyreduce: break; case 103: - -/* Line 1479 of yacc.c */ -#line 615 "parse-gram.y" +/* Line 1778 of yacc.c */ +#line 651 "parse-gram.y" { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; case 106: - -/* Line 1479 of yacc.c */ -#line 627 "parse-gram.y" +/* Line 1778 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), token_sym, (yylsp[(1) - (1)]), false); @@ -2652,9 +2878,8 @@ yyreduce: break; case 108: - -/* Line 1479 of yacc.c */ -#line 636 "parse-gram.y" +/* Line 1778 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)])); @@ -2666,11 +2891,24 @@ yyreduce: break; - -/* Line 1479 of yacc.c */ -#line 2672 "parse-gram.c" - default: break; - } +/* Line 1778 of yacc.c */ +#line 2896 "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); @@ -2699,6 +2937,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) { @@ -2706,32 +2948,43 @@ yyerrlab: #if ! YYERROR_VERBOSE yyerror (YY_("syntax error")); #else - while (1) - { - int yysyntax_error_status = - yysyntax_error (&yymsg_alloc, &yymsg, yystate, yytoken); - if (yysyntax_error_status == 2 && 0 < yymsg_alloc) - { - if (yymsg != yymsgbuf) - YYSTACK_FREE (yymsg); - yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc); - if (yymsg) - continue; - yymsg = yymsgbuf; - yymsg_alloc = sizeof yymsgbuf; - } - if (yysyntax_error_status == 0) - yyerror (yymsg); - else - yyerror (YY_("syntax error")); - if (yysyntax_error_status == 2) - goto yyexhaustedlab; - break; - } +# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \ + yyesa, &yyes, &yyes_capacity, \ + yyssp, yytoken) + { + 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) { @@ -2768,7 +3021,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); @@ -2802,7 +3055,7 @@ yyerrlab1: if (yyssp == yyss) YYABORT; - yyerror_range[0] = *yylsp; + yyerror_range[1] = *yylsp; yydestruct ("Error: popping", yystos[yystate], yyvsp, yylsp); YYPOPSTACK (1); @@ -2810,12 +3063,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. */ @@ -2839,7 +3098,7 @@ yyabortlab: yyresult = 1; goto yyreturn; -#if !defined(yyoverflow) || YYERROR_VERBOSE +#if 1 /*-------------------------------------------------. | yyexhaustedlab -- memory exhaustion comes here. | `-------------------------------------------------*/ @@ -2851,8 +3110,13 @@ yyexhaustedlab: yyreturn: if (yychar != YYEMPTY) - yydestruct ("Cleanup: discarding lookahead", - yytoken, &yylval, &yylloc); + { + /* Make sure we have latest lookahead translation. See comments at + user semantic actions for why this is necessary. */ + yytoken = YYTRANSLATE (yychar); + yydestruct ("Cleanup: discarding lookahead", + yytoken, &yylval, &yylloc); + } /* Do not reclaim the symbols of the rule which action triggered this YYABORT or YYACCEPT. */ YYPOPSTACK (yylen); @@ -2867,6 +3131,8 @@ yyreturn: if (yyss != yyssa) YYSTACK_FREE (yyss); #endif + if (yyes != yyesa) + YYSTACK_FREE (yyes); #if YYERROR_VERBOSE if (yymsg != yymsgbuf) YYSTACK_FREE (yymsg); @@ -2876,9 +3142,8 @@ yyreturn: } - -/* Line 1690 of yacc.c */ -#line 646 "parse-gram.y" +/* Line 2041 of yacc.c */ +#line 682 "parse-gram.y" @@ -2898,7 +3163,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++) @@ -2935,27 +3200,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); } @@ -2970,8 +3227,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); } } @@ -2999,4 +3256,3 @@ char_name (char c) return quotearg_style (escape_quoting_style, buf); } } -