X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/94ebeba53ffd20afbc5d0c9caa3c80c40e910e4c..d0ee410565c9d7bc876af42583ee092568f44fa8:/src/parse-gram.c?ds=sidebyside
diff --git a/src/parse-gram.c b/src/parse-gram.c
index acdfa120..41168732 100644
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -1,3 +1,4 @@
+
/* A Bison parser, made by GNU Bison 2.3a+. */
/* Skeleton implementation for Bison's Yacc-like parsers in C
@@ -5,10 +6,10 @@
Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
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
@@ -16,9 +17,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
@@ -55,9 +54,6 @@
/* Pure parsers. */
#define YYPURE 1
-/* Push parsers. */
-#define YYPUSH 0
-
/* Using locations. */
#define YYLSP_NEEDED 1
@@ -73,17 +69,18 @@
/* Copy the first part of user declarations. */
-/* Line 164 of yacc.c */
+/* Line 1542 of yacc.c */
#line 1 "parse-gram.y"
/* Bison Grammar Parser -*- C -*-
- Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 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,
@@ -92,10 +89,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 . */
#include
#include "system.h"
@@ -152,8 +146,8 @@ static int current_prec = 0;
#define YYTYPE_UINT8 uint_fast8_t
-/* Line 164 of yacc.c */
-#line 157 "parse-gram.c"
+/* Line 1542 of yacc.c */
+#line 151 "parse-gram.c"
/* Enabling traces. */
#ifndef YYDEBUG
@@ -195,50 +189,46 @@ static int current_prec = 0;
PERCENT_DPREC = 269,
PERCENT_MERGE = 270,
PERCENT_CODE = 271,
- PERCENT_CODE_TOP = 272,
- PERCENT_DEBUG = 273,
- PERCENT_DEFAULT_PREC = 274,
- PERCENT_DEFINE = 275,
- PERCENT_DEFINES = 276,
- PERCENT_ERROR_VERBOSE = 277,
- PERCENT_EXPECT = 278,
- PERCENT_EXPECT_RR = 279,
- PERCENT_FILE_PREFIX = 280,
- PERCENT_GLR_PARSER = 281,
- PERCENT_INITIAL_ACTION = 282,
- PERCENT_LANGUAGE = 283,
- PERCENT_LEX_PARAM = 284,
- PERCENT_LOCATIONS = 285,
- PERCENT_NAME_PREFIX = 286,
- PERCENT_NO_DEFAULT_PREC = 287,
- PERCENT_NO_LINES = 288,
- PERCENT_NONDETERMINISTIC_PARSER = 289,
- PERCENT_OUTPUT = 290,
- PERCENT_PARSE_PARAM = 291,
- PERCENT_PROVIDES = 292,
- PERCENT_PURE_PARSER = 293,
- PERCENT_PUSH_PARSER = 294,
- PERCENT_REQUIRE = 295,
- PERCENT_REQUIRES = 296,
- PERCENT_SKELETON = 297,
- PERCENT_START = 298,
- PERCENT_TOKEN_TABLE = 299,
- PERCENT_VERBOSE = 300,
- PERCENT_YACC = 301,
- BRACED_CODE = 302,
- CHAR = 303,
- EPILOGUE = 304,
- EQUAL = 305,
- ID = 306,
- ID_COLON = 307,
- PERCENT_PERCENT = 308,
- PIPE = 309,
- PROLOGUE = 310,
- SEMICOLON = 311,
- TYPE = 312,
- TYPE_TAG_ANY = 313,
- TYPE_TAG_NONE = 314,
- PERCENT_UNION = 315
+ PERCENT_DEBUG = 272,
+ PERCENT_DEFAULT_PREC = 273,
+ PERCENT_DEFINE = 274,
+ PERCENT_DEFINES = 275,
+ PERCENT_ERROR_VERBOSE = 276,
+ PERCENT_EXPECT = 277,
+ PERCENT_EXPECT_RR = 278,
+ PERCENT_FILE_PREFIX = 279,
+ PERCENT_GLR_PARSER = 280,
+ PERCENT_INITIAL_ACTION = 281,
+ PERCENT_LANGUAGE = 282,
+ PERCENT_LEX_PARAM = 283,
+ PERCENT_LOCATIONS = 284,
+ PERCENT_NAME_PREFIX = 285,
+ PERCENT_NO_DEFAULT_PREC = 286,
+ PERCENT_NO_LINES = 287,
+ PERCENT_NONDETERMINISTIC_PARSER = 288,
+ PERCENT_OUTPUT = 289,
+ PERCENT_PARSE_PARAM = 290,
+ PERCENT_PURE_PARSER = 291,
+ 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,
+ PERCENT_UNION = 311
};
#endif
/* Tokens. */
@@ -257,50 +247,46 @@ static int current_prec = 0;
#define PERCENT_DPREC 269
#define PERCENT_MERGE 270
#define PERCENT_CODE 271
-#define PERCENT_CODE_TOP 272
-#define PERCENT_DEBUG 273
-#define PERCENT_DEFAULT_PREC 274
-#define PERCENT_DEFINE 275
-#define PERCENT_DEFINES 276
-#define PERCENT_ERROR_VERBOSE 277
-#define PERCENT_EXPECT 278
-#define PERCENT_EXPECT_RR 279
-#define PERCENT_FILE_PREFIX 280
-#define PERCENT_GLR_PARSER 281
-#define PERCENT_INITIAL_ACTION 282
-#define PERCENT_LANGUAGE 283
-#define PERCENT_LEX_PARAM 284
-#define PERCENT_LOCATIONS 285
-#define PERCENT_NAME_PREFIX 286
-#define PERCENT_NO_DEFAULT_PREC 287
-#define PERCENT_NO_LINES 288
-#define PERCENT_NONDETERMINISTIC_PARSER 289
-#define PERCENT_OUTPUT 290
-#define PERCENT_PARSE_PARAM 291
-#define PERCENT_PROVIDES 292
-#define PERCENT_PURE_PARSER 293
-#define PERCENT_PUSH_PARSER 294
-#define PERCENT_REQUIRE 295
-#define PERCENT_REQUIRES 296
-#define PERCENT_SKELETON 297
-#define PERCENT_START 298
-#define PERCENT_TOKEN_TABLE 299
-#define PERCENT_VERBOSE 300
-#define PERCENT_YACC 301
-#define BRACED_CODE 302
-#define CHAR 303
-#define EPILOGUE 304
-#define EQUAL 305
-#define ID 306
-#define ID_COLON 307
-#define PERCENT_PERCENT 308
-#define PIPE 309
-#define PROLOGUE 310
-#define SEMICOLON 311
-#define TYPE 312
-#define TYPE_TAG_ANY 313
-#define TYPE_TAG_NONE 314
-#define PERCENT_UNION 315
+#define PERCENT_DEBUG 272
+#define PERCENT_DEFAULT_PREC 273
+#define PERCENT_DEFINE 274
+#define PERCENT_DEFINES 275
+#define PERCENT_ERROR_VERBOSE 276
+#define PERCENT_EXPECT 277
+#define PERCENT_EXPECT_RR 278
+#define PERCENT_FILE_PREFIX 279
+#define PERCENT_GLR_PARSER 280
+#define PERCENT_INITIAL_ACTION 281
+#define PERCENT_LANGUAGE 282
+#define PERCENT_LEX_PARAM 283
+#define PERCENT_LOCATIONS 284
+#define PERCENT_NAME_PREFIX 285
+#define PERCENT_NO_DEFAULT_PREC 286
+#define PERCENT_NO_LINES 287
+#define PERCENT_NONDETERMINISTIC_PARSER 288
+#define PERCENT_OUTPUT 289
+#define PERCENT_PARSE_PARAM 290
+#define PERCENT_PURE_PARSER 291
+#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 PERCENT_UNION 311
@@ -308,8 +294,9 @@ static int current_prec = 0;
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
{
-/* Line 198 of yacc.c */
-#line 97 "parse-gram.y"
+
+/* Line 1542 of yacc.c */
+#line 94 "parse-gram.y"
symbol *symbol;
symbol_list *list;
@@ -319,11 +306,12 @@ typedef union YYSTYPE
assoc assoc;
uniqstr uniqstr;
unsigned char character;
-}
-/* Line 198 of yacc.c */
-#line 326 "parse-gram.c"
- YYSTYPE;
+
+
+/* Line 1542 of yacc.c */
+#line 314 "parse-gram.c"
+} YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
@@ -346,8 +334,8 @@ typedef struct YYLTYPE
/* Copy the second part of user declarations. */
-/* Line 221 of yacc.c */
-#line 351 "parse-gram.c"
+/* Line 1542 of yacc.c */
+#line 339 "parse-gram.c"
#ifdef short
# undef short
@@ -564,20 +552,20 @@ union yyalloc
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 3
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 187
+#define YYLAST 155
/* YYNTOKENS -- Number of terminals. */
-#define YYNTOKENS 61
+#define YYNTOKENS 57
/* YYNNTS -- Number of nonterminals. */
#define YYNNTS 31
/* YYNRULES -- Number of rules. */
-#define YYNRULES 104
+#define YYNRULES 101
/* YYNRULES -- Number of states. */
-#define YYNSTATES 144
+#define YYNSTATES 139
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
#define YYUNDEFTOK 2
-#define YYMAXUTOK 315
+#define YYMAXUTOK 311
#define YYTRANSLATE(YYX) \
((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -616,7 +604,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, 59, 60
+ 55, 56
};
#if YYDEBUG
@@ -627,62 +615,61 @@ 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, 83, 86, 88, 90, 92, 94, 96, 98, 101,
- 105, 109, 111, 113, 116, 119, 122, 125, 126, 128,
- 132, 133, 137, 138, 142, 146, 150, 152, 154, 156,
- 157, 159, 161, 164, 166, 169, 171, 173, 175, 177,
- 179, 181, 184, 187, 191, 193, 196, 198, 201, 203,
- 206, 209, 210, 214, 216, 220, 223, 224, 227, 230,
- 234, 238, 242, 244, 246, 247, 249, 251, 253, 255,
- 257, 259, 261, 263, 264
+ 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, 166, 168, 170, 172, 174, 177,
+ 180, 184, 186, 189, 191, 194, 196, 199, 202, 203,
+ 207, 209, 213, 216, 217, 220, 223, 227, 231, 235,
+ 237, 239, 240, 242, 244, 246, 248, 250, 252, 254,
+ 256, 257
};
/* YYRHS -- A `-1'-separated list of the rules' RHS. */
static const yytype_int8 yyrhs[] =
{
- 62, 0, -1, 63, 53, 78, 91, -1, -1, 63,
- 64, -1, 65, -1, 55, -1, 18, -1, 20, 3,
- 85, -1, 21, -1, 21, 3, -1, 22, -1, 23,
- 4, -1, 24, 4, -1, 25, 3, -1, 25, 50,
- 3, -1, 26, -1, 27, 47, -1, 28, 3, -1,
- 29, 47, -1, 30, -1, 31, 3, -1, 31, 50,
- 3, -1, 33, -1, 34, -1, 35, 3, -1, 35,
- 50, 3, -1, 36, 47, -1, 38, -1, 39, -1,
- 40, 3, -1, 42, 3, -1, 44, -1, 45, -1,
- 46, -1, 56, -1, 70, -1, 67, -1, 43, 89,
- -1, 8, 47, 74, -1, 9, 47, 74, -1, 19,
- -1, 32, -1, 16, 86, -1, 17, 86, -1, 37,
- 86, -1, 41, 86, -1, -1, 51, -1, 60, 66,
- 47, -1, -1, 6, 68, 77, -1, -1, 5, 69,
- 77, -1, 7, 57, 73, -1, 71, 72, 73, -1,
- 10, -1, 11, -1, 12, -1, -1, 57, -1, 89,
- -1, 73, 89, -1, 75, -1, 74, 75, -1, 89,
- -1, 57, -1, 58, -1, 59, -1, 57, -1, 87,
- -1, 87, 4, -1, 87, 90, -1, 87, 4, 90,
- -1, 76, -1, 77, 76, -1, 79, -1, 78, 79,
- -1, 80, -1, 65, 56, -1, 1, 56, -1, -1,
- 88, 81, 82, -1, 83, -1, 82, 54, 83, -1,
- 82, 56, -1, -1, 83, 89, -1, 83, 47, -1,
- 83, 13, 89, -1, 83, 14, 4, -1, 83, 15,
- 57, -1, 3, -1, 86, -1, -1, 84, -1, 47,
- -1, 51, -1, 48, -1, 52, -1, 87, -1, 90,
- -1, 3, -1, -1, 53, 49, -1
+ 58, 0, -1, 59, 49, 74, 87, -1, -1, 59,
+ 60, -1, 61, -1, 51, -1, 17, -1, 19, 80,
+ 81, -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,
+ 46, 3, -1, 35, 43, -1, 36, -1, 37, 3,
+ -1, 38, 3, -1, 40, -1, 41, -1, 42, -1,
+ 52, -1, 66, -1, 63, -1, 39, 85, -1, 8,
+ 43, 70, -1, 9, 43, 70, -1, 18, -1, 31,
+ -1, 16, 82, -1, 16, 47, 82, -1, -1, 47,
+ -1, 56, 62, 82, -1, -1, 6, 64, 73, -1,
+ -1, 5, 65, 73, -1, 7, 53, 69, -1, 67,
+ 68, 69, -1, 10, -1, 11, -1, 12, -1, -1,
+ 53, -1, 85, -1, 69, 85, -1, 71, -1, 70,
+ 71, -1, 85, -1, 53, -1, 54, -1, 55, -1,
+ 53, -1, 83, -1, 83, 4, -1, 83, 86, -1,
+ 83, 4, 86, -1, 72, -1, 73, 72, -1, 75,
+ -1, 74, 75, -1, 76, -1, 61, 52, -1, 1,
+ 52, -1, -1, 84, 77, 78, -1, 79, -1, 78,
+ 50, 79, -1, 78, 52, -1, -1, 79, 85, -1,
+ 79, 43, -1, 79, 13, 85, -1, 79, 14, 4,
+ -1, 79, 15, 53, -1, 47, -1, 3, -1, -1,
+ 3, -1, 43, -1, 47, -1, 44, -1, 48, -1,
+ 83, -1, 86, -1, 3, -1, -1, 49, 45, -1
};
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
static const yytype_uint16 yyrline[] =
{
- 0, 211, 211, 219, 221, 225, 226, 227, 228, 229,
- 230, 235, 236, 237, 238, 239, 240, 245, 249, 250,
- 251, 252, 253, 254, 255, 256, 257, 258, 259, 260,
- 261, 262, 263, 264, 265, 266, 270, 271, 272, 276,
- 284, 292, 296, 300, 301, 302, 303, 314, 315, 319,
- 347, 347, 352, 352, 357, 368, 383, 384, 385, 389,
- 390, 395, 397, 402, 403, 407, 408, 409, 410, 415,
- 420, 425, 431, 437, 448, 449, 458, 459, 465, 466,
- 467, 474, 474, 478, 479, 480, 485, 486, 488, 490,
- 492, 494, 504, 505, 511, 515, 520, 536, 538, 547,
- 552, 553, 558, 565, 567
+ 0, 204, 204, 212, 214, 218, 219, 229, 230, 234,
+ 235, 240, 241, 242, 243, 244, 245, 250, 259, 260,
+ 261, 262, 263, 264, 265, 266, 267, 268, 269, 282,
+ 283, 307, 308, 309, 310, 314, 315, 316, 320, 327,
+ 334, 338, 342, 349, 364, 365, 369, 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, 548, 557, 577, 579, 588, 593, 594, 599,
+ 606, 608
};
#endif
@@ -694,14 +681,13 @@ static const char *const yytname[] =
"\"end of file\"", "error", "$undefined", "\"string\"", "\"integer\"",
"\"%token\"", "\"%nterm\"", "\"%type\"", "\"%destructor\"",
"\"%printer\"", "\"%left\"", "\"%right\"", "\"%nonassoc\"", "\"%prec\"",
- "\"%dprec\"", "\"%merge\"", "\"%code\"", "\"%code-top\"", "\"%debug\"",
+ "\"%dprec\"", "\"%merge\"", "\"%code\"", "\"%debug\"",
"\"%default-prec\"", "\"%define\"", "\"%defines\"", "\"%error-verbose\"",
"\"%expect\"", "\"%expect-rr\"", "\"%file-prefix\"", "\"%glr-parser\"",
"\"%initial-action\"", "\"%language\"", "\"%lex-param\"",
"\"%locations\"", "\"%name-prefix\"", "\"%no-default-prec\"",
"\"%no-lines\"", "\"%nondeterministic-parser\"", "\"%output\"",
- "\"%parse-param\"", "\"%provides\"", "\"%pure-parser\"",
- "\"%push-parser\"", "\"%require\"", "\"%requires\"", "\"%skeleton\"",
+ "\"%parse-param\"", "\"%pure-parser\"", "\"%require\"", "\"%skeleton\"",
"\"%start\"", "\"%token-table\"", "\"%verbose\"", "\"%yacc\"",
"\"{...}\"", "\"char\"", "\"epilogue\"", "\"=\"", "\"identifier\"",
"\"identifier:\"", "\"%%\"", "\"|\"", "\"%{...%}\"", "\";\"", "\"type\"",
@@ -711,7 +697,7 @@ static const char *const yytname[] =
"precedence_declaration", "precedence_declarator", "type.opt",
"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",
+ "$@3", "rhses.1", "rhs", "variable", "content.opt", "braceless", "id",
"id_colon", "symbol", "string_as_id", "epilogue.opt", 0
};
#endif
@@ -726,25 +712,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, 314,
- 315
+ 305, 306, 307, 308, 309, 310, 311
};
# endif
/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
static const yytype_uint8 yyr1[] =
{
- 0, 61, 62, 63, 63, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 65, 65, 65, 65,
- 65, 65, 65, 65, 65, 65, 65, 66, 66, 65,
- 68, 67, 69, 67, 67, 70, 71, 71, 71, 72,
- 72, 73, 73, 74, 74, 75, 75, 75, 75, 76,
- 76, 76, 76, 76, 77, 77, 78, 78, 79, 79,
- 79, 81, 80, 82, 82, 82, 83, 83, 83, 83,
- 83, 83, 84, 84, 85, 85, 86, 87, 87, 88,
- 89, 89, 90, 91, 91
+ 0, 57, 58, 59, 59, 60, 60, 60, 60, 60,
+ 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
+ 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
+ 60, 60, 60, 60, 60, 61, 61, 61, 61, 61,
+ 61, 61, 61, 61, 62, 62, 61, 64, 63, 65,
+ 63, 63, 66, 67, 67, 67, 68, 68, 69, 69,
+ 70, 70, 71, 71, 71, 71, 72, 72, 72, 72,
+ 72, 73, 73, 74, 74, 75, 75, 75, 77, 76,
+ 78, 78, 78, 79, 79, 79, 79, 79, 79, 80,
+ 80, 81, 81, 82, 83, 83, 84, 85, 85, 86,
+ 87, 87
};
/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
@@ -752,15 +737,15 @@ 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,
- 2, 2, 1, 1, 1, 1, 1, 1, 2, 3,
- 3, 1, 1, 2, 2, 2, 2, 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, 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
};
/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -768,133 +753,124 @@ static const yytype_uint8 yyr2[] =
means the default is an error. */
static const yytype_uint8 yydefact[] =
{
- 3, 0, 0, 1, 52, 50, 0, 0, 0, 56,
- 57, 58, 0, 0, 7, 41, 0, 9, 11, 0,
- 0, 0, 16, 0, 0, 0, 20, 0, 42, 23,
- 24, 0, 0, 0, 28, 29, 0, 0, 0, 0,
- 32, 33, 34, 0, 6, 35, 47, 4, 5, 37,
- 36, 59, 0, 0, 0, 0, 0, 96, 43, 44,
- 94, 10, 12, 13, 14, 0, 17, 18, 19, 21,
- 0, 25, 0, 27, 45, 30, 46, 31, 102, 98,
- 97, 100, 38, 101, 0, 99, 0, 0, 76, 78,
- 81, 48, 0, 60, 0, 69, 74, 53, 70, 51,
- 54, 61, 66, 67, 68, 39, 63, 65, 40, 92,
- 95, 8, 93, 15, 22, 26, 80, 79, 0, 77,
- 2, 86, 49, 55, 75, 71, 72, 62, 64, 104,
- 82, 83, 73, 86, 85, 0, 0, 0, 88, 87,
- 84, 89, 90, 91
+ 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, 93, 0, 42, 90, 89, 91, 10,
+ 12, 13, 14, 0, 17, 18, 19, 21, 0, 25,
+ 0, 27, 29, 30, 99, 95, 94, 97, 37, 98,
+ 0, 96, 0, 0, 73, 75, 78, 45, 0, 57,
+ 0, 66, 71, 50, 67, 48, 51, 58, 63, 64,
+ 65, 38, 60, 62, 39, 43, 92, 8, 15, 22,
+ 26, 77, 76, 0, 74, 2, 83, 46, 52, 72,
+ 68, 69, 59, 61, 101, 79, 80, 70, 83, 82,
+ 0, 0, 0, 85, 84, 81, 86, 87, 88
};
/* YYDEFGOTO[NTERM-NUM]. */
-static const yytype_int16 yydefgoto[] =
+static const yytype_int8 yydefgoto[] =
{
- -1, 1, 2, 47, 86, 92, 49, 53, 52, 50,
- 51, 94, 100, 105, 106, 96, 97, 87, 88, 89,
- 121, 130, 131, 110, 111, 58, 81, 90, 107, 83,
- 120
+ -1, 1, 2, 43, 82, 88, 45, 49, 48, 46,
+ 47, 90, 96, 101, 102, 92, 93, 83, 84, 85,
+ 116, 125, 126, 58, 107, 55, 77, 86, 103, 79,
+ 115
};
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
-#define YYPACT_NINF -95
-static const yytype_int8 yypact[] =
+#define YYPACT_NINF -60
+static const yytype_int16 yypact[] =
{
- -95, 3, 127, -95, -95, -95, -24, -7, -6, -95,
- -95, -95, -3, -3, -95, -95, 42, 56, -95, 70,
- 87, 10, -95, 28, 90, 47, -95, 35, -95, -95,
- -95, 36, 48, -3, -95, -95, 94, -3, 95, -2,
- -95, -95, -95, 71, -95, -95, 49, -95, -95, -95,
- -95, 45, -43, -43, -2, -1, -1, -95, -95, -95,
- 21, -95, -95, -95, -95, 96, -95, -95, -95, -95,
- 101, -95, 102, -95, -95, -95, -95, -95, -95, -95,
- -95, -95, -95, -95, 50, -95, 51, 11, -95, -95,
- -95, -95, 62, -95, -2, -95, -95, -43, 6, -43,
- -2, -95, -95, -95, -95, -1, -95, -95, -1, -95,
- -95, -95, -95, -95, -95, -95, -95, -95, 61, -95,
- -95, -95, -95, -2, -95, 108, -95, -95, -95, -95,
- -22, 22, -95, -95, -95, -2, 109, 58, -95, -95,
- 22, -95, -95, -95
+ -60, 18, 96, -60, -60, -60, -16, 17, 24, -60,
+ -60, -60, -8, -60, -60, 11, 70, -60, 71, 80,
+ 2, -60, 46, 87, 49, -60, 31, -60, -60, -60,
+ 40, 50, -60, 91, 93, 0, -60, -60, -60, 15,
+ -60, -60, 51, -60, -60, -60, -60, 44, 12, 12,
+ 0, 25, 25, -60, 56, -60, -60, -60, 106, -60,
+ -60, -60, -60, 107, -60, -60, -60, -60, 108, -60,
+ 136, -60, -60, -60, -60, -60, -60, -60, -60, -60,
+ 88, -60, 89, 1, -60, -60, -60, -60, 56, -60,
+ 0, -60, -60, 12, 84, 12, 0, -60, -60, -60,
+ -60, 25, -60, -60, 25, -60, -60, -60, -60, -60,
+ -60, -60, -60, 97, -60, -60, -60, -60, 0, -60,
+ 140, -60, -60, -60, -60, 14, 38, -60, -60, -60,
+ 0, 142, 98, -60, -60, 38, -60, -60, -60
};
/* YYPGOTO[NTERM-NUM]. */
-static const yytype_int8 yypgoto[] =
+static const yytype_int16 yypgoto[] =
{
- -95, -95, -95, -95, 114, -95, -95, -95, -95, -95,
- -95, -95, 23, 63, -79, -32, 65, -95, 33, -95,
- -95, -95, -12, -95, -95, 29, -46, -95, -39, -94,
- -95
+ -60, -60, -60, -60, 147, -60, -60, -60, -60, -60,
+ -60, -60, 54, 101, -59, -25, 105, -60, 67, -60,
+ -60, -60, 27, -60, -60, -50, -19, -60, -35, -58,
+ -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 -104
+#define YYTABLE_NINF -101
static const yytype_int16 yytable[] =
{
- 82, 78, 78, 3, 126, 79, 98, 98, 80, 78,
- 125, -103, 84, 64, 95, 101, 4, 5, 6, 7,
- 8, 9, 10, 11, 109, 78, 128, 12, 13, 128,
- 15, 132, 133, 54, 134, 135, 136, 137, 69, 71,
- 55, 56, 59, 28, 57, 60, 79, 79, 33, 80,
- 80, 98, 37, 98, 39, 101, 102, 103, 104, 61,
- 65, 127, 74, 85, 118, 124, 76, 124, 57, 138,
- 79, 46, 84, 80, 62, 66, 4, 5, 6, 7,
- 8, 9, 10, 11, 127, 70, 72, 12, 13, 112,
- 15, 63, 139, 67, 68, 73, 141, 75, 77, 113,
- 91, 139, 93, 28, 114, 115, 116, 117, 33, 122,
- 129, 78, 37, 142, 39, 143, 48, 123, 99, 108,
- 119, 140, 0, 85, 0, 0, 0, 0, 0, 0,
- 0, 46, 4, 5, 6, 7, 8, 9, 10, 11,
- 0, 0, 0, 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, 41, 42, 0, 0, 0, 0, 0, 0,
- 43, 0, 44, 45, 0, 0, 0, 46
+ 78, -100, 80, 74, 105, 62, 4, 5, 6, 7,
+ 8, 9, 10, 11, 56, 97, 80, 12, 3, 14,
+ 4, 5, 6, 7, 8, 9, 10, 11, 74, 94,
+ 94, 12, 27, 14, 67, 53, 121, 50, 117, 54,
+ 35, 74, 123, 69, 75, 123, 27, 76, 63, 81,
+ 113, 130, 131, 132, 35, 97, 75, 42, 57, 76,
+ 51, 122, 127, 81, 128, 91, 129, 52, 119, 75,
+ 119, 42, 76, 59, 94, 60, 94, 68, 98, 99,
+ 100, 133, 75, 122, 61, 76, 70, 74, 120, 64,
+ 65, 134, 66, 71, 72, 136, 73, 89, 87, 53,
+ 134, 4, 5, 6, 7, 8, 9, 10, 11, 106,
+ 108, 109, 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, 110,
+ 111, 112, 124, 74, 118, 39, 137, 40, 41, 44,
+ 114, 138, 42, 104, 95, 135
};
-static const yytype_int16 yycheck[] =
+static const yytype_uint8 yycheck[] =
{
- 39, 3, 3, 0, 98, 48, 52, 53, 51, 3,
- 4, 0, 1, 3, 57, 54, 5, 6, 7, 8,
- 9, 10, 11, 12, 3, 3, 105, 16, 17, 108,
- 19, 125, 54, 57, 56, 13, 14, 15, 3, 3,
- 47, 47, 13, 32, 47, 3, 48, 48, 37, 51,
- 51, 97, 41, 99, 43, 94, 57, 58, 59, 3,
- 50, 100, 33, 52, 53, 97, 37, 99, 47, 47,
- 48, 60, 1, 51, 4, 47, 5, 6, 7, 8,
- 9, 10, 11, 12, 123, 50, 50, 16, 17, 60,
- 19, 4, 131, 3, 47, 47, 135, 3, 3, 3,
- 51, 140, 57, 32, 3, 3, 56, 56, 37, 47,
- 49, 3, 41, 4, 43, 57, 2, 94, 53, 56,
- 87, 133, -1, 52, -1, -1, -1, -1, -1, -1,
- -1, 60, 5, 6, 7, 8, 9, 10, 11, 12,
- -1, -1, -1, 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, 45, 46, -1, -1, -1, -1, -1, -1,
- 53, -1, 55, 56, -1, -1, -1, 60
+ 35, 0, 1, 3, 54, 3, 5, 6, 7, 8,
+ 9, 10, 11, 12, 3, 50, 1, 16, 0, 18,
+ 5, 6, 7, 8, 9, 10, 11, 12, 3, 48,
+ 49, 16, 31, 18, 3, 43, 94, 53, 88, 47,
+ 39, 3, 101, 3, 44, 104, 31, 47, 46, 48,
+ 49, 13, 14, 15, 39, 90, 44, 56, 47, 47,
+ 43, 96, 120, 48, 50, 53, 52, 43, 93, 44,
+ 95, 56, 47, 3, 93, 4, 95, 46, 53, 54,
+ 55, 43, 44, 118, 4, 47, 46, 3, 4, 43,
+ 3, 126, 43, 43, 3, 130, 3, 53, 47, 43,
+ 135, 5, 6, 7, 8, 9, 10, 11, 12, 3,
+ 3, 3, 16, 17, 18, 19, 20, 21, 22, 23,
+ 24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
+ 34, 35, 36, 37, 38, 39, 40, 41, 42, 3,
+ 52, 52, 45, 3, 90, 49, 4, 51, 52, 2,
+ 83, 53, 56, 52, 49, 128
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
symbol of state STATE-NUM. */
static const yytype_uint8 yystos[] =
{
- 0, 62, 63, 0, 5, 6, 7, 8, 9, 10,
+ 0, 58, 59, 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, 45, 46, 53, 55, 56, 60, 64, 65, 67,
- 70, 71, 69, 68, 57, 47, 47, 47, 86, 86,
- 3, 3, 4, 4, 3, 50, 47, 3, 47, 3,
- 50, 3, 50, 47, 86, 3, 86, 3, 3, 48,
- 51, 87, 89, 90, 1, 52, 65, 78, 79, 80,
- 88, 51, 66, 57, 72, 57, 76, 77, 87, 77,
- 73, 89, 57, 58, 59, 74, 75, 89, 74, 3,
- 84, 85, 86, 3, 3, 3, 56, 56, 53, 79,
- 91, 81, 47, 73, 76, 4, 90, 89, 75, 49,
- 82, 83, 90, 54, 56, 13, 14, 15, 47, 89,
- 83, 89, 4, 57
+ 34, 35, 36, 37, 38, 39, 40, 41, 42, 49,
+ 51, 52, 56, 60, 61, 63, 66, 67, 65, 64,
+ 53, 43, 43, 43, 47, 82, 3, 47, 80, 3,
+ 4, 4, 3, 46, 43, 3, 43, 3, 46, 3,
+ 46, 43, 3, 3, 3, 44, 47, 83, 85, 86,
+ 1, 48, 61, 74, 75, 76, 84, 47, 62, 53,
+ 68, 53, 72, 73, 83, 73, 69, 85, 53, 54,
+ 55, 70, 71, 85, 70, 82, 3, 81, 3, 3,
+ 3, 52, 52, 49, 75, 87, 77, 82, 69, 72,
+ 4, 86, 85, 71, 45, 78, 79, 86, 50, 52,
+ 13, 14, 15, 43, 85, 79, 85, 4, 53
};
#define yyerrok (yyerrstatus = 0)
@@ -1044,147 +1020,147 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
{
case 3: /* "\"string\"" */
-/* Line 670 of yacc.c */
-#line 189 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 182 "parse-gram.y"
{ fputs (quotearg_style (c_quoting_style, (yyvaluep->chars)), stderr); };
-/* Line 670 of yacc.c */
-#line 1053 "parse-gram.c"
+/* Line 1542 of yacc.c */
+#line 1029 "parse-gram.c"
break;
case 4: /* "\"integer\"" */
-/* Line 670 of yacc.c */
-#line 200 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 193 "parse-gram.y"
{ fprintf (stderr, "%d", (yyvaluep->integer)); };
-/* Line 670 of yacc.c */
-#line 1062 "parse-gram.c"
+/* Line 1542 of yacc.c */
+#line 1038 "parse-gram.c"
break;
- case 47: /* "\"{...}\"" */
+ case 43: /* "\"{...}\"" */
-/* Line 670 of yacc.c */
-#line 191 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 184 "parse-gram.y"
{ fprintf (stderr, "{\n%s\n}", (yyvaluep->code)); };
-/* Line 670 of yacc.c */
-#line 1071 "parse-gram.c"
+/* Line 1542 of yacc.c */
+#line 1047 "parse-gram.c"
break;
- case 48: /* "\"char\"" */
+ case 44: /* "\"char\"" */
-/* Line 670 of yacc.c */
-#line 183 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 176 "parse-gram.y"
{ fputs (char_name ((yyvaluep->character)), stderr); };
-/* Line 670 of yacc.c */
-#line 1080 "parse-gram.c"
+/* Line 1542 of yacc.c */
+#line 1056 "parse-gram.c"
break;
- case 49: /* "\"epilogue\"" */
+ case 45: /* "\"epilogue\"" */
-/* Line 670 of yacc.c */
-#line 191 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 184 "parse-gram.y"
{ fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-/* Line 670 of yacc.c */
-#line 1089 "parse-gram.c"
+/* Line 1542 of yacc.c */
+#line 1065 "parse-gram.c"
break;
- case 51: /* "\"identifier\"" */
+ case 47: /* "\"identifier\"" */
-/* Line 670 of yacc.c */
-#line 196 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 189 "parse-gram.y"
{ fputs ((yyvaluep->uniqstr), stderr); };
-/* Line 670 of yacc.c */
-#line 1098 "parse-gram.c"
+/* Line 1542 of yacc.c */
+#line 1074 "parse-gram.c"
break;
- case 52: /* "\"identifier:\"" */
+ case 48: /* "\"identifier:\"" */
-/* Line 670 of yacc.c */
-#line 197 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 190 "parse-gram.y"
{ fprintf (stderr, "%s:", (yyvaluep->uniqstr)); };
-/* Line 670 of yacc.c */
-#line 1107 "parse-gram.c"
+/* Line 1542 of yacc.c */
+#line 1083 "parse-gram.c"
break;
- case 55: /* "\"%{...%}\"" */
+ case 51: /* "\"%{...%}\"" */
-/* Line 670 of yacc.c */
-#line 191 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 184 "parse-gram.y"
{ fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-/* Line 670 of yacc.c */
-#line 1116 "parse-gram.c"
+/* Line 1542 of yacc.c */
+#line 1092 "parse-gram.c"
break;
- case 57: /* "\"type\"" */
+ case 53: /* "\"type\"" */
-/* Line 670 of yacc.c */
-#line 195 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 188 "parse-gram.y"
{ fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); };
-/* Line 670 of yacc.c */
-#line 1125 "parse-gram.c"
+/* Line 1542 of yacc.c */
+#line 1101 "parse-gram.c"
break;
- case 84: /* "content" */
+ case 80: /* "variable" */
-/* Line 670 of yacc.c */
-#line 191 "parse-gram.y"
- { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
+/* Line 1542 of yacc.c */
+#line 189 "parse-gram.y"
+ { fputs ((yyvaluep->uniqstr), stderr); };
-/* Line 670 of yacc.c */
-#line 1134 "parse-gram.c"
+/* Line 1542 of yacc.c */
+#line 1110 "parse-gram.c"
break;
- case 85: /* "content.opt" */
+ case 81: /* "content.opt" */
-/* Line 670 of yacc.c */
-#line 191 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 184 "parse-gram.y"
{ fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-/* Line 670 of yacc.c */
-#line 1143 "parse-gram.c"
+/* Line 1542 of yacc.c */
+#line 1119 "parse-gram.c"
break;
- case 86: /* "braceless" */
+ case 82: /* "braceless" */
-/* Line 670 of yacc.c */
-#line 191 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 184 "parse-gram.y"
{ fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-/* Line 670 of yacc.c */
-#line 1152 "parse-gram.c"
+/* Line 1542 of yacc.c */
+#line 1128 "parse-gram.c"
break;
- case 87: /* "id" */
+ case 83: /* "id" */
-/* Line 670 of yacc.c */
-#line 203 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 196 "parse-gram.y"
{ fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
-/* Line 670 of yacc.c */
-#line 1161 "parse-gram.c"
+/* Line 1542 of yacc.c */
+#line 1137 "parse-gram.c"
break;
- case 88: /* "id_colon" */
+ case 84: /* "id_colon" */
-/* Line 670 of yacc.c */
-#line 204 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 197 "parse-gram.y"
{ fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); };
-/* Line 670 of yacc.c */
-#line 1170 "parse-gram.c"
+/* Line 1542 of yacc.c */
+#line 1146 "parse-gram.c"
break;
- case 89: /* "symbol" */
+ case 85: /* "symbol" */
-/* Line 670 of yacc.c */
-#line 203 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 196 "parse-gram.y"
{ fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
-/* Line 670 of yacc.c */
-#line 1179 "parse-gram.c"
+/* Line 1542 of yacc.c */
+#line 1155 "parse-gram.c"
break;
- case 90: /* "string_as_id" */
+ case 86: /* "string_as_id" */
-/* Line 670 of yacc.c */
-#line 203 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 196 "parse-gram.y"
{ fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
-/* Line 670 of yacc.c */
-#line 1188 "parse-gram.c"
+/* Line 1542 of yacc.c */
+#line 1164 "parse-gram.c"
break;
default:
break;
@@ -1276,11 +1252,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");
}
}
@@ -1698,8 +1674,8 @@ YYLTYPE yylloc;
/* User initialization code. */
-/* Line 1082 of yacc.c */
-#line 89 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 86 "parse-gram.y"
{
/* Bison's grammar can initial empty locations, hence a default
location is needed. */
@@ -1707,8 +1683,8 @@ YYLTYPE yylloc;
boundary_set (&yylloc.end, current_file, 1, 1);
}
-/* Line 1082 of yacc.c */
-#line 1712 "parse-gram.c"
+/* Line 1542 of yacc.c */
+#line 1688 "parse-gram.c"
yylsp[0] = yylloc;
goto yysetstate;
@@ -1893,36 +1869,46 @@ yyreduce:
{
case 6:
-/* Line 1269 of yacc.c */
-#line 226 "parse-gram.y"
- { prologue_augment (translate_code ((yyvsp[(1) - (1)].chars), (yylsp[(1) - (1)])), (yylsp[(1) - (1)]), union_seen); }
+/* Line 1542 of yacc.c */
+#line 220 "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 ();
+ muscle_code_grow (union_seen ? "post_prologue" : "pre_prologue",
+ plain_code.code, (yylsp[(1) - (1)]));
+ code_scanner_last_string_free ();
+ }
break;
case 7:
-/* Line 1269 of yacc.c */
-#line 227 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 229 "parse-gram.y"
{ debug_flag = true; }
break;
case 8:
-/* Line 1269 of yacc.c */
-#line 228 "parse-gram.y"
- { muscle_insert ((yyvsp[(2) - (3)].chars), (yyvsp[(3) - (3)].chars)); }
+/* Line 1542 of yacc.c */
+#line 231 "parse-gram.y"
+ {
+ muscle_percent_define_insert ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars));
+ }
break;
case 9:
-/* Line 1269 of yacc.c */
-#line 229 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 234 "parse-gram.y"
{ defines_flag = true; }
break;
case 10:
-/* Line 1269 of yacc.c */
-#line 231 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 236 "parse-gram.y"
{
defines_flag = true;
spec_defines_file = xstrdup ((yyvsp[(2) - (2)].chars));
@@ -1931,43 +1917,43 @@ yyreduce:
case 11:
-/* Line 1269 of yacc.c */
-#line 235 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 240 "parse-gram.y"
{ error_verbose = true; }
break;
case 12:
-/* Line 1269 of yacc.c */
-#line 236 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 241 "parse-gram.y"
{ expected_sr_conflicts = (yyvsp[(2) - (2)].integer); }
break;
case 13:
-/* Line 1269 of yacc.c */
-#line 237 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 242 "parse-gram.y"
{ expected_rr_conflicts = (yyvsp[(2) - (2)].integer); }
break;
case 14:
-/* Line 1269 of yacc.c */
-#line 238 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 243 "parse-gram.y"
{ spec_file_prefix = (yyvsp[(2) - (2)].chars); }
break;
case 15:
-/* Line 1269 of yacc.c */
-#line 239 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 244 "parse-gram.y"
{ spec_file_prefix = (yyvsp[(3) - (3)].chars); }
break;
case 16:
-/* Line 1269 of yacc.c */
-#line 241 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 246 "parse-gram.y"
{
nondeterministic_parser = true;
glr_parser = true;
@@ -1976,292 +1962,299 @@ yyreduce:
case 17:
-/* Line 1269 of yacc.c */
-#line 246 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 251 "parse-gram.y"
{
- muscle_code_grow ("initial_action", translate_symbol_action ((yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])), (yylsp[(2) - (2)]));
+ code_props action;
+ code_props_symbol_action_init (&action, (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)]));
+ code_props_translate_code (&action);
+ gram_scanner_last_string_free ();
+ muscle_code_grow ("initial_action", action.code, (yylsp[(2) - (2)]));
+ code_scanner_last_string_free ();
}
break;
case 18:
-/* Line 1269 of yacc.c */
-#line 249 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 259 "parse-gram.y"
{ language_argmatch ((yyvsp[(2) - (2)].chars), 1, &(yylsp[(1) - (2)])); }
break;
case 19:
-/* Line 1269 of yacc.c */
-#line 250 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 260 "parse-gram.y"
{ add_param ("lex_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
break;
case 20:
-/* Line 1269 of yacc.c */
-#line 251 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 261 "parse-gram.y"
{ locations_flag = true; }
break;
case 21:
-/* Line 1269 of yacc.c */
-#line 252 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 262 "parse-gram.y"
{ spec_name_prefix = (yyvsp[(2) - (2)].chars); }
break;
case 22:
-/* Line 1269 of yacc.c */
-#line 253 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 263 "parse-gram.y"
{ spec_name_prefix = (yyvsp[(3) - (3)].chars); }
break;
case 23:
-/* Line 1269 of yacc.c */
-#line 254 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 264 "parse-gram.y"
{ no_lines_flag = true; }
break;
case 24:
-/* Line 1269 of yacc.c */
-#line 255 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 265 "parse-gram.y"
{ nondeterministic_parser = true; }
break;
case 25:
-/* Line 1269 of yacc.c */
-#line 256 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 266 "parse-gram.y"
{ spec_outfile = (yyvsp[(2) - (2)].chars); }
break;
case 26:
-/* Line 1269 of yacc.c */
-#line 257 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 267 "parse-gram.y"
{ spec_outfile = (yyvsp[(3) - (3)].chars); }
break;
case 27:
-/* Line 1269 of yacc.c */
-#line 258 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 268 "parse-gram.y"
{ add_param ("parse_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
break;
case 28:
-/* Line 1269 of yacc.c */
-#line 259 "parse-gram.y"
- { pure_parser = true; }
+/* Line 1542 of yacc.c */
+#line 270 "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)]), "");
+ /* 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)]), "");
+ }
break;
case 29:
-/* Line 1269 of yacc.c */
-#line 260 "parse-gram.y"
- { push_parser = true; }
+/* Line 1542 of yacc.c */
+#line 282 "parse-gram.y"
+ { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); }
break;
case 30:
-/* Line 1269 of yacc.c */
-#line 261 "parse-gram.y"
- { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); }
+/* Line 1542 of yacc.c */
+#line 284 "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, 1, &(yylsp[(1) - (2)]));
+ }
break;
case 31:
-/* Line 1269 of yacc.c */
-#line 262 "parse-gram.y"
- { skeleton_arg ((yyvsp[(2) - (2)].chars), 1, &(yylsp[(1) - (2)])); }
- break;
-
- case 32:
-
-/* Line 1269 of yacc.c */
-#line 263 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 307 "parse-gram.y"
{ token_table_flag = true; }
break;
- case 33:
+ case 32:
-/* Line 1269 of yacc.c */
-#line 264 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 308 "parse-gram.y"
{ report_flag = report_states; }
break;
- case 34:
+ case 33:
-/* Line 1269 of yacc.c */
-#line 265 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 309 "parse-gram.y"
{ yacc_flag = true; }
break;
- case 38:
+ case 37:
-/* Line 1269 of yacc.c */
-#line 273 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 317 "parse-gram.y"
{
grammar_start_symbol_set ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]));
}
break;
- case 39:
+ case 38:
-/* Line 1269 of yacc.c */
-#line 277 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 321 "parse-gram.y"
{
symbol_list *list;
- const char *action = translate_symbol_action ((yyvsp[(2) - (3)].code), (yylsp[(2) - (3)]));
for (list = (yyvsp[(3) - (3)].list); list; list = list->next)
- symbol_list_destructor_set (list, action, (yylsp[(2) - (3)]));
+ symbol_list_destructor_set (list, (yyvsp[(2) - (3)].code), (yylsp[(2) - (3)]));
symbol_list_free ((yyvsp[(3) - (3)].list));
}
break;
- case 40:
+ case 39:
-/* Line 1269 of yacc.c */
-#line 285 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 328 "parse-gram.y"
{
symbol_list *list;
- const char *action = translate_symbol_action ((yyvsp[(2) - (3)].code), (yylsp[(2) - (3)]));
for (list = (yyvsp[(3) - (3)].list); list; list = list->next)
- symbol_list_printer_set (list, action, (yylsp[(2) - (3)]));
+ symbol_list_printer_set (list, (yyvsp[(2) - (3)].code), (yylsp[(2) - (3)]));
symbol_list_free ((yyvsp[(3) - (3)].list));
}
break;
- case 41:
+ case 40:
-/* Line 1269 of yacc.c */
-#line 293 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 335 "parse-gram.y"
{
default_prec = true;
}
break;
- case 42:
+ case 41:
-/* Line 1269 of yacc.c */
-#line 297 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 339 "parse-gram.y"
{
default_prec = false;
}
break;
- case 43:
-
-/* Line 1269 of yacc.c */
-#line 300 "parse-gram.y"
- { prologue_augment ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)]), true); }
- break;
-
- case 44:
-
-/* Line 1269 of yacc.c */
-#line 301 "parse-gram.y"
- { prologue_augment ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)]), false); }
- break;
-
- case 45:
+ case 42:
-/* Line 1269 of yacc.c */
-#line 302 "parse-gram.y"
- { muscle_code_grow ("provides", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); }
+/* Line 1542 of yacc.c */
+#line 343 "parse-gram.y"
+ {
+ /* 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 46:
+ case 43:
-/* Line 1269 of yacc.c */
-#line 303 "parse-gram.y"
- { muscle_code_grow ("requires", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); }
+/* Line 1542 of yacc.c */
+#line 350 "parse-gram.y"
+ {
+ muscle_percent_code_grow ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)]));
+ code_scanner_last_string_free ();
+ }
break;
- case 47:
+ case 44:
-/* Line 1269 of yacc.c */
-#line 314 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 364 "parse-gram.y"
{}
break;
- case 48:
+ case 45:
-/* Line 1269 of yacc.c */
-#line 315 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 365 "parse-gram.y"
{ muscle_code_grow ("union_name", (yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
break;
- case 49:
+ case 46:
-/* Line 1269 of yacc.c */
-#line 320 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 370 "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)]));
+ muscle_code_grow ("stype", (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)]));
+ code_scanner_last_string_free ();
}
break;
- case 50:
+ case 47:
-/* Line 1269 of yacc.c */
-#line 347 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 381 "parse-gram.y"
{ current_class = nterm_sym; }
break;
- case 51:
+ case 48:
-/* Line 1269 of yacc.c */
-#line 348 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 382 "parse-gram.y"
{
current_class = unknown_sym;
current_type = NULL;
}
break;
- case 52:
+ case 49:
-/* Line 1269 of yacc.c */
-#line 352 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 386 "parse-gram.y"
{ current_class = token_sym; }
break;
- case 53:
+ case 50:
-/* Line 1269 of yacc.c */
-#line 353 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 387 "parse-gram.y"
{
current_class = unknown_sym;
current_type = NULL;
}
break;
- case 54:
+ case 51:
-/* Line 1269 of yacc.c */
-#line 358 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 392 "parse-gram.y"
{
symbol_list *list;
tag_seen = true;
@@ -2271,10 +2264,10 @@ yyreduce:
}
break;
- case 55:
+ case 52:
-/* Line 1269 of yacc.c */
-#line 369 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 403 "parse-gram.y"
{
symbol_list *list;
++current_prec;
@@ -2288,121 +2281,121 @@ yyreduce:
}
break;
- case 56:
+ case 53:
-/* Line 1269 of yacc.c */
-#line 383 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 417 "parse-gram.y"
{ (yyval.assoc) = left_assoc; }
break;
- case 57:
+ case 54:
-/* Line 1269 of yacc.c */
-#line 384 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 418 "parse-gram.y"
{ (yyval.assoc) = right_assoc; }
break;
- case 58:
+ case 55:
-/* Line 1269 of yacc.c */
-#line 385 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 419 "parse-gram.y"
{ (yyval.assoc) = non_assoc; }
break;
- case 59:
+ case 56:
-/* Line 1269 of yacc.c */
-#line 389 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 423 "parse-gram.y"
{ current_type = NULL; }
break;
- case 60:
+ case 57:
-/* Line 1269 of yacc.c */
-#line 390 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 424 "parse-gram.y"
{ current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; }
break;
- case 61:
+ case 58:
-/* Line 1269 of yacc.c */
-#line 396 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 430 "parse-gram.y"
{ (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
break;
- case 62:
+ case 59:
-/* Line 1269 of yacc.c */
-#line 398 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 432 "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 63:
+ case 60:
-/* Line 1269 of yacc.c */
-#line 402 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 436 "parse-gram.y"
{ (yyval.list) = (yyvsp[(1) - (1)].list); }
break;
- case 64:
+ case 61:
-/* Line 1269 of yacc.c */
-#line 403 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 437 "parse-gram.y"
{ (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); }
break;
- case 65:
+ case 62:
-/* Line 1269 of yacc.c */
-#line 407 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 441 "parse-gram.y"
{ (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
break;
- case 66:
+ case 63:
-/* Line 1269 of yacc.c */
-#line 408 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 442 "parse-gram.y"
{ (yyval.list) = symbol_list_type_new ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
break;
- case 67:
+ case 64:
-/* Line 1269 of yacc.c */
-#line 409 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 443 "parse-gram.y"
{ (yyval.list) = symbol_list_default_tagged_new ((yylsp[(1) - (1)])); }
break;
- case 68:
+ case 65:
-/* Line 1269 of yacc.c */
-#line 410 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 444 "parse-gram.y"
{ (yyval.list) = symbol_list_default_tagless_new ((yylsp[(1) - (1)])); }
break;
- case 69:
+ case 66:
-/* Line 1269 of yacc.c */
-#line 416 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 450 "parse-gram.y"
{
current_type = (yyvsp[(1) - (1)].uniqstr);
tag_seen = true;
}
break;
- case 70:
+ case 67:
-/* Line 1269 of yacc.c */
-#line 421 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 455 "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 71:
+ case 68:
-/* Line 1269 of yacc.c */
-#line 426 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 460 "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)]));
@@ -2410,10 +2403,10 @@ yyreduce:
}
break;
- case 72:
+ case 69:
-/* Line 1269 of yacc.c */
-#line 432 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 466 "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)]));
@@ -2421,10 +2414,10 @@ yyreduce:
}
break;
- case 73:
+ case 70:
-/* Line 1269 of yacc.c */
-#line 438 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 472 "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)]));
@@ -2433,109 +2426,119 @@ yyreduce:
}
break;
- case 80:
+ case 77:
-/* Line 1269 of yacc.c */
-#line 468 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 502 "parse-gram.y"
{
yyerrok;
}
break;
- case 81:
+ case 78:
-/* Line 1269 of yacc.c */
-#line 474 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 508 "parse-gram.y"
{ current_lhs = (yyvsp[(1) - (1)].symbol); current_lhs_location = (yylsp[(1) - (1)]); }
break;
- case 83:
+ case 80:
-/* Line 1269 of yacc.c */
-#line 478 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 512 "parse-gram.y"
{ grammar_current_rule_end ((yylsp[(1) - (1)])); }
break;
- case 84:
+ case 81:
-/* Line 1269 of yacc.c */
-#line 479 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 513 "parse-gram.y"
{ grammar_current_rule_end ((yylsp[(3) - (3)])); }
break;
- case 86:
+ case 83:
-/* Line 1269 of yacc.c */
-#line 485 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 519 "parse-gram.y"
{ grammar_current_rule_begin (current_lhs, current_lhs_location); }
break;
- case 87:
+ case 84:
-/* Line 1269 of yacc.c */
-#line 487 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 521 "parse-gram.y"
{ grammar_current_rule_symbol_append ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); }
break;
- case 88:
+ case 85:
-/* Line 1269 of yacc.c */
-#line 489 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 523 "parse-gram.y"
{ grammar_current_rule_action_append ((yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
break;
- case 89:
+ case 86:
-/* Line 1269 of yacc.c */
-#line 491 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 525 "parse-gram.y"
{ grammar_current_rule_prec_set ((yyvsp[(3) - (3)].symbol), (yylsp[(3) - (3)])); }
break;
- case 90:
+ case 87:
-/* Line 1269 of yacc.c */
-#line 493 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 527 "parse-gram.y"
{ grammar_current_rule_dprec_set ((yyvsp[(3) - (3)].integer), (yylsp[(3) - (3)])); }
break;
- case 91:
+ case 88:
-/* Line 1269 of yacc.c */
-#line 495 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 529 "parse-gram.y"
{ grammar_current_rule_merge_set ((yyvsp[(3) - (3)].uniqstr), (yylsp[(3) - (3)])); }
break;
- case 94:
+ case 90:
+
+/* Line 1542 of yacc.c */
+#line 539 "parse-gram.y"
+ { (yyval.uniqstr) = uniqstr_new ((yyvsp[(1) - (1)].chars)); }
+ break;
-/* Line 1269 of yacc.c */
-#line 511 "parse-gram.y"
+ case 91:
+
+/* Line 1542 of yacc.c */
+#line 545 "parse-gram.y"
{
- static char one[] = "1";
- (yyval.chars) = one;
+ (yyval.chars) = "";
}
break;
- case 96:
+ case 93:
-/* Line 1269 of yacc.c */
-#line 521 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 558 "parse-gram.y"
{
+ code_props plain_code;
(yyvsp[(1) - (1)].code)[strlen ((yyvsp[(1) - (1)].code)) - 1] = '\n';
- (yyval.chars) = translate_code ((yyvsp[(1) - (1)].code) + 1, (yylsp[(1) - (1)]));
+ code_props_plain_init (&plain_code, (yyvsp[(1) - (1)].code)+1, (yylsp[(1) - (1)]));
+ code_props_translate_code (&plain_code);
+ gram_scanner_last_string_free ();
+ (yyval.chars) = plain_code.code;
}
break;
- case 97:
+ case 94:
-/* Line 1269 of yacc.c */
-#line 537 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 578 "parse-gram.y"
{ (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
break;
- case 98:
+ case 95:
-/* Line 1269 of yacc.c */
-#line 539 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 580 "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);
@@ -2543,37 +2546,41 @@ yyreduce:
}
break;
- case 99:
+ case 96:
-/* Line 1269 of yacc.c */
-#line 547 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 588 "parse-gram.y"
{ (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
break;
- case 102:
+ case 99:
-/* Line 1269 of yacc.c */
-#line 559 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 600 "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 104:
+ case 101:
-/* Line 1269 of yacc.c */
-#line 568 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 609 "parse-gram.y"
{
- muscle_code_grow ("epilogue", translate_code ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])), (yylsp[(2) - (2)]));
+ code_props plain_code;
+ code_props_plain_init (&plain_code, (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)]));
+ code_props_translate_code (&plain_code);
gram_scanner_last_string_free ();
+ muscle_code_grow ("epilogue", plain_code.code, (yylsp[(2) - (2)]));
+ code_scanner_last_string_free ();
}
break;
-/* Line 1269 of yacc.c */
-#line 2577 "parse-gram.c"
+/* Line 1542 of yacc.c */
+#line 2584 "parse-gram.c"
default: break;
}
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -2753,7 +2760,7 @@ yyabortlab:
yyresult = 1;
goto yyreturn;
-#ifndef yyoverflow
+#if !defined(yyoverflow) || YYERROR_VERBOSE
/*-------------------------------------------------.
| yyexhaustedlab -- memory exhaustion comes here. |
`-------------------------------------------------*/
@@ -2791,8 +2798,8 @@ yyreturn:
-/* Line 1486 of yacc.c */
-#line 574 "parse-gram.y"
+/* Line 1542 of yacc.c */
+#line 619 "parse-gram.y"