X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/6afc30cc8763e690a1f9b8aa21fbc7b72244b5c6..4bb975e1ad59a39460fe6b16eec5c7830f904b6b:/src/parse-gram.c?ds=sidebyside
diff --git a/src/parse-gram.c b/src/parse-gram.c
index dc416ad8..d4ac32e6 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.124-faff. */
/* 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.124-faff"
/* 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 1535 of yacc.c */
+/* Line 190 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 "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 1535 of yacc.c */
-#line 162 "parse-gram.c"
+/* Line 190 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,
+ 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,
+ 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 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 PERCENT_UNION 312
@@ -309,8 +301,9 @@ static int current_prec = 0;
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
{
-/* Line 1535 of yacc.c */
-#line 97 "parse-gram.y"
+
+/* Line 215 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 1535 of yacc.c */
-#line 327 "parse-gram.c"
- YYSTYPE;
+
+/* Line 215 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 1535 of yacc.c */
-#line 352 "parse-gram.c"
+/* Line 265 of yacc.c */
+#line 347 "parse-gram.c"
#ifdef short
# undef short
@@ -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 185
+#define YYLAST 159
/* YYNTOKENS -- Number of terminals. */
-#define YYNTOKENS 59
+#define YYNTOKENS 58
/* YYNNTS -- Number of nonterminals. */
-#define YYNNTS 30
+#define YYNNTS 34
/* YYNRULES -- Number of rules. */
-#define YYNRULES 101
+#define YYNRULES 107
/* YYNRULES -- Number of states. */
-#define YYNSTATES 139
+#define YYNSTATES 147
/* 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,61 +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, 240, 242, 244, 246, 248, 250, 252, 254,
- 256, 257
+ 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, 273
};
/* YYRHS -- A `-1'-separated list of the rules' RHS. */
static const yytype_int8 yyrhs[] =
{
- 60, 0, -1, 61, 51, 76, 88, -1, -1, 61,
- 62, -1, 63, -1, 53, -1, 17, -1, 19, 3,
- 82, -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, 49, 77, 91, -1, -1, 60,
+ 61, -1, 62, -1, 51, -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,
+ 3, -1, 25, -1, 26, 43, -1, 27, 3, -1,
+ 28, 43, -1, 29, -1, 30, 3, -1, 30, 46,
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, 86, -1, 8, 45, 72, -1, 9, 45, 72,
- -1, 18, -1, 31, -1, 16, 83, -1, 16, 3,
- 83, -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, 86, -1, 71, 86,
- -1, 73, -1, 72, 73, -1, 86, -1, 55, -1,
- 56, -1, 57, -1, 55, -1, 84, -1, 84, 4,
- -1, 84, 87, -1, 84, 4, 87, -1, 74, -1,
- 75, 74, -1, 77, -1, 76, 77, -1, 78, -1,
- 63, 54, -1, 1, 54, -1, -1, 85, 79, 80,
- -1, 81, -1, 80, 52, 81, -1, 80, 54, -1,
- -1, 81, 86, -1, 81, 45, -1, 81, 13, 86,
- -1, 81, 14, 4, -1, 81, 15, 55, -1, -1,
- 3, -1, 45, -1, 49, -1, 46, -1, 50, -1,
- 84, -1, 87, -1, 3, -1, -1, 51, 47, -1
+ 46, 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,
+ 43, 73, -1, 9, 43, 73, -1, 18, -1, 31,
+ -1, 16, 86, -1, 16, 47, 86, -1, -1, 47,
+ -1, 57, 63, 86, -1, -1, 6, 65, 76, -1,
+ -1, 5, 66, 76, -1, 7, 53, 72, -1, 68,
+ 69, 70, -1, 10, -1, 11, -1, 12, -1, -1,
+ 53, -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,
+ 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,
+ 83, -1, 82, 43, 83, -1, 82, 13, 89, -1,
+ 82, 14, 4, -1, 82, 15, 53, -1, -1, 56,
+ -1, 47, -1, 3, -1, -1, 3, -1, 43, -1,
+ 47, -1, 44, -1, 48, -1, 87, -1, 90, -1,
+ 3, -1, -1, 49, 45, -1
};
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
static const yytype_uint16 yyrline[] =
{
- 0, 210, 210, 218, 220, 224, 225, 234, 235, 249,
- 250, 255, 256, 257, 258, 259, 260, 265, 274, 275,
- 276, 277, 278, 279, 280, 281, 282, 283, 284, 285,
- 286, 287, 288, 289, 290, 291, 292, 296, 297, 298,
- 302, 309, 316, 320, 324, 329, 352, 353, 357, 386,
- 386, 391, 391, 396, 407, 422, 423, 424, 428, 429,
- 434, 436, 441, 442, 446, 447, 448, 449, 454, 459,
- 464, 470, 476, 487, 488, 497, 498, 504, 505, 506,
- 513, 513, 517, 518, 519, 524, 525, 527, 529, 531,
- 533, 545, 549, 558, 578, 580, 589, 594, 595, 600,
- 607, 609
+ 0, 207, 207, 215, 217, 221, 222, 232, 233, 238,
+ 239, 244, 245, 246, 247, 248, 249, 254, 263, 264,
+ 265, 266, 267, 268, 269, 270, 271, 272, 273, 288,
+ 289, 313, 314, 315, 316, 320, 321, 322, 326, 333,
+ 340, 344, 348, 355, 370, 371, 375, 387, 387, 392,
+ 392, 397, 408, 423, 424, 425, 429, 430, 435, 437,
+ 442, 443, 448, 450, 455, 456, 460, 461, 462, 463,
+ 468, 473, 478, 484, 490, 501, 502, 511, 512, 518,
+ 519, 520, 527, 527, 532, 533, 534, 539, 541, 543,
+ 545, 547, 549, 554, 556, 567, 568, 573, 574, 583,
+ 603, 605, 614, 619, 620, 625, 632, 634
};
#endif
@@ -700,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\"",
+ "\"{...}\"", "\"char\"", "\"epilogue\"", "\"=\"", "\"identifier\"",
+ "\"identifier:\"", "\"%%\"", "\"|\"", "\"%{...%}\"", "\";\"", "\"type\"",
+ "\"<*>\"", "\"<>\"", "\"[identifier]\"", "\"%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.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
@@ -726,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, 84, 84, 85, 86, 86, 87,
- 88, 88
+ 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, 86,
+ 87, 87, 88, 89, 89, 90, 91, 91
};
/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
@@ -751,144 +748,148 @@ 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, 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, 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, 93, 44, 91, 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, 99, 0, 42, 96, 95, 97, 10,
12, 13, 14, 0, 17, 18, 19, 21, 0, 25,
- 0, 27, 31, 32, 99, 95, 94, 97, 39, 98,
- 0, 96, 0, 0, 75, 77, 80, 47, 0, 59,
- 0, 68, 73, 52, 69, 50, 53, 60, 65, 66,
- 67, 40, 62, 64, 41, 45, 92, 8, 15, 22,
- 26, 79, 78, 0, 76, 2, 85, 48, 54, 74,
- 70, 71, 61, 63, 101, 81, 82, 72, 85, 84,
- 0, 0, 0, 87, 86, 83, 88, 89, 90
+ 0, 27, 29, 30, 105, 101, 100, 103, 37, 104,
+ 0, 102, 0, 0, 77, 79, 93, 45, 0, 57,
+ 0, 70, 75, 50, 71, 48, 51, 62, 67, 68,
+ 69, 38, 64, 66, 39, 43, 98, 8, 15, 22,
+ 26, 81, 80, 0, 78, 2, 94, 82, 46, 52,
+ 58, 60, 76, 72, 73, 63, 65, 107, 87, 59,
+ 61, 74, 83, 84, 87, 86, 0, 0, 0, 93,
+ 93, 85, 90, 91, 92, 89, 88
};
/* YYDEFGOTO[NTERM-NUM]. */
-static const yytype_int8 yydefgoto[] =
+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,
- 116, 125, 126, 107, 57, 77, 86, 103, 79, 115
+ -1, 1, 2, 43, 82, 88, 45, 49, 48, 46,
+ 47, 90, 119, 120, 96, 101, 102, 92, 93, 83,
+ 84, 85, 128, 132, 133, 117, 58, 107, 55, 77,
+ 86, 103, 79, 115
};
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
-#define YYPACT_NINF -93
+#define YYPACT_NINF -60
static const yytype_int16 yypact[] =
{
- -93, 8, 94, -93, -93, -93, -41, -20, -6, -93,
- -93, -93, 4, -93, -93, 42, 54, -93, 56, 64,
- 2, -93, 28, 71, 34, -93, 3, -93, -93, -93,
- 6, 35, -93, -93, -93, 79, 81, -2, -93, -93,
- -93, 25, -93, -93, 36, -93, -93, -93, -93, 31,
- 9, 9, -2, 21, 21, 43, -93, -93, 84, -93,
- -93, -93, -93, 87, -93, -93, -93, -93, 88, -93,
- 89, -93, -93, -93, -93, -93, -93, -93, -93, -93,
- 40, -93, 41, 11, -93, -93, -93, -93, 51, -93,
- -2, -93, -93, 9, 68, 9, -2, -93, -93, -93,
- -93, 21, -93, -93, 21, -93, -93, -93, -93, -93,
- -93, -93, -93, 50, -93, -93, -93, -93, -2, -93,
- 104, -93, -93, -93, -93, -14, 136, -93, -93, -93,
- -2, 105, 53, -93, -93, 136, -93, -93, -93
+ -60, 4, 102, -60, -60, -60, 7, 10, 22, -60,
+ -60, -60, -6, -60, -60, 27, 40, -60, 65, 72,
+ 2, -60, 35, 79, 47, -60, 11, -60, -60, -60,
+ 25, 48, -60, 89, 90, 0, -60, -60, -60, 15,
+ -60, -60, 52, -60, -60, -60, -60, 41, -2, -2,
+ 0, 26, 26, -60, 59, -60, -60, -60, 92, -60,
+ -60, -60, -60, 100, -60, -60, -60, -60, 101, -60,
+ 112, -60, -60, -60, -60, -60, -60, -60, -60, -60,
+ 64, -60, 93, 1, -60, -60, 49, -60, 59, -60,
+ 0, -60, -60, -2, 83, -2, 0, -60, -60, -60,
+ -60, 26, -60, -60, 26, -60, -60, -60, -60, -60,
+ -60, -60, -60, 103, -60, -60, -60, -60, -60, 0,
+ -60, 113, -60, 143, -60, -60, -60, -60, -60, -60,
+ -60, -60, -16, 53, -60, -60, 0, 145, 94, 49,
+ 49, 53, -60, -60, -60, -60, -60
};
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int16 yypgoto[] =
{
- -93, -93, -93, -93, 138, -93, -93, -93, -93, -93,
- -93, -93, 52, 90, -91, -30, 92, -93, 58, -93,
- -93, -93, 18, -93, 98, -47, -93, -37, -92, -93
+ -60, -60, -60, -60, 148, -60, -60, -60, -60, -60,
+ -60, -60, -60, 33, -60, 104, -42, -18, 106, -60,
+ 74, -60, -60, -60, 24, -51, -60, -60, -36, -10,
+ -60, -35, -59, -60
};
/* 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 -101
+ number is the opposite. If YYTABLE_NINF, syntax error. */
+#define YYTABLE_NINF -107
static const yytype_int16 yytable[] =
{
- 78, 74, 121, 94, 94, 62, 67, 55, 3, 69,
- 123, -100, 80, 123, 52, 97, 4, 5, 6, 7,
- 8, 9, 10, 11, 74, 53, 80, 12, 127, 14,
- 4, 5, 6, 7, 8, 9, 10, 11, 128, 54,
- 129, 12, 27, 14, 75, 58, 94, 76, 94, 56,
- 63, 68, 37, 97, 70, 75, 27, 59, 76, 122,
- 60, 81, 113, 119, 91, 119, 37, 75, 61, 44,
- 76, 74, 120, 64, 65, 81, 98, 99, 100, 66,
- 71, 122, 72, 44, 73, 87, 89, 106, 56, 134,
- 108, 109, 110, 136, 111, 112, 117, 124, 134, 4,
- 5, 6, 7, 8, 9, 10, 11, 74, 138, 137,
- 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, 114, 118, 95, 104, 41, 135, 42, 43, 130,
- 131, 132, 44, 105, 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, 133, 75, 0, 0, 76
+ 78, -106, 80, 74, 3, 62, 4, 5, 6, 7,
+ 8, 9, 10, 11, 67, 97, 80, 12, 105, 14,
+ 4, 5, 6, 7, 8, 9, 10, 11, 69, 74,
+ 56, 12, 27, 14, 134, 124, 135, 53, 94, 94,
+ 35, 54, 75, 59, 75, 76, 27, 76, 63, 81,
+ 113, 91, 118, 51, 35, 121, 74, 68, 42, 126,
+ 50, 125, 126, 81, 131, 52, 136, 137, 138, 60,
+ 75, 70, 42, 76, 57, 122, 61, 122, 64, 98,
+ 99, 100, 65, 94, 121, 94, 74, 123, 145, 146,
+ 66, 71, 72, 73, 89, 106, 139, 75, 140, 87,
+ 76, 142, 53, 108, 109, 116, 140, 4, 5, 6,
+ 7, 8, 9, 10, 11, 110, 111, 130, 12, 13,
+ 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
+ 24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
+ 34, 35, 36, 37, 38, 112, 74, 144, 127, 143,
+ 44, 39, 129, 40, 41, 95, 104, 114, 141, 42
};
-static const yytype_int16 yycheck[] =
+#define yypact_value_is_default(yystate) \
+ ((yystate) == (-60))
+
+#define yytable_value_is_error(yytable_value) \
+ YYID (0)
+
+static const yytype_uint8 yycheck[] =
{
- 37, 3, 94, 50, 51, 3, 3, 3, 0, 3,
- 101, 0, 1, 104, 55, 52, 5, 6, 7, 8,
- 9, 10, 11, 12, 3, 45, 1, 16, 120, 18,
- 5, 6, 7, 8, 9, 10, 11, 12, 52, 45,
- 54, 16, 31, 18, 46, 3, 93, 49, 95, 45,
- 48, 48, 41, 90, 48, 46, 31, 3, 49, 96,
- 4, 50, 51, 93, 55, 95, 41, 46, 4, 58,
- 49, 3, 4, 45, 3, 50, 55, 56, 57, 45,
- 45, 118, 3, 58, 3, 49, 55, 3, 45, 126,
- 3, 3, 3, 130, 54, 54, 45, 47, 135, 5,
- 6, 7, 8, 9, 10, 11, 12, 3, 55, 4,
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
- 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
- 36, 37, 38, 39, 40, 41, 42, 43, 44, 3,
- 2, 83, 90, 51, 54, 51, 128, 53, 54, 13,
- 14, 15, 58, 55, -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, 3, 0, 3, 5, 6, 7, 8,
+ 9, 10, 11, 12, 3, 50, 1, 16, 54, 18,
+ 5, 6, 7, 8, 9, 10, 11, 12, 3, 3,
+ 3, 16, 31, 18, 50, 94, 52, 43, 48, 49,
+ 39, 47, 44, 3, 44, 47, 31, 47, 46, 48,
+ 49, 53, 88, 43, 39, 90, 3, 46, 57, 101,
+ 53, 96, 104, 48, 123, 43, 13, 14, 15, 4,
+ 44, 46, 57, 47, 47, 93, 4, 95, 43, 53,
+ 54, 55, 3, 93, 119, 95, 3, 4, 139, 140,
+ 43, 43, 3, 3, 53, 3, 43, 44, 133, 47,
+ 47, 136, 43, 3, 3, 56, 141, 5, 6, 7,
+ 8, 9, 10, 11, 12, 3, 52, 4, 16, 17,
+ 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
+ 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
+ 38, 39, 40, 41, 42, 52, 3, 53, 45, 4,
+ 2, 49, 119, 51, 52, 49, 52, 83, 134, 57
};
/* 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, 83, 3, 3,
- 4, 4, 3, 48, 45, 3, 45, 3, 48, 3,
- 48, 45, 3, 3, 3, 46, 49, 84, 86, 87,
- 1, 50, 63, 76, 77, 78, 85, 49, 64, 55,
- 70, 55, 74, 75, 84, 75, 71, 86, 55, 56,
- 57, 72, 73, 86, 72, 83, 3, 82, 3, 3,
- 3, 54, 54, 51, 77, 88, 79, 45, 71, 74,
- 4, 87, 86, 73, 47, 80, 81, 87, 52, 54,
- 13, 14, 15, 45, 86, 81, 86, 4, 55
+ 34, 35, 36, 37, 38, 39, 40, 41, 42, 49,
+ 51, 52, 57, 61, 62, 64, 67, 68, 66, 65,
+ 53, 43, 43, 43, 47, 86, 3, 47, 84, 3,
+ 4, 4, 3, 46, 43, 3, 43, 3, 46, 3,
+ 46, 43, 3, 3, 3, 44, 47, 87, 89, 90,
+ 1, 48, 62, 77, 78, 79, 88, 47, 63, 53,
+ 69, 53, 75, 76, 87, 76, 72, 89, 53, 54,
+ 55, 73, 74, 89, 73, 86, 3, 85, 3, 3,
+ 3, 52, 52, 49, 78, 91, 56, 83, 86, 70,
+ 71, 89, 75, 4, 90, 89, 74, 45, 80, 71,
+ 4, 90, 81, 82, 50, 52, 13, 14, 15, 43,
+ 89, 82, 89, 4, 53, 83, 83
};
#define yyerrok (yyerrstatus = 0)
@@ -1038,138 +1039,147 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
{
case 3: /* "\"string\"" */
-/* Line 1535 of yacc.c */
-#line 188 "parse-gram.y"
+/* Line 721 of yacc.c */
+#line 184 "parse-gram.y"
{ fputs (quotearg_style (c_quoting_style, (yyvaluep->chars)), stderr); };
-/* Line 1535 of yacc.c */
-#line 1047 "parse-gram.c"
+/* Line 721 of yacc.c */
+#line 1048 "parse-gram.c"
break;
case 4: /* "\"integer\"" */
-/* Line 1535 of yacc.c */
-#line 199 "parse-gram.y"
+/* Line 721 of yacc.c */
+#line 196 "parse-gram.y"
{ fprintf (stderr, "%d", (yyvaluep->integer)); };
-/* Line 1535 of yacc.c */
-#line 1056 "parse-gram.c"
+/* Line 721 of yacc.c */
+#line 1057 "parse-gram.c"
break;
- case 45: /* "\"{...}\"" */
+ case 43: /* "\"{...}\"" */
-/* Line 1535 of yacc.c */
-#line 190 "parse-gram.y"
+/* Line 721 of yacc.c */
+#line 186 "parse-gram.y"
{ fprintf (stderr, "{\n%s\n}", (yyvaluep->code)); };
-/* Line 1535 of yacc.c */
-#line 1065 "parse-gram.c"
+/* Line 721 of yacc.c */
+#line 1066 "parse-gram.c"
break;
- case 46: /* "\"char\"" */
+ case 44: /* "\"char\"" */
-/* Line 1535 of yacc.c */
-#line 182 "parse-gram.y"
+/* Line 721 of yacc.c */
+#line 178 "parse-gram.y"
{ fputs (char_name ((yyvaluep->character)), stderr); };
-/* Line 1535 of yacc.c */
-#line 1074 "parse-gram.c"
+/* Line 721 of yacc.c */
+#line 1075 "parse-gram.c"
break;
- case 47: /* "\"epilogue\"" */
+ case 45: /* "\"epilogue\"" */
-/* Line 1535 of yacc.c */
-#line 190 "parse-gram.y"
+/* Line 721 of yacc.c */
+#line 186 "parse-gram.y"
{ fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-/* Line 1535 of yacc.c */
-#line 1083 "parse-gram.c"
+/* Line 721 of yacc.c */
+#line 1084 "parse-gram.c"
break;
- case 49: /* "\"identifier\"" */
+ case 47: /* "\"identifier\"" */
-/* Line 1535 of yacc.c */
-#line 195 "parse-gram.y"
+/* Line 721 of yacc.c */
+#line 192 "parse-gram.y"
{ fputs ((yyvaluep->uniqstr), stderr); };
-/* Line 1535 of yacc.c */
-#line 1092 "parse-gram.c"
+/* Line 721 of yacc.c */
+#line 1093 "parse-gram.c"
break;
- case 50: /* "\"identifier:\"" */
+ case 48: /* "\"identifier:\"" */
-/* Line 1535 of yacc.c */
-#line 196 "parse-gram.y"
+/* Line 721 of yacc.c */
+#line 193 "parse-gram.y"
{ fprintf (stderr, "%s:", (yyvaluep->uniqstr)); };
-/* Line 1535 of yacc.c */
-#line 1101 "parse-gram.c"
+/* Line 721 of yacc.c */
+#line 1102 "parse-gram.c"
break;
- case 53: /* "\"%{...%}\"" */
+ case 51: /* "\"%{...%}\"" */
-/* Line 1535 of yacc.c */
-#line 190 "parse-gram.y"
+/* Line 721 of yacc.c */
+#line 186 "parse-gram.y"
{ fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-/* Line 1535 of yacc.c */
-#line 1110 "parse-gram.c"
+/* Line 721 of yacc.c */
+#line 1111 "parse-gram.c"
break;
- case 55: /* "\"type\"" */
+ case 53: /* "\"type\"" */
-/* Line 1535 of yacc.c */
-#line 194 "parse-gram.y"
+/* Line 721 of yacc.c */
+#line 191 "parse-gram.y"
{ fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); };
-/* Line 1535 of yacc.c */
-#line 1119 "parse-gram.c"
+/* Line 721 of yacc.c */
+#line 1120 "parse-gram.c"
break;
- case 82: /* "content.opt" */
+ case 84: /* "variable" */
+
+/* Line 721 of yacc.c */
+#line 192 "parse-gram.y"
+ { fputs ((yyvaluep->uniqstr), stderr); };
-/* Line 1535 of yacc.c */
-#line 190 "parse-gram.y"
+/* Line 721 of yacc.c */
+#line 1129 "parse-gram.c"
+ break;
+ case 85: /* "content.opt" */
+
+/* Line 721 of yacc.c */
+#line 186 "parse-gram.y"
{ fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-/* Line 1535 of yacc.c */
-#line 1128 "parse-gram.c"
+/* Line 721 of yacc.c */
+#line 1138 "parse-gram.c"
break;
- case 83: /* "braceless" */
+ case 86: /* "braceless" */
-/* Line 1535 of yacc.c */
-#line 190 "parse-gram.y"
+/* Line 721 of yacc.c */
+#line 186 "parse-gram.y"
{ fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-/* Line 1535 of yacc.c */
-#line 1137 "parse-gram.c"
+/* Line 721 of yacc.c */
+#line 1147 "parse-gram.c"
break;
- case 84: /* "id" */
+ case 87: /* "id" */
-/* Line 1535 of yacc.c */
-#line 202 "parse-gram.y"
+/* Line 721 of yacc.c */
+#line 199 "parse-gram.y"
{ fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
-/* Line 1535 of yacc.c */
-#line 1146 "parse-gram.c"
+/* Line 721 of yacc.c */
+#line 1156 "parse-gram.c"
break;
- case 85: /* "id_colon" */
+ case 88: /* "id_colon" */
-/* Line 1535 of yacc.c */
-#line 203 "parse-gram.y"
+/* Line 721 of yacc.c */
+#line 200 "parse-gram.y"
{ fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); };
-/* Line 1535 of yacc.c */
-#line 1155 "parse-gram.c"
+/* Line 721 of yacc.c */
+#line 1165 "parse-gram.c"
break;
- case 86: /* "symbol" */
+ case 89: /* "symbol" */
-/* Line 1535 of yacc.c */
-#line 202 "parse-gram.y"
+/* Line 721 of yacc.c */
+#line 199 "parse-gram.y"
{ fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
-/* Line 1535 of yacc.c */
-#line 1164 "parse-gram.c"
+/* Line 721 of yacc.c */
+#line 1174 "parse-gram.c"
break;
- case 87: /* "string_as_id" */
+ case 90: /* "string_as_id" */
-/* Line 1535 of yacc.c */
-#line 202 "parse-gram.y"
+/* Line 721 of yacc.c */
+#line 199 "parse-gram.y"
{ fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
-/* Line 1535 of yacc.c */
-#line 1173 "parse-gram.c"
+/* Line 721 of yacc.c */
+#line 1183 "parse-gram.c"
break;
default:
break;
@@ -1261,11 +1271,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");
}
}
@@ -1451,7 +1461,8 @@ yysyntax_error (char *yyresult, int yystate, int yychar)
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. */
@@ -1463,7 +1474,8 @@ yysyntax_error (char *yyresult, int yystate, int yychar)
yyfmt = yystpcpy (yyformat, yyunexpected);
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)
{
@@ -1547,10 +1559,8 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
break;
}
}
-
/* Prevent warnings from -Wmissing-prototypes. */
-
#ifdef YYPARSE_PARAM
#if defined __STDC__ || defined __cplusplus
int yyparse (void *YYPARSE_PARAM);
@@ -1569,10 +1579,9 @@ int yyparse ();
-
-/*----------.
-| yyparse. |
-`----------*/
+/*-------------------------.
+| yyparse or yypush_parse. |
+`-------------------------*/
#ifdef YYPARSE_PARAM
#if (defined __STDC__ || defined __C99__FUNC__ \
@@ -1596,95 +1605,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;
- /* Three stacks and their tools:
- `yyss': related to states,
- `yyvs': related to semantic values,
- `yyls': related to locations.
+ int yystate;
+ /* Number of tokens to shift before error messages enabled. */
+ int yyerrstatus;
- Refer to the stacks thru separate pointers, to allow yyoverflow
- to reallocate them elsewhere. */
+ /* The stacks and their tools:
+ `yyss': related to states.
+ `yyvs': related to semantic values.
+ `yyls': related to locations.
- /* The state stack. */
- yytype_int16 yyssa[YYINITDEPTH];
- yytype_int16 *yyss = yyssa;
- yytype_int16 *yyssp;
+ Refer to the stacks thru separate pointers, to allow yyoverflow
+ to reallocate them elsewhere. */
- /* The semantic value stack. */
- YYSTYPE yyvsa[YYINITDEPTH];
- YYSTYPE *yyvs = yyvsa;
- YYSTYPE *yyvsp;
+ /* The state stack. */
+ yytype_int16 yyssa[YYINITDEPTH];
+ yytype_int16 *yyss;
+ yytype_int16 *yyssp;
- /* The location stack. */
- YYLTYPE yylsa[YYINITDEPTH];
- YYLTYPE *yyls = yylsa;
- YYLTYPE *yylsp;
- /* The locations where the error started and ended. */
- YYLTYPE yyerror_range[2];
+ /* The semantic value stack. */
+ YYSTYPE yyvsa[YYINITDEPTH];
+ YYSTYPE *yyvs;
+ YYSTYPE *yyvsp;
-#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N), yylsp -= (N))
+ /* The location stack. */
+ YYLTYPE yylsa[YYINITDEPTH];
+ YYLTYPE *yyls;
+ YYLTYPE *yylsp;
+
+ /* The locations where the error started and ended. */
+ YYLTYPE yyerror_range[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
/* 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 1535 of yacc.c */
-#line 89 "parse-gram.y"
+/* Line 1250 of yacc.c */
+#line 86 "parse-gram.y"
{
/* Bison's grammar can initial empty locations, hence a default
location is needed. */
@@ -1692,9 +1709,10 @@ YYLTYPE yylloc;
boundary_set (&yylloc.end, current_file, 1, 1);
}
-/* Line 1535 of yacc.c */
-#line 1697 "parse-gram.c"
+/* Line 1250 of yacc.c */
+#line 1714 "parse-gram.c"
yylsp[0] = yylloc;
+
goto yysetstate;
/*------------------------------------------------------------.
@@ -1731,6 +1749,7 @@ YYLTYPE yylloc;
&yyvs1, yysize * sizeof (*yyvsp),
&yyls1, yysize * sizeof (*yylsp),
&yystacksize);
+
yyls = yyls1;
yyss = yyss1;
yyvs = yyvs1;
@@ -1752,9 +1771,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);
@@ -1790,7 +1809,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. */
@@ -1821,7 +1840,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;
@@ -1878,55 +1897,47 @@ yyreduce:
{
case 6:
-/* Line 1535 of yacc.c */
-#line 226 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 223 "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 1535 of yacc.c */
-#line 234 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 232 "parse-gram.y"
{ debug_flag = true; }
break;
case 8:
-/* Line 1535 of yacc.c */
-#line 236 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 234 "parse-gram.y"
{
- /* FIXME: Special characters in $2 may break %define.
- For example: `['. */
- char const name_prefix[] = "percent_define_";
- 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));
- if (muscle_find_const (name))
- warn_at ((yylsp[(2) - (3)]), _("%s `%s' redefined"), "%define variable", (yyvsp[(2) - (3)].chars));
- muscle_insert (uniqstr_new (name), (yyvsp[(3) - (3)].chars));
- free (name);
- muscle_grow_user_name_list ("user_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 1535 of yacc.c */
-#line 249 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 238 "parse-gram.y"
{ defines_flag = true; }
break;
case 10:
-/* Line 1535 of yacc.c */
-#line 251 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 240 "parse-gram.y"
{
defines_flag = true;
spec_defines_file = xstrdup ((yyvsp[(2) - (2)].chars));
@@ -1935,43 +1946,43 @@ yyreduce:
case 11:
-/* Line 1535 of yacc.c */
-#line 255 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 244 "parse-gram.y"
{ error_verbose = true; }
break;
case 12:
-/* Line 1535 of yacc.c */
-#line 256 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 245 "parse-gram.y"
{ expected_sr_conflicts = (yyvsp[(2) - (2)].integer); }
break;
case 13:
-/* Line 1535 of yacc.c */
-#line 257 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 246 "parse-gram.y"
{ expected_rr_conflicts = (yyvsp[(2) - (2)].integer); }
break;
case 14:
-/* Line 1535 of yacc.c */
-#line 258 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 247 "parse-gram.y"
{ spec_file_prefix = (yyvsp[(2) - (2)].chars); }
break;
case 15:
-/* Line 1535 of yacc.c */
-#line 259 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 248 "parse-gram.y"
{ spec_file_prefix = (yyvsp[(3) - (3)].chars); }
break;
case 16:
-/* Line 1535 of yacc.c */
-#line 261 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 250 "parse-gram.y"
{
nondeterministic_parser = true;
glr_parser = true;
@@ -1980,8 +1991,8 @@ yyreduce:
case 17:
-/* Line 1535 of yacc.c */
-#line 266 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 255 "parse-gram.y"
{
code_props action;
code_props_symbol_action_init (&action, (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)]));
@@ -1994,143 +2005,164 @@ yyreduce:
case 18:
-/* Line 1535 of yacc.c */
-#line 274 "parse-gram.y"
- { language_argmatch ((yyvsp[(2) - (2)].chars), 1, &(yylsp[(1) - (2)])); }
+/* Line 1463 of yacc.c */
+#line 263 "parse-gram.y"
+ { language_argmatch ((yyvsp[(2) - (2)].chars), grammar_prio, (yylsp[(1) - (2)])); }
break;
case 19:
-/* Line 1535 of yacc.c */
-#line 275 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 264 "parse-gram.y"
{ add_param ("lex_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
break;
case 20:
-/* Line 1535 of yacc.c */
-#line 276 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 265 "parse-gram.y"
{ locations_flag = true; }
break;
case 21:
-/* Line 1535 of yacc.c */
-#line 277 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 266 "parse-gram.y"
{ spec_name_prefix = (yyvsp[(2) - (2)].chars); }
break;
case 22:
-/* Line 1535 of yacc.c */
-#line 278 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 267 "parse-gram.y"
{ spec_name_prefix = (yyvsp[(3) - (3)].chars); }
break;
case 23:
-/* Line 1535 of yacc.c */
-#line 279 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 268 "parse-gram.y"
{ no_lines_flag = true; }
break;
case 24:
-/* Line 1535 of yacc.c */
-#line 280 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 269 "parse-gram.y"
{ nondeterministic_parser = true; }
break;
case 25:
-/* Line 1535 of yacc.c */
-#line 281 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 270 "parse-gram.y"
{ spec_outfile = (yyvsp[(2) - (2)].chars); }
break;
case 26:
-/* Line 1535 of yacc.c */
-#line 282 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 271 "parse-gram.y"
{ spec_outfile = (yyvsp[(3) - (3)].chars); }
break;
case 27:
-/* Line 1535 of yacc.c */
-#line 283 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 272 "parse-gram.y"
{ add_param ("parse_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
break;
case 28:
-/* Line 1535 of yacc.c */
-#line 284 "parse-gram.y"
- { pure_parser = true; }
+/* Line 1463 of yacc.c */
+#line 274 "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 1535 of yacc.c */
-#line 285 "parse-gram.y"
- { push_parser = true; pull_parser = false; }
+/* Line 1463 of yacc.c */
+#line 288 "parse-gram.y"
+ { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); }
break;
case 30:
-/* Line 1535 of yacc.c */
-#line 286 "parse-gram.y"
- { push_parser = true; pull_parser = true; }
+/* Line 1463 of yacc.c */
+#line 290 "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 1535 of yacc.c */
-#line 287 "parse-gram.y"
- { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); }
+/* Line 1463 of yacc.c */
+#line 313 "parse-gram.y"
+ { token_table_flag = true; }
break;
case 32:
-/* Line 1535 of yacc.c */
-#line 288 "parse-gram.y"
- { skeleton_arg ((yyvsp[(2) - (2)].chars), 1, &(yylsp[(1) - (2)])); }
+/* Line 1463 of yacc.c */
+#line 314 "parse-gram.y"
+ { report_flag |= report_states; }
break;
case 33:
-/* Line 1535 of yacc.c */
-#line 289 "parse-gram.y"
- { token_table_flag = true; }
- break;
-
- case 34:
-
-/* Line 1535 of yacc.c */
-#line 290 "parse-gram.y"
- { report_flag = report_states; }
- break;
-
- case 35:
-
-/* Line 1535 of yacc.c */
-#line 291 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 315 "parse-gram.y"
{ yacc_flag = true; }
break;
- case 39:
+ case 37:
-/* Line 1535 of yacc.c */
-#line 299 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 323 "parse-gram.y"
{
grammar_start_symbol_set ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]));
}
break;
- case 40:
+ case 38:
-/* Line 1535 of yacc.c */
-#line 303 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 327 "parse-gram.y"
{
symbol_list *list;
for (list = (yyvsp[(3) - (3)].list); list; list = list->next)
@@ -2139,10 +2171,10 @@ yyreduce:
}
break;
- case 41:
+ case 39:
-/* Line 1535 of yacc.c */
-#line 310 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 334 "parse-gram.y"
{
symbol_list *list;
for (list = (yyvsp[(3) - (3)].list); list; list = list->next)
@@ -2151,132 +2183,109 @@ yyreduce:
}
break;
- case 42:
+ case 40:
-/* Line 1535 of yacc.c */
-#line 317 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 341 "parse-gram.y"
{
default_prec = true;
}
break;
- case 43:
+ case 41:
-/* Line 1535 of yacc.c */
-#line 321 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 345 "parse-gram.y"
{
default_prec = false;
}
break;
- case 44:
+ case 42:
-/* Line 1535 of yacc.c */
-#line 325 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 349 "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 1535 of yacc.c */
-#line 330 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 356 "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_user_name_list ("user_percent_code_qualifiers", (yyvsp[(2) - (3)].chars), (yylsp[(2) - (3)]));
}
break;
- case 46:
+ case 44:
-/* Line 1535 of yacc.c */
-#line 352 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 370 "parse-gram.y"
{}
break;
- case 47:
+ case 45:
-/* Line 1535 of yacc.c */
-#line 353 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 371 "parse-gram.y"
{ muscle_code_grow ("union_name", (yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
break;
- case 48:
+ case 46:
-/* Line 1535 of yacc.c */
-#line 358 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 376 "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 1535 of yacc.c */
-#line 386 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 387 "parse-gram.y"
{ current_class = nterm_sym; }
break;
- case 50:
+ case 48:
-/* Line 1535 of yacc.c */
-#line 387 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 388 "parse-gram.y"
{
current_class = unknown_sym;
current_type = NULL;
}
break;
- case 51:
+ case 49:
-/* Line 1535 of yacc.c */
-#line 391 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 392 "parse-gram.y"
{ current_class = token_sym; }
break;
- case 52:
+ case 50:
-/* Line 1535 of yacc.c */
-#line 392 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 393 "parse-gram.y"
{
current_class = unknown_sym;
current_type = NULL;
}
break;
- case 53:
+ case 51:
-/* Line 1535 of yacc.c */
-#line 397 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 398 "parse-gram.y"
{
symbol_list *list;
tag_seen = true;
@@ -2286,10 +2295,10 @@ yyreduce:
}
break;
- case 54:
+ case 52:
-/* Line 1535 of yacc.c */
-#line 408 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 409 "parse-gram.y"
{
symbol_list *list;
++current_prec;
@@ -2303,121 +2312,149 @@ yyreduce:
}
break;
- case 55:
+ case 53:
-/* Line 1535 of yacc.c */
-#line 422 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 423 "parse-gram.y"
{ (yyval.assoc) = left_assoc; }
break;
- case 56:
+ case 54:
-/* Line 1535 of yacc.c */
-#line 423 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 424 "parse-gram.y"
{ (yyval.assoc) = right_assoc; }
break;
- case 57:
+ case 55:
-/* Line 1535 of yacc.c */
-#line 424 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 425 "parse-gram.y"
{ (yyval.assoc) = non_assoc; }
break;
- case 58:
+ case 56:
-/* Line 1535 of yacc.c */
-#line 428 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 429 "parse-gram.y"
{ current_type = NULL; }
break;
- case 59:
+ case 57:
-/* Line 1535 of yacc.c */
-#line 429 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 430 "parse-gram.y"
{ current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; }
break;
- case 60:
+ case 58:
-/* Line 1535 of yacc.c */
-#line 435 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 436 "parse-gram.y"
{ (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
break;
- case 61:
+ case 59:
-/* Line 1535 of yacc.c */
-#line 437 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 438 "parse-gram.y"
{ (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); }
break;
+ case 60:
+
+/* Line 1463 of yacc.c */
+#line 442 "parse-gram.y"
+ { (yyval.symbol) = (yyvsp[(1) - (1)].symbol); }
+ break;
+
+ case 61:
+
+/* Line 1463 of yacc.c */
+#line 443 "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 1535 of yacc.c */
-#line 441 "parse-gram.y"
- { (yyval.list) = (yyvsp[(1) - (1)].list); }
+/* Line 1463 of yacc.c */
+#line 449 "parse-gram.y"
+ { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
break;
case 63:
-/* Line 1535 of yacc.c */
-#line 442 "parse-gram.y"
- { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); }
+/* Line 1463 of yacc.c */
+#line 451 "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 1535 of yacc.c */
-#line 446 "parse-gram.y"
- { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
+/* Line 1463 of yacc.c */
+#line 455 "parse-gram.y"
+ { (yyval.list) = (yyvsp[(1) - (1)].list); }
break;
case 65:
-/* Line 1535 of yacc.c */
-#line 447 "parse-gram.y"
- { (yyval.list) = symbol_list_type_new ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
+/* Line 1463 of yacc.c */
+#line 456 "parse-gram.y"
+ { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); }
break;
case 66:
-/* Line 1535 of yacc.c */
-#line 448 "parse-gram.y"
- { (yyval.list) = symbol_list_default_tagged_new ((yylsp[(1) - (1)])); }
+/* Line 1463 of yacc.c */
+#line 460 "parse-gram.y"
+ { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
break;
case 67:
-/* Line 1535 of yacc.c */
-#line 449 "parse-gram.y"
- { (yyval.list) = symbol_list_default_tagless_new ((yylsp[(1) - (1)])); }
+/* Line 1463 of yacc.c */
+#line 461 "parse-gram.y"
+ { (yyval.list) = symbol_list_type_new ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
break;
case 68:
-/* Line 1535 of yacc.c */
-#line 455 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 462 "parse-gram.y"
+ { (yyval.list) = symbol_list_default_tagged_new ((yylsp[(1) - (1)])); }
+ break;
+
+ case 69:
+
+/* Line 1463 of yacc.c */
+#line 463 "parse-gram.y"
+ { (yyval.list) = symbol_list_default_tagless_new ((yylsp[(1) - (1)])); }
+ break;
+
+ case 70:
+
+/* Line 1463 of yacc.c */
+#line 469 "parse-gram.y"
{
current_type = (yyvsp[(1) - (1)].uniqstr);
tag_seen = true;
}
break;
- case 69:
+ case 71:
-/* Line 1535 of yacc.c */
-#line 460 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 474 "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 1535 of yacc.c */
-#line 465 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 479 "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)]));
@@ -2425,10 +2462,10 @@ yyreduce:
}
break;
- case 71:
+ case 73:
-/* Line 1535 of yacc.c */
-#line 471 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 485 "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)]));
@@ -2436,10 +2473,10 @@ yyreduce:
}
break;
- case 72:
+ case 74:
-/* Line 1535 of yacc.c */
-#line 477 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 491 "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)]));
@@ -2448,92 +2485,112 @@ yyreduce:
}
break;
- case 79:
+ case 81:
-/* Line 1535 of yacc.c */
-#line 507 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 521 "parse-gram.y"
{
yyerrok;
}
break;
- case 80:
+ case 82:
-/* Line 1535 of yacc.c */
-#line 513 "parse-gram.y"
- { current_lhs = (yyvsp[(1) - (1)].symbol); current_lhs_location = (yylsp[(1) - (1)]); }
+/* Line 1463 of yacc.c */
+#line 527 "parse-gram.y"
+ { current_lhs = (yyvsp[(1) - (2)].symbol); current_lhs_location = (yylsp[(1) - (2)]);
+ current_lhs_named_ref = (yyvsp[(2) - (2)].named_ref); }
break;
- case 82:
+ case 84:
-/* Line 1535 of yacc.c */
-#line 517 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 532 "parse-gram.y"
{ grammar_current_rule_end ((yylsp[(1) - (1)])); }
break;
- case 83:
+ case 85:
-/* Line 1535 of yacc.c */
-#line 518 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 533 "parse-gram.y"
{ grammar_current_rule_end ((yylsp[(3) - (3)])); }
break;
- case 85:
+ case 87:
-/* Line 1535 of yacc.c */
-#line 524 "parse-gram.y"
- { grammar_current_rule_begin (current_lhs, current_lhs_location); }
+/* Line 1463 of yacc.c */
+#line 539 "parse-gram.y"
+ { grammar_current_rule_begin (current_lhs, current_lhs_location,
+ current_lhs_named_ref); }
break;
- case 86:
+ case 88:
-/* Line 1535 of yacc.c */
-#line 526 "parse-gram.y"
- { grammar_current_rule_symbol_append ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); }
+/* Line 1463 of yacc.c */
+#line 542 "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 1535 of yacc.c */
-#line 528 "parse-gram.y"
- { grammar_current_rule_action_append ((yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
+/* Line 1463 of yacc.c */
+#line 544 "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 1535 of yacc.c */
-#line 530 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 546 "parse-gram.y"
{ grammar_current_rule_prec_set ((yyvsp[(3) - (3)].symbol), (yylsp[(3) - (3)])); }
break;
- case 89:
+ case 91:
-/* Line 1535 of yacc.c */
-#line 532 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 548 "parse-gram.y"
{ grammar_current_rule_dprec_set ((yyvsp[(3) - (3)].integer), (yylsp[(3) - (3)])); }
break;
- case 90:
+ case 92:
-/* Line 1535 of yacc.c */
-#line 534 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 550 "parse-gram.y"
{ grammar_current_rule_merge_set ((yyvsp[(3) - (3)].uniqstr), (yylsp[(3) - (3)])); }
break;
- case 91:
+ case 93:
-/* Line 1535 of yacc.c */
-#line 545 "parse-gram.y"
- {
- static char one[] = "1";
- (yyval.chars) = one;
- }
+/* Line 1463 of yacc.c */
+#line 554 "parse-gram.y"
+ { (yyval.named_ref) = 0; }
break;
- case 93:
+ case 94:
+
+/* Line 1463 of yacc.c */
+#line 556 "parse-gram.y"
+ { (yyval.named_ref) = named_ref_new((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
+ break;
+
+ case 96:
+
+/* Line 1463 of yacc.c */
+#line 568 "parse-gram.y"
+ { (yyval.uniqstr) = uniqstr_new ((yyvsp[(1) - (1)].chars)); }
+ break;
+
+ case 97:
+
+/* Line 1463 of yacc.c */
+#line 573 "parse-gram.y"
+ { (yyval.chars) = ""; }
+ break;
+
+ case 99:
-/* Line 1535 of yacc.c */
-#line 559 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 584 "parse-gram.y"
{
code_props plain_code;
(yyvsp[(1) - (1)].code)[strlen ((yyvsp[(1) - (1)].code)) - 1] = '\n';
@@ -2544,17 +2601,17 @@ yyreduce:
}
break;
- case 94:
+ case 100:
-/* Line 1535 of yacc.c */
-#line 579 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 604 "parse-gram.y"
{ (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
break;
- case 95:
+ case 101:
-/* Line 1535 of yacc.c */
-#line 581 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 606 "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);
@@ -2562,27 +2619,27 @@ yyreduce:
}
break;
- case 96:
+ case 102:
-/* Line 1535 of yacc.c */
-#line 589 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 614 "parse-gram.y"
{ (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
break;
- case 99:
+ case 105:
-/* Line 1535 of yacc.c */
-#line 601 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 626 "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 101:
+ case 107:
-/* Line 1535 of yacc.c */
-#line 610 "parse-gram.y"
+/* Line 1463 of yacc.c */
+#line 635 "parse-gram.y"
{
code_props plain_code;
code_props_plain_init (&plain_code, (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)]));
@@ -2595,8 +2652,8 @@ yyreduce:
-/* Line 1535 of yacc.c */
-#line 2600 "parse-gram.c"
+/* Line 1463 of yacc.c */
+#line 2657 "parse-gram.c"
default: break;
}
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -2724,7 +2781,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)
@@ -2776,7 +2833,7 @@ yyabortlab:
yyresult = 1;
goto yyreturn;
-#ifndef yyoverflow
+#if !defined(yyoverflow) || YYERROR_VERBOSE
/*-------------------------------------------------.
| yyexhaustedlab -- memory exhaustion comes here. |
`-------------------------------------------------*/
@@ -2814,8 +2871,8 @@ yyreturn:
-/* Line 1535 of yacc.c */
-#line 620 "parse-gram.y"
+/* Line 1683 of yacc.c */
+#line 645 "parse-gram.y"