X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/136a0f766b38072ec6ac6c386b230e04d4146151..1b17b01d0fa00512e2d7b561757336bff9784fa0:/src/parse-gram.c
diff --git a/src/parse-gram.c b/src/parse-gram.c
index 2fbe52e1..0a92ba19 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
@@ -58,6 +57,9 @@
/* Push parsers. */
#define YYPUSH 0
+/* Pull parsers. */
+#define YYPULL 1
+
/* Using locations. */
#define YYLSP_NEEDED 1
@@ -73,17 +75,18 @@
/* Copy the first part of user declarations. */
-/* Line 164 of yacc.c */
-#line 1 "../../src/parse-gram.y"
+/* Line 1535 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 +95,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 +152,8 @@ static int current_prec = 0;
#define YYTYPE_UINT8 uint_fast8_t
-/* Line 164 of yacc.c */
-#line 157 "../../src/parse-gram.c"
+/* Line 1535 of yacc.c */
+#line 157 "parse-gram.c"
/* Enabling traces. */
#ifndef YYDEBUG
@@ -188,24 +188,24 @@ static int current_prec = 0;
PERCENT_TYPE = 262,
PERCENT_DESTRUCTOR = 263,
PERCENT_PRINTER = 264,
- PERCENT_SYMBOL_DEFAULT = 265,
- PERCENT_LEFT = 266,
- PERCENT_RIGHT = 267,
- PERCENT_NONASSOC = 268,
- PERCENT_PREC = 269,
- PERCENT_DPREC = 270,
- PERCENT_MERGE = 271,
- PERCENT_CODE = 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_LEFT = 265,
+ PERCENT_RIGHT = 266,
+ PERCENT_NONASSOC = 267,
+ PERCENT_PREC = 268,
+ PERCENT_DPREC = 269,
+ PERCENT_MERGE = 270,
+ 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,
@@ -214,28 +214,29 @@ static int current_prec = 0;
PERCENT_NONDETERMINISTIC_PARSER = 288,
PERCENT_OUTPUT = 289,
PERCENT_PARSE_PARAM = 290,
- PERCENT_PROVIDES = 291,
- PERCENT_PURE_PARSER = 292,
- PERCENT_PUSH_PARSER = 293,
+ PERCENT_PURE_PARSER = 291,
+ PERCENT_PUSH_PARSER = 292,
+ PERCENT_PUSH_PULL_PARSER = 293,
PERCENT_REQUIRE = 294,
- PERCENT_REQUIRES = 295,
- PERCENT_SKELETON = 296,
- PERCENT_START = 297,
- PERCENT_TOKEN_TABLE = 298,
- PERCENT_VERBOSE = 299,
- PERCENT_YACC = 300,
- BRACED_CODE = 301,
- CHAR = 302,
- EPILOGUE = 303,
- EQUAL = 304,
- ID = 305,
- ID_COLON = 306,
- PERCENT_PERCENT = 307,
- PIPE = 308,
- PROLOGUE = 309,
- SEMICOLON = 310,
- TYPE = 311,
- PERCENT_UNION = 312
+ PERCENT_SKELETON = 295,
+ PERCENT_START = 296,
+ PERCENT_TOKEN_TABLE = 297,
+ PERCENT_VERBOSE = 298,
+ PERCENT_YACC = 299,
+ BRACED_CODE = 300,
+ CHAR = 301,
+ EPILOGUE = 302,
+ EQUAL = 303,
+ ID = 304,
+ ID_COLON = 305,
+ PERCENT_PERCENT = 306,
+ PIPE = 307,
+ PROLOGUE = 308,
+ SEMICOLON = 309,
+ TYPE = 310,
+ TYPE_TAG_ANY = 311,
+ TYPE_TAG_NONE = 312,
+ PERCENT_UNION = 313
};
#endif
/* Tokens. */
@@ -247,24 +248,24 @@ static int current_prec = 0;
#define PERCENT_TYPE 262
#define PERCENT_DESTRUCTOR 263
#define PERCENT_PRINTER 264
-#define PERCENT_SYMBOL_DEFAULT 265
-#define PERCENT_LEFT 266
-#define PERCENT_RIGHT 267
-#define PERCENT_NONASSOC 268
-#define PERCENT_PREC 269
-#define PERCENT_DPREC 270
-#define PERCENT_MERGE 271
-#define PERCENT_CODE 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_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
@@ -273,28 +274,29 @@ static int current_prec = 0;
#define PERCENT_NONDETERMINISTIC_PARSER 288
#define PERCENT_OUTPUT 289
#define PERCENT_PARSE_PARAM 290
-#define PERCENT_PROVIDES 291
-#define PERCENT_PURE_PARSER 292
-#define PERCENT_PUSH_PARSER 293
+#define PERCENT_PURE_PARSER 291
+#define PERCENT_PUSH_PARSER 292
+#define PERCENT_PUSH_PULL_PARSER 293
#define PERCENT_REQUIRE 294
-#define PERCENT_REQUIRES 295
-#define PERCENT_SKELETON 296
-#define PERCENT_START 297
-#define PERCENT_TOKEN_TABLE 298
-#define PERCENT_VERBOSE 299
-#define PERCENT_YACC 300
-#define BRACED_CODE 301
-#define CHAR 302
-#define EPILOGUE 303
-#define EQUAL 304
-#define ID 305
-#define ID_COLON 306
-#define PERCENT_PERCENT 307
-#define PIPE 308
-#define PROLOGUE 309
-#define SEMICOLON 310
-#define TYPE 311
-#define PERCENT_UNION 312
+#define PERCENT_SKELETON 295
+#define PERCENT_START 296
+#define PERCENT_TOKEN_TABLE 297
+#define PERCENT_VERBOSE 298
+#define PERCENT_YACC 299
+#define BRACED_CODE 300
+#define CHAR 301
+#define EPILOGUE 302
+#define EQUAL 303
+#define ID 304
+#define ID_COLON 305
+#define PERCENT_PERCENT 306
+#define PIPE 307
+#define PROLOGUE 308
+#define SEMICOLON 309
+#define TYPE 310
+#define TYPE_TAG_ANY 311
+#define TYPE_TAG_NONE 312
+#define PERCENT_UNION 313
@@ -302,21 +304,24 @@ static int current_prec = 0;
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
{
-/* Line 198 of yacc.c */
-#line 98 "../../src/parse-gram.y"
+
+/* Line 1535 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 198 of yacc.c */
-#line 319 "../../src/parse-gram.c"
- YYSTYPE;
+
+
+/* Line 1535 of yacc.c */
+#line 324 "parse-gram.c"
+} YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
@@ -339,8 +344,8 @@ typedef struct YYLTYPE
/* Copy the second part of user declarations. */
-/* Line 221 of yacc.c */
-#line 344 "../../src/parse-gram.c"
+/* Line 1535 of yacc.c */
+#line 349 "parse-gram.c"
#ifdef short
# undef short
@@ -557,20 +562,20 @@ union yyalloc
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 3
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 184
+#define YYLAST 158
/* YYNTOKENS -- Number of terminals. */
-#define YYNTOKENS 58
+#define YYNTOKENS 59
/* YYNNTS -- Number of nonterminals. */
#define YYNNTS 31
/* YYNRULES -- Number of rules. */
-#define YYNRULES 97
+#define YYNRULES 103
/* YYNRULES -- Number of states. */
-#define YYNSTATES 135
+#define YYNSTATES 141
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
#define YYUNDEFTOK 2
-#define YYMAXUTOK 312
+#define YYMAXUTOK 313
#define YYTRANSLATE(YYX) \
((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -609,69 +614,73 @@ 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
+ 55, 56, 57, 58
};
#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, 21,
- 25, 27, 29, 32, 35, 39, 41, 44, 47, 49,
- 53, 55, 57, 61, 64, 67, 69, 71, 74, 77,
- 80, 82, 84, 86, 88, 90, 92, 95, 99, 103,
- 105, 107, 108, 110, 114, 115, 119, 120, 124, 128,
- 132, 134, 136, 138, 139, 141, 143, 146, 148, 151,
- 153, 155, 157, 159, 161, 164, 167, 171, 173, 176,
- 178, 181, 183, 186, 189, 190, 194, 196, 200, 203,
- 204, 207, 210, 214, 218, 222, 224, 226, 227, 229,
- 231, 233, 235, 237, 239, 241, 243, 244
+ 0, 0, 3, 8, 9, 12, 14, 16, 18, 22,
+ 24, 27, 29, 32, 35, 38, 42, 44, 47, 50,
+ 53, 55, 58, 62, 64, 66, 69, 73, 76, 78,
+ 80, 82, 85, 88, 90, 92, 94, 96, 98, 100,
+ 103, 107, 111, 113, 115, 118, 122, 123, 125, 129,
+ 130, 134, 135, 139, 143, 147, 149, 151, 153, 154,
+ 156, 158, 161, 163, 166, 168, 170, 172, 174, 176,
+ 178, 181, 184, 188, 190, 193, 195, 198, 200, 203,
+ 206, 207, 211, 213, 217, 220, 221, 224, 227, 231,
+ 235, 239, 241, 243, 244, 246, 248, 250, 252, 254,
+ 256, 258, 260, 261
};
/* YYRHS -- A `-1'-separated list of the rules' RHS. */
static const yytype_int8 yyrhs[] =
{
- 59, 0, -1, 60, 52, 75, 88, -1, -1, 60,
- 61, -1, 62, -1, 54, -1, 17, 83, -1, 18,
- -1, 20, 3, 82, -1, 21, -1, 22, -1, 23,
- 4, -1, 24, 4, -1, 25, 49, 3, -1, 26,
- -1, 27, 46, -1, 28, 46, -1, 29, -1, 30,
- 49, 3, -1, 32, -1, 33, -1, 34, 49, 3,
- -1, 35, 46, -1, 36, 83, -1, 37, -1, 38,
- -1, 39, 3, -1, 40, 83, -1, 41, 3, -1,
- 43, -1, 44, -1, 45, -1, 55, -1, 67, -1,
- 64, -1, 42, 86, -1, 8, 46, 71, -1, 9,
- 46, 71, -1, 19, -1, 31, -1, -1, 50, -1,
- 57, 63, 46, -1, -1, 6, 65, 74, -1, -1,
- 5, 66, 74, -1, 7, 56, 70, -1, 68, 69,
- 70, -1, 11, -1, 12, -1, 13, -1, -1, 56,
- -1, 86, -1, 70, 86, -1, 72, -1, 71, 72,
- -1, 86, -1, 56, -1, 10, -1, 56, -1, 84,
- -1, 84, 4, -1, 84, 87, -1, 84, 4, 87,
- -1, 73, -1, 74, 73, -1, 76, -1, 75, 76,
- -1, 77, -1, 62, 55, -1, 1, 55, -1, -1,
- 85, 78, 79, -1, 80, -1, 79, 53, 80, -1,
- 79, 55, -1, -1, 80, 86, -1, 80, 46, -1,
- 80, 14, 86, -1, 80, 15, 4, -1, 80, 16,
- 56, -1, 3, -1, 83, -1, -1, 81, -1, 46,
- -1, 50, -1, 47, -1, 51, -1, 84, -1, 87,
- -1, 3, -1, -1, 52, 48, -1
+ 60, 0, -1, 61, 51, 76, 89, -1, -1, 61,
+ 62, -1, 63, -1, 53, -1, 17, -1, 19, 82,
+ 83, -1, 20, -1, 20, 3, -1, 21, -1, 22,
+ 4, -1, 23, 4, -1, 24, 3, -1, 24, 48,
+ 3, -1, 25, -1, 26, 45, -1, 27, 3, -1,
+ 28, 45, -1, 29, -1, 30, 3, -1, 30, 48,
+ 3, -1, 32, -1, 33, -1, 34, 3, -1, 34,
+ 48, 3, -1, 35, 45, -1, 36, -1, 37, -1,
+ 38, -1, 39, 3, -1, 40, 3, -1, 42, -1,
+ 43, -1, 44, -1, 54, -1, 68, -1, 65, -1,
+ 41, 87, -1, 8, 45, 72, -1, 9, 45, 72,
+ -1, 18, -1, 31, -1, 16, 84, -1, 16, 49,
+ 84, -1, -1, 49, -1, 58, 64, 84, -1, -1,
+ 6, 66, 75, -1, -1, 5, 67, 75, -1, 7,
+ 55, 71, -1, 69, 70, 71, -1, 10, -1, 11,
+ -1, 12, -1, -1, 55, -1, 87, -1, 71, 87,
+ -1, 73, -1, 72, 73, -1, 87, -1, 55, -1,
+ 56, -1, 57, -1, 55, -1, 85, -1, 85, 4,
+ -1, 85, 88, -1, 85, 4, 88, -1, 74, -1,
+ 75, 74, -1, 77, -1, 76, 77, -1, 78, -1,
+ 63, 54, -1, 1, 54, -1, -1, 86, 79, 80,
+ -1, 81, -1, 80, 52, 81, -1, 80, 54, -1,
+ -1, 81, 87, -1, 81, 45, -1, 81, 13, 87,
+ -1, 81, 14, 4, -1, 81, 15, 55, -1, 49,
+ -1, 3, -1, -1, 3, -1, 45, -1, 49, -1,
+ 46, -1, 50, -1, 85, -1, 88, -1, 3, -1,
+ -1, 51, 47, -1
};
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
static const yytype_uint16 yyrline[] =
{
- 0, 208, 208, 216, 218, 222, 223, 224, 225, 226,
- 227, 228, 229, 230, 231, 232, 237, 241, 242, 243,
- 244, 245, 246, 247, 248, 249, 250, 251, 252, 253,
- 254, 255, 256, 257, 261, 262, 263, 267, 275, 283,
- 287, 301, 302, 306, 334, 334, 339, 339, 344, 355,
- 370, 371, 372, 376, 377, 382, 384, 389, 390, 394,
- 395, 396, 401, 406, 411, 417, 423, 434, 435, 444,
- 445, 451, 452, 453, 460, 460, 464, 465, 466, 471,
- 472, 474, 476, 478, 480, 490, 491, 497, 501, 506,
- 522, 524, 533, 538, 539, 544, 551, 553
+ 0, 207, 207, 215, 217, 221, 222, 232, 233, 237,
+ 238, 243, 244, 245, 246, 247, 248, 253, 262, 263,
+ 264, 265, 266, 267, 268, 269, 270, 271, 272, 273,
+ 274, 275, 276, 300, 301, 302, 303, 307, 308, 309,
+ 313, 320, 327, 331, 335, 342, 357, 358, 362, 374,
+ 374, 379, 379, 384, 395, 410, 411, 412, 416, 417,
+ 422, 424, 429, 430, 434, 435, 436, 437, 442, 447,
+ 452, 458, 464, 475, 476, 485, 486, 492, 493, 494,
+ 501, 501, 505, 506, 507, 512, 513, 515, 517, 519,
+ 521, 531, 532, 538, 541, 550, 570, 572, 581, 586,
+ 587, 592, 599, 601
};
#endif
@@ -682,25 +691,25 @@ static const char *const yytname[] =
{
"\"end of file\"", "error", "$undefined", "\"string\"", "\"integer\"",
"\"%token\"", "\"%nterm\"", "\"%type\"", "\"%destructor\"",
- "\"%printer\"", "\"%symbol-default\"", "\"%left\"", "\"%right\"",
- "\"%nonassoc\"", "\"%prec\"", "\"%dprec\"", "\"%merge\"", "\"%code\"",
- "\"%debug\"", "\"%default-prec\"", "\"%define\"", "\"%defines\"",
- "\"%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\"", "\"%provides\"", "\"%pure-parser\"",
- "\"%push-parser\"", "\"%require\"", "\"%requires\"", "\"%skeleton\"",
- "\"%start\"", "\"%token-table\"", "\"%verbose\"", "\"%yacc\"",
- "\"{...}\"", "\"char\"", "\"epilogue\"", "\"=\"", "\"identifier\"",
- "\"identifier:\"", "\"%%\"", "\"|\"", "\"%{...%}\"", "\";\"", "\"type\"",
+ "\"%printer\"", "\"%left\"", "\"%right\"", "\"%nonassoc\"", "\"%prec\"",
+ "\"%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\"", "\"%push-parser\"",
+ "\"%push-pull-parser\"", "\"%require\"", "\"%skeleton\"", "\"%start\"",
+ "\"%token-table\"", "\"%verbose\"", "\"%yacc\"", "\"{...}\"", "\"char\"",
+ "\"epilogue\"", "\"=\"", "\"identifier\"", "\"identifier:\"", "\"%%\"",
+ "\"|\"", "\"%{...%}\"", "\";\"", "\"type\"", "\"<*>\"", "\"<>\"",
"\"%union\"", "$accept", "input", "prologue_declarations",
"prologue_declaration", "grammar_declaration", "union_name",
- "symbol_declaration", "@1", "@2", "precedence_declaration",
+ "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",
- "content", "content.opt", "braceless", "id", "id_colon", "symbol",
+ "rules_or_grammar_declaration", "rules", "$@3", "rhses.1", "rhs",
+ "variable", "content.opt", "braceless", "id", "id_colon", "symbol",
"string_as_id", "epilogue.opt", 0
};
#endif
@@ -715,38 +724,40 @@ 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
+ 305, 306, 307, 308, 309, 310, 311, 312, 313
};
# endif
/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
static const yytype_uint8 yyr1[] =
{
- 0, 58, 59, 60, 60, 61, 61, 61, 61, 61,
- 61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
- 61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
- 61, 61, 61, 61, 62, 62, 62, 62, 62, 62,
- 62, 63, 63, 62, 65, 64, 66, 64, 64, 67,
- 68, 68, 68, 69, 69, 70, 70, 71, 71, 72,
- 72, 72, 73, 73, 73, 73, 73, 74, 74, 75,
- 75, 76, 76, 76, 78, 77, 79, 79, 79, 80,
- 80, 80, 80, 80, 80, 81, 81, 82, 82, 83,
- 84, 84, 85, 86, 86, 87, 88, 88
+ 0, 59, 60, 61, 61, 62, 62, 62, 62, 62,
+ 62, 62, 62, 62, 62, 62, 62, 62, 62, 62,
+ 62, 62, 62, 62, 62, 62, 62, 62, 62, 62,
+ 62, 62, 62, 62, 62, 62, 62, 63, 63, 63,
+ 63, 63, 63, 63, 63, 63, 64, 64, 63, 66,
+ 65, 67, 65, 65, 68, 69, 69, 69, 70, 70,
+ 71, 71, 72, 72, 73, 73, 73, 73, 74, 74,
+ 74, 74, 74, 75, 75, 76, 76, 77, 77, 77,
+ 79, 78, 80, 80, 80, 81, 81, 81, 81, 81,
+ 81, 82, 82, 83, 83, 84, 85, 85, 86, 87,
+ 87, 88, 89, 89
};
/* 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, 1, 3,
- 1, 1, 2, 2, 3, 1, 2, 2, 1, 3,
- 1, 1, 3, 2, 2, 1, 1, 2, 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, 2, 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
+ 0, 2, 4, 0, 2, 1, 1, 1, 3, 1,
+ 2, 1, 2, 2, 2, 3, 1, 2, 2, 2,
+ 1, 2, 3, 1, 1, 2, 3, 2, 1, 1,
+ 1, 2, 2, 1, 1, 1, 1, 1, 1, 2,
+ 3, 3, 1, 1, 2, 3, 0, 1, 3, 0,
+ 3, 0, 3, 3, 3, 1, 1, 1, 0, 1,
+ 1, 2, 1, 2, 1, 1, 1, 1, 1, 1,
+ 2, 2, 3, 1, 2, 1, 2, 1, 2, 2,
+ 0, 3, 1, 3, 2, 0, 2, 2, 3, 3,
+ 3, 1, 1, 0, 1, 1, 1, 1, 1, 1,
+ 1, 1, 0, 2
};
/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -754,130 +765,127 @@ static const yytype_uint8 yyr2[] =
means the default is an error. */
static const yytype_uint8 yydefact[] =
{
- 3, 0, 0, 1, 46, 44, 0, 0, 0, 50,
- 51, 52, 0, 8, 39, 0, 10, 11, 0, 0,
- 0, 15, 0, 0, 18, 0, 40, 20, 21, 0,
- 0, 0, 25, 26, 0, 0, 0, 0, 30, 31,
- 32, 0, 6, 33, 41, 4, 5, 35, 34, 53,
- 0, 0, 0, 0, 0, 89, 7, 87, 12, 13,
- 0, 16, 17, 0, 0, 23, 24, 27, 28, 29,
- 95, 91, 90, 93, 36, 94, 0, 92, 0, 0,
- 69, 71, 74, 42, 0, 54, 0, 62, 67, 47,
- 63, 45, 48, 55, 61, 60, 37, 57, 59, 38,
- 85, 88, 9, 86, 14, 19, 22, 73, 72, 0,
- 70, 2, 79, 43, 49, 68, 64, 65, 56, 58,
- 97, 75, 76, 66, 79, 78, 0, 0, 0, 81,
- 80, 77, 82, 83, 84
+ 3, 0, 0, 1, 51, 49, 0, 0, 0, 55,
+ 56, 57, 0, 7, 42, 0, 9, 11, 0, 0,
+ 0, 16, 0, 0, 0, 20, 0, 43, 23, 24,
+ 0, 0, 28, 29, 30, 0, 0, 0, 33, 34,
+ 35, 0, 6, 36, 46, 4, 5, 38, 37, 58,
+ 0, 0, 0, 0, 0, 95, 0, 44, 92, 91,
+ 93, 10, 12, 13, 14, 0, 17, 18, 19, 21,
+ 0, 25, 0, 27, 31, 32, 101, 97, 96, 99,
+ 39, 100, 0, 98, 0, 0, 75, 77, 80, 47,
+ 0, 59, 0, 68, 73, 52, 69, 50, 53, 60,
+ 65, 66, 67, 40, 62, 64, 41, 45, 94, 8,
+ 15, 22, 26, 79, 78, 0, 76, 2, 85, 48,
+ 54, 74, 70, 71, 61, 63, 103, 81, 82, 72,
+ 85, 84, 0, 0, 0, 87, 86, 83, 88, 89,
+ 90
};
/* YYDEFGOTO[NTERM-NUM]. */
-static const yytype_int8 yydefgoto[] =
+static const yytype_int16 yydefgoto[] =
{
- -1, 1, 2, 45, 78, 84, 47, 51, 50, 48,
- 49, 86, 92, 96, 97, 88, 89, 79, 80, 81,
- 112, 121, 122, 101, 102, 56, 73, 82, 98, 75,
- 111
+ -1, 1, 2, 45, 84, 90, 47, 51, 50, 48,
+ 49, 92, 98, 103, 104, 94, 95, 85, 86, 87,
+ 118, 127, 128, 60, 109, 57, 79, 88, 105, 81,
+ 117
};
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
-#define YYPACT_NINF -75
+#define YYPACT_NINF -79
static const yytype_int16 yypact[] =
{
- -75, 5, 90, -75, -75, -75, -52, -25, -19, -75,
- -75, -75, -13, -75, -75, 42, -75, -75, 47, 52,
- 15, -75, 19, 21, -75, 20, -75, -75, -75, 22,
- 24, -13, -75, -75, 69, -13, 70, 0, -75, -75,
- -75, 17, -75, -75, 26, -75, -75, -75, -75, 27,
- 10, 10, 0, 28, 28, -75, -75, 8, -75, -75,
- 77, -75, -75, 79, 83, -75, -75, -75, -75, -75,
- -75, -75, -75, -75, -75, -75, 32, -75, 33, 1,
- -75, -75, -75, -75, 44, -75, 0, -75, -75, 10,
- 59, 10, 0, -75, -75, -75, 28, -75, -75, 28,
- -75, -75, -75, -75, -75, -75, -75, -75, -75, 43,
- -75, -75, -75, -75, 0, -75, 89, -75, -75, -75,
- -75, -36, 134, -75, -75, -75, 0, 96, 37, -75,
- -75, 134, -75, -75, -75
+ -79, 5, 96, -79, -79, -79, -6, 13, 18, -79,
+ -79, -79, -8, -79, -79, 27, 66, -79, 74, 82,
+ 31, -79, 43, 86, 45, -79, 32, -79, -79, -79,
+ 33, 47, -79, -79, -79, 91, 93, 26, -79, -79,
+ -79, 15, -79, -79, 48, -79, -79, -79, -79, 44,
+ 38, 38, 26, 11, 11, -79, 53, -79, -79, -79,
+ 106, -79, -79, -79, -79, 107, -79, -79, -79, -79,
+ 108, -79, 138, -79, -79, -79, -79, -79, -79, -79,
+ -79, -79, 88, -79, 89, 1, -79, -79, -79, -79,
+ 53, -79, 26, -79, -79, 38, 50, 38, 26, -79,
+ -79, -79, -79, 11, -79, -79, 11, -79, -79, -79,
+ -79, -79, -79, -79, -79, 97, -79, -79, -79, -79,
+ 26, -79, 142, -79, -79, -79, -79, -7, 25, -79,
+ -79, -79, 26, 144, 98, -79, -79, 25, -79, -79,
+ -79
};
/* YYPGOTO[NTERM-NUM]. */
-static const yytype_int8 yypgoto[] =
+static const yytype_int16 yypgoto[] =
{
- -75, -75, -75, -75, 102, -75, -75, -75, -75, -75,
- -75, -75, 50, 51, -62, -45, 55, -75, 60, -75,
- -75, -75, 14, -75, -75, 4, -10, -75, -37, -74,
- -75
+ -79, -79, -79, -79, 149, -79, -79, -79, -79, -79,
+ -79, -79, 54, 101, -21, -33, 105, -79, 67, -79,
+ -79, -79, 28, -79, -79, -13, -47, -79, -37, -78,
+ -79
};
/* 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 -97
+#define YYTABLE_NINF -103
static const yytype_int16 yytable[] =
{
- 74, -96, 76, 70, 52, 3, 4, 5, 6, 7,
- 8, 100, 9, 10, 11, 93, 117, 124, 76, 125,
- 14, 53, 4, 5, 6, 7, 8, 54, 9, 10,
- 11, 70, 26, 55, 119, 66, 14, 119, 94, 68,
- 90, 90, 123, 37, 115, 57, 115, 71, 26, 93,
- 72, 58, 77, 109, 55, 118, 59, 71, 44, 37,
- 72, 103, 70, 116, 60, 61, 87, 62, 77, 63,
- 65, 64, 67, 69, 44, 71, 83, 118, 72, 90,
- 104, 90, 105, 85, 95, 130, 106, 107, 108, 132,
- 113, 120, 70, 134, 130, 4, 5, 6, 7, 8,
- 133, 9, 10, 11, 46, 99, 91, 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, 114, 70, 131, 110,
- 0, 0, 41, 0, 42, 43, 0, 44, 126, 127,
- 128, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 129, 71, 0, 0, 72
+ 80, -102, 82, 96, 96, 3, 4, 5, 6, 7,
+ 8, 9, 10, 11, 76, 99, 82, 12, 123, 14,
+ 4, 5, 6, 7, 8, 9, 10, 11, 76, 76,
+ 58, 12, 27, 14, 64, 69, 71, 55, 132, 133,
+ 134, 56, 37, 107, 129, 130, 27, 131, 96, 52,
+ 96, 83, 115, 76, 122, 99, 37, 77, 53, 44,
+ 78, 124, 121, 54, 121, 83, 100, 101, 102, 61,
+ 135, 77, 77, 44, 78, 78, 59, 119, 62, 65,
+ 70, 72, 125, 124, 77, 125, 63, 78, 66, 67,
+ 68, 136, 73, 93, 74, 138, 75, 89, 55, 91,
+ 136, 4, 5, 6, 7, 8, 9, 10, 11, 108,
+ 110, 111, 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, 112, 113, 114, 126, 76, 120, 41, 139, 42,
+ 43, 46, 116, 140, 44, 106, 97, 0, 137
};
static const yytype_int16 yycheck[] =
{
- 37, 0, 1, 3, 56, 0, 5, 6, 7, 8,
- 9, 3, 11, 12, 13, 52, 90, 53, 1, 55,
- 19, 46, 5, 6, 7, 8, 9, 46, 11, 12,
- 13, 3, 31, 46, 96, 31, 19, 99, 10, 35,
- 50, 51, 116, 42, 89, 3, 91, 47, 31, 86,
- 50, 4, 51, 52, 46, 92, 4, 47, 57, 42,
- 50, 57, 3, 4, 49, 46, 56, 46, 51, 49,
- 46, 49, 3, 3, 57, 47, 50, 114, 50, 89,
- 3, 91, 3, 56, 56, 122, 3, 55, 55, 126,
- 46, 48, 3, 56, 131, 5, 6, 7, 8, 9,
- 4, 11, 12, 13, 2, 54, 51, 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, 86, 3, 124, 79,
- -1, -1, 52, -1, 54, 55, -1, 57, 14, 15,
- 16, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 46, 47, -1, -1, 50
+ 37, 0, 1, 50, 51, 0, 5, 6, 7, 8,
+ 9, 10, 11, 12, 3, 52, 1, 16, 96, 18,
+ 5, 6, 7, 8, 9, 10, 11, 12, 3, 3,
+ 3, 16, 31, 18, 3, 3, 3, 45, 13, 14,
+ 15, 49, 41, 56, 122, 52, 31, 54, 95, 55,
+ 97, 50, 51, 3, 4, 92, 41, 46, 45, 58,
+ 49, 98, 95, 45, 97, 50, 55, 56, 57, 3,
+ 45, 46, 46, 58, 49, 49, 49, 90, 4, 48,
+ 48, 48, 103, 120, 46, 106, 4, 49, 45, 3,
+ 45, 128, 45, 55, 3, 132, 3, 49, 45, 55,
+ 137, 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, 3, 54, 54, 47, 3, 92, 51, 4, 53,
+ 54, 2, 85, 55, 58, 54, 51, -1, 130
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
symbol of state STATE-NUM. */
static const yytype_uint8 yystos[] =
{
- 0, 59, 60, 0, 5, 6, 7, 8, 9, 11,
- 12, 13, 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, 52, 54, 55, 57, 61, 62, 64, 67, 68,
- 66, 65, 56, 46, 46, 46, 83, 3, 4, 4,
- 49, 46, 46, 49, 49, 46, 83, 3, 83, 3,
- 3, 47, 50, 84, 86, 87, 1, 51, 62, 75,
- 76, 77, 85, 50, 63, 56, 69, 56, 73, 74,
- 84, 74, 70, 86, 10, 56, 71, 72, 86, 71,
- 3, 81, 82, 83, 3, 3, 3, 55, 55, 52,
- 76, 88, 78, 46, 70, 73, 4, 87, 86, 72,
- 48, 79, 80, 87, 53, 55, 14, 15, 16, 46,
- 86, 80, 86, 4, 56
+ 0, 60, 61, 0, 5, 6, 7, 8, 9, 10,
+ 11, 12, 16, 17, 18, 19, 20, 21, 22, 23,
+ 24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
+ 34, 35, 36, 37, 38, 39, 40, 41, 42, 43,
+ 44, 51, 53, 54, 58, 62, 63, 65, 68, 69,
+ 67, 66, 55, 45, 45, 45, 49, 84, 3, 49,
+ 82, 3, 4, 4, 3, 48, 45, 3, 45, 3,
+ 48, 3, 48, 45, 3, 3, 3, 46, 49, 85,
+ 87, 88, 1, 50, 63, 76, 77, 78, 86, 49,
+ 64, 55, 70, 55, 74, 75, 85, 75, 71, 87,
+ 55, 56, 57, 72, 73, 87, 72, 84, 3, 83,
+ 3, 3, 3, 54, 54, 51, 77, 89, 79, 84,
+ 71, 74, 4, 88, 87, 73, 47, 80, 81, 88,
+ 52, 54, 13, 14, 15, 45, 87, 81, 87, 4,
+ 55
};
#define yyerrok (yyerrstatus = 0)
@@ -1027,147 +1035,147 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
{
case 3: /* "\"string\"" */
-/* Line 670 of yacc.c */
-#line 186 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 185 "parse-gram.y"
{ fputs (quotearg_style (c_quoting_style, (yyvaluep->chars)), stderr); };
-/* Line 670 of yacc.c */
-#line 1036 "../../src/parse-gram.c"
+/* Line 1535 of yacc.c */
+#line 1044 "parse-gram.c"
break;
case 4: /* "\"integer\"" */
-/* Line 670 of yacc.c */
-#line 197 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 196 "parse-gram.y"
{ fprintf (stderr, "%d", (yyvaluep->integer)); };
-/* Line 670 of yacc.c */
-#line 1045 "../../src/parse-gram.c"
+/* Line 1535 of yacc.c */
+#line 1053 "parse-gram.c"
break;
- case 46: /* "\"{...}\"" */
+ case 45: /* "\"{...}\"" */
-/* Line 670 of yacc.c */
-#line 188 "../../src/parse-gram.y"
- { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
+/* Line 1535 of yacc.c */
+#line 187 "parse-gram.y"
+ { fprintf (stderr, "{\n%s\n}", (yyvaluep->code)); };
-/* Line 670 of yacc.c */
-#line 1054 "../../src/parse-gram.c"
+/* Line 1535 of yacc.c */
+#line 1062 "parse-gram.c"
break;
- case 47: /* "\"char\"" */
+ case 46: /* "\"char\"" */
-/* Line 670 of yacc.c */
-#line 181 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 179 "parse-gram.y"
{ fputs (char_name ((yyvaluep->character)), stderr); };
-/* Line 670 of yacc.c */
-#line 1063 "../../src/parse-gram.c"
+/* Line 1535 of yacc.c */
+#line 1071 "parse-gram.c"
break;
- case 48: /* "\"epilogue\"" */
+ case 47: /* "\"epilogue\"" */
-/* Line 670 of yacc.c */
-#line 188 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 187 "parse-gram.y"
{ fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-/* Line 670 of yacc.c */
-#line 1072 "../../src/parse-gram.c"
+/* Line 1535 of yacc.c */
+#line 1080 "parse-gram.c"
break;
- case 50: /* "\"identifier\"" */
+ case 49: /* "\"identifier\"" */
-/* Line 670 of yacc.c */
-#line 193 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 192 "parse-gram.y"
{ fputs ((yyvaluep->uniqstr), stderr); };
-/* Line 670 of yacc.c */
-#line 1081 "../../src/parse-gram.c"
+/* Line 1535 of yacc.c */
+#line 1089 "parse-gram.c"
break;
- case 51: /* "\"identifier:\"" */
+ case 50: /* "\"identifier:\"" */
-/* Line 670 of yacc.c */
-#line 194 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 193 "parse-gram.y"
{ fprintf (stderr, "%s:", (yyvaluep->uniqstr)); };
-/* Line 670 of yacc.c */
-#line 1090 "../../src/parse-gram.c"
+/* Line 1535 of yacc.c */
+#line 1098 "parse-gram.c"
break;
- case 54: /* "\"%{...%}\"" */
+ case 53: /* "\"%{...%}\"" */
-/* Line 670 of yacc.c */
-#line 188 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 187 "parse-gram.y"
{ fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-/* Line 670 of yacc.c */
-#line 1099 "../../src/parse-gram.c"
+/* Line 1535 of yacc.c */
+#line 1107 "parse-gram.c"
break;
- case 56: /* "\"type\"" */
+ case 55: /* "\"type\"" */
-/* Line 670 of yacc.c */
-#line 192 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 191 "parse-gram.y"
{ fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); };
-/* Line 670 of yacc.c */
-#line 1108 "../../src/parse-gram.c"
+/* Line 1535 of yacc.c */
+#line 1116 "parse-gram.c"
break;
- case 81: /* "content" */
+ case 82: /* "variable" */
-/* Line 670 of yacc.c */
-#line 188 "../../src/parse-gram.y"
- { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
+/* Line 1535 of yacc.c */
+#line 192 "parse-gram.y"
+ { fputs ((yyvaluep->uniqstr), stderr); };
-/* Line 670 of yacc.c */
-#line 1117 "../../src/parse-gram.c"
+/* Line 1535 of yacc.c */
+#line 1125 "parse-gram.c"
break;
- case 82: /* "content.opt" */
+ case 83: /* "content.opt" */
-/* Line 670 of yacc.c */
-#line 188 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 187 "parse-gram.y"
{ fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-/* Line 670 of yacc.c */
-#line 1126 "../../src/parse-gram.c"
+/* Line 1535 of yacc.c */
+#line 1134 "parse-gram.c"
break;
- case 83: /* "braceless" */
+ case 84: /* "braceless" */
-/* Line 670 of yacc.c */
-#line 188 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 187 "parse-gram.y"
{ fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-/* Line 670 of yacc.c */
-#line 1135 "../../src/parse-gram.c"
+/* Line 1535 of yacc.c */
+#line 1143 "parse-gram.c"
break;
- case 84: /* "id" */
+ case 85: /* "id" */
-/* Line 670 of yacc.c */
-#line 200 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 199 "parse-gram.y"
{ fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
-/* Line 670 of yacc.c */
-#line 1144 "../../src/parse-gram.c"
+/* Line 1535 of yacc.c */
+#line 1152 "parse-gram.c"
break;
- case 85: /* "id_colon" */
+ case 86: /* "id_colon" */
-/* Line 670 of yacc.c */
-#line 201 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 200 "parse-gram.y"
{ fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); };
-/* Line 670 of yacc.c */
-#line 1153 "../../src/parse-gram.c"
+/* Line 1535 of yacc.c */
+#line 1161 "parse-gram.c"
break;
- case 86: /* "symbol" */
+ case 87: /* "symbol" */
-/* Line 670 of yacc.c */
-#line 200 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 199 "parse-gram.y"
{ fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
-/* Line 670 of yacc.c */
-#line 1162 "../../src/parse-gram.c"
+/* Line 1535 of yacc.c */
+#line 1170 "parse-gram.c"
break;
- case 87: /* "string_as_id" */
+ case 88: /* "string_as_id" */
-/* Line 670 of yacc.c */
-#line 200 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 199 "parse-gram.y"
{ fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
-/* Line 670 of yacc.c */
-#line 1171 "../../src/parse-gram.c"
+/* Line 1535 of yacc.c */
+#line 1179 "parse-gram.c"
break;
default:
break;
@@ -1259,11 +1267,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");
}
}
@@ -1681,8 +1689,8 @@ YYLTYPE yylloc;
/* User initialization code. */
-/* Line 1082 of yacc.c */
-#line 89 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 86 "parse-gram.y"
{
/* Bison's grammar can initial empty locations, hence a default
location is needed. */
@@ -1690,8 +1698,8 @@ YYLTYPE yylloc;
boundary_set (&yylloc.end, current_file, 1, 1);
}
-/* Line 1082 of yacc.c */
-#line 1695 "../../src/parse-gram.c"
+/* Line 1535 of yacc.c */
+#line 1703 "parse-gram.c"
yylsp[0] = yylloc;
goto yysetstate;
@@ -1876,330 +1884,395 @@ yyreduce:
{
case 6:
-/* Line 1269 of yacc.c */
-#line 223 "../../src/parse-gram.y"
- { prologue_augment (translate_code ((yyvsp[(1) - (1)].chars), (yylsp[(1) - (1)])), (yylsp[(1) - (1)]), union_seen); }
+/* Line 1535 of yacc.c */
+#line 223 "parse-gram.y"
+ {
+ code_props plain_code;
+ code_props_plain_init (&plain_code, (yyvsp[(1) - (1)].chars), (yylsp[(1) - (1)]));
+ code_props_translate_code (&plain_code);
+ gram_scanner_last_string_free ();
+ 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 224 "../../src/parse-gram.y"
- { prologue_augment ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)]), true); }
+/* Line 1535 of yacc.c */
+#line 232 "parse-gram.y"
+ { debug_flag = true; }
break;
case 8:
-/* Line 1269 of yacc.c */
-#line 225 "../../src/parse-gram.y"
- { debug_flag = true; }
+/* Line 1535 of yacc.c */
+#line 234 "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 226 "../../src/parse-gram.y"
- { muscle_insert ((yyvsp[(2) - (3)].chars), (yyvsp[(3) - (3)].chars)); }
+/* Line 1535 of yacc.c */
+#line 237 "parse-gram.y"
+ { defines_flag = true; }
break;
case 10:
-/* Line 1269 of yacc.c */
-#line 227 "../../src/parse-gram.y"
- { defines_flag = true; }
+/* Line 1535 of yacc.c */
+#line 239 "parse-gram.y"
+ {
+ defines_flag = true;
+ spec_defines_file = xstrdup ((yyvsp[(2) - (2)].chars));
+ }
break;
case 11:
-/* Line 1269 of yacc.c */
-#line 228 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 243 "parse-gram.y"
{ error_verbose = true; }
break;
case 12:
-/* Line 1269 of yacc.c */
-#line 229 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 244 "parse-gram.y"
{ expected_sr_conflicts = (yyvsp[(2) - (2)].integer); }
break;
case 13:
-/* Line 1269 of yacc.c */
-#line 230 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 245 "parse-gram.y"
{ expected_rr_conflicts = (yyvsp[(2) - (2)].integer); }
break;
case 14:
-/* Line 1269 of yacc.c */
-#line 231 "../../src/parse-gram.y"
- { spec_file_prefix = (yyvsp[(3) - (3)].chars); }
+/* Line 1535 of yacc.c */
+#line 246 "parse-gram.y"
+ { spec_file_prefix = (yyvsp[(2) - (2)].chars); }
break;
case 15:
-/* Line 1269 of yacc.c */
-#line 233 "../../src/parse-gram.y"
- {
- nondeterministic_parser = true;
- glr_parser = true;
- }
+/* Line 1535 of yacc.c */
+#line 247 "parse-gram.y"
+ { spec_file_prefix = (yyvsp[(3) - (3)].chars); }
break;
case 16:
-/* Line 1269 of yacc.c */
-#line 238 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 249 "parse-gram.y"
{
- muscle_code_grow ("initial_action", translate_symbol_action ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])), (yylsp[(2) - (2)]));
+ nondeterministic_parser = true;
+ glr_parser = true;
}
break;
case 17:
-/* Line 1269 of yacc.c */
-#line 241 "../../src/parse-gram.y"
- { add_param ("lex_param", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); }
+/* Line 1535 of yacc.c */
+#line 254 "parse-gram.y"
+ {
+ 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 242 "../../src/parse-gram.y"
- { locations_flag = true; }
+/* Line 1535 of yacc.c */
+#line 262 "parse-gram.y"
+ { language_argmatch ((yyvsp[(2) - (2)].chars), 1, &(yylsp[(1) - (2)])); }
break;
case 19:
-/* Line 1269 of yacc.c */
-#line 243 "../../src/parse-gram.y"
- { spec_name_prefix = (yyvsp[(3) - (3)].chars); }
+/* Line 1535 of yacc.c */
+#line 263 "parse-gram.y"
+ { add_param ("lex_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
break;
case 20:
-/* Line 1269 of yacc.c */
-#line 244 "../../src/parse-gram.y"
- { no_lines_flag = true; }
+/* Line 1535 of yacc.c */
+#line 264 "parse-gram.y"
+ { locations_flag = true; }
break;
case 21:
-/* Line 1269 of yacc.c */
-#line 245 "../../src/parse-gram.y"
- { nondeterministic_parser = true; }
+/* Line 1535 of yacc.c */
+#line 265 "parse-gram.y"
+ { spec_name_prefix = (yyvsp[(2) - (2)].chars); }
break;
case 22:
-/* Line 1269 of yacc.c */
-#line 246 "../../src/parse-gram.y"
- { spec_outfile = (yyvsp[(3) - (3)].chars); }
+/* Line 1535 of yacc.c */
+#line 266 "parse-gram.y"
+ { spec_name_prefix = (yyvsp[(3) - (3)].chars); }
break;
case 23:
-/* Line 1269 of yacc.c */
-#line 247 "../../src/parse-gram.y"
- { add_param ("parse_param", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); }
+/* Line 1535 of yacc.c */
+#line 267 "parse-gram.y"
+ { no_lines_flag = true; }
break;
case 24:
-/* Line 1269 of yacc.c */
-#line 248 "../../src/parse-gram.y"
- { muscle_code_grow ("provides", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); }
+/* Line 1535 of yacc.c */
+#line 268 "parse-gram.y"
+ { nondeterministic_parser = true; }
break;
case 25:
-/* Line 1269 of yacc.c */
-#line 249 "../../src/parse-gram.y"
- { pure_parser = true; }
+/* Line 1535 of yacc.c */
+#line 269 "parse-gram.y"
+ { spec_outfile = (yyvsp[(2) - (2)].chars); }
break;
case 26:
-/* Line 1269 of yacc.c */
-#line 250 "../../src/parse-gram.y"
- { push_parser = true; }
+/* Line 1535 of yacc.c */
+#line 270 "parse-gram.y"
+ { spec_outfile = (yyvsp[(3) - (3)].chars); }
break;
case 27:
-/* Line 1269 of yacc.c */
-#line 251 "../../src/parse-gram.y"
- { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); }
+/* Line 1535 of yacc.c */
+#line 271 "parse-gram.y"
+ { add_param ("parse_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
break;
case 28:
-/* Line 1269 of yacc.c */
-#line 252 "../../src/parse-gram.y"
- { muscle_code_grow ("requires", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); }
+/* Line 1535 of yacc.c */
+#line 272 "parse-gram.y"
+ { pure_parser = true; }
break;
case 29:
-/* Line 1269 of yacc.c */
-#line 253 "../../src/parse-gram.y"
- { skeleton = (yyvsp[(2) - (2)].chars); }
+/* Line 1535 of yacc.c */
+#line 273 "parse-gram.y"
+ { push_parser = true; pull_parser = false; }
break;
case 30:
-/* Line 1269 of yacc.c */
-#line 254 "../../src/parse-gram.y"
- { token_table_flag = true; }
+/* Line 1535 of yacc.c */
+#line 274 "parse-gram.y"
+ { push_parser = true; pull_parser = true; }
break;
case 31:
-/* Line 1269 of yacc.c */
-#line 255 "../../src/parse-gram.y"
- { report_flag = report_states; }
+/* Line 1535 of yacc.c */
+#line 275 "parse-gram.y"
+ { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); }
break;
case 32:
-/* Line 1269 of yacc.c */
-#line 256 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 277 "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 33:
+
+/* Line 1535 of yacc.c */
+#line 300 "parse-gram.y"
+ { token_table_flag = true; }
+ break;
+
+ case 34:
+
+/* Line 1535 of yacc.c */
+#line 301 "parse-gram.y"
+ { report_flag = report_states; }
+ break;
+
+ case 35:
+
+/* Line 1535 of yacc.c */
+#line 302 "parse-gram.y"
{ yacc_flag = true; }
break;
- case 36:
+ case 39:
-/* Line 1269 of yacc.c */
-#line 264 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 310 "parse-gram.y"
{
grammar_start_symbol_set ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]));
}
break;
- case 37:
+ case 40:
-/* Line 1269 of yacc.c */
-#line 268 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 314 "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_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 38:
+ case 41:
-/* Line 1269 of yacc.c */
-#line 276 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 321 "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_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 39:
+ case 42:
-/* Line 1269 of yacc.c */
-#line 284 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 328 "parse-gram.y"
{
default_prec = true;
}
break;
- case 40:
+ case 43:
-/* Line 1269 of yacc.c */
-#line 288 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 332 "parse-gram.y"
{
default_prec = false;
}
break;
- case 41:
+ case 44:
+
+/* Line 1535 of yacc.c */
+#line 336 "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 45:
+
+/* Line 1535 of yacc.c */
+#line 343 "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;
-/* Line 1269 of yacc.c */
-#line 301 "../../src/parse-gram.y"
+ case 46:
+
+/* Line 1535 of yacc.c */
+#line 357 "parse-gram.y"
{}
break;
- case 42:
+ case 47:
-/* Line 1269 of yacc.c */
-#line 302 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 358 "parse-gram.y"
{ muscle_code_grow ("union_name", (yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
break;
- case 43:
+ case 48:
-/* Line 1269 of yacc.c */
-#line 307 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 363 "parse-gram.y"
{
- char const *body = (yyvsp[(3) - (3)].chars);
-
- /* 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 44:
+ case 49:
-/* Line 1269 of yacc.c */
-#line 334 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 374 "parse-gram.y"
{ current_class = nterm_sym; }
break;
- case 45:
+ case 50:
-/* Line 1269 of yacc.c */
-#line 335 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 375 "parse-gram.y"
{
current_class = unknown_sym;
current_type = NULL;
}
break;
- case 46:
+ case 51:
-/* Line 1269 of yacc.c */
-#line 339 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 379 "parse-gram.y"
{ current_class = token_sym; }
break;
- case 47:
+ case 52:
-/* Line 1269 of yacc.c */
-#line 340 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 380 "parse-gram.y"
{
current_class = unknown_sym;
current_type = NULL;
}
break;
- case 48:
+ case 53:
-/* Line 1269 of yacc.c */
-#line 345 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 385 "parse-gram.y"
{
symbol_list *list;
tag_seen = true;
@@ -2209,10 +2282,10 @@ yyreduce:
}
break;
- case 49:
+ case 54:
-/* Line 1269 of yacc.c */
-#line 356 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 396 "parse-gram.y"
{
symbol_list *list;
++current_prec;
@@ -2226,114 +2299,121 @@ yyreduce:
}
break;
- case 50:
+ case 55:
-/* Line 1269 of yacc.c */
-#line 370 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 410 "parse-gram.y"
{ (yyval.assoc) = left_assoc; }
break;
- case 51:
+ case 56:
-/* Line 1269 of yacc.c */
-#line 371 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 411 "parse-gram.y"
{ (yyval.assoc) = right_assoc; }
break;
- case 52:
+ case 57:
-/* Line 1269 of yacc.c */
-#line 372 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 412 "parse-gram.y"
{ (yyval.assoc) = non_assoc; }
break;
- case 53:
+ case 58:
-/* Line 1269 of yacc.c */
-#line 376 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 416 "parse-gram.y"
{ current_type = NULL; }
break;
- case 54:
+ case 59:
-/* Line 1269 of yacc.c */
-#line 377 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 417 "parse-gram.y"
{ current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; }
break;
- case 55:
+ case 60:
-/* Line 1269 of yacc.c */
-#line 383 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 423 "parse-gram.y"
{ (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
break;
- case 56:
+ case 61:
-/* Line 1269 of yacc.c */
-#line 385 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 425 "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 57:
+ case 62:
-/* Line 1269 of yacc.c */
-#line 389 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 429 "parse-gram.y"
{ (yyval.list) = (yyvsp[(1) - (1)].list); }
break;
- case 58:
+ case 63:
-/* Line 1269 of yacc.c */
-#line 390 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 430 "parse-gram.y"
{ (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); }
break;
- case 59:
+ case 64:
-/* Line 1269 of yacc.c */
-#line 394 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 434 "parse-gram.y"
{ (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
break;
- case 60:
+ case 65:
-/* Line 1269 of yacc.c */
-#line 395 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 435 "parse-gram.y"
{ (yyval.list) = symbol_list_type_new ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
break;
- case 61:
+ case 66:
-/* Line 1269 of yacc.c */
-#line 396 "../../src/parse-gram.y"
- { (yyval.list) = symbol_list_default_new ((yylsp[(1) - (1)])); }
+/* Line 1535 of yacc.c */
+#line 436 "parse-gram.y"
+ { (yyval.list) = symbol_list_default_tagged_new ((yylsp[(1) - (1)])); }
break;
- case 62:
+ case 67:
-/* Line 1269 of yacc.c */
-#line 402 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 437 "parse-gram.y"
+ { (yyval.list) = symbol_list_default_tagless_new ((yylsp[(1) - (1)])); }
+ break;
+
+ case 68:
+
+/* Line 1535 of yacc.c */
+#line 443 "parse-gram.y"
{
current_type = (yyvsp[(1) - (1)].uniqstr);
tag_seen = true;
}
break;
- case 63:
+ case 69:
-/* Line 1269 of yacc.c */
-#line 407 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 448 "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 64:
+ case 70:
-/* Line 1269 of yacc.c */
-#line 412 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 453 "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)]));
@@ -2341,10 +2421,10 @@ yyreduce:
}
break;
- case 65:
+ case 71:
-/* Line 1269 of yacc.c */
-#line 418 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 459 "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)]));
@@ -2352,10 +2432,10 @@ yyreduce:
}
break;
- case 66:
+ case 72:
-/* Line 1269 of yacc.c */
-#line 424 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 465 "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)]));
@@ -2364,109 +2444,119 @@ yyreduce:
}
break;
- case 73:
+ case 79:
-/* Line 1269 of yacc.c */
-#line 454 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 495 "parse-gram.y"
{
yyerrok;
}
break;
- case 74:
+ case 80:
-/* Line 1269 of yacc.c */
-#line 460 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 501 "parse-gram.y"
{ current_lhs = (yyvsp[(1) - (1)].symbol); current_lhs_location = (yylsp[(1) - (1)]); }
break;
- case 76:
+ case 82:
-/* Line 1269 of yacc.c */
-#line 464 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 505 "parse-gram.y"
{ grammar_current_rule_end ((yylsp[(1) - (1)])); }
break;
- case 77:
+ case 83:
-/* Line 1269 of yacc.c */
-#line 465 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 506 "parse-gram.y"
{ grammar_current_rule_end ((yylsp[(3) - (3)])); }
break;
- case 79:
+ case 85:
-/* Line 1269 of yacc.c */
-#line 471 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 512 "parse-gram.y"
{ grammar_current_rule_begin (current_lhs, current_lhs_location); }
break;
- case 80:
+ case 86:
-/* Line 1269 of yacc.c */
-#line 473 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 514 "parse-gram.y"
{ grammar_current_rule_symbol_append ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); }
break;
- case 81:
+ case 87:
-/* Line 1269 of yacc.c */
-#line 475 "../../src/parse-gram.y"
- { grammar_current_rule_action_append ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); }
+/* Line 1535 of yacc.c */
+#line 516 "parse-gram.y"
+ { grammar_current_rule_action_append ((yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
break;
- case 82:
+ case 88:
-/* Line 1269 of yacc.c */
-#line 477 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 518 "parse-gram.y"
{ grammar_current_rule_prec_set ((yyvsp[(3) - (3)].symbol), (yylsp[(3) - (3)])); }
break;
- case 83:
+ case 89:
-/* Line 1269 of yacc.c */
-#line 479 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 520 "parse-gram.y"
{ grammar_current_rule_dprec_set ((yyvsp[(3) - (3)].integer), (yylsp[(3) - (3)])); }
break;
- case 84:
+ case 90:
-/* Line 1269 of yacc.c */
-#line 481 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 522 "parse-gram.y"
{ grammar_current_rule_merge_set ((yyvsp[(3) - (3)].uniqstr), (yylsp[(3) - (3)])); }
break;
- case 87:
+ case 92:
+
+/* Line 1535 of yacc.c */
+#line 532 "parse-gram.y"
+ { (yyval.uniqstr) = uniqstr_new ((yyvsp[(1) - (1)].chars)); }
+ break;
-/* Line 1269 of yacc.c */
-#line 497 "../../src/parse-gram.y"
+ case 93:
+
+/* Line 1535 of yacc.c */
+#line 538 "parse-gram.y"
{
- static char one[] = "1";
- (yyval.chars) = one;
+ (yyval.chars) = "";
}
break;
- case 89:
+ case 95:
-/* Line 1269 of yacc.c */
-#line 507 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 551 "parse-gram.y"
{
- (yyvsp[(1) - (1)].chars)[strlen ((yyvsp[(1) - (1)].chars)) - 1] = '\n';
- (yyval.chars) = translate_code ((yyvsp[(1) - (1)].chars) + 1, (yylsp[(1) - (1)]));
+ 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 90:
+ case 96:
-/* Line 1269 of yacc.c */
-#line 523 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 571 "parse-gram.y"
{ (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
break;
- case 91:
+ case 97:
-/* Line 1269 of yacc.c */
-#line 525 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 573 "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);
@@ -2474,37 +2564,41 @@ yyreduce:
}
break;
- case 92:
+ case 98:
-/* Line 1269 of yacc.c */
-#line 533 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 581 "parse-gram.y"
{ (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
break;
- case 95:
+ case 101:
-/* Line 1269 of yacc.c */
-#line 545 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 593 "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 97:
+ case 103:
-/* Line 1269 of yacc.c */
-#line 554 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 602 "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 2508 "../../src/parse-gram.c"
+/* Line 1535 of yacc.c */
+#line 2602 "parse-gram.c"
default: break;
}
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -2684,7 +2778,7 @@ yyabortlab:
yyresult = 1;
goto yyreturn;
-#ifndef yyoverflow
+#if !defined(yyoverflow) || YYERROR_VERBOSE
/*-------------------------------------------------.
| yyexhaustedlab -- memory exhaustion comes here. |
`-------------------------------------------------*/
@@ -2722,8 +2816,8 @@ yyreturn:
-/* Line 1486 of yacc.c */
-#line 560 "../../src/parse-gram.y"
+/* Line 1535 of yacc.c */
+#line 612 "parse-gram.y"