[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/5] regen
From: |
Akim Demaille |
Subject: |
[PATCH 2/5] regen |
Date: |
Thu, 30 May 2013 10:50:16 +0200 |
---
src/parse-gram.c | 531 ++++++++++++++++++++++++++++---------------------------
src/parse-gram.h | 28 +--
2 files changed, 282 insertions(+), 277 deletions(-)
diff --git a/src/parse-gram.c b/src/parse-gram.c
index 4cf41af..79cfa3f 100644
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 2.7.1164-a174b-dirty. */
+/* A Bison parser, made by GNU Bison 2.7.1.1188-a7ee3. */
/* Bison implementation for Yacc-like parsers in C
@@ -44,7 +44,7 @@
#define YYBISON 1
/* Bison version. */
-#define YYBISON_VERSION "2.7.1164-a174b-dirty"
+#define YYBISON_VERSION "2.7.1.1188-a7ee3"
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
@@ -58,6 +58,12 @@
/* Pull parsers. */
#define YYPULL 1
+/* "%code top" blocks. */
+#line 27 "src/parse-gram.y" /* yacc.c:333 */
+
+#include <config.h>
+
+#line 67 "src/parse-gram.c" /* yacc.c:333 */
/* Substitute the type names. */
#define YYSTYPE GRAM_STYPE
#define YYLTYPE GRAM_LTYPE
@@ -71,7 +77,7 @@
/* Copy the first part of user declarations. */
-#line 75 "src/parse-gram.c" /* yacc.c:356 */
+#line 81 "src/parse-gram.c" /* yacc.c:356 */
# ifndef YY_NULL
# if defined __cplusplus && 201103L <= __cplusplus
@@ -113,7 +119,7 @@ extern int gram_debug;
#include "symlist.h"
#include "symtab.h"
-#line 216 "src/parse-gram.y" /* yacc.c:372 */
+#line 220 "src/parse-gram.y" /* yacc.c:372 */
typedef enum
{
@@ -122,10 +128,10 @@ extern int gram_debug;
param_parse = 1 << 1,
param_both = param_lex | param_parse
} param_type;
-#line 640 "src/parse-gram.y" /* yacc.c:372 */
+#line 644 "src/parse-gram.y" /* yacc.c:372 */
#include "muscle-tab.h"
-#line 129 "src/parse-gram.c" /* yacc.c:372 */
+#line 135 "src/parse-gram.c" /* yacc.c:372 */
/* Token type. */
#ifndef GRAM_TOKENTYPE
@@ -196,27 +202,27 @@ extern int gram_debug;
typedef union GRAM_STYPE GRAM_STYPE;
union GRAM_STYPE
{
-#line 177 "src/parse-gram.y" /* yacc.c:372 */
-unsigned char character;
#line 181 "src/parse-gram.y" /* yacc.c:372 */
+unsigned char character;
+#line 185 "src/parse-gram.y" /* yacc.c:372 */
char *code;
-#line 186 "src/parse-gram.y" /* yacc.c:372 */
+#line 190 "src/parse-gram.y" /* yacc.c:372 */
uniqstr uniqstr;
-#line 194 "src/parse-gram.y" /* yacc.c:372 */
-int integer;
#line 198 "src/parse-gram.y" /* yacc.c:372 */
+int integer;
+#line 202 "src/parse-gram.y" /* yacc.c:372 */
symbol *symbol;
-#line 203 "src/parse-gram.y" /* yacc.c:372 */
+#line 207 "src/parse-gram.y" /* yacc.c:372 */
assoc assoc;
-#line 206 "src/parse-gram.y" /* yacc.c:372 */
+#line 210 "src/parse-gram.y" /* yacc.c:372 */
symbol_list *list;
-#line 209 "src/parse-gram.y" /* yacc.c:372 */
+#line 213 "src/parse-gram.y" /* yacc.c:372 */
named_ref *named_ref;
-#line 236 "src/parse-gram.y" /* yacc.c:372 */
+#line 240 "src/parse-gram.y" /* yacc.c:372 */
param_type param;
-#line 404 "src/parse-gram.y" /* yacc.c:372 */
+#line 408 "src/parse-gram.y" /* yacc.c:372 */
code_props_type code_type;
-#line 642 "src/parse-gram.y" /* yacc.c:372 */
+#line 646 "src/parse-gram.y" /* yacc.c:372 */
struct
{
@@ -224,7 +230,7 @@ code_props_type code_type;
muscle_kind kind;
} value;
-#line 228 "src/parse-gram.c" /* yacc.c:372 */
+#line 234 "src/parse-gram.c" /* yacc.c:372 */
};
# define GRAM_STYPE_IS_TRIVIAL 1
# define GRAM_STYPE_IS_DECLARED 1
@@ -252,11 +258,10 @@ int gram_parse (void);
/* Copy the second part of user declarations. */
-#line 256 "src/parse-gram.c" /* yacc.c:375 */
+#line 262 "src/parse-gram.c" /* yacc.c:375 */
/* Unqualified %code blocks. */
-#line 27 "src/parse-gram.y" /* yacc.c:376 */
+#line 32 "src/parse-gram.y" /* yacc.c:376 */
- #include <config.h>
#include "system.h"
#include "c-ctype.h"
@@ -318,7 +323,7 @@ int gram_parse (void);
#define YYTYPE_INT8 int_fast8_t
#define YYTYPE_UINT16 uint_fast16_t
#define YYTYPE_UINT8 uint_fast8_t
-#line 226 "src/parse-gram.y" /* yacc.c:376 */
+#line 230 "src/parse-gram.y" /* yacc.c:376 */
/** Add a lex-param and/or a parse-param.
*
@@ -329,7 +334,7 @@ int gram_parse (void);
static void add_param (param_type type, char *decl, location loc);
static param_type current_param = param_none;
-#line 333 "src/parse-gram.c" /* yacc.c:376 */
+#line 338 "src/parse-gram.c" /* yacc.c:376 */
#ifdef short
# undef short
@@ -573,18 +578,18 @@ static const yytype_uint8 yytranslate[] =
/* YYRLINE[YYN] -- Source line where rule number YYN was defined. */
static const yytype_uint16 yyrline[] =
{
- 0, 259, 259, 268, 269, 273, 274, 280, 284, 289,
- 290, 295, 301, 302, 303, 304, 309, 314, 315, 316,
- 317, 318, 319, 319, 320, 321, 345, 346, 347, 348,
- 352, 353, 362, 363, 364, 368, 380, 384, 388, 396,
- 407, 408, 418, 419, 423, 435, 435, 440, 440, 445,
- 456, 471, 472, 473, 474, 478, 479, 484, 486, 491,
- 496, 506, 508, 513, 514, 518, 519, 523, 524, 525,
- 530, 535, 540, 546, 552, 563, 564, 573, 574, 580,
- 581, 582, 589, 589, 597, 598, 599, 604, 607, 609,
- 611, 613, 615, 617, 619, 624, 625, 635, 636, 661,
- 662, 663, 664, 676, 678, 687, 692, 693, 698, 706,
- 707
+ 0, 263, 263, 272, 273, 277, 278, 284, 288, 293,
+ 294, 299, 305, 306, 307, 308, 313, 318, 319, 320,
+ 321, 322, 323, 323, 324, 325, 349, 350, 351, 352,
+ 356, 357, 366, 367, 368, 372, 384, 388, 392, 400,
+ 411, 412, 422, 423, 427, 439, 439, 444, 444, 449,
+ 460, 475, 476, 477, 478, 482, 483, 488, 490, 495,
+ 500, 510, 512, 517, 518, 522, 523, 527, 528, 529,
+ 534, 539, 544, 550, 556, 567, 568, 577, 578, 584,
+ 585, 586, 593, 593, 601, 602, 603, 608, 611, 613,
+ 615, 617, 619, 621, 623, 628, 629, 639, 640, 665,
+ 666, 667, 668, 680, 682, 691, 696, 697, 702, 710,
+ 711
};
#endif
@@ -956,79 +961,79 @@ yy_symbol_value_print (FILE *yyoutput, int yytype,
YYSTYPE const * const yyvalue
switch (yytype)
{
case 3: /* "string" */
-#line 183 "src/parse-gram.y" /* yacc.c:701 */
+#line 187 "src/parse-gram.y" /* yacc.c:701 */
{ fputs (quotearg_style (c_quoting_style, ((*yyvaluep).code)), yyo); }
-#line 962 "src/parse-gram.c" /* yacc.c:701 */
+#line 967 "src/parse-gram.c" /* yacc.c:701 */
break;
case 23: /* "%<flag>" */
-#line 191 "src/parse-gram.y" /* yacc.c:701 */
+#line 195 "src/parse-gram.y" /* yacc.c:701 */
{ fprintf (yyo, "%%%s", ((*yyvaluep).uniqstr)); }
-#line 968 "src/parse-gram.c" /* yacc.c:701 */
+#line 973 "src/parse-gram.c" /* yacc.c:701 */
break;
case 39: /* "{...}" */
-#line 184 "src/parse-gram.y" /* yacc.c:701 */
+#line 188 "src/parse-gram.y" /* yacc.c:701 */
{ fprintf (yyo, "{\n%s\n}", ((*yyvaluep).code)); }
-#line 974 "src/parse-gram.c" /* yacc.c:701 */
+#line 979 "src/parse-gram.c" /* yacc.c:701 */
break;
case 40: /* "%?{...}" */
-#line 184 "src/parse-gram.y" /* yacc.c:701 */
+#line 188 "src/parse-gram.y" /* yacc.c:701 */
{ fprintf (yyo, "{\n%s\n}", ((*yyvaluep).code)); }
-#line 980 "src/parse-gram.c" /* yacc.c:701 */
+#line 985 "src/parse-gram.c" /* yacc.c:701 */
break;
case 41: /* "[identifier]" */
-#line 189 "src/parse-gram.y" /* yacc.c:701 */
+#line 193 "src/parse-gram.y" /* yacc.c:701 */
{ fprintf (yyo, "[%s]", ((*yyvaluep).uniqstr)); }
-#line 986 "src/parse-gram.c" /* yacc.c:701 */
+#line 991 "src/parse-gram.c" /* yacc.c:701 */
break;
case 42: /* "char" */
-#line 179 "src/parse-gram.y" /* yacc.c:701 */
+#line 183 "src/parse-gram.y" /* yacc.c:701 */
{ fputs (char_name (((*yyvaluep).character)), yyo); }
-#line 992 "src/parse-gram.c" /* yacc.c:701 */
+#line 997 "src/parse-gram.c" /* yacc.c:701 */
break;
case 43: /* "epilogue" */
-#line 184 "src/parse-gram.y" /* yacc.c:701 */
+#line 188 "src/parse-gram.y" /* yacc.c:701 */
{ fprintf (yyo, "{\n%s\n}", ((*yyvaluep).code)); }
-#line 998 "src/parse-gram.c" /* yacc.c:701 */
+#line 1003 "src/parse-gram.c" /* yacc.c:701 */
break;
case 45: /* "identifier" */
-#line 188 "src/parse-gram.y" /* yacc.c:701 */
+#line 192 "src/parse-gram.y" /* yacc.c:701 */
{ fputs (((*yyvaluep).uniqstr), yyo); }
-#line 1004 "src/parse-gram.c" /* yacc.c:701 */
+#line 1009 "src/parse-gram.c" /* yacc.c:701 */
break;
case 46: /* "identifier:" */
-#line 190 "src/parse-gram.y" /* yacc.c:701 */
+#line 194 "src/parse-gram.y" /* yacc.c:701 */
{ fprintf (yyo, "%s:", ((*yyvaluep).uniqstr)); }
-#line 1010 "src/parse-gram.c" /* yacc.c:701 */
+#line 1015 "src/parse-gram.c" /* yacc.c:701 */
break;
case 49: /* "%{...%}" */
-#line 184 "src/parse-gram.y" /* yacc.c:701 */
+#line 188 "src/parse-gram.y" /* yacc.c:701 */
{ fprintf (yyo, "{\n%s\n}", ((*yyvaluep).code)); }
-#line 1016 "src/parse-gram.c" /* yacc.c:701 */
+#line 1021 "src/parse-gram.c" /* yacc.c:701 */
break;
case 51: /* "<tag>" */
-#line 192 "src/parse-gram.y" /* yacc.c:701 */
+#line 196 "src/parse-gram.y" /* yacc.c:701 */
{ fprintf (yyo, "<%s>", ((*yyvaluep).uniqstr)); }
-#line 1022 "src/parse-gram.c" /* yacc.c:701 */
+#line 1027 "src/parse-gram.c" /* yacc.c:701 */
break;
case 54: /* "integer" */
-#line 196 "src/parse-gram.y" /* yacc.c:701 */
+#line 200 "src/parse-gram.y" /* yacc.c:701 */
{ fprintf (yyo, "%d", ((*yyvaluep).integer)); }
-#line 1028 "src/parse-gram.c" /* yacc.c:701 */
+#line 1033 "src/parse-gram.c" /* yacc.c:701 */
break;
case 55: /* "%param" */
-#line 239 "src/parse-gram.y" /* yacc.c:701 */
+#line 243 "src/parse-gram.y" /* yacc.c:701 */
{
switch (((*yyvaluep).param))
{
@@ -1041,35 +1046,35 @@ yy_symbol_value_print (FILE *yyoutput, int yytype,
YYSTYPE const * const yyvalue
case param_none: aver (false); break;
}
}
-#line 1045 "src/parse-gram.c" /* yacc.c:701 */
+#line 1050 "src/parse-gram.c" /* yacc.c:701 */
break;
case 65: /* code_props_type */
-#line 405 "src/parse-gram.y" /* yacc.c:701 */
+#line 409 "src/parse-gram.y" /* yacc.c:701 */
{ fprintf (yyo, "%s", code_props_type_string (((*yyvaluep).code_type)));
}
-#line 1051 "src/parse-gram.c" /* yacc.c:701 */
+#line 1056 "src/parse-gram.c" /* yacc.c:701 */
break;
case 74: /* symbol.prec */
-#line 200 "src/parse-gram.y" /* yacc.c:701 */
+#line 204 "src/parse-gram.y" /* yacc.c:701 */
{ fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); }
-#line 1057 "src/parse-gram.c" /* yacc.c:701 */
+#line 1062 "src/parse-gram.c" /* yacc.c:701 */
break;
case 78: /* tag */
-#line 192 "src/parse-gram.y" /* yacc.c:701 */
+#line 196 "src/parse-gram.y" /* yacc.c:701 */
{ fprintf (yyo, "<%s>", ((*yyvaluep).uniqstr)); }
-#line 1063 "src/parse-gram.c" /* yacc.c:701 */
+#line 1068 "src/parse-gram.c" /* yacc.c:701 */
break;
case 88: /* variable */
-#line 188 "src/parse-gram.y" /* yacc.c:701 */
+#line 192 "src/parse-gram.y" /* yacc.c:701 */
{ fputs (((*yyvaluep).uniqstr), yyo); }
-#line 1069 "src/parse-gram.c" /* yacc.c:701 */
+#line 1074 "src/parse-gram.c" /* yacc.c:701 */
break;
case 89: /* value */
-#line 651 "src/parse-gram.y" /* yacc.c:701 */
+#line 655 "src/parse-gram.y" /* yacc.c:701 */
{
switch (((*yyvaluep).value).kind)
{
@@ -1078,31 +1083,31 @@ yy_symbol_value_print (FILE *yyoutput, int yytype,
YYSTYPE const * const yyvalue
case muscle_string: fprintf (yyo, "\"%s\"", ((*yyvaluep).value).chars);
break;
}
}
-#line 1082 "src/parse-gram.c" /* yacc.c:701 */
+#line 1087 "src/parse-gram.c" /* yacc.c:701 */
break;
case 90: /* id */
-#line 200 "src/parse-gram.y" /* yacc.c:701 */
+#line 204 "src/parse-gram.y" /* yacc.c:701 */
{ fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); }
-#line 1088 "src/parse-gram.c" /* yacc.c:701 */
+#line 1093 "src/parse-gram.c" /* yacc.c:701 */
break;
case 91: /* id_colon */
-#line 201 "src/parse-gram.y" /* yacc.c:701 */
+#line 205 "src/parse-gram.y" /* yacc.c:701 */
{ fprintf (yyo, "%s:", ((*yyvaluep).symbol)->tag); }
-#line 1094 "src/parse-gram.c" /* yacc.c:701 */
+#line 1099 "src/parse-gram.c" /* yacc.c:701 */
break;
case 92: /* symbol */
-#line 200 "src/parse-gram.y" /* yacc.c:701 */
+#line 204 "src/parse-gram.y" /* yacc.c:701 */
{ fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); }
-#line 1100 "src/parse-gram.c" /* yacc.c:701 */
+#line 1105 "src/parse-gram.c" /* yacc.c:701 */
break;
case 93: /* string_as_id */
-#line 200 "src/parse-gram.y" /* yacc.c:701 */
+#line 204 "src/parse-gram.y" /* yacc.c:701 */
{ fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); }
-#line 1106 "src/parse-gram.c" /* yacc.c:701 */
+#line 1111 "src/parse-gram.c" /* yacc.c:701 */
break;
@@ -1814,7 +1819,7 @@ YYLTYPE yylloc = yyloc_default;
yychar = YYEMPTY; /* Cause a token to be read. */
/* User initialization code. */
-#line 103 "src/parse-gram.y" /* yacc.c:1446 */
+#line 107 "src/parse-gram.y" /* yacc.c:1446 */
{
/* Bison's grammar can initial empty locations, hence a default
location is needed. */
@@ -1822,7 +1827,7 @@ YYLTYPE yylloc = yyloc_default;
boundary_set (&yylloc.end, current_file, 1, 1);
}
-#line 1826 "src/parse-gram.c" /* yacc.c:1446 */
+#line 1831 "src/parse-gram.c" /* yacc.c:1446 */
yylsp[0] = yylloc;
goto yysetstate;
@@ -2016,143 +2021,143 @@ yyreduce:
switch (yyn)
{
case 6:
-#line 275 "src/parse-gram.y" /* yacc.c:1663 */
+#line 279 "src/parse-gram.y" /* yacc.c:1663 */
{
muscle_code_grow (union_seen ? "post_prologue" : "pre_prologue",
translate_code ((yyvsp[0].code), (yylsp[0]), true),
(yylsp[0]));
code_scanner_last_string_free ();
}
-#line 2026 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2031 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 7:
-#line 281 "src/parse-gram.y" /* yacc.c:1663 */
+#line 285 "src/parse-gram.y" /* yacc.c:1663 */
{
muscle_percent_define_ensure ((yyvsp[0].uniqstr), (yylsp[0]), true);
}
-#line 2034 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2039 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 8:
-#line 285 "src/parse-gram.y" /* yacc.c:1663 */
+#line 289 "src/parse-gram.y" /* yacc.c:1663 */
{
muscle_percent_define_insert ((yyvsp[-1].uniqstr), (yylsp[-1]),
(yyvsp[0].value).kind, (yyvsp[0].value).chars,
MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
}
-#line 2043 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2048 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 9:
-#line 289 "src/parse-gram.y" /* yacc.c:1663 */
+#line 293 "src/parse-gram.y" /* yacc.c:1663 */
{ defines_flag = true; }
-#line 2049 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2054 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 10:
-#line 291 "src/parse-gram.y" /* yacc.c:1663 */
+#line 295 "src/parse-gram.y" /* yacc.c:1663 */
{
defines_flag = true;
spec_defines_file = xstrdup ((yyvsp[0].code));
}
-#line 2058 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2063 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 11:
-#line 296 "src/parse-gram.y" /* yacc.c:1663 */
+#line 300 "src/parse-gram.y" /* yacc.c:1663 */
{
muscle_percent_define_insert ("parse.error", (yylsp[0]), muscle_keyword,
"verbose",
MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
}
-#line 2068 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2073 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 12:
-#line 301 "src/parse-gram.y" /* yacc.c:1663 */
+#line 305 "src/parse-gram.y" /* yacc.c:1663 */
{ expected_sr_conflicts = (yyvsp[0].integer); }
-#line 2074 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2079 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 13:
-#line 302 "src/parse-gram.y" /* yacc.c:1663 */
+#line 306 "src/parse-gram.y" /* yacc.c:1663 */
{ expected_rr_conflicts = (yyvsp[0].integer); }
-#line 2080 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2085 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 14:
-#line 303 "src/parse-gram.y" /* yacc.c:1663 */
+#line 307 "src/parse-gram.y" /* yacc.c:1663 */
{ spec_file_prefix = (yyvsp[0].code); }
-#line 2086 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2091 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 15:
-#line 305 "src/parse-gram.y" /* yacc.c:1663 */
+#line 309 "src/parse-gram.y" /* yacc.c:1663 */
{
nondeterministic_parser = true;
glr_parser = true;
}
-#line 2095 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2100 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 16:
-#line 310 "src/parse-gram.y" /* yacc.c:1663 */
+#line 314 "src/parse-gram.y" /* yacc.c:1663 */
{
muscle_code_grow ("initial_action", translate_code ((yyvsp[0].code),
(yylsp[0]), false), (yylsp[0]));
code_scanner_last_string_free ();
}
-#line 2104 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2109 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 17:
-#line 314 "src/parse-gram.y" /* yacc.c:1663 */
+#line 318 "src/parse-gram.y" /* yacc.c:1663 */
{ language_argmatch ((yyvsp[0].code), grammar_prio, (yylsp[-1])); }
-#line 2110 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2115 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 18:
-#line 315 "src/parse-gram.y" /* yacc.c:1663 */
+#line 319 "src/parse-gram.y" /* yacc.c:1663 */
{ spec_name_prefix = (yyvsp[0].code); }
-#line 2116 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2121 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 19:
-#line 316 "src/parse-gram.y" /* yacc.c:1663 */
+#line 320 "src/parse-gram.y" /* yacc.c:1663 */
{ no_lines_flag = true; }
-#line 2122 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2127 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 20:
-#line 317 "src/parse-gram.y" /* yacc.c:1663 */
+#line 321 "src/parse-gram.y" /* yacc.c:1663 */
{ nondeterministic_parser = true; }
-#line 2128 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2133 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 21:
-#line 318 "src/parse-gram.y" /* yacc.c:1663 */
+#line 322 "src/parse-gram.y" /* yacc.c:1663 */
{ spec_outfile = (yyvsp[0].code); }
-#line 2134 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2139 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 22:
-#line 319 "src/parse-gram.y" /* yacc.c:1663 */
+#line 323 "src/parse-gram.y" /* yacc.c:1663 */
{ current_param = (yyvsp[0].param); }
-#line 2140 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2145 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 23:
-#line 319 "src/parse-gram.y" /* yacc.c:1663 */
+#line 323 "src/parse-gram.y" /* yacc.c:1663 */
{ current_param = param_none; }
-#line 2146 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2151 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 24:
-#line 320 "src/parse-gram.y" /* yacc.c:1663 */
+#line 324 "src/parse-gram.y" /* yacc.c:1663 */
{ version_check (&(yylsp[0]), (yyvsp[0].code)); }
-#line 2152 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2157 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 25:
-#line 322 "src/parse-gram.y" /* yacc.c:1663 */
+#line 326 "src/parse-gram.y" /* yacc.c:1663 */
{
char const *skeleton_user = (yyvsp[0].code);
if (strchr (skeleton_user, '/'))
@@ -2176,49 +2181,49 @@ yyreduce:
}
skeleton_arg (skeleton_user, grammar_prio, (yylsp[-1]));
}
-#line 2180 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2185 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 26:
-#line 345 "src/parse-gram.y" /* yacc.c:1663 */
+#line 349 "src/parse-gram.y" /* yacc.c:1663 */
{ token_table_flag = true; }
-#line 2186 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2191 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 27:
-#line 346 "src/parse-gram.y" /* yacc.c:1663 */
+#line 350 "src/parse-gram.y" /* yacc.c:1663 */
{ report_flag |= report_states; }
-#line 2192 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2197 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 28:
-#line 347 "src/parse-gram.y" /* yacc.c:1663 */
+#line 351 "src/parse-gram.y" /* yacc.c:1663 */
{ yacc_flag = true; }
-#line 2198 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2203 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 30:
-#line 352 "src/parse-gram.y" /* yacc.c:1663 */
+#line 356 "src/parse-gram.y" /* yacc.c:1663 */
{ add_param (current_param, (yyvsp[0].code), (yylsp[0])); }
-#line 2204 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2209 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 31:
-#line 353 "src/parse-gram.y" /* yacc.c:1663 */
+#line 357 "src/parse-gram.y" /* yacc.c:1663 */
{ add_param (current_param, (yyvsp[0].code), (yylsp[0])); }
-#line 2210 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2215 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 34:
-#line 365 "src/parse-gram.y" /* yacc.c:1663 */
+#line 369 "src/parse-gram.y" /* yacc.c:1663 */
{
grammar_start_symbol_set ((yyvsp[0].symbol), (yylsp[0]));
}
-#line 2218 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2223 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 35:
-#line 369 "src/parse-gram.y" /* yacc.c:1663 */
+#line 373 "src/parse-gram.y" /* yacc.c:1663 */
{
code_props code;
code_props_symbol_action_init (&code, (yyvsp[-1].code), (yylsp[-1]));
@@ -2230,27 +2235,27 @@ yyreduce:
symbol_list_free ((yyvsp[0].list));
}
}
-#line 2234 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2239 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 36:
-#line 381 "src/parse-gram.y" /* yacc.c:1663 */
+#line 385 "src/parse-gram.y" /* yacc.c:1663 */
{
default_prec = true;
}
-#line 2242 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2247 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 37:
-#line 385 "src/parse-gram.y" /* yacc.c:1663 */
+#line 389 "src/parse-gram.y" /* yacc.c:1663 */
{
default_prec = false;
}
-#line 2250 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2255 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 38:
-#line 389 "src/parse-gram.y" /* yacc.c:1663 */
+#line 393 "src/parse-gram.y" /* yacc.c:1663 */
{
/* Do not invoke muscle_percent_code_grow here since it invokes
muscle_user_name_list_grow. */
@@ -2258,84 +2263,84 @@ yyreduce:
translate_code_braceless ((yyvsp[0].code),
(yylsp[0])), (yylsp[0]));
code_scanner_last_string_free ();
}
-#line 2262 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2267 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 39:
-#line 397 "src/parse-gram.y" /* yacc.c:1663 */
+#line 401 "src/parse-gram.y" /* yacc.c:1663 */
{
muscle_percent_code_grow ((yyvsp[-1].uniqstr), (yylsp[-1]),
translate_code_braceless ((yyvsp[0].code), (yylsp[0])), (yylsp[0]));
code_scanner_last_string_free ();
}
-#line 2271 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2276 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 40:
-#line 407 "src/parse-gram.y" /* yacc.c:1663 */
+#line 411 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.code_type) = destructor; }
-#line 2277 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2282 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 41:
-#line 408 "src/parse-gram.y" /* yacc.c:1663 */
+#line 412 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.code_type) = printer; }
-#line 2283 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2288 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 42:
-#line 418 "src/parse-gram.y" /* yacc.c:1663 */
+#line 422 "src/parse-gram.y" /* yacc.c:1663 */
{}
-#line 2289 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2294 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 43:
-#line 419 "src/parse-gram.y" /* yacc.c:1663 */
+#line 423 "src/parse-gram.y" /* yacc.c:1663 */
{ muscle_code_grow ("union_name", (yyvsp[0].uniqstr), (yylsp[0])); }
-#line 2295 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2300 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 44:
-#line 424 "src/parse-gram.y" /* yacc.c:1663 */
+#line 428 "src/parse-gram.y" /* yacc.c:1663 */
{
union_seen = true;
muscle_code_grow ("union_members", translate_code_braceless
((yyvsp[0].code), (yylsp[0])), (yylsp[0]));
code_scanner_last_string_free ();
}
-#line 2305 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2310 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 45:
-#line 435 "src/parse-gram.y" /* yacc.c:1663 */
+#line 439 "src/parse-gram.y" /* yacc.c:1663 */
{ current_class = nterm_sym; }
-#line 2311 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2316 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 46:
-#line 436 "src/parse-gram.y" /* yacc.c:1663 */
+#line 440 "src/parse-gram.y" /* yacc.c:1663 */
{
current_class = unknown_sym;
current_type = NULL;
}
-#line 2320 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2325 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 47:
-#line 440 "src/parse-gram.y" /* yacc.c:1663 */
+#line 444 "src/parse-gram.y" /* yacc.c:1663 */
{ current_class = token_sym; }
-#line 2326 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2331 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 48:
-#line 441 "src/parse-gram.y" /* yacc.c:1663 */
+#line 445 "src/parse-gram.y" /* yacc.c:1663 */
{
current_class = unknown_sym;
current_type = NULL;
}
-#line 2335 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2340 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 49:
-#line 446 "src/parse-gram.y" /* yacc.c:1663 */
+#line 450 "src/parse-gram.y" /* yacc.c:1663 */
{
symbol_list *list;
tag_seen = true;
@@ -2343,11 +2348,11 @@ yyreduce:
symbol_type_set (list->content.sym, (yyvsp[-1].uniqstr), (yylsp[-1]));
symbol_list_free ((yyvsp[0].list));
}
-#line 2347 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2352 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 50:
-#line 457 "src/parse-gram.y" /* yacc.c:1663 */
+#line 461 "src/parse-gram.y" /* yacc.c:1663 */
{
symbol_list *list;
++current_prec;
@@ -2359,341 +2364,341 @@ yyreduce:
symbol_list_free ((yyvsp[0].list));
current_type = NULL;
}
-#line 2363 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2368 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 51:
-#line 471 "src/parse-gram.y" /* yacc.c:1663 */
+#line 475 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.assoc) = left_assoc; }
-#line 2369 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2374 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 52:
-#line 472 "src/parse-gram.y" /* yacc.c:1663 */
+#line 476 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.assoc) = right_assoc; }
-#line 2375 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2380 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 53:
-#line 473 "src/parse-gram.y" /* yacc.c:1663 */
+#line 477 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.assoc) = non_assoc; }
-#line 2381 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2386 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 54:
-#line 474 "src/parse-gram.y" /* yacc.c:1663 */
+#line 478 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.assoc) = precedence_assoc; }
-#line 2387 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2392 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 55:
-#line 478 "src/parse-gram.y" /* yacc.c:1663 */
+#line 482 "src/parse-gram.y" /* yacc.c:1663 */
{ current_type = NULL; }
-#line 2393 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2398 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 56:
-#line 479 "src/parse-gram.y" /* yacc.c:1663 */
+#line 483 "src/parse-gram.y" /* yacc.c:1663 */
{ current_type = (yyvsp[0].uniqstr); tag_seen = true; }
-#line 2399 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2404 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 57:
-#line 485 "src/parse-gram.y" /* yacc.c:1663 */
+#line 489 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
-#line 2405 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2410 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 58:
-#line 487 "src/parse-gram.y" /* yacc.c:1663 */
+#line 491 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.list) = symbol_list_append ((yyvsp[-1].list), symbol_list_sym_new
((yyvsp[0].symbol), (yylsp[0]))); }
-#line 2411 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2416 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 59:
-#line 492 "src/parse-gram.y" /* yacc.c:1663 */
+#line 496 "src/parse-gram.y" /* yacc.c:1663 */
{
(yyval.symbol) = (yyvsp[0].symbol);
symbol_class_set ((yyvsp[0].symbol), token_sym, (yylsp[0]), false);
}
-#line 2420 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2425 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 60:
-#line 497 "src/parse-gram.y" /* yacc.c:1663 */
+#line 501 "src/parse-gram.y" /* yacc.c:1663 */
{
(yyval.symbol) = (yyvsp[-1].symbol);
symbol_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer),
(yylsp[0]));
symbol_class_set ((yyvsp[-1].symbol), token_sym, (yylsp[-1]), false);
}
-#line 2430 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2435 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 61:
-#line 507 "src/parse-gram.y" /* yacc.c:1663 */
+#line 511 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
-#line 2436 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2441 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 62:
-#line 509 "src/parse-gram.y" /* yacc.c:1663 */
+#line 513 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.list) = symbol_list_append ((yyvsp[-1].list), symbol_list_sym_new
((yyvsp[0].symbol), (yylsp[0]))); }
-#line 2442 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2447 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 63:
-#line 513 "src/parse-gram.y" /* yacc.c:1663 */
+#line 517 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.list) = (yyvsp[0].list); }
-#line 2448 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2453 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 64:
-#line 514 "src/parse-gram.y" /* yacc.c:1663 */
+#line 518 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.list) = symbol_list_append ((yyvsp[-1].list), (yyvsp[0].list)); }
-#line 2454 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2459 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 65:
-#line 518 "src/parse-gram.y" /* yacc.c:1663 */
+#line 522 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
-#line 2460 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2465 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 66:
-#line 519 "src/parse-gram.y" /* yacc.c:1663 */
+#line 523 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.list) = symbol_list_type_new ((yyvsp[0].uniqstr), (yylsp[0])); }
-#line 2466 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2471 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 68:
-#line 524 "src/parse-gram.y" /* yacc.c:1663 */
+#line 528 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.uniqstr) = uniqstr_new ("*"); }
-#line 2472 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2477 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 69:
-#line 525 "src/parse-gram.y" /* yacc.c:1663 */
+#line 529 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.uniqstr) = uniqstr_new (""); }
-#line 2478 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2483 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 70:
-#line 531 "src/parse-gram.y" /* yacc.c:1663 */
+#line 535 "src/parse-gram.y" /* yacc.c:1663 */
{
current_type = (yyvsp[0].uniqstr);
tag_seen = true;
}
-#line 2487 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2492 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 71:
-#line 536 "src/parse-gram.y" /* yacc.c:1663 */
+#line 540 "src/parse-gram.y" /* yacc.c:1663 */
{
symbol_class_set ((yyvsp[0].symbol), current_class, (yylsp[0]), true);
symbol_type_set ((yyvsp[0].symbol), current_type, (yylsp[0]));
}
-#line 2496 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2501 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 72:
-#line 541 "src/parse-gram.y" /* yacc.c:1663 */
+#line 545 "src/parse-gram.y" /* yacc.c:1663 */
{
symbol_class_set ((yyvsp[-1].symbol), current_class, (yylsp[-1]), true);
symbol_type_set ((yyvsp[-1].symbol), current_type, (yylsp[-1]));
symbol_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer),
(yylsp[0]));
}
-#line 2506 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2511 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 73:
-#line 547 "src/parse-gram.y" /* yacc.c:1663 */
+#line 551 "src/parse-gram.y" /* yacc.c:1663 */
{
symbol_class_set ((yyvsp[-1].symbol), current_class, (yylsp[-1]), true);
symbol_type_set ((yyvsp[-1].symbol), current_type, (yylsp[-1]));
symbol_make_alias ((yyvsp[-1].symbol), (yyvsp[0].symbol), (yyloc));
}
-#line 2516 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2521 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 74:
-#line 553 "src/parse-gram.y" /* yacc.c:1663 */
+#line 557 "src/parse-gram.y" /* yacc.c:1663 */
{
symbol_class_set ((yyvsp[-2].symbol), current_class, (yylsp[-2]), true);
symbol_type_set ((yyvsp[-2].symbol), current_type, (yylsp[-2]));
symbol_user_token_number_set ((yyvsp[-2].symbol), (yyvsp[-1].integer),
(yylsp[-1]));
symbol_make_alias ((yyvsp[-2].symbol), (yyvsp[0].symbol), (yyloc));
}
-#line 2527 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2532 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 81:
-#line 583 "src/parse-gram.y" /* yacc.c:1663 */
+#line 587 "src/parse-gram.y" /* yacc.c:1663 */
{
yyerrok;
}
-#line 2535 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2540 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 82:
-#line 589 "src/parse-gram.y" /* yacc.c:1663 */
+#line 593 "src/parse-gram.y" /* yacc.c:1663 */
{ current_lhs ((yyvsp[-1].symbol), (yylsp[-1]), (yyvsp[0].named_ref)); }
-#line 2541 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2546 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 83:
-#line 590 "src/parse-gram.y" /* yacc.c:1663 */
+#line 594 "src/parse-gram.y" /* yacc.c:1663 */
{
/* Free the current lhs. */
current_lhs (0, (yylsp[-3]), 0);
}
-#line 2550 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2555 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 84:
-#line 597 "src/parse-gram.y" /* yacc.c:1663 */
+#line 601 "src/parse-gram.y" /* yacc.c:1663 */
{ grammar_current_rule_end ((yylsp[0])); }
-#line 2556 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2561 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 85:
-#line 598 "src/parse-gram.y" /* yacc.c:1663 */
+#line 602 "src/parse-gram.y" /* yacc.c:1663 */
{ grammar_current_rule_end ((yylsp[0])); }
-#line 2562 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2567 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 87:
-#line 605 "src/parse-gram.y" /* yacc.c:1663 */
+#line 609 "src/parse-gram.y" /* yacc.c:1663 */
{ grammar_current_rule_begin (current_lhs_symbol, current_lhs_location,
current_lhs_named_ref); }
-#line 2569 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2574 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 88:
-#line 608 "src/parse-gram.y" /* yacc.c:1663 */
+#line 612 "src/parse-gram.y" /* yacc.c:1663 */
{ grammar_current_rule_symbol_append ((yyvsp[-1].symbol), (yylsp[-1]),
(yyvsp[0].named_ref)); }
-#line 2575 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2580 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 89:
-#line 610 "src/parse-gram.y" /* yacc.c:1663 */
+#line 614 "src/parse-gram.y" /* yacc.c:1663 */
{ grammar_current_rule_action_append ((yyvsp[-1].code), (yylsp[-1]),
(yyvsp[0].named_ref), false); }
-#line 2581 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2586 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 90:
-#line 612 "src/parse-gram.y" /* yacc.c:1663 */
+#line 616 "src/parse-gram.y" /* yacc.c:1663 */
{ grammar_current_rule_action_append ((yyvsp[0].code), (yylsp[0]), NULL,
true); }
-#line 2587 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2592 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 91:
-#line 614 "src/parse-gram.y" /* yacc.c:1663 */
+#line 618 "src/parse-gram.y" /* yacc.c:1663 */
{ grammar_current_rule_empty_set ((yylsp[0])); }
-#line 2593 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2598 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 92:
-#line 616 "src/parse-gram.y" /* yacc.c:1663 */
+#line 620 "src/parse-gram.y" /* yacc.c:1663 */
{ grammar_current_rule_prec_set ((yyvsp[0].symbol), (yylsp[0])); }
-#line 2599 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2604 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 93:
-#line 618 "src/parse-gram.y" /* yacc.c:1663 */
+#line 622 "src/parse-gram.y" /* yacc.c:1663 */
{ grammar_current_rule_dprec_set ((yyvsp[0].integer), (yylsp[0])); }
-#line 2605 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2610 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 94:
-#line 620 "src/parse-gram.y" /* yacc.c:1663 */
+#line 624 "src/parse-gram.y" /* yacc.c:1663 */
{ grammar_current_rule_merge_set ((yyvsp[0].uniqstr), (yylsp[0])); }
-#line 2611 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2616 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 95:
-#line 624 "src/parse-gram.y" /* yacc.c:1663 */
+#line 628 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.named_ref) = 0; }
-#line 2617 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2622 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 96:
-#line 625 "src/parse-gram.y" /* yacc.c:1663 */
+#line 629 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.named_ref) = named_ref_new((yyvsp[0].uniqstr), (yylsp[0])); }
-#line 2623 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2628 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 98:
-#line 636 "src/parse-gram.y" /* yacc.c:1663 */
+#line 640 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.uniqstr) = uniqstr_new ((yyvsp[0].code)); }
-#line 2629 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2634 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 99:
-#line 661 "src/parse-gram.y" /* yacc.c:1663 */
+#line 665 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.value).kind = muscle_keyword; (yyval.value).chars = ""; }
-#line 2635 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2640 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 100:
-#line 662 "src/parse-gram.y" /* yacc.c:1663 */
+#line 666 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.value).kind = muscle_keyword; (yyval.value).chars =
(yyvsp[0].uniqstr); }
-#line 2641 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2646 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 101:
-#line 663 "src/parse-gram.y" /* yacc.c:1663 */
+#line 667 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.value).kind = muscle_string; (yyval.value).chars =
(yyvsp[0].code); }
-#line 2647 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2652 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 102:
-#line 664 "src/parse-gram.y" /* yacc.c:1663 */
+#line 668 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.value).kind = muscle_code; (yyval.value).chars = strip_braces
((yyvsp[0].code)); }
-#line 2653 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2658 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 103:
-#line 677 "src/parse-gram.y" /* yacc.c:1663 */
+#line 681 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); }
-#line 2659 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2664 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 104:
-#line 679 "src/parse-gram.y" /* yacc.c:1663 */
+#line 683 "src/parse-gram.y" /* yacc.c:1663 */
{
(yyval.symbol) = symbol_get (char_name ((yyvsp[0].character)),
(yylsp[0]));
symbol_class_set ((yyval.symbol), token_sym, (yylsp[0]), false);
symbol_user_token_number_set ((yyval.symbol), (yyvsp[0].character),
(yylsp[0]));
}
-#line 2669 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2674 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 105:
-#line 687 "src/parse-gram.y" /* yacc.c:1663 */
+#line 691 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); }
-#line 2675 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2680 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 108:
-#line 699 "src/parse-gram.y" /* yacc.c:1663 */
+#line 703 "src/parse-gram.y" /* yacc.c:1663 */
{
(yyval.symbol) = symbol_get (quotearg_style (c_quoting_style,
(yyvsp[0].code)), (yylsp[0]));
symbol_class_set ((yyval.symbol), token_sym, (yylsp[0]), false);
}
-#line 2684 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2689 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 110:
-#line 708 "src/parse-gram.y" /* yacc.c:1663 */
+#line 712 "src/parse-gram.y" /* yacc.c:1663 */
{
muscle_code_grow ("epilogue", translate_code ((yyvsp[0].code),
(yylsp[0]), true), (yylsp[0]));
code_scanner_last_string_free ();
}
-#line 2693 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2698 "src/parse-gram.c" /* yacc.c:1663 */
break;
-#line 2697 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2702 "src/parse-gram.c" /* yacc.c:1663 */
default: break;
}
if (yychar_backup != yychar)
@@ -2940,7 +2945,7 @@ yyreturn:
#endif
return yyresult;
}
-#line 714 "src/parse-gram.y" /* yacc.c:1923 */
+#line 718 "src/parse-gram.y" /* yacc.c:1923 */
/* Return the location of the left-hand side of a rule whose
diff --git a/src/parse-gram.h b/src/parse-gram.h
index 8ddb7a5..75bdcb9 100644
--- a/src/parse-gram.h
+++ b/src/parse-gram.h
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 2.7.1164-a174b-dirty. */
+/* A Bison parser, made by GNU Bison 2.7.1.1188-a7ee3. */
/* Bison interface for Yacc-like parsers in C
@@ -52,7 +52,7 @@ extern int gram_debug;
#include "symlist.h"
#include "symtab.h"
-#line 216 "src/parse-gram.y" /* yacc.c:1926 */
+#line 220 "src/parse-gram.y" /* yacc.c:1926 */
typedef enum
{
@@ -61,7 +61,7 @@ extern int gram_debug;
param_parse = 1 << 1,
param_both = param_lex | param_parse
} param_type;
-#line 640 "src/parse-gram.y" /* yacc.c:1926 */
+#line 644 "src/parse-gram.y" /* yacc.c:1926 */
#include "muscle-tab.h"
#line 68 "src/parse-gram.h" /* yacc.c:1926 */
@@ -135,27 +135,27 @@ extern int gram_debug;
typedef union GRAM_STYPE GRAM_STYPE;
union GRAM_STYPE
{
-#line 177 "src/parse-gram.y" /* yacc.c:1926 */
-unsigned char character;
#line 181 "src/parse-gram.y" /* yacc.c:1926 */
+unsigned char character;
+#line 185 "src/parse-gram.y" /* yacc.c:1926 */
char *code;
-#line 186 "src/parse-gram.y" /* yacc.c:1926 */
+#line 190 "src/parse-gram.y" /* yacc.c:1926 */
uniqstr uniqstr;
-#line 194 "src/parse-gram.y" /* yacc.c:1926 */
-int integer;
#line 198 "src/parse-gram.y" /* yacc.c:1926 */
+int integer;
+#line 202 "src/parse-gram.y" /* yacc.c:1926 */
symbol *symbol;
-#line 203 "src/parse-gram.y" /* yacc.c:1926 */
+#line 207 "src/parse-gram.y" /* yacc.c:1926 */
assoc assoc;
-#line 206 "src/parse-gram.y" /* yacc.c:1926 */
+#line 210 "src/parse-gram.y" /* yacc.c:1926 */
symbol_list *list;
-#line 209 "src/parse-gram.y" /* yacc.c:1926 */
+#line 213 "src/parse-gram.y" /* yacc.c:1926 */
named_ref *named_ref;
-#line 236 "src/parse-gram.y" /* yacc.c:1926 */
+#line 240 "src/parse-gram.y" /* yacc.c:1926 */
param_type param;
-#line 404 "src/parse-gram.y" /* yacc.c:1926 */
+#line 408 "src/parse-gram.y" /* yacc.c:1926 */
code_props_type code_type;
-#line 642 "src/parse-gram.y" /* yacc.c:1926 */
+#line 646 "src/parse-gram.y" /* yacc.c:1926 */
struct
{
--
1.8.2.3
- [PATCH 0/5] {master} minor fixes, Akim Demaille, 2013/05/30
- [PATCH 3/5] fix a memory leak, Akim Demaille, 2013/05/30
- [PATCH 4/5] build: locally disable new GCC warnings that fail on Flex generated code, Akim Demaille, 2013/05/30
- [PATCH 1/5] build: be sure to include config.h first in the generated parser, Akim Demaille, 2013/05/30
- [PATCH 5/5] xml: use %empty in the text output, Akim Demaille, 2013/05/30
- [PATCH 2/5] regen,
Akim Demaille <=
- Re: [PATCH 0/5] {master} minor fixes, Akim Demaille, 2013/05/30