X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/7eb8a0bcca2b3897f4a2045cd36250191d4e6aa0..510df9519ec6347c13a57535d0589e3a87bfe2fe:/src/parse-gram.c
diff --git a/src/parse-gram.c b/src/parse-gram.c
index 50b4fb8c..19038b32 100644
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -1,15 +1,14 @@
-
-/* A Bison parser, made by GNU Bison 2.3a+. */
+/* A Bison parser, made by GNU Bison 2.4.1.173-62efdd. */
/* Skeleton implementation for Bison's 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, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009 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 +16,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 +45,7 @@
#define YYBISON 1
/* Bison version. */
-#define YYBISON_VERSION "2.3a+"
+#define YYBISON_VERSION "2.4.1.173-62efdd"
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
@@ -66,29 +63,29 @@
#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 176 of yacc.c */
+/* Line 252 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, 2003, 2004, 2005, 2006, 2007, 2008, 2009 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,22 +94,18 @@
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 "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"
@@ -149,6 +142,7 @@ static symbol_class current_class = unknown_sym;
static uniqstr current_type = NULL;
static symbol *current_lhs;
static location current_lhs_location;
+static named_ref *current_lhs_named_ref;
static int current_prec = 0;
#define YYTYPE_INT16 int_fast16_t
@@ -157,8 +151,8 @@ static int current_prec = 0;
#define YYTYPE_UINT8 uint_fast8_t
-/* Line 176 of yacc.c */
-#line 162 "parse-gram.c"
+/* Line 252 of yacc.c */
+#line 156 "parse-gram.c"
/* Enabling traces. */
#ifndef YYDEBUG
@@ -220,28 +214,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,28 +273,27 @@ 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
@@ -309,8 +301,9 @@ static int current_prec = 0;
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
{
-/* Line 210 of yacc.c */
-#line 97 "parse-gram.y"
+
+/* Line 277 of yacc.c */
+#line 94 "parse-gram.y"
symbol *symbol;
symbol_list *list;
@@ -320,11 +313,13 @@ typedef union YYSTYPE
assoc assoc;
uniqstr uniqstr;
unsigned char character;
-}
+ named_ref *named_ref;
-/* Line 210 of yacc.c */
-#line 327 "parse-gram.c"
- YYSTYPE;
+
+
+/* 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
@@ -347,8 +342,8 @@ typedef struct YYLTYPE
/* Copy the second part of user declarations. */
-/* Line 233 of yacc.c */
-#line 352 "parse-gram.c"
+/* Line 327 of yacc.c */
+#line 347 "parse-gram.c"
#ifdef short
# undef short
@@ -398,7 +393,7 @@ typedef short int yytype_int16;
#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
#ifndef YY_
-# if YYENABLE_NLS
+# if defined YYENABLE_NLS && YYENABLE_NLS
# if ENABLE_NLS
# include /* INFRINGES ON USER NAME SPACE */
# define YY_(msgid) dgettext ("bison-runtime", msgid)
@@ -512,9 +507,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. */
@@ -549,12 +544,12 @@ union yyalloc
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); \
} \
@@ -565,20 +560,20 @@ union yyalloc
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 3
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 187
+#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)
@@ -617,7 +612,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
@@ -628,62 +623,63 @@ 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, 3,
- 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, 3,
- 84, -1, -1, 49, -1, 58, 64, 45, -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, 3,
- -1, 84, -1, -1, 82, -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, 234, 235, 244,
- 245, 250, 251, 252, 253, 254, 255, 260, 269, 270,
- 271, 272, 273, 274, 275, 276, 277, 278, 279, 280,
- 281, 282, 283, 284, 285, 286, 287, 291, 292, 293,
- 297, 304, 311, 315, 319, 324, 347, 348, 352, 381,
- 381, 386, 386, 391, 402, 417, 418, 419, 423, 424,
- 429, 431, 436, 437, 441, 442, 443, 444, 449, 454,
- 459, 465, 471, 482, 483, 492, 493, 499, 500, 501,
- 508, 508, 512, 513, 514, 519, 520, 522, 524, 526,
- 528, 538, 539, 545, 549, 554, 574, 576, 585, 590,
- 591, 596, 603, 605
+ 0, 209, 209, 217, 219, 223, 224, 234, 235, 240,
+ 241, 246, 247, 248, 249, 250, 251, 256, 265, 266,
+ 267, 268, 269, 270, 271, 272, 273, 274, 275, 290,
+ 291, 315, 316, 317, 318, 322, 323, 324, 328, 335,
+ 342, 346, 350, 357, 372, 373, 377, 389, 389, 394,
+ 394, 399, 410, 425, 426, 427, 431, 432, 437, 439,
+ 444, 445, 450, 452, 457, 458, 462, 463, 464, 465,
+ 470, 475, 480, 486, 492, 503, 504, 513, 514, 520,
+ 521, 522, 529, 529, 534, 535, 536, 541, 543, 545,
+ 547, 549, 551, 556, 558, 569, 570, 575, 576, 577,
+ 586, 606, 608, 617, 622, 623, 628, 635, 637
};
#endif
@@ -701,19 +697,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",
- "content", "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", 0
};
#endif
@@ -727,24 +723,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. */
@@ -752,149 +748,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, 0, 95, 44, 93, 10,
+ 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, 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, 91, 94, 8, 92,
- 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
+ 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, 82, 88, 47, 51, 50, 48,
- 49, 90, 96, 101, 102, 92, 93, 83, 84, 85,
- 118, 127, 128, 107, 108, 57, 77, 86, 103, 79,
- 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 -93
+#define YYPACT_NINF -91
static const yytype_int16 yypact[] =
{
- -93, 14, 96, -93, -93, -93, -4, 20, 30, -93,
- -93, -93, 21, -93, -93, 73, 75, -93, 76, 77,
- 6, -93, 34, 79, 39, -93, 22, -93, -93, -93,
- 23, 41, -93, -93, -93, 84, 85, -2, -93, -93,
- -93, 27, -93, -93, 40, -93, -93, -93, -93, 35,
- -42, -42, -2, 0, 0, 47, -93, -93, 28, -93,
- -93, -93, -93, 90, -93, -93, -93, -93, 91, -93,
- 93, -93, -93, -93, -93, -93, -93, -93, -93, -93,
- 43, -93, 44, 11, -93, -93, -93, -93, 54, -93,
- -2, -93, -93, -42, 37, -42, -2, -93, -93, -93,
- -93, 0, -93, -93, 0, -93, -93, -93, -93, -93,
- -93, -93, -93, -93, -93, 62, -93, -93, -93, -93,
- -2, -93, 107, -93, -93, -93, -93, -44, 138, -93,
- -93, -93, -2, 139, 56, -93, -93, 138, -93, -93,
- -93
+ -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[] =
{
- -93, -93, -93, -93, 140, -93, -93, -93, -93, -93,
- -93, -93, 55, 92, -41, -21, 97, -93, 61, -93,
- -93, -93, 25, -93, -93, 9, -45, -93, -37, -92,
- -93
+ -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[] =
{
- 78, 74, 123, 74, 75, 94, 94, 76, 130, 62,
- 131, -102, 80, 91, 3, 97, 4, 5, 6, 7,
- 8, 9, 10, 11, 55, 67, 69, 12, 80, 14,
- 129, 106, 4, 5, 6, 7, 8, 9, 10, 11,
- 74, 122, 27, 12, 75, 14, 75, 76, 94, 76,
- 94, 52, 37, 97, 63, 98, 99, 100, 27, 124,
- 125, 81, 115, 125, 105, 53, 56, 109, 37, 44,
- 68, 70, 121, 56, 121, 54, 58, 81, 59, 64,
- 60, 61, 65, 124, 66, 44, 71, 72, 73, 87,
- 89, 136, 56, 110, 111, 138, 112, 113, 114, 119,
- 136, 4, 5, 6, 7, 8, 9, 10, 11, 126,
- 74, 140, 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, 74, 46, 139, 116, 120, 104, 41, 95, 42,
- 43, 132, 133, 134, 44, 137, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 135, 75, 0, 0, 76
+ 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, 3, 94, 3, 46, 50, 51, 49, 52, 3,
- 54, 0, 1, 55, 0, 52, 5, 6, 7, 8,
- 9, 10, 11, 12, 3, 3, 3, 16, 1, 18,
- 122, 3, 5, 6, 7, 8, 9, 10, 11, 12,
- 3, 4, 31, 16, 46, 18, 46, 49, 93, 49,
- 95, 55, 41, 90, 48, 55, 56, 57, 31, 96,
- 101, 50, 51, 104, 55, 45, 45, 58, 41, 58,
- 48, 48, 93, 45, 95, 45, 3, 50, 3, 45,
- 4, 4, 3, 120, 45, 58, 45, 3, 3, 49,
- 55, 128, 45, 3, 3, 132, 3, 54, 54, 45,
- 137, 5, 6, 7, 8, 9, 10, 11, 12, 47,
- 3, 55, 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, 2, 4, 83, 90, 54, 51, 51, 53,
- 54, 13, 14, 15, 58, 130, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 45, 46, -1, -1, 49
+ 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, 3, 45, 84, 3, 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, 82, 83, 84,
- 3, 3, 3, 54, 54, 51, 77, 89, 79, 45,
- 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)
@@ -909,9 +906,18 @@ 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)
@@ -921,7 +927,6 @@ do \
{ \
yychar = (Token); \
yylval = (Value); \
- yytoken = YYTRANSLATE (yychar); \
YYPOPSTACK (1); \
goto yybackup; \
} \
@@ -968,7 +973,7 @@ while (YYID (0))
we won't break user code: when these are the locations we know. */
#ifndef YY_LOCATION_PRINT
-# if YYLTYPE_IS_TRIVIAL
+# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
# define YY_LOCATION_PRINT(File, Loc) \
fprintf (File, "%d.%d-%d.%d", \
(Loc).first_line, (Loc).first_column, \
@@ -1044,147 +1049,165 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
{
case 3: /* "\"string\"" */
-/* Line 686 of yacc.c */
-#line 188 "parse-gram.y"
+/* Line 798 of yacc.c */
+#line 184 "parse-gram.y"
{ fputs (quotearg_style (c_quoting_style, (yyvaluep->chars)), stderr); };
-/* Line 686 of yacc.c */
-#line 1053 "parse-gram.c"
+/* Line 798 of yacc.c */
+#line 1058 "parse-gram.c"
break;
case 4: /* "\"integer\"" */
-/* Line 686 of yacc.c */
-#line 199 "parse-gram.y"
+/* Line 798 of yacc.c */
+#line 196 "parse-gram.y"
{ fprintf (stderr, "%d", (yyvaluep->integer)); };
-/* Line 686 of yacc.c */
-#line 1062 "parse-gram.c"
+/* Line 798 of yacc.c */
+#line 1067 "parse-gram.c"
break;
- case 45: /* "\"{...}\"" */
+ case 43: /* "\"{...}\"" */
-/* Line 686 of yacc.c */
-#line 190 "parse-gram.y"
+/* Line 798 of yacc.c */
+#line 186 "parse-gram.y"
{ fprintf (stderr, "{\n%s\n}", (yyvaluep->code)); };
-/* Line 686 of yacc.c */
-#line 1071 "parse-gram.c"
+/* Line 798 of yacc.c */
+#line 1076 "parse-gram.c"
break;
- case 46: /* "\"char\"" */
+ case 44: /* "\"[identifier]\"" */
-/* Line 686 of yacc.c */
-#line 182 "parse-gram.y"
+/* Line 798 of yacc.c */
+#line 191 "parse-gram.y"
+ { fprintf (stderr, "[%s]", (yyvaluep->uniqstr)); };
+
+/* Line 798 of yacc.c */
+#line 1085 "parse-gram.c"
+ break;
+ case 45: /* "\"char\"" */
+
+/* Line 798 of yacc.c */
+#line 178 "parse-gram.y"
{ fputs (char_name ((yyvaluep->character)), stderr); };
-/* Line 686 of yacc.c */
-#line 1080 "parse-gram.c"
+/* Line 798 of yacc.c */
+#line 1094 "parse-gram.c"
break;
- case 47: /* "\"epilogue\"" */
+ case 46: /* "\"epilogue\"" */
-/* Line 686 of yacc.c */
-#line 190 "parse-gram.y"
+/* Line 798 of yacc.c */
+#line 186 "parse-gram.y"
{ fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-/* Line 686 of yacc.c */
-#line 1089 "parse-gram.c"
+/* Line 798 of yacc.c */
+#line 1103 "parse-gram.c"
break;
- case 49: /* "\"identifier\"" */
+ case 48: /* "\"identifier\"" */
-/* Line 686 of yacc.c */
-#line 195 "parse-gram.y"
+/* Line 798 of yacc.c */
+#line 190 "parse-gram.y"
{ fputs ((yyvaluep->uniqstr), stderr); };
-/* Line 686 of yacc.c */
-#line 1098 "parse-gram.c"
+/* Line 798 of yacc.c */
+#line 1112 "parse-gram.c"
break;
- case 50: /* "\"identifier:\"" */
+ case 49: /* "\"identifier:\"" */
-/* Line 686 of yacc.c */
-#line 196 "parse-gram.y"
+/* Line 798 of yacc.c */
+#line 192 "parse-gram.y"
{ fprintf (stderr, "%s:", (yyvaluep->uniqstr)); };
-/* Line 686 of yacc.c */
-#line 1107 "parse-gram.c"
+/* Line 798 of yacc.c */
+#line 1121 "parse-gram.c"
break;
- case 53: /* "\"%{...%}\"" */
+ case 52: /* "\"%{...%}\"" */
-/* Line 686 of yacc.c */
-#line 190 "parse-gram.y"
+/* Line 798 of yacc.c */
+#line 186 "parse-gram.y"
{ fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-/* Line 686 of yacc.c */
-#line 1116 "parse-gram.c"
+/* Line 798 of yacc.c */
+#line 1130 "parse-gram.c"
break;
- case 55: /* "\"type\"" */
+ case 54: /* "\"type\"" */
-/* Line 686 of yacc.c */
-#line 194 "parse-gram.y"
+/* Line 798 of yacc.c */
+#line 193 "parse-gram.y"
{ fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); };
-/* Line 686 of yacc.c */
-#line 1125 "parse-gram.c"
+/* Line 798 of yacc.c */
+#line 1139 "parse-gram.c"
break;
- case 82: /* "content" */
+ case 71: /* "symbol.prec" */
-/* Line 686 of yacc.c */
-#line 190 "parse-gram.y"
- { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
+/* Line 798 of yacc.c */
+#line 199 "parse-gram.y"
+ { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
-/* Line 686 of yacc.c */
-#line 1134 "parse-gram.c"
+/* Line 798 of yacc.c */
+#line 1148 "parse-gram.c"
break;
- case 83: /* "content.opt" */
+ case 84: /* "variable" */
-/* Line 686 of yacc.c */
+/* Line 798 of yacc.c */
#line 190 "parse-gram.y"
+ { fputs ((yyvaluep->uniqstr), stderr); };
+
+/* Line 798 of yacc.c */
+#line 1157 "parse-gram.c"
+ break;
+ case 85: /* "content.opt" */
+
+/* Line 798 of yacc.c */
+#line 186 "parse-gram.y"
{ fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-/* Line 686 of yacc.c */
-#line 1143 "parse-gram.c"
+/* Line 798 of yacc.c */
+#line 1166 "parse-gram.c"
break;
- case 84: /* "braceless" */
+ case 86: /* "braceless" */
-/* Line 686 of yacc.c */
-#line 190 "parse-gram.y"
+/* Line 798 of yacc.c */
+#line 186 "parse-gram.y"
{ fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-/* Line 686 of yacc.c */
-#line 1152 "parse-gram.c"
+/* Line 798 of yacc.c */
+#line 1175 "parse-gram.c"
break;
- case 85: /* "id" */
+ case 87: /* "id" */
-/* Line 686 of yacc.c */
-#line 202 "parse-gram.y"
+/* Line 798 of yacc.c */
+#line 199 "parse-gram.y"
{ fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
-/* Line 686 of yacc.c */
-#line 1161 "parse-gram.c"
+/* Line 798 of yacc.c */
+#line 1184 "parse-gram.c"
break;
- case 86: /* "id_colon" */
+ case 88: /* "id_colon" */
-/* Line 686 of yacc.c */
-#line 203 "parse-gram.y"
+/* Line 798 of yacc.c */
+#line 200 "parse-gram.y"
{ fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); };
-/* Line 686 of yacc.c */
-#line 1170 "parse-gram.c"
+/* Line 798 of yacc.c */
+#line 1193 "parse-gram.c"
break;
- case 87: /* "symbol" */
+ case 89: /* "symbol" */
-/* Line 686 of yacc.c */
-#line 202 "parse-gram.y"
+/* Line 798 of yacc.c */
+#line 199 "parse-gram.y"
{ fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
-/* Line 686 of yacc.c */
-#line 1179 "parse-gram.c"
+/* Line 798 of yacc.c */
+#line 1202 "parse-gram.c"
break;
- case 88: /* "string_as_id" */
+ case 90: /* "string_as_id" */
-/* Line 686 of yacc.c */
-#line 202 "parse-gram.y"
+/* Line 798 of yacc.c */
+#line 199 "parse-gram.y"
{ fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
-/* Line 686 of yacc.c */
-#line 1188 "parse-gram.c"
+/* Line 798 of yacc.c */
+#line 1211 "parse-gram.c"
break;
default:
break;
@@ -1276,11 +1299,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");
}
}
@@ -1420,111 +1443,121 @@ 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)
+/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
+ about the unexpected token YYTOKEN while in state YYSTATE.
+
+ Return 0 if *YYMSG was successfully written. Return 1 if an ordinary
+ "syntax error" message will suffice instead. Return 2 if *YYMSG is
+ not large enough to hold the message. In the last case, also set
+ *YYMSG_ALLOC to either (a) the required number of bytes or (b) zero
+ if the required number of bytes is too large to store. */
+static int
+yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
+ int yystate, int yytoken)
{
int yyn = yypact[yystate];
if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
- return 0;
+ return 1;
else
{
- int yytype = YYTRANSLATE (yychar);
- YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
+ YYSIZE_T yysize0 = yytnamerr (0, yytname[yytoken]);
YYSIZE_T yysize = yysize0;
YYSIZE_T yysize1;
- int yysize_overflow = 0;
enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+ /* Internationalized format string. */
+ const char *yyformat = 0;
+ /* Arguments of yyformat. */
char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
- 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");
-# 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. */
+ YYCHECK. In other words, skip the first -YYN actions for this
+ state because they are default actions. */
int yyxbegin = yyn < 0 ? -yyn : 0;
/* Stay within bounds of both yycheck and yytname. */
int yychecklim = YYLAST - yyn + 1;
int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
- int yycount = 1;
+ /* Number of reported tokens (one for the "unexpected", one per
+ "expected"). */
+ int yycount = 0;
+ int yyx;
- yyarg[0] = yytname[yytype];
- yyfmt = yystpcpy (yyformat, yyunexpected);
+ yyarg[yycount++] = yytname[yytoken];
for (yyx = yyxbegin; yyx < yyxend; ++yyx)
- if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+ if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
+ && !yytable_value_is_error (yytable[yyx + yyn]))
{
if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
{
yycount = 1;
yysize = yysize0;
- yyformat[sizeof yyunexpected - 1] = '\0';
break;
}
yyarg[yycount++] = yytname[yyx];
yysize1 = yysize + yytnamerr (0, yytname[yyx]);
- yysize_overflow |= (yysize1 < yysize);
+ if (! (yysize <= yysize1
+ && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+ {
+ /* Overflow. */
+ *yymsg_alloc = 0;
+ return 2;
+ }
yysize = yysize1;
- yyfmt = yystpcpy (yyfmt, yyprefix);
- yyprefix = yyor;
}
- yyf = YY_(yyformat);
- yysize1 = yysize + yystrlen (yyf);
- yysize_overflow |= (yysize1 < yysize);
+ switch (yycount)
+ {
+#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_
+ }
+
+ yysize1 = yysize + yystrlen (yyformat);
+ if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+ {
+ /* Overflow. */
+ *yymsg_alloc = 0;
+ return 2;
+ }
yysize = yysize1;
- if (yysize_overflow)
- return YYSIZE_MAXIMUM;
-
- if (yyresult)
- {
- /* Avoid sprintf, as that infringes on the user's name space.
- Don't have undefined behavior even if the translation
- produced a string with the wrong number of "%s"s. */
- char *yyp = yyresult;
- int yyi = 0;
- while ((*yyp = *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 2;
+ }
+
+ /* 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 */
@@ -1562,10 +1595,9 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
break;
}
}
-
-/* Prevent warnings from -Wmissing-prototypes. */
+/* Prevent warnings from -Wmissing-prototypes. */
#ifdef YYPARSE_PARAM
#if defined __STDC__ || defined __cplusplus
int yyparse (void *YYPARSE_PARAM);
@@ -1581,10 +1613,6 @@ int yyparse ();
#endif /* ! YYPARSE_PARAM */
-
-
-
-
/*----------.
| yyparse. |
`----------*/
@@ -1611,95 +1639,103 @@ yyparse ()
#endif
#endif
{
- /* The lookahead symbol. */
+/* The lookahead symbol. */
int yychar;
/* 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;
+
+ int yystate;
+ /* Number of tokens to shift before error messages enabled. */
+ int yyerrstatus;
- /* Three stacks and their tools:
- `yyss': related to states,
- `yyvs': related to semantic values,
- `yyls': related to locations.
+ /* The stacks and their tools:
+ `yyss': related to states.
+ `yyvs': related to semantic values.
+ `yyls': related to locations.
- Refer to the stacks thru separate pointers, to allow yyoverflow
- to reallocate them elsewhere. */
+ Refer to the stacks thru separate pointers, to allow yyoverflow
+ to reallocate them elsewhere. */
- /* The state stack. */
- yytype_int16 yyssa[YYINITDEPTH];
- yytype_int16 *yyss = yyssa;
- yytype_int16 *yyssp;
+ /* The state stack. */
+ yytype_int16 yyssa[YYINITDEPTH];
+ yytype_int16 *yyss;
+ yytype_int16 *yyssp;
- /* The semantic value stack. */
- YYSTYPE yyvsa[YYINITDEPTH];
- YYSTYPE *yyvs = yyvsa;
- YYSTYPE *yyvsp;
+ /* The semantic value stack. */
+ YYSTYPE yyvsa[YYINITDEPTH];
+ YYSTYPE *yyvs;
+ YYSTYPE *yyvsp;
- /* The location stack. */
- YYLTYPE yylsa[YYINITDEPTH];
- YYLTYPE *yyls = yylsa;
- YYLTYPE *yylsp;
- /* The locations where the error started and ended. */
- YYLTYPE yyerror_range[2];
+ /* The location stack. */
+ YYLTYPE yylsa[YYINITDEPTH];
+ YYLTYPE *yyls;
+ YYLTYPE *yylsp;
-#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N), yylsp -= (N))
+ /* The locations where the error started and ended. */
+ YYLTYPE yyerror_range[2];
- YYSIZE_T yystacksize = YYINITDEPTH;
+ YYSIZE_T yystacksize;
+ int yyn;
+ int yyresult;
+ /* Lookahead token as an internal (translated) token number. */
+ int yytoken;
/* 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;
+ yytoken = 0;
+ yyss = yyssa;
+ yyvs = yyvsa;
+ yyls = yylsa;
+ yystacksize = YYINITDEPTH;
+
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
+
+#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. */
- /* User initialization code. */
-
-/* Line 1098 of yacc.c */
-#line 89 "parse-gram.y"
+/* Line 1281 of yacc.c */
+#line 86 "parse-gram.y"
{
/* Bison's grammar can initial empty locations, hence a default
location is needed. */
@@ -1707,9 +1743,10 @@ YYLTYPE yylloc;
boundary_set (&yylloc.end, current_file, 1, 1);
}
-/* Line 1098 of yacc.c */
-#line 1712 "parse-gram.c"
+/* Line 1281 of yacc.c */
+#line 1748 "parse-gram.c"
yylsp[0] = yylloc;
+
goto yysetstate;
/*------------------------------------------------------------.
@@ -1746,6 +1783,7 @@ YYLTYPE yylloc;
&yyvs1, yysize * sizeof (*yyvsp),
&yyls1, yysize * sizeof (*yylsp),
&yystacksize);
+
yyls = yyls1;
yyss = yyss1;
yyvs = yyvs1;
@@ -1767,9 +1805,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);
@@ -1805,7 +1843,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. */
@@ -1836,7 +1874,7 @@ yybackup:
yyn = yytable[yyn];
if (yyn <= 0)
{
- if (yyn == 0 || yyn == YYTABLE_NINF)
+ if (yytable_value_is_error (yyn))
goto yyerrlab;
yyn = -yyn;
goto yyreduce;
@@ -1893,50 +1931,47 @@ yyreduce:
{
case 6:
-/* Line 1285 of yacc.c */
-#line 226 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 225 "parse-gram.y"
{
code_props plain_code;
code_props_plain_init (&plain_code, (yyvsp[(1) - (1)].chars), (yylsp[(1) - (1)]));
code_props_translate_code (&plain_code);
gram_scanner_last_string_free ();
- prologue_augment (plain_code.code, (yylsp[(1) - (1)]), union_seen);
+ muscle_code_grow (union_seen ? "post_prologue" : "pre_prologue",
+ plain_code.code, (yylsp[(1) - (1)]));
code_scanner_last_string_free ();
}
break;
case 7:
-/* Line 1285 of yacc.c */
+/* Line 1494 of yacc.c */
#line 234 "parse-gram.y"
{ debug_flag = true; }
break;
case 8:
-/* Line 1285 of yacc.c */
+/* Line 1494 of yacc.c */
#line 236 "parse-gram.y"
{
- /* FIXME: Special characters in $2 may break %define.
- For example: `['. */
- if (muscle_find_const ((yyvsp[(2) - (3)].chars)))
- warn_at ((yylsp[(2) - (3)]), _("%s: `%s' redefined"), "%define", (yyvsp[(2) - (3)].chars));
- muscle_insert ((yyvsp[(2) - (3)].chars), (yyvsp[(3) - (3)].chars));
- muscle_grow_used_name_list ("used_percent_define_variables", (yyvsp[(2) - (3)].chars), (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 1285 of yacc.c */
-#line 244 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 240 "parse-gram.y"
{ defines_flag = true; }
break;
case 10:
-/* Line 1285 of yacc.c */
-#line 246 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 242 "parse-gram.y"
{
defines_flag = true;
spec_defines_file = xstrdup ((yyvsp[(2) - (2)].chars));
@@ -1945,43 +1980,43 @@ yyreduce:
case 11:
-/* Line 1285 of yacc.c */
-#line 250 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 246 "parse-gram.y"
{ error_verbose = true; }
break;
case 12:
-/* Line 1285 of yacc.c */
-#line 251 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 247 "parse-gram.y"
{ expected_sr_conflicts = (yyvsp[(2) - (2)].integer); }
break;
case 13:
-/* Line 1285 of yacc.c */
-#line 252 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 248 "parse-gram.y"
{ expected_rr_conflicts = (yyvsp[(2) - (2)].integer); }
break;
case 14:
-/* Line 1285 of yacc.c */
-#line 253 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 249 "parse-gram.y"
{ spec_file_prefix = (yyvsp[(2) - (2)].chars); }
break;
case 15:
-/* Line 1285 of yacc.c */
-#line 254 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 250 "parse-gram.y"
{ spec_file_prefix = (yyvsp[(3) - (3)].chars); }
break;
case 16:
-/* Line 1285 of yacc.c */
-#line 256 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 252 "parse-gram.y"
{
nondeterministic_parser = true;
glr_parser = true;
@@ -1990,8 +2025,8 @@ yyreduce:
case 17:
-/* Line 1285 of yacc.c */
-#line 261 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 257 "parse-gram.y"
{
code_props action;
code_props_symbol_action_init (&action, (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)]));
@@ -2004,143 +2039,164 @@ yyreduce:
case 18:
-/* Line 1285 of yacc.c */
-#line 269 "parse-gram.y"
- { language_argmatch ((yyvsp[(2) - (2)].chars), 1, &(yylsp[(1) - (2)])); }
+/* Line 1494 of yacc.c */
+#line 265 "parse-gram.y"
+ { language_argmatch ((yyvsp[(2) - (2)].chars), grammar_prio, (yylsp[(1) - (2)])); }
break;
case 19:
-/* Line 1285 of yacc.c */
-#line 270 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 266 "parse-gram.y"
{ add_param ("lex_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
break;
case 20:
-/* Line 1285 of yacc.c */
-#line 271 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 267 "parse-gram.y"
{ locations_flag = true; }
break;
case 21:
-/* Line 1285 of yacc.c */
-#line 272 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 268 "parse-gram.y"
{ spec_name_prefix = (yyvsp[(2) - (2)].chars); }
break;
case 22:
-/* Line 1285 of yacc.c */
-#line 273 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 269 "parse-gram.y"
{ spec_name_prefix = (yyvsp[(3) - (3)].chars); }
break;
case 23:
-/* Line 1285 of yacc.c */
-#line 274 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 270 "parse-gram.y"
{ no_lines_flag = true; }
break;
case 24:
-/* Line 1285 of yacc.c */
-#line 275 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 271 "parse-gram.y"
{ nondeterministic_parser = true; }
break;
case 25:
-/* Line 1285 of yacc.c */
-#line 276 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 272 "parse-gram.y"
{ spec_outfile = (yyvsp[(2) - (2)].chars); }
break;
case 26:
-/* Line 1285 of yacc.c */
-#line 277 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 273 "parse-gram.y"
{ spec_outfile = (yyvsp[(3) - (3)].chars); }
break;
case 27:
-/* Line 1285 of yacc.c */
-#line 278 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 274 "parse-gram.y"
{ add_param ("parse_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
break;
case 28:
-/* Line 1285 of yacc.c */
-#line 279 "parse-gram.y"
- { pure_parser = true; }
+/* Line 1494 of yacc.c */
+#line 276 "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 1285 of yacc.c */
-#line 280 "parse-gram.y"
- { push_parser = true; pull_parser = false; }
+/* Line 1494 of yacc.c */
+#line 290 "parse-gram.y"
+ { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); }
break;
case 30:
-/* Line 1285 of yacc.c */
-#line 281 "parse-gram.y"
- { push_parser = true; pull_parser = true; }
+/* Line 1494 of yacc.c */
+#line 292 "parse-gram.y"
+ {
+ char const *skeleton_user = (yyvsp[(2) - (2)].chars);
+ if (strchr (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)
+ {
+ strncpy (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 1285 of yacc.c */
-#line 282 "parse-gram.y"
- { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); }
+/* Line 1494 of yacc.c */
+#line 315 "parse-gram.y"
+ { token_table_flag = true; }
break;
case 32:
-/* Line 1285 of yacc.c */
-#line 283 "parse-gram.y"
- { skeleton_arg ((yyvsp[(2) - (2)].chars), 1, &(yylsp[(1) - (2)])); }
+/* Line 1494 of yacc.c */
+#line 316 "parse-gram.y"
+ { report_flag |= report_states; }
break;
case 33:
-/* Line 1285 of yacc.c */
-#line 284 "parse-gram.y"
- { token_table_flag = true; }
- break;
-
- case 34:
-
-/* Line 1285 of yacc.c */
-#line 285 "parse-gram.y"
- { report_flag = report_states; }
- break;
-
- case 35:
-
-/* Line 1285 of yacc.c */
-#line 286 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 317 "parse-gram.y"
{ yacc_flag = true; }
break;
- case 39:
+ case 37:
-/* Line 1285 of yacc.c */
-#line 294 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 325 "parse-gram.y"
{
grammar_start_symbol_set ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]));
}
break;
- case 40:
+ case 38:
-/* Line 1285 of yacc.c */
-#line 298 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 329 "parse-gram.y"
{
symbol_list *list;
for (list = (yyvsp[(3) - (3)].list); list; list = list->next)
@@ -2149,10 +2205,10 @@ yyreduce:
}
break;
- case 41:
+ case 39:
-/* Line 1285 of yacc.c */
-#line 305 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 336 "parse-gram.y"
{
symbol_list *list;
for (list = (yyvsp[(3) - (3)].list); list; list = list->next)
@@ -2161,132 +2217,109 @@ yyreduce:
}
break;
- case 42:
+ case 40:
-/* Line 1285 of yacc.c */
-#line 312 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 343 "parse-gram.y"
{
default_prec = true;
}
break;
- case 43:
+ case 41:
-/* Line 1285 of yacc.c */
-#line 316 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 347 "parse-gram.y"
{
default_prec = false;
}
break;
- case 44:
+ case 42:
-/* Line 1285 of yacc.c */
-#line 320 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 351 "parse-gram.y"
{
- muscle_code_grow ("percent_code", (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:
+ case 43:
-/* Line 1285 of yacc.c */
-#line 325 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 358 "parse-gram.y"
{
- /* FIXME: Special characters in $2 may break %code.
- For example: `['. */
- char const name_prefix[] = "percent_code_";
- char *name = xmalloc (sizeof name_prefix + strlen ((yyvsp[(2) - (3)].chars)));
- strcpy (name, name_prefix);
- strcpy (name + sizeof name_prefix - 1, (yyvsp[(2) - (3)].chars));
- 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_used_name_list ("used_percent_code_qualifiers", (yyvsp[(2) - (3)].chars), (yylsp[(2) - (3)]));
}
break;
- case 46:
+ case 44:
-/* Line 1285 of yacc.c */
-#line 347 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 372 "parse-gram.y"
{}
break;
- case 47:
+ case 45:
-/* Line 1285 of yacc.c */
-#line 348 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 373 "parse-gram.y"
{ muscle_code_grow ("union_name", (yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
break;
- case 48:
+ case 46:
-/* Line 1285 of yacc.c */
-#line 353 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 378 "parse-gram.y"
{
- char const *body = (yyvsp[(3) - (3)].code);
-
- /* Concatenate the %union bodies. If this is the first %union, make sure
- the synchronization line appears after the opening '{' so as not to
- confuse Doxygen. Otherwise, turn the previous %union's trailing '}'
- into '\n', and omit the new %union's leading '{'. */
- if (!union_seen)
- {
- muscle_grow ("stype", "{", "");
- }
- else
- {
- char *code = muscle_find ("stype");
- code[strlen (code) - 1] = '\n';
- }
- body++;
-
union_seen = true;
- muscle_code_grow ("stype", body, (yylsp[(3) - (3)]));
- gram_scanner_last_string_free ();
+ muscle_code_grow ("stype", (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)]));
+ code_scanner_last_string_free ();
}
break;
- case 49:
+ case 47:
-/* Line 1285 of yacc.c */
-#line 381 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 389 "parse-gram.y"
{ current_class = nterm_sym; }
break;
- case 50:
+ case 48:
-/* Line 1285 of yacc.c */
-#line 382 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 390 "parse-gram.y"
{
current_class = unknown_sym;
current_type = NULL;
}
break;
- case 51:
+ case 49:
-/* Line 1285 of yacc.c */
-#line 386 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 394 "parse-gram.y"
{ current_class = token_sym; }
break;
- case 52:
+ case 50:
-/* Line 1285 of yacc.c */
-#line 387 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 395 "parse-gram.y"
{
current_class = unknown_sym;
current_type = NULL;
}
break;
- case 53:
+ case 51:
-/* Line 1285 of yacc.c */
-#line 392 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 400 "parse-gram.y"
{
symbol_list *list;
tag_seen = true;
@@ -2296,10 +2329,10 @@ yyreduce:
}
break;
- case 54:
+ case 52:
-/* Line 1285 of yacc.c */
-#line 403 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 411 "parse-gram.y"
{
symbol_list *list;
++current_prec;
@@ -2313,121 +2346,149 @@ yyreduce:
}
break;
- case 55:
+ case 53:
-/* Line 1285 of yacc.c */
-#line 417 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 425 "parse-gram.y"
{ (yyval.assoc) = left_assoc; }
break;
- case 56:
+ case 54:
-/* Line 1285 of yacc.c */
-#line 418 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 426 "parse-gram.y"
{ (yyval.assoc) = right_assoc; }
break;
- case 57:
+ case 55:
-/* Line 1285 of yacc.c */
-#line 419 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 427 "parse-gram.y"
{ (yyval.assoc) = non_assoc; }
break;
- case 58:
+ case 56:
-/* Line 1285 of yacc.c */
-#line 423 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 431 "parse-gram.y"
{ current_type = NULL; }
break;
- case 59:
+ case 57:
-/* Line 1285 of yacc.c */
-#line 424 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 432 "parse-gram.y"
{ current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; }
break;
- case 60:
+ case 58:
-/* Line 1285 of yacc.c */
-#line 430 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 438 "parse-gram.y"
{ (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
break;
- case 61:
+ case 59:
-/* Line 1285 of yacc.c */
-#line 432 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 440 "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 1494 of yacc.c */
+#line 444 "parse-gram.y"
+ { (yyval.symbol) = (yyvsp[(1) - (1)].symbol); }
+ break;
+
+ case 61:
+
+/* Line 1494 of yacc.c */
+#line 445 "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 1285 of yacc.c */
-#line 436 "parse-gram.y"
- { (yyval.list) = (yyvsp[(1) - (1)].list); }
+/* Line 1494 of yacc.c */
+#line 451 "parse-gram.y"
+ { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
break;
case 63:
-/* Line 1285 of yacc.c */
-#line 437 "parse-gram.y"
- { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); }
+/* Line 1494 of yacc.c */
+#line 453 "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 1285 of yacc.c */
-#line 441 "parse-gram.y"
- { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
+/* Line 1494 of yacc.c */
+#line 457 "parse-gram.y"
+ { (yyval.list) = (yyvsp[(1) - (1)].list); }
break;
case 65:
-/* Line 1285 of yacc.c */
-#line 442 "parse-gram.y"
- { (yyval.list) = symbol_list_type_new ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
+/* Line 1494 of yacc.c */
+#line 458 "parse-gram.y"
+ { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); }
break;
case 66:
-/* Line 1285 of yacc.c */
-#line 443 "parse-gram.y"
- { (yyval.list) = symbol_list_default_tagged_new ((yylsp[(1) - (1)])); }
+/* Line 1494 of yacc.c */
+#line 462 "parse-gram.y"
+ { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
break;
case 67:
-/* Line 1285 of yacc.c */
-#line 444 "parse-gram.y"
- { (yyval.list) = symbol_list_default_tagless_new ((yylsp[(1) - (1)])); }
+/* Line 1494 of yacc.c */
+#line 463 "parse-gram.y"
+ { (yyval.list) = symbol_list_type_new ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
break;
case 68:
-/* Line 1285 of yacc.c */
-#line 450 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 464 "parse-gram.y"
+ { (yyval.list) = symbol_list_default_tagged_new ((yylsp[(1) - (1)])); }
+ break;
+
+ case 69:
+
+/* Line 1494 of yacc.c */
+#line 465 "parse-gram.y"
+ { (yyval.list) = symbol_list_default_tagless_new ((yylsp[(1) - (1)])); }
+ break;
+
+ case 70:
+
+/* Line 1494 of yacc.c */
+#line 471 "parse-gram.y"
{
current_type = (yyvsp[(1) - (1)].uniqstr);
tag_seen = true;
}
break;
- case 69:
+ case 71:
-/* Line 1285 of yacc.c */
-#line 455 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 476 "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:
+ case 72:
-/* Line 1285 of yacc.c */
-#line 460 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 481 "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)]));
@@ -2435,10 +2496,10 @@ yyreduce:
}
break;
- case 71:
+ case 73:
-/* Line 1285 of yacc.c */
-#line 466 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 487 "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)]));
@@ -2446,10 +2507,10 @@ yyreduce:
}
break;
- case 72:
+ case 74:
-/* Line 1285 of yacc.c */
-#line 472 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 493 "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)]));
@@ -2458,92 +2519,119 @@ yyreduce:
}
break;
- case 79:
+ case 81:
-/* Line 1285 of yacc.c */
-#line 502 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 523 "parse-gram.y"
{
yyerrok;
}
break;
- case 80:
+ case 82:
-/* Line 1285 of yacc.c */
-#line 508 "parse-gram.y"
- { current_lhs = (yyvsp[(1) - (1)].symbol); current_lhs_location = (yylsp[(1) - (1)]); }
+/* Line 1494 of yacc.c */
+#line 529 "parse-gram.y"
+ { current_lhs = (yyvsp[(1) - (2)].symbol); current_lhs_location = (yylsp[(1) - (2)]);
+ current_lhs_named_ref = (yyvsp[(2) - (2)].named_ref); }
break;
- case 82:
+ case 84:
-/* Line 1285 of yacc.c */
-#line 512 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 534 "parse-gram.y"
{ grammar_current_rule_end ((yylsp[(1) - (1)])); }
break;
- case 83:
+ case 85:
-/* Line 1285 of yacc.c */
-#line 513 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 535 "parse-gram.y"
{ grammar_current_rule_end ((yylsp[(3) - (3)])); }
break;
- case 85:
+ case 87:
-/* Line 1285 of yacc.c */
-#line 519 "parse-gram.y"
- { grammar_current_rule_begin (current_lhs, current_lhs_location); }
+/* Line 1494 of yacc.c */
+#line 541 "parse-gram.y"
+ { grammar_current_rule_begin (current_lhs, current_lhs_location,
+ current_lhs_named_ref); }
break;
- case 86:
+ case 88:
-/* Line 1285 of yacc.c */
-#line 521 "parse-gram.y"
- { grammar_current_rule_symbol_append ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); }
+/* Line 1494 of yacc.c */
+#line 544 "parse-gram.y"
+ { grammar_current_rule_symbol_append ((yyvsp[(2) - (3)].symbol), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].named_ref)); }
break;
- case 87:
+ case 89:
-/* Line 1285 of yacc.c */
-#line 523 "parse-gram.y"
- { grammar_current_rule_action_append ((yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
+/* Line 1494 of yacc.c */
+#line 546 "parse-gram.y"
+ { grammar_current_rule_action_append ((yyvsp[(2) - (3)].code), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].named_ref)); }
break;
- case 88:
+ case 90:
-/* Line 1285 of yacc.c */
-#line 525 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 548 "parse-gram.y"
{ grammar_current_rule_prec_set ((yyvsp[(3) - (3)].symbol), (yylsp[(3) - (3)])); }
break;
- case 89:
+ case 91:
-/* Line 1285 of yacc.c */
-#line 527 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 550 "parse-gram.y"
{ grammar_current_rule_dprec_set ((yyvsp[(3) - (3)].integer), (yylsp[(3) - (3)])); }
break;
- case 90:
+ case 92:
-/* Line 1285 of yacc.c */
-#line 529 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 552 "parse-gram.y"
{ grammar_current_rule_merge_set ((yyvsp[(3) - (3)].uniqstr), (yylsp[(3) - (3)])); }
break;
case 93:
-/* Line 1285 of yacc.c */
-#line 545 "parse-gram.y"
- {
- static char one[] = "1";
- (yyval.chars) = one;
- }
+/* Line 1494 of yacc.c */
+#line 556 "parse-gram.y"
+ { (yyval.named_ref) = 0; }
+ break;
+
+ case 94:
+
+/* Line 1494 of yacc.c */
+#line 558 "parse-gram.y"
+ { (yyval.named_ref) = named_ref_new((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
break;
- case 95:
+ case 96:
+
+/* Line 1494 of yacc.c */
+#line 570 "parse-gram.y"
+ { (yyval.uniqstr) = uniqstr_new ((yyvsp[(1) - (1)].chars)); }
+ break;
-/* Line 1285 of yacc.c */
-#line 555 "parse-gram.y"
+ case 97:
+
+/* Line 1494 of yacc.c */
+#line 575 "parse-gram.y"
+ { (yyval.chars) = ""; }
+ break;
+
+ case 98:
+
+/* Line 1494 of yacc.c */
+#line 576 "parse-gram.y"
+ { (yyval.chars) = (yyvsp[(1) - (1)].uniqstr); }
+ break;
+
+ case 100:
+
+/* Line 1494 of yacc.c */
+#line 587 "parse-gram.y"
{
code_props plain_code;
(yyvsp[(1) - (1)].code)[strlen ((yyvsp[(1) - (1)].code)) - 1] = '\n';
@@ -2554,17 +2642,17 @@ yyreduce:
}
break;
- case 96:
+ case 101:
-/* Line 1285 of yacc.c */
-#line 575 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 607 "parse-gram.y"
{ (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
break;
- case 97:
+ case 102:
-/* Line 1285 of yacc.c */
-#line 577 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 609 "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);
@@ -2572,27 +2660,27 @@ yyreduce:
}
break;
- case 98:
+ case 103:
-/* Line 1285 of yacc.c */
-#line 585 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 617 "parse-gram.y"
{ (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
break;
- case 101:
+ case 106:
-/* Line 1285 of yacc.c */
-#line 597 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 629 "parse-gram.y"
{
(yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[(1) - (1)].chars)), (yylsp[(1) - (1)]));
symbol_class_set ((yyval.symbol), token_sym, (yylsp[(1) - (1)]), false);
}
break;
- case 103:
+ case 108:
-/* Line 1285 of yacc.c */
-#line 606 "parse-gram.y"
+/* Line 1494 of yacc.c */
+#line 638 "parse-gram.y"
{
code_props plain_code;
code_props_plain_init (&plain_code, (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)]));
@@ -2605,10 +2693,21 @@ yyreduce:
-/* Line 1285 of yacc.c */
-#line 2610 "parse-gram.c"
+/* Line 1494 of yacc.c */
+#line 2698 "parse-gram.c"
default: break;
}
+ /* User semantic actions sometimes alter yychar, and that requires
+ that yytoken be updated with the new translation. We take the
+ approach of translating immediately before every use of yytoken.
+ One alternative is translating here after every semantic action,
+ but that translation would be missed if the semantic action invokes
+ YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
+ if it invokes YYBACKUP. In the case of YYABORT or YYACCEPT, an
+ incorrect destructor might then be invoked immediately. In the
+ case of YYERROR or YYBACKUP, subsequent parser actions might lead
+ to an incorrect destructor call or verbose syntax error message
+ before the lookahead is translated. */
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
YYPOPSTACK (yylen);
@@ -2637,6 +2736,10 @@ yyreduce:
| yyerrlab -- here on detecting error |
`------------------------------------*/
yyerrlab:
+ /* Make sure we have latest lookahead translation. See comments at
+ user semantic actions for why this is necessary. */
+ yytoken = YYTRANSLATE (yychar);
+
/* If not already recovering from an error, report this error. */
if (!yyerrstatus)
{
@@ -2644,37 +2747,28 @@ yyerrlab:
#if ! YYERROR_VERBOSE
yyerror (YY_("syntax error"));
#else
- {
- 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;
- }
- }
+ while (1)
+ {
+ int yysyntax_error_status =
+ yysyntax_error (&yymsg_alloc, &yymsg, yystate, yytoken);
+ if (yysyntax_error_status == 2 && 0 < yymsg_alloc)
+ {
+ if (yymsg != yymsgbuf)
+ YYSTACK_FREE (yymsg);
+ yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
+ if (yymsg)
+ continue;
+ yymsg = yymsgbuf;
+ yymsg_alloc = sizeof yymsgbuf;
+ }
+ if (yysyntax_error_status == 0)
+ yyerror (yymsg);
+ else
+ yyerror (YY_("syntax error"));
+ if (yysyntax_error_status == 2)
+ goto yyexhaustedlab;
+ break;
+ }
#endif
}
@@ -2734,7 +2828,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)
@@ -2786,7 +2880,7 @@ yyabortlab:
yyresult = 1;
goto yyreturn;
-#ifndef yyoverflow
+#if !defined(yyoverflow) || YYERROR_VERBOSE
/*-------------------------------------------------.
| yyexhaustedlab -- memory exhaustion comes here. |
`-------------------------------------------------*/
@@ -2798,8 +2892,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);
@@ -2824,8 +2923,8 @@ yyreturn:
-/* Line 1502 of yacc.c */
-#line 616 "parse-gram.y"
+/* Line 1725 of yacc.c */
+#line 648 "parse-gram.y"