X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/3b452f4ea6f6e69ba90d93cf1bed2ef1437f5b29..b7a7016204ebf337b2eb0ba2e6384f0b763f9cba:/src/parse-gram.c
diff --git a/src/parse-gram.c b/src/parse-gram.c
index 1f4dfbba..a652dcc4 100644
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -1,24 +1,23 @@
-/* A Bison parser, made by GNU Bison 2.3+. */
-/* Skeleton implementation for Bison's Yacc-like parsers in C
+/* A Bison parser, made by GNU Bison 2.3a+. */
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+/* 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.
-
- 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
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
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
@@ -29,7 +28,7 @@
special exception, which will cause the skeleton and the resulting
Bison output files to be licensed under the GNU General Public
License without this special exception.
-
+
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
@@ -47,7 +46,7 @@
#define YYBISON 1
/* Bison version. */
-#define YYBISON_VERSION "2.3+"
+#define YYBISON_VERSION "2.3a+"
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
@@ -69,17 +68,19 @@
#define yylloc gram_lloc
/* Copy the first part of user declarations. */
-/* Line 164 of yacc.c. */
+
+/* Line 1538 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,
@@ -88,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"
@@ -127,10 +125,17 @@ static void gram_error (location const *, char const *);
static char const *char_name (char);
-static void add_param (char const *, char *, location);
+/** Add a lex-param or a parse-param.
+ *
+ * \param type \a lex_param or \a parse_param
+ * \param decl the formal argument
+ * \param loc the location in the source.
+ */
+static void add_param (char const *type, char *decl, location loc);
+
static symbol_class current_class = unknown_sym;
-static uniqstr current_type = 0;
+static uniqstr current_type = NULL;
static symbol *current_lhs;
static location current_lhs_location;
static int current_prec = 0;
@@ -141,6 +146,9 @@ static int current_prec = 0;
#define YYTYPE_UINT8 uint_fast8_t
+/* Line 1538 of yacc.c */
+#line 151 "parse-gram.c"
+
/* Enabling traces. */
#ifndef YYDEBUG
# define YYDEBUG 1
@@ -180,71 +188,133 @@ static int current_prec = 0;
PERCENT_PREC = 268,
PERCENT_DPREC = 269,
PERCENT_MERGE = 270,
- PERCENT_AFTER_HEADER = 271,
- PERCENT_BEFORE_HEADER = 272,
- PERCENT_DEBUG = 273,
- PERCENT_DEFAULT_PREC = 274,
- PERCENT_DEFINE = 275,
- PERCENT_DEFINES = 276,
- PERCENT_END_HEADER = 277,
- PERCENT_ERROR_VERBOSE = 278,
- PERCENT_EXPECT = 279,
- PERCENT_EXPECT_RR = 280,
- PERCENT_FILE_PREFIX = 281,
- PERCENT_GLR_PARSER = 282,
- PERCENT_INITIAL_ACTION = 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_PURE_PARSER = 292,
- PERCENT_REQUIRE = 293,
- PERCENT_SKELETON = 294,
- PERCENT_START = 295,
- PERCENT_START_HEADER = 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,
+ PERCENT_CODE = 271,
+ 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. */
+#define GRAM_EOF 0
+#define STRING 258
+#define INT 259
+#define PERCENT_TOKEN 260
+#define PERCENT_NTERM 261
+#define PERCENT_TYPE 262
+#define PERCENT_DESTRUCTOR 263
+#define PERCENT_PRINTER 264
+#define PERCENT_LEFT 265
+#define PERCENT_RIGHT 266
+#define PERCENT_NONASSOC 267
+#define PERCENT_PREC 268
+#define PERCENT_DPREC 269
+#define PERCENT_MERGE 270
+#define PERCENT_CODE 271
+#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
+
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
-/* Line 195 of yacc.c. */
-#line 90 "parse-gram.y"
{
+
+/* Line 1538 of yacc.c */
+#line 94 "parse-gram.y"
+
symbol *symbol;
symbol_list *list;
int integer;
- char *chars;
+ char const *chars;
+ char *code;
assoc assoc;
uniqstr uniqstr;
unsigned char character;
-}
-/* Line 195 of yacc.c. */
-#line 244 "parse-gram.c"
- YYSTYPE;
+
+
+
+/* Line 1538 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
-# define YYSTYPE_IS_TRIVIAL 1
#endif
#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED
@@ -263,8 +333,9 @@ typedef struct YYLTYPE
/* Copy the second part of user declarations. */
-/* Line 219 of yacc.c. */
-#line 268 "parse-gram.c"
+
+/* Line 1538 of yacc.c */
+#line 339 "parse-gram.c"
#ifdef short
# undef short
@@ -481,16 +552,16 @@ union yyalloc
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 3
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 192
+#define YYLAST 155
/* YYNTOKENS -- Number of terminals. */
#define YYNTOKENS 57
/* YYNNTS -- Number of nonterminals. */
-#define YYNNTS 27
+#define YYNNTS 31
/* YYNRULES -- Number of rules. */
-#define YYNRULES 89
+#define YYNRULES 101
/* YYNRULES -- Number of states. */
-#define YYNSTATES 128
+#define YYNSTATES 139
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
#define YYUNDEFTOK 2
@@ -539,60 +610,66 @@ static const yytype_uint8 yytranslate[] =
#if YYDEBUG
/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
YYRHS. */
-static const yytype_uint8 yyprhs[] =
+static const yytype_uint16 yyprhs[] =
{
- 0, 0, 3, 8, 9, 12, 14, 16, 19, 22,
- 24, 27, 31, 33, 36, 38, 41, 44, 48, 50,
- 53, 56, 58, 62, 64, 66, 70, 73, 75, 78,
+ 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,
81, 84, 86, 88, 90, 92, 94, 96, 99, 103,
- 107, 109, 111, 112, 114, 118, 119, 123, 124, 128,
- 132, 136, 138, 140, 142, 143, 145, 147, 150, 152,
- 154, 157, 160, 164, 166, 169, 171, 174, 176, 179,
- 182, 183, 187, 189, 193, 196, 197, 200, 203, 207,
- 211, 215, 217, 219, 221, 223, 225, 227, 229, 230
+ 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[] =
{
- 58, 0, -1, 59, 51, 72, 83, -1, -1, 59,
- 60, -1, 61, -1, 53, -1, 16, 45, -1, 17,
- 45, -1, 18, -1, 20, 82, -1, 20, 82, 82,
- -1, 21, -1, 22, 45, -1, 23, -1, 24, 4,
- -1, 25, 4, -1, 26, 48, 82, -1, 27, -1,
- 28, 45, -1, 29, 45, -1, 30, -1, 31, 48,
- 82, -1, 33, -1, 34, -1, 35, 48, 82, -1,
- 36, 45, -1, 37, -1, 38, 82, -1, 39, 82,
- -1, 41, 45, -1, 42, -1, 43, -1, 44, -1,
- 54, -1, 66, -1, 63, -1, 40, 80, -1, 8,
- 45, 69, -1, 9, 45, 69, -1, 19, -1, 32,
- -1, -1, 49, -1, 56, 62, 45, -1, -1, 6,
- 64, 71, -1, -1, 5, 65, 71, -1, 7, 55,
- 69, -1, 67, 68, 69, -1, 10, -1, 11, -1,
- 12, -1, -1, 55, -1, 80, -1, 69, 80, -1,
- 55, -1, 78, -1, 78, 4, -1, 78, 81, -1,
- 78, 4, 81, -1, 70, -1, 71, 70, -1, 73,
- -1, 72, 73, -1, 74, -1, 61, 54, -1, 1,
- 54, -1, -1, 79, 75, 76, -1, 77, -1, 76,
- 52, 77, -1, 76, 54, -1, -1, 77, 80, -1,
- 77, 45, -1, 77, 13, 80, -1, 77, 14, 4,
- -1, 77, 15, 55, -1, 49, -1, 46, -1, 50,
- -1, 78, -1, 81, -1, 3, -1, 3, -1, -1,
- 51, 47, -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, 195, 195, 203, 205, 209, 210, 214, 220, 226,
- 227, 232, 233, 234, 240, 241, 242, 243, 244, 249,
- 253, 254, 255, 256, 257, 258, 259, 260, 261, 262,
- 263, 269, 270, 271, 272, 276, 277, 278, 282, 290,
- 298, 302, 316, 317, 321, 343, 343, 348, 348, 353,
- 363, 378, 379, 380, 384, 385, 390, 391, 396, 400,
- 405, 411, 417, 428, 429, 438, 439, 445, 446, 447,
- 454, 454, 458, 459, 460, 465, 466, 468, 470, 472,
- 474, 487, 489, 498, 503, 504, 509, 518, 523, 525
+ 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, 270,
+ 271, 295, 296, 297, 298, 302, 303, 304, 308, 315,
+ 322, 326, 330, 337, 352, 353, 357, 369, 369, 374,
+ 374, 379, 390, 405, 406, 407, 411, 412, 417, 419,
+ 424, 425, 429, 430, 431, 432, 437, 442, 447, 453,
+ 459, 470, 471, 480, 481, 487, 488, 489, 496, 496,
+ 500, 501, 502, 507, 508, 510, 512, 514, 516, 526,
+ 527, 533, 536, 545, 565, 567, 576, 581, 582, 587,
+ 594, 596
};
#endif
@@ -604,23 +681,24 @@ static const char *const yytname[] =
"\"end of file\"", "error", "$undefined", "\"string\"", "\"integer\"",
"\"%token\"", "\"%nterm\"", "\"%type\"", "\"%destructor\"",
"\"%printer\"", "\"%left\"", "\"%right\"", "\"%nonassoc\"", "\"%prec\"",
- "\"%dprec\"", "\"%merge\"", "\"%after-header\"", "\"%before-header\"",
- "\"%debug\"", "\"%default-prec\"", "\"%define\"", "\"%defines\"",
- "\"%end-header\"", "\"%error-verbose\"", "\"%expect\"", "\"%expect-rr\"",
- "\"%file-prefix\"", "\"%glr-parser\"", "\"%initial-action\"",
- "\"%lex-param\"", "\"%locations\"", "\"%name-prefix\"",
- "\"%no-default-prec\"", "\"%no-lines\"", "\"%nondeterministic-parser\"",
- "\"%output\"", "\"%parse-param\"", "\"%pure-parser\"", "\"%require\"",
- "\"%skeleton\"", "\"%start\"", "\"%start-header\"", "\"%token-table\"",
- "\"%verbose\"", "\"%yacc\"", "\"{...}\"", "\"char\"", "\"epilogue\"",
- "\"=\"", "\"identifier\"", "\"identifier:\"", "\"%%\"", "\"|\"",
- "\"%{...%}\"", "\";\"", "\"type\"", "\"%union\"", "$accept", "input",
- "declarations", "declaration", "grammar_declaration", "union_name",
- "symbol_declaration", "@1", "@2", "precedence_declaration",
- "precedence_declarator", "type.opt", "symbols.1", "symbol_def",
+ "\"%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\"", "\"%pure-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", "generic_symlist_item", "symbol_def",
"symbol_defs.1", "grammar", "rules_or_grammar_declaration", "rules",
- "@3", "rhses.1", "rhs", "id", "id_colon", "symbol", "string_as_id",
- "string_content", "epilogue.opt", 0
+ "$@3", "rhses.1", "rhs", "variable", "content.opt", "braceless", "id",
+ "id_colon", "symbol", "string_as_id", "epilogue.opt", 0
};
#endif
@@ -645,25 +723,29 @@ static const yytype_uint8 yyr1[] =
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, 62, 62, 61, 64, 63, 65, 63, 63,
- 66, 67, 67, 67, 68, 68, 69, 69, 70, 70,
- 70, 70, 70, 71, 71, 72, 72, 73, 73, 73,
- 75, 74, 76, 76, 76, 77, 77, 77, 77, 77,
- 77, 78, 78, 79, 80, 80, 81, 82, 83, 83
+ 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. */
static const yytype_uint8 yyr2[] =
{
- 0, 2, 4, 0, 2, 1, 1, 2, 2, 1,
- 2, 3, 1, 2, 1, 2, 2, 3, 1, 2,
- 2, 1, 3, 1, 1, 3, 2, 1, 2, 2,
+ 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, 2,
2, 1, 1, 1, 1, 1, 1, 2, 3, 3,
- 1, 1, 0, 1, 3, 0, 3, 0, 3, 3,
- 3, 1, 1, 1, 0, 1, 1, 2, 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, 1, 1, 1, 1, 1, 0, 2
+ 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
@@ -671,108 +753,104 @@ static const yytype_uint8 yyr2[] =
means the default is an error. */
static const yytype_uint8 yydefact[] =
{
- 3, 0, 0, 1, 47, 45, 0, 0, 0, 51,
- 52, 53, 0, 0, 9, 40, 0, 12, 0, 14,
- 0, 0, 0, 18, 0, 0, 21, 0, 41, 23,
- 24, 0, 0, 27, 0, 0, 0, 0, 31, 32,
- 33, 0, 6, 34, 42, 4, 5, 36, 35, 54,
- 0, 0, 0, 0, 0, 7, 8, 87, 10, 13,
- 15, 16, 0, 19, 20, 0, 0, 26, 28, 29,
- 86, 82, 81, 84, 37, 85, 30, 0, 83, 0,
- 0, 65, 67, 70, 43, 0, 55, 0, 58, 63,
- 48, 59, 46, 49, 56, 38, 39, 11, 17, 22,
- 25, 69, 68, 0, 66, 2, 75, 44, 50, 64,
- 60, 61, 57, 89, 71, 72, 62, 75, 74, 0,
- 0, 0, 77, 76, 73, 78, 79, 80
+ 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_int8 yydefgoto[] =
{
- -1, 1, 2, 45, 79, 85, 47, 51, 50, 48,
- 49, 87, 93, 89, 90, 80, 81, 82, 106, 114,
- 115, 73, 83, 94, 75, 58, 105
+ -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 -76
+#define YYPACT_NINF -60
static const yytype_int16 yypact[] =
{
- -76, 6, 136, -76, -76, -76, -40, -12, -9, -76,
- -76, -76, -5, 1, -76, -76, 40, -76, 5, -76,
- 47, 50, 7, -76, 11, 18, -76, 19, -76, -76,
- -76, 20, 25, -76, 40, 40, -2, 26, -76, -76,
- -76, 84, -76, -76, 27, -76, -76, -76, -76, 14,
- -23, -23, -2, -2, -2, -76, -76, -76, 40, -76,
- -76, -76, 40, -76, -76, 40, 40, -76, -76, -76,
- -76, -76, -76, -76, -76, -76, -76, 21, -76, 23,
- 2, -76, -76, -76, -76, 28, -76, -2, -76, -76,
- -23, 24, -23, -2, -76, -2, -2, -76, -76, -76,
- -76, -76, -76, 31, -76, -76, -76, -76, -2, -76,
- 71, -76, -76, -76, -32, 16, -76, -76, -76, -2,
- 76, 29, -76, -76, 16, -76, -76, -76
+ -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[] =
{
- -76, -76, -76, -76, 79, -76, -76, -76, -76, -76,
- -76, -76, -49, -53, 35, -76, 17, -76, -76, -76,
- -35, -26, -76, -36, -75, -17, -76
+ -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 -89
-static const yytype_int8 yytable[] =
+#define YYTABLE_NINF -101
+static const yytype_int16 yytable[] =
{
- 74, 70, -88, 77, 95, 96, 3, 4, 5, 6,
- 7, 8, 9, 10, 11, 52, 111, 68, 69, 70,
- 117, 15, 118, 71, 91, 91, 72, 70, 110, 119,
- 120, 121, 88, 53, 28, 116, 54, 109, 108, 109,
- 55, 97, 36, 57, 71, 98, 56, 72, 99, 100,
- 59, 60, 78, 103, 61, 62, 63, 112, 44, 112,
- 112, 122, 71, 64, 91, 72, 91, 65, 66, 86,
- 67, 76, 112, 107, 70, 101, 84, 102, 113, 123,
- 126, 46, 124, 125, 127, 77, 92, 0, 123, 4,
- 5, 6, 7, 8, 9, 10, 11, 104, 0, 0,
- 0, 0, 0, 15, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 28, 0, 0, 0,
- 0, 0, 0, 0, 36, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 78, 0, 0, 0, 0, 0,
- 44, 4, 5, 6, 7, 8, 9, 10, 11, 0,
- 0, 0, 12, 13, 14, 15, 16, 17, 18, 19,
+ 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, 39,
- 40, 0, 0, 0, 0, 0, 0, 41, 0, 42,
- 43, 0, 44
+ 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_int8 yycheck[] =
+static const yytype_uint8 yycheck[] =
{
- 36, 3, 0, 1, 53, 54, 0, 5, 6, 7,
- 8, 9, 10, 11, 12, 55, 91, 34, 35, 3,
- 52, 19, 54, 46, 50, 51, 49, 3, 4, 13,
- 14, 15, 55, 45, 32, 110, 45, 90, 87, 92,
- 45, 58, 40, 3, 46, 62, 45, 49, 65, 66,
- 45, 4, 50, 51, 4, 48, 45, 93, 56, 95,
- 96, 45, 46, 45, 90, 49, 92, 48, 48, 55,
- 45, 45, 108, 45, 3, 54, 49, 54, 47, 115,
- 4, 2, 117, 119, 55, 1, 51, -1, 124, 5,
- 6, 7, 8, 9, 10, 11, 12, 80, -1, -1,
- -1, -1, -1, 19, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 32, -1, -1, -1,
- -1, -1, -1, -1, 40, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 50, -1, -1, -1, -1, -1,
- 56, 5, 6, 7, 8, 9, 10, 11, 12, -1,
- -1, -1, 16, 17, 18, 19, 20, 21, 22, 23,
+ 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, 43,
- 44, -1, -1, -1, -1, -1, -1, 51, -1, 53,
- 54, -1, 56
+ 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
@@ -782,16 +860,17 @@ static const yytype_uint8 yystos[] =
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, 51, 53, 54, 56, 60, 61, 63, 66, 67,
- 65, 64, 55, 45, 45, 45, 45, 3, 82, 45,
- 4, 4, 48, 45, 45, 48, 48, 45, 82, 82,
- 3, 46, 49, 78, 80, 81, 45, 1, 50, 61,
- 72, 73, 74, 79, 49, 62, 55, 68, 55, 70,
- 71, 78, 71, 69, 80, 69, 69, 82, 82, 82,
- 82, 54, 54, 51, 73, 83, 75, 45, 69, 70,
- 4, 81, 80, 47, 76, 77, 81, 52, 54, 13,
- 14, 15, 45, 80, 77, 80, 4, 55
+ 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)
@@ -940,102 +1019,148 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
switch (yytype)
{
case 3: /* "\"string\"" */
-/* Line 668 of yacc.c. */
-#line 174 "parse-gram.y"
+
+/* Line 1538 of yacc.c */
+#line 182 "parse-gram.y"
{ fputs (quotearg_style (c_quoting_style, (yyvaluep->chars)), stderr); };
-/* Line 668 of yacc.c. */
-#line 948 "parse-gram.c"
+
+/* Line 1538 of yacc.c */
+#line 1029 "parse-gram.c"
break;
case 4: /* "\"integer\"" */
-/* Line 668 of yacc.c. */
-#line 184 "parse-gram.y"
+
+/* Line 1538 of yacc.c */
+#line 193 "parse-gram.y"
{ fprintf (stderr, "%d", (yyvaluep->integer)); };
-/* Line 668 of yacc.c. */
-#line 955 "parse-gram.c"
+
+/* Line 1538 of yacc.c */
+#line 1038 "parse-gram.c"
break;
- case 45: /* "\"{...}\"" */
-/* Line 668 of yacc.c. */
-#line 176 "parse-gram.y"
- { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-/* Line 668 of yacc.c. */
-#line 962 "parse-gram.c"
+ case 43: /* "\"{...}\"" */
+
+/* Line 1538 of yacc.c */
+#line 184 "parse-gram.y"
+ { fprintf (stderr, "{\n%s\n}", (yyvaluep->code)); };
+
+/* Line 1538 of yacc.c */
+#line 1047 "parse-gram.c"
break;
- case 46: /* "\"char\"" */
-/* Line 668 of yacc.c. */
-#line 171 "parse-gram.y"
+ case 44: /* "\"char\"" */
+
+/* Line 1538 of yacc.c */
+#line 176 "parse-gram.y"
{ fputs (char_name ((yyvaluep->character)), stderr); };
-/* Line 668 of yacc.c. */
-#line 969 "parse-gram.c"
+
+/* Line 1538 of yacc.c */
+#line 1056 "parse-gram.c"
break;
- case 47: /* "\"epilogue\"" */
-/* Line 668 of yacc.c. */
-#line 176 "parse-gram.y"
+ case 45: /* "\"epilogue\"" */
+
+/* Line 1538 of yacc.c */
+#line 184 "parse-gram.y"
{ fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-/* Line 668 of yacc.c. */
-#line 976 "parse-gram.c"
+
+/* Line 1538 of yacc.c */
+#line 1065 "parse-gram.c"
break;
- case 49: /* "\"identifier\"" */
-/* Line 668 of yacc.c. */
-#line 180 "parse-gram.y"
+ case 47: /* "\"identifier\"" */
+
+/* Line 1538 of yacc.c */
+#line 189 "parse-gram.y"
{ fputs ((yyvaluep->uniqstr), stderr); };
-/* Line 668 of yacc.c. */
-#line 983 "parse-gram.c"
+
+/* Line 1538 of yacc.c */
+#line 1074 "parse-gram.c"
break;
- case 50: /* "\"identifier:\"" */
-/* Line 668 of yacc.c. */
-#line 181 "parse-gram.y"
+ case 48: /* "\"identifier:\"" */
+
+/* Line 1538 of yacc.c */
+#line 190 "parse-gram.y"
{ fprintf (stderr, "%s:", (yyvaluep->uniqstr)); };
-/* Line 668 of yacc.c. */
-#line 990 "parse-gram.c"
+
+/* Line 1538 of yacc.c */
+#line 1083 "parse-gram.c"
break;
- case 53: /* "\"%{...%}\"" */
-/* Line 668 of yacc.c. */
-#line 176 "parse-gram.y"
+ case 51: /* "\"%{...%}\"" */
+
+/* Line 1538 of yacc.c */
+#line 184 "parse-gram.y"
{ fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-/* Line 668 of yacc.c. */
-#line 997 "parse-gram.c"
+
+/* Line 1538 of yacc.c */
+#line 1092 "parse-gram.c"
break;
- case 55: /* "\"type\"" */
-/* Line 668 of yacc.c. */
-#line 179 "parse-gram.y"
+ case 53: /* "\"type\"" */
+
+/* Line 1538 of yacc.c */
+#line 188 "parse-gram.y"
{ fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); };
-/* Line 668 of yacc.c. */
-#line 1004 "parse-gram.c"
+
+/* Line 1538 of yacc.c */
+#line 1101 "parse-gram.c"
+ break;
+ case 80: /* "variable" */
+
+/* Line 1538 of yacc.c */
+#line 189 "parse-gram.y"
+ { fputs ((yyvaluep->uniqstr), stderr); };
+
+/* Line 1538 of yacc.c */
+#line 1110 "parse-gram.c"
+ break;
+ case 81: /* "content.opt" */
+
+/* Line 1538 of yacc.c */
+#line 184 "parse-gram.y"
+ { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
+
+/* Line 1538 of yacc.c */
+#line 1119 "parse-gram.c"
+ break;
+ case 82: /* "braceless" */
+
+/* Line 1538 of yacc.c */
+#line 184 "parse-gram.y"
+ { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
+
+/* Line 1538 of yacc.c */
+#line 1128 "parse-gram.c"
break;
- case 78: /* "id" */
-/* Line 668 of yacc.c. */
-#line 187 "parse-gram.y"
+ case 83: /* "id" */
+
+/* Line 1538 of yacc.c */
+#line 196 "parse-gram.y"
{ fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
-/* Line 668 of yacc.c. */
-#line 1011 "parse-gram.c"
+
+/* Line 1538 of yacc.c */
+#line 1137 "parse-gram.c"
break;
- case 79: /* "id_colon" */
-/* Line 668 of yacc.c. */
-#line 188 "parse-gram.y"
+ case 84: /* "id_colon" */
+
+/* Line 1538 of yacc.c */
+#line 197 "parse-gram.y"
{ fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); };
-/* Line 668 of yacc.c. */
-#line 1018 "parse-gram.c"
+
+/* Line 1538 of yacc.c */
+#line 1146 "parse-gram.c"
break;
- case 80: /* "symbol" */
-/* Line 668 of yacc.c. */
-#line 187 "parse-gram.y"
+ case 85: /* "symbol" */
+
+/* Line 1538 of yacc.c */
+#line 196 "parse-gram.y"
{ fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
-/* Line 668 of yacc.c. */
-#line 1025 "parse-gram.c"
+
+/* Line 1538 of yacc.c */
+#line 1155 "parse-gram.c"
break;
- case 81: /* "string_as_id" */
-/* Line 668 of yacc.c. */
-#line 187 "parse-gram.y"
+ case 86: /* "string_as_id" */
+
+/* Line 1538 of yacc.c */
+#line 196 "parse-gram.y"
{ fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
-/* Line 668 of yacc.c. */
-#line 1032 "parse-gram.c"
- break;
- case 82: /* "string_content" */
-/* Line 668 of yacc.c. */
-#line 174 "parse-gram.y"
- { fputs (quotearg_style (c_quoting_style, (yyvaluep->chars)), stderr); };
-/* Line 668 of yacc.c. */
-#line 1039 "parse-gram.c"
+
+/* Line 1538 of yacc.c */
+#line 1164 "parse-gram.c"
break;
default:
break;
@@ -1127,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");
}
}
@@ -1548,16 +1673,18 @@ YYLTYPE yylloc;
/* User initialization code. */
- /* Line 1080 of yacc.c. */
-#line 81 "parse-gram.y"
+
+/* Line 1538 of yacc.c */
+#line 86 "parse-gram.y"
{
/* Bison's grammar can initial empty locations, hence a default
location is needed. */
boundary_set (&yylloc.start, current_file, 1, 1);
boundary_set (&yylloc.end, current_file, 1, 1);
}
-/* Line 1080 of yacc.c. */
-#line 1561 "parse-gram.c"
+
+/* Line 1538 of yacc.c */
+#line 1688 "parse-gram.c"
yylsp[0] = yylloc;
goto yysetstate;
@@ -1639,6 +1766,9 @@ YYLTYPE yylloc;
YYDPRINTF ((stderr, "Entering state %d\n", yystate));
+ if (yystate == YYFINAL)
+ YYACCEPT;
+
goto yybackup;
/*-----------.
@@ -1688,9 +1818,6 @@ yybackup:
goto yyreduce;
}
- if (yyn == YYFINAL)
- YYACCEPT;
-
/* Count tokens shifted since error; after three, turn off error
status. */
if (yyerrstatus)
@@ -1699,9 +1826,8 @@ yybackup:
/* Shift the lookahead token. */
YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
- /* Discard the shifted token unless it is eof. */
- if (yychar != YYEOF)
- yychar = YYEMPTY;
+ /* Discard the shifted token. */
+ yychar = YYEMPTY;
yystate = yyn;
*++yyvsp = yylval;
@@ -1742,398 +1868,523 @@ yyreduce:
switch (yyn)
{
case 6:
-/* Line 1268 of yacc.c. */
-#line 211 "parse-gram.y"
+
+/* Line 1538 of yacc.c */
+#line 220 "parse-gram.y"
{
- prologue_augment (translate_code ((yyvsp[(1) - (1)].chars), (yylsp[(1) - (1)])), (yylsp[(1) - (1)]), typed);
+ 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 1268 of yacc.c. */
-#line 215 "parse-gram.y"
- {
- /* Remove the '{', and replace the '}' with '\n'. */
- (yyvsp[(2) - (2)].chars)[strlen ((yyvsp[(2) - (2)].chars)) - 1] = '\n';
- prologue_augment (translate_code ((yyvsp[(2) - (2)].chars)+1, (yylsp[(2) - (2)])), (yylsp[(2) - (2)]), true);
- }
+
+/* Line 1538 of yacc.c */
+#line 229 "parse-gram.y"
+ { debug_flag = true; }
break;
case 8:
-/* Line 1268 of yacc.c. */
-#line 221 "parse-gram.y"
+
+/* Line 1538 of yacc.c */
+#line 231 "parse-gram.y"
{
- /* Remove the '{', and replace the '}' with '\n'. */
- (yyvsp[(2) - (2)].chars)[strlen ((yyvsp[(2) - (2)].chars)) - 1] = '\n';
- prologue_augment (translate_code ((yyvsp[(2) - (2)].chars)+1, (yylsp[(2) - (2)])), (yylsp[(2) - (2)]), false);
+ muscle_percent_define_insert ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars));
}
break;
case 9:
-/* Line 1268 of yacc.c. */
-#line 226 "parse-gram.y"
- { debug_flag = true; }
+
+/* Line 1538 of yacc.c */
+#line 234 "parse-gram.y"
+ { defines_flag = true; }
break;
case 10:
-/* Line 1268 of yacc.c. */
-#line 228 "parse-gram.y"
+
+/* Line 1538 of yacc.c */
+#line 236 "parse-gram.y"
{
- static char one[] = "1";
- muscle_insert ((yyvsp[(2) - (2)].chars), one);
+ defines_flag = true;
+ spec_defines_file = xstrdup ((yyvsp[(2) - (2)].chars));
}
break;
case 11:
-/* Line 1268 of yacc.c. */
-#line 232 "parse-gram.y"
- { muscle_insert ((yyvsp[(2) - (3)].chars), (yyvsp[(3) - (3)].chars)); }
- break;
- case 12:
-/* Line 1268 of yacc.c. */
-#line 233 "parse-gram.y"
- { defines_flag = true; }
- break;
-
- case 13:
-/* Line 1268 of yacc.c. */
-#line 235 "parse-gram.y"
- {
- /* Remove the '{', and replace the '}' with '\n'. */
- (yyvsp[(2) - (2)].chars)[strlen ((yyvsp[(2) - (2)].chars)) - 1] = '\n';
- muscle_code_grow ("end_header", translate_code ((yyvsp[(2) - (2)].chars)+1, (yylsp[(2) - (2)])), (yylsp[(2) - (2)]));
- }
- break;
-
- case 14:
-/* Line 1268 of yacc.c. */
+/* Line 1538 of yacc.c */
#line 240 "parse-gram.y"
{ error_verbose = true; }
break;
- case 15:
-/* Line 1268 of yacc.c. */
+ case 12:
+
+/* Line 1538 of yacc.c */
#line 241 "parse-gram.y"
{ expected_sr_conflicts = (yyvsp[(2) - (2)].integer); }
break;
- case 16:
-/* Line 1268 of yacc.c. */
+ case 13:
+
+/* Line 1538 of yacc.c */
#line 242 "parse-gram.y"
{ expected_rr_conflicts = (yyvsp[(2) - (2)].integer); }
break;
- case 17:
-/* Line 1268 of yacc.c. */
+ case 14:
+
+/* Line 1538 of yacc.c */
#line 243 "parse-gram.y"
+ { spec_file_prefix = (yyvsp[(2) - (2)].chars); }
+ break;
+
+ case 15:
+
+/* Line 1538 of yacc.c */
+#line 244 "parse-gram.y"
{ spec_file_prefix = (yyvsp[(3) - (3)].chars); }
break;
- case 18:
-/* Line 1268 of yacc.c. */
-#line 245 "parse-gram.y"
+ case 16:
+
+/* Line 1538 of yacc.c */
+#line 246 "parse-gram.y"
{
nondeterministic_parser = true;
glr_parser = true;
}
break;
- case 19:
-/* Line 1268 of yacc.c. */
-#line 250 "parse-gram.y"
+ case 17:
+
+/* Line 1538 of yacc.c */
+#line 251 "parse-gram.y"
{
- muscle_code_grow ("initial_action", translate_symbol_action ((yyvsp[(2) - (2)].chars), (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 1538 of yacc.c */
+#line 259 "parse-gram.y"
+ { language_argmatch ((yyvsp[(2) - (2)].chars), 1, &(yylsp[(1) - (2)])); }
+ break;
+
+ case 19:
+
+/* Line 1538 of yacc.c */
+#line 260 "parse-gram.y"
+ { add_param ("lex_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
+ break;
+
case 20:
-/* Line 1268 of yacc.c. */
-#line 253 "parse-gram.y"
- { add_param ("lex_param", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); }
+
+/* Line 1538 of yacc.c */
+#line 261 "parse-gram.y"
+ { locations_flag = true; }
break;
case 21:
-/* Line 1268 of yacc.c. */
-#line 254 "parse-gram.y"
- { locations_flag = true; }
+
+/* Line 1538 of yacc.c */
+#line 262 "parse-gram.y"
+ { spec_name_prefix = (yyvsp[(2) - (2)].chars); }
break;
case 22:
-/* Line 1268 of yacc.c. */
-#line 255 "parse-gram.y"
+
+/* Line 1538 of yacc.c */
+#line 263 "parse-gram.y"
{ spec_name_prefix = (yyvsp[(3) - (3)].chars); }
break;
case 23:
-/* Line 1268 of yacc.c. */
-#line 256 "parse-gram.y"
+
+/* Line 1538 of yacc.c */
+#line 264 "parse-gram.y"
{ no_lines_flag = true; }
break;
case 24:
-/* Line 1268 of yacc.c. */
-#line 257 "parse-gram.y"
+
+/* Line 1538 of yacc.c */
+#line 265 "parse-gram.y"
{ nondeterministic_parser = true; }
break;
case 25:
-/* Line 1268 of yacc.c. */
-#line 258 "parse-gram.y"
- { spec_outfile = (yyvsp[(3) - (3)].chars); }
+
+/* Line 1538 of yacc.c */
+#line 266 "parse-gram.y"
+ { spec_outfile = (yyvsp[(2) - (2)].chars); }
break;
case 26:
-/* Line 1268 of yacc.c. */
-#line 259 "parse-gram.y"
- { add_param ("parse_param", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); }
+
+/* Line 1538 of yacc.c */
+#line 267 "parse-gram.y"
+ { spec_outfile = (yyvsp[(3) - (3)].chars); }
break;
case 27:
-/* Line 1268 of yacc.c. */
-#line 260 "parse-gram.y"
- { pure_parser = true; }
+
+/* Line 1538 of yacc.c */
+#line 268 "parse-gram.y"
+ { add_param ("parse_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
break;
case 28:
-/* Line 1268 of yacc.c. */
-#line 261 "parse-gram.y"
- { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); }
+
+/* Line 1538 of yacc.c */
+#line 269 "parse-gram.y"
+ { pure_parser = true; }
break;
case 29:
-/* Line 1268 of yacc.c. */
-#line 262 "parse-gram.y"
- { skeleton = (yyvsp[(2) - (2)].chars); }
+
+/* Line 1538 of yacc.c */
+#line 270 "parse-gram.y"
+ { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); }
break;
case 30:
-/* Line 1268 of yacc.c. */
-#line 264 "parse-gram.y"
+
+/* Line 1538 of yacc.c */
+#line 272 "parse-gram.y"
{
- /* Remove the '{', and replace the '}' with '\n'. */
- (yyvsp[(2) - (2)].chars)[strlen ((yyvsp[(2) - (2)].chars)) - 1] = '\n';
- muscle_code_grow ("start_header", translate_code ((yyvsp[(2) - (2)].chars)+1, (yylsp[(2) - (2)])), (yylsp[(2) - (2)]));
+ 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 1268 of yacc.c. */
-#line 269 "parse-gram.y"
+
+/* Line 1538 of yacc.c */
+#line 295 "parse-gram.y"
{ token_table_flag = true; }
break;
case 32:
-/* Line 1268 of yacc.c. */
-#line 270 "parse-gram.y"
+
+/* Line 1538 of yacc.c */
+#line 296 "parse-gram.y"
{ report_flag = report_states; }
break;
case 33:
-/* Line 1268 of yacc.c. */
-#line 271 "parse-gram.y"
+
+/* Line 1538 of yacc.c */
+#line 297 "parse-gram.y"
{ yacc_flag = true; }
break;
case 37:
-/* Line 1268 of yacc.c. */
-#line 279 "parse-gram.y"
+
+/* Line 1538 of yacc.c */
+#line 305 "parse-gram.y"
{
grammar_start_symbol_set ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]));
}
break;
case 38:
-/* Line 1268 of yacc.c. */
-#line 283 "parse-gram.y"
+
+/* Line 1538 of yacc.c */
+#line 309 "parse-gram.y"
{
symbol_list *list;
- const char *action = translate_symbol_action ((yyvsp[(2) - (3)].chars), (yylsp[(2) - (3)]));
for (list = (yyvsp[(3) - (3)].list); list; list = list->next)
- symbol_destructor_set (list->sym, 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 39:
-/* Line 1268 of yacc.c. */
-#line 291 "parse-gram.y"
+
+/* Line 1538 of yacc.c */
+#line 316 "parse-gram.y"
{
symbol_list *list;
- const char *action = translate_symbol_action ((yyvsp[(2) - (3)].chars), (yylsp[(2) - (3)]));
for (list = (yyvsp[(3) - (3)].list); list; list = list->next)
- symbol_printer_set (list->sym, 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 40:
-/* Line 1268 of yacc.c. */
-#line 299 "parse-gram.y"
+
+/* Line 1538 of yacc.c */
+#line 323 "parse-gram.y"
{
default_prec = true;
}
break;
case 41:
-/* Line 1268 of yacc.c. */
-#line 303 "parse-gram.y"
+
+/* Line 1538 of yacc.c */
+#line 327 "parse-gram.y"
{
default_prec = false;
}
break;
case 42:
-/* Line 1268 of yacc.c. */
-#line 316 "parse-gram.y"
- {}
+
+/* Line 1538 of yacc.c */
+#line 331 "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 43:
-/* Line 1268 of yacc.c. */
-#line 317 "parse-gram.y"
- { muscle_code_grow ("union_name", (yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
+
+/* Line 1538 of yacc.c */
+#line 338 "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 44:
-/* Line 1268 of yacc.c. */
-#line 322 "parse-gram.y"
- {
- char const *body = (yyvsp[(3) - (3)].chars);
- if (typed)
- {
- /* Concatenate the union bodies, turning the first one's
- trailing '}' into '\n', and omitting the second one's '{'. */
- char *code = muscle_find ("stype");
- code[strlen (code) - 1] = '\n';
- body++;
- }
+/* Line 1538 of yacc.c */
+#line 352 "parse-gram.y"
+ {}
+ break;
+
+ case 45:
- typed = true;
- muscle_code_grow ("stype", body, (yylsp[(3) - (3)]));
+/* Line 1538 of yacc.c */
+#line 353 "parse-gram.y"
+ { muscle_code_grow ("union_name", (yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
+ break;
+
+ case 46:
+
+/* Line 1538 of yacc.c */
+#line 358 "parse-gram.y"
+ {
+ union_seen = true;
+ muscle_code_grow ("stype", (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)]));
+ code_scanner_last_string_free ();
}
break;
- case 45:
-/* Line 1268 of yacc.c. */
-#line 343 "parse-gram.y"
+ case 47:
+
+/* Line 1538 of yacc.c */
+#line 369 "parse-gram.y"
{ current_class = nterm_sym; }
break;
- case 46:
-/* Line 1268 of yacc.c. */
-#line 344 "parse-gram.y"
+ case 48:
+
+/* Line 1538 of yacc.c */
+#line 370 "parse-gram.y"
{
current_class = unknown_sym;
current_type = NULL;
}
break;
- case 47:
-/* Line 1268 of yacc.c. */
-#line 348 "parse-gram.y"
+ case 49:
+
+/* Line 1538 of yacc.c */
+#line 374 "parse-gram.y"
{ current_class = token_sym; }
break;
- case 48:
-/* Line 1268 of yacc.c. */
-#line 349 "parse-gram.y"
+ case 50:
+
+/* Line 1538 of yacc.c */
+#line 375 "parse-gram.y"
{
current_class = unknown_sym;
current_type = NULL;
}
break;
- case 49:
-/* Line 1268 of yacc.c. */
-#line 354 "parse-gram.y"
+ case 51:
+
+/* Line 1538 of yacc.c */
+#line 380 "parse-gram.y"
{
symbol_list *list;
+ tag_seen = true;
for (list = (yyvsp[(3) - (3)].list); list; list = list->next)
- symbol_type_set (list->sym, (yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]));
+ symbol_type_set (list->content.sym, (yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]));
symbol_list_free ((yyvsp[(3) - (3)].list));
}
break;
- case 50:
-/* Line 1268 of yacc.c. */
-#line 364 "parse-gram.y"
+ case 52:
+
+/* Line 1538 of yacc.c */
+#line 391 "parse-gram.y"
{
symbol_list *list;
++current_prec;
for (list = (yyvsp[(3) - (3)].list); list; list = list->next)
{
- symbol_type_set (list->sym, current_type, (yylsp[(2) - (3)]));
- symbol_precedence_set (list->sym, current_prec, (yyvsp[(1) - (3)].assoc), (yylsp[(1) - (3)]));
+ symbol_type_set (list->content.sym, current_type, (yylsp[(2) - (3)]));
+ symbol_precedence_set (list->content.sym, current_prec, (yyvsp[(1) - (3)].assoc), (yylsp[(1) - (3)]));
}
symbol_list_free ((yyvsp[(3) - (3)].list));
current_type = NULL;
}
break;
- case 51:
-/* Line 1268 of yacc.c. */
-#line 378 "parse-gram.y"
+ case 53:
+
+/* Line 1538 of yacc.c */
+#line 405 "parse-gram.y"
{ (yyval.assoc) = left_assoc; }
break;
- case 52:
-/* Line 1268 of yacc.c. */
-#line 379 "parse-gram.y"
+ case 54:
+
+/* Line 1538 of yacc.c */
+#line 406 "parse-gram.y"
{ (yyval.assoc) = right_assoc; }
break;
- case 53:
-/* Line 1268 of yacc.c. */
-#line 380 "parse-gram.y"
+ case 55:
+
+/* Line 1538 of yacc.c */
+#line 407 "parse-gram.y"
{ (yyval.assoc) = non_assoc; }
break;
- case 54:
-/* Line 1268 of yacc.c. */
-#line 384 "parse-gram.y"
+ case 56:
+
+/* Line 1538 of yacc.c */
+#line 411 "parse-gram.y"
{ current_type = NULL; }
break;
- case 55:
-/* Line 1268 of yacc.c. */
-#line 385 "parse-gram.y"
- { current_type = (yyvsp[(1) - (1)].uniqstr); }
+ case 57:
+
+/* Line 1538 of yacc.c */
+#line 412 "parse-gram.y"
+ { current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; }
break;
- case 56:
-/* Line 1268 of yacc.c. */
-#line 390 "parse-gram.y"
- { (yyval.list) = symbol_list_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
+ case 58:
+
+/* Line 1538 of yacc.c */
+#line 418 "parse-gram.y"
+ { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
break;
- case 57:
-/* Line 1268 of yacc.c. */
-#line 391 "parse-gram.y"
- { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); }
+ case 59:
+
+/* Line 1538 of yacc.c */
+#line 420 "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 58:
-/* Line 1268 of yacc.c. */
-#line 397 "parse-gram.y"
+ case 60:
+
+/* Line 1538 of yacc.c */
+#line 424 "parse-gram.y"
+ { (yyval.list) = (yyvsp[(1) - (1)].list); }
+ break;
+
+ case 61:
+
+/* Line 1538 of yacc.c */
+#line 425 "parse-gram.y"
+ { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); }
+ break;
+
+ case 62:
+
+/* Line 1538 of yacc.c */
+#line 429 "parse-gram.y"
+ { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
+ break;
+
+ case 63:
+
+/* Line 1538 of yacc.c */
+#line 430 "parse-gram.y"
+ { (yyval.list) = symbol_list_type_new ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
+ break;
+
+ case 64:
+
+/* Line 1538 of yacc.c */
+#line 431 "parse-gram.y"
+ { (yyval.list) = symbol_list_default_tagged_new ((yylsp[(1) - (1)])); }
+ break;
+
+ case 65:
+
+/* Line 1538 of yacc.c */
+#line 432 "parse-gram.y"
+ { (yyval.list) = symbol_list_default_tagless_new ((yylsp[(1) - (1)])); }
+ break;
+
+ case 66:
+
+/* Line 1538 of yacc.c */
+#line 438 "parse-gram.y"
{
current_type = (yyvsp[(1) - (1)].uniqstr);
+ tag_seen = true;
}
break;
- case 59:
-/* Line 1268 of yacc.c. */
-#line 401 "parse-gram.y"
+ case 67:
+
+/* Line 1538 of yacc.c */
+#line 443 "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 60:
-/* Line 1268 of yacc.c. */
-#line 406 "parse-gram.y"
+ case 68:
+
+/* Line 1538 of yacc.c */
+#line 448 "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)]));
@@ -2141,9 +2392,10 @@ yyreduce:
}
break;
- case 61:
-/* Line 1268 of yacc.c. */
-#line 412 "parse-gram.y"
+ case 69:
+
+/* Line 1538 of yacc.c */
+#line 454 "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)]));
@@ -2151,9 +2403,10 @@ yyreduce:
}
break;
- case 62:
-/* Line 1268 of yacc.c. */
-#line 418 "parse-gram.y"
+ case 70:
+
+/* Line 1538 of yacc.c */
+#line 460 "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)]));
@@ -2162,77 +2415,119 @@ yyreduce:
}
break;
- case 69:
-/* Line 1268 of yacc.c. */
-#line 448 "parse-gram.y"
+ case 77:
+
+/* Line 1538 of yacc.c */
+#line 490 "parse-gram.y"
{
yyerrok;
}
break;
- case 70:
-/* Line 1268 of yacc.c. */
-#line 454 "parse-gram.y"
+ case 78:
+
+/* Line 1538 of yacc.c */
+#line 496 "parse-gram.y"
{ current_lhs = (yyvsp[(1) - (1)].symbol); current_lhs_location = (yylsp[(1) - (1)]); }
break;
- case 72:
-/* Line 1268 of yacc.c. */
-#line 458 "parse-gram.y"
+ case 80:
+
+/* Line 1538 of yacc.c */
+#line 500 "parse-gram.y"
{ grammar_current_rule_end ((yylsp[(1) - (1)])); }
break;
- case 73:
-/* Line 1268 of yacc.c. */
-#line 459 "parse-gram.y"
+ case 81:
+
+/* Line 1538 of yacc.c */
+#line 501 "parse-gram.y"
{ grammar_current_rule_end ((yylsp[(3) - (3)])); }
break;
- case 75:
-/* Line 1268 of yacc.c. */
-#line 465 "parse-gram.y"
+ case 83:
+
+/* Line 1538 of yacc.c */
+#line 507 "parse-gram.y"
{ grammar_current_rule_begin (current_lhs, current_lhs_location); }
break;
- case 76:
-/* Line 1268 of yacc.c. */
-#line 467 "parse-gram.y"
+ case 84:
+
+/* Line 1538 of yacc.c */
+#line 509 "parse-gram.y"
{ grammar_current_rule_symbol_append ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); }
break;
- case 77:
-/* Line 1268 of yacc.c. */
-#line 469 "parse-gram.y"
- { grammar_current_rule_action_append ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); }
+ case 85:
+
+/* Line 1538 of yacc.c */
+#line 511 "parse-gram.y"
+ { grammar_current_rule_action_append ((yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
break;
- case 78:
-/* Line 1268 of yacc.c. */
-#line 471 "parse-gram.y"
+ case 86:
+
+/* Line 1538 of yacc.c */
+#line 513 "parse-gram.y"
{ grammar_current_rule_prec_set ((yyvsp[(3) - (3)].symbol), (yylsp[(3) - (3)])); }
break;
- case 79:
-/* Line 1268 of yacc.c. */
-#line 473 "parse-gram.y"
+ case 87:
+
+/* Line 1538 of yacc.c */
+#line 515 "parse-gram.y"
{ grammar_current_rule_dprec_set ((yyvsp[(3) - (3)].integer), (yylsp[(3) - (3)])); }
break;
- case 80:
-/* Line 1268 of yacc.c. */
-#line 475 "parse-gram.y"
+ case 88:
+
+/* Line 1538 of yacc.c */
+#line 517 "parse-gram.y"
{ grammar_current_rule_merge_set ((yyvsp[(3) - (3)].uniqstr), (yylsp[(3) - (3)])); }
break;
- case 81:
-/* Line 1268 of yacc.c. */
-#line 488 "parse-gram.y"
+ case 90:
+
+/* Line 1538 of yacc.c */
+#line 527 "parse-gram.y"
+ { (yyval.uniqstr) = uniqstr_new ((yyvsp[(1) - (1)].chars)); }
+ break;
+
+ case 91:
+
+/* Line 1538 of yacc.c */
+#line 533 "parse-gram.y"
+ {
+ (yyval.chars) = "";
+ }
+ break;
+
+ case 93:
+
+/* Line 1538 of yacc.c */
+#line 546 "parse-gram.y"
+ {
+ code_props plain_code;
+ (yyvsp[(1) - (1)].code)[strlen ((yyvsp[(1) - (1)].code)) - 1] = '\n';
+ 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 94:
+
+/* Line 1538 of yacc.c */
+#line 566 "parse-gram.y"
{ (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
break;
- case 82:
-/* Line 1268 of yacc.c. */
-#line 490 "parse-gram.y"
+ case 95:
+
+/* Line 1538 of yacc.c */
+#line 568 "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);
@@ -2240,39 +2535,41 @@ yyreduce:
}
break;
- case 83:
-/* Line 1268 of yacc.c. */
-#line 498 "parse-gram.y"
+ case 96:
+
+/* Line 1538 of yacc.c */
+#line 576 "parse-gram.y"
{ (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
break;
- case 86:
-/* Line 1268 of yacc.c. */
-#line 510 "parse-gram.y"
+ case 99:
+
+/* Line 1538 of yacc.c */
+#line 588 "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 87:
-/* Line 1268 of yacc.c. */
-#line 519 "parse-gram.y"
- { (yyval.chars) = (yyvsp[(1) - (1)].chars); }
- break;
+ case 101:
- case 89:
-/* Line 1268 of yacc.c. */
-#line 526 "parse-gram.y"
+/* Line 1538 of yacc.c */
+#line 597 "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 1268 of yacc.c. */
-#line 2276 "parse-gram.c"
+
+/* Line 1538 of yacc.c */
+#line 2573 "parse-gram.c"
default: break;
}
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -2423,9 +2720,6 @@ yyerrlab1:
YY_STACK_PRINT (yyss, yyssp);
}
- if (yyn == YYFINAL)
- YYACCEPT;
-
*++yyvsp = yylval;
yyerror_range[1] = yylloc;
@@ -2455,7 +2749,7 @@ yyabortlab:
yyresult = 1;
goto yyreturn;
-#ifndef yyoverflow
+#if !defined(yyoverflow) || YYERROR_VERBOSE
/*-------------------------------------------------.
| yyexhaustedlab -- memory exhaustion comes here. |
`-------------------------------------------------*/
@@ -2466,7 +2760,7 @@ yyexhaustedlab:
#endif
yyreturn:
- if (yychar != YYEOF && yychar != YYEMPTY)
+ if (yychar != YYEMPTY)
yydestruct ("Cleanup: discarding lookahead",
yytoken, &yylval, &yylloc);
/* Do not reclaim the symbols of the rule which action triggered
@@ -2492,8 +2786,9 @@ yyreturn:
}
-/* Line 1488 of yacc.c. */
-#line 532 "parse-gram.y"
+
+/* Line 1538 of yacc.c */
+#line 607 "parse-gram.y"
@@ -2578,6 +2873,7 @@ add_param (char const *type, char *decl, location loc)
gram_scanner_last_string_free ();
}
+
static void
version_check (location const *loc, char const *version)
{