X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/8ecac08f2dfccd80219038b36ed352b4910801d7..985d7177e8aaedcabe48dd911077ddcc8f74891f:/src/parse-gram.c
diff --git a/src/parse-gram.c b/src/parse-gram.c
index 032dabf5..f44f03da 100644
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 2.7.1087-c21e-dirty. */
+/* A Bison parser, made by GNU Bison 2.7.1164-a174b-dirty. */
/* Bison implementation for Yacc-like parsers in C
@@ -44,7 +44,7 @@
#define YYBISON 1
/* Bison version. */
-#define YYBISON_VERSION "2.7.1087-c21e-dirty"
+#define YYBISON_VERSION "2.7.1164-a174b-dirty"
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
@@ -70,59 +70,8 @@
/* Copy the first part of user declarations. */
-#line 1 "src/parse-gram.y" /* yacc.c:357 */
-/* Bison Grammar Parser -*- C -*-
- Copyright (C) 2002-2013 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
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see . */
-
-#include
-#include "system.h"
-
-#include "c-ctype.h"
-#include "complain.h"
-#include "conflicts.h"
-#include "files.h"
-#include "getargs.h"
-#include "gram.h"
-#include "muscle-tab.h"
-#include "named-ref.h"
-#include "quotearg.h"
-#include "reader.h"
-#include "symlist.h"
-#include "symtab.h"
-#include "scan-gram.h"
-#include "scan-code.h"
-#include "xmemdup0.h"
-
-#define YYLLOC_DEFAULT(Current, Rhs, N) (Current) = lloc_default (Rhs, N)
-static YYLTYPE lloc_default (YYLTYPE const *, int);
-
-#define YY_LOCATION_PRINT(File, Loc) \
- location_print (Loc, File)
-
-static void version_check (location const *loc, char const *version);
-
-static void gram_error (location const *, char const *);
-
-/* A string that describes a char (e.g., 'a' -> "'a'"). */
-static char const *char_name (char);
-
-#line 126 "src/parse-gram.c" /* yacc.c:357 */
+#line 75 "src/parse-gram.c" /* yacc.c:356 */
# ifndef YY_NULL
# if defined __cplusplus && 201103L <= __cplusplus
@@ -160,10 +109,12 @@ static char const *char_name (char);
extern int gram_debug;
#endif
/* "%code requires" blocks. */
-#line 219 "src/parse-gram.y" /* yacc.c:373 */
+#line 21 "src/parse-gram.y" /* yacc.c:372 */
+
+#include "symlist.h"
+#include "symtab.h"
+#line 209 "src/parse-gram.y" /* yacc.c:372 */
-# ifndef PARAM_TYPE
-# define PARAM_TYPE
typedef enum
{
param_none = 0,
@@ -171,10 +122,10 @@ extern int gram_debug;
param_parse = 1 << 1,
param_both = param_lex | param_parse
} param_type;
-# endif
-
+#line 640 "src/parse-gram.y" /* yacc.c:372 */
+#include "muscle-tab.h"
-#line 178 "src/parse-gram.c" /* yacc.c:373 */
+#line 129 "src/parse-gram.c" /* yacc.c:372 */
/* Token type. */
#ifndef GRAM_TOKENTYPE
@@ -183,145 +134,99 @@ extern int gram_debug;
{
GRAM_EOF = 0,
STRING = 258,
- INT = 259,
- PERCENT_TOKEN = 260,
- PERCENT_NTERM = 261,
- PERCENT_TYPE = 262,
- PERCENT_DESTRUCTOR = 263,
- PERCENT_PRINTER = 264,
- PERCENT_LEFT = 265,
- PERCENT_RIGHT = 266,
- PERCENT_NONASSOC = 267,
- PERCENT_PRECEDENCE = 268,
- PERCENT_PREC = 269,
- PERCENT_DPREC = 270,
- PERCENT_MERGE = 271,
- PERCENT_CODE = 272,
- PERCENT_DEFAULT_PREC = 273,
- PERCENT_DEFINE = 274,
- PERCENT_DEFINES = 275,
- PERCENT_ERROR_VERBOSE = 276,
- PERCENT_EXPECT = 277,
- PERCENT_EXPECT_RR = 278,
- PERCENT_FLAG = 279,
- PERCENT_FILE_PREFIX = 280,
- PERCENT_GLR_PARSER = 281,
- PERCENT_INITIAL_ACTION = 282,
- PERCENT_LANGUAGE = 283,
- PERCENT_NAME_PREFIX = 284,
- PERCENT_NO_DEFAULT_PREC = 285,
- PERCENT_NO_LINES = 286,
- PERCENT_NONDETERMINISTIC_PARSER = 287,
- PERCENT_OUTPUT = 288,
- PERCENT_REQUIRE = 289,
- PERCENT_SKELETON = 290,
- PERCENT_START = 291,
- PERCENT_TOKEN_TABLE = 292,
- PERCENT_VERBOSE = 293,
- PERCENT_YACC = 294,
- BRACED_CODE = 295,
- BRACED_PREDICATE = 296,
- BRACKETED_ID = 297,
- CHAR = 298,
- EPILOGUE = 299,
- EQUAL = 300,
- ID = 301,
- ID_COLON = 302,
- PERCENT_PERCENT = 303,
- PIPE = 304,
- PROLOGUE = 305,
- SEMICOLON = 306,
- TAG = 307,
- TAG_ANY = 308,
- TAG_NONE = 309,
+ PERCENT_TOKEN = 259,
+ PERCENT_NTERM = 260,
+ PERCENT_TYPE = 261,
+ PERCENT_DESTRUCTOR = 262,
+ PERCENT_PRINTER = 263,
+ PERCENT_LEFT = 264,
+ PERCENT_RIGHT = 265,
+ PERCENT_NONASSOC = 266,
+ PERCENT_PRECEDENCE = 267,
+ PERCENT_PREC = 268,
+ PERCENT_DPREC = 269,
+ PERCENT_MERGE = 270,
+ PERCENT_CODE = 271,
+ PERCENT_DEFAULT_PREC = 272,
+ PERCENT_DEFINE = 273,
+ PERCENT_DEFINES = 274,
+ PERCENT_ERROR_VERBOSE = 275,
+ PERCENT_EXPECT = 276,
+ PERCENT_EXPECT_RR = 277,
+ PERCENT_FLAG = 278,
+ PERCENT_FILE_PREFIX = 279,
+ PERCENT_GLR_PARSER = 280,
+ PERCENT_INITIAL_ACTION = 281,
+ PERCENT_LANGUAGE = 282,
+ PERCENT_NAME_PREFIX = 283,
+ PERCENT_NO_DEFAULT_PREC = 284,
+ PERCENT_NO_LINES = 285,
+ PERCENT_NONDETERMINISTIC_PARSER = 286,
+ PERCENT_OUTPUT = 287,
+ PERCENT_REQUIRE = 288,
+ PERCENT_SKELETON = 289,
+ PERCENT_START = 290,
+ PERCENT_TOKEN_TABLE = 291,
+ PERCENT_VERBOSE = 292,
+ PERCENT_YACC = 293,
+ BRACED_CODE = 294,
+ BRACED_PREDICATE = 295,
+ BRACKETED_ID = 296,
+ CHAR = 297,
+ EPILOGUE = 298,
+ EQUAL = 299,
+ ID = 300,
+ ID_COLON = 301,
+ PERCENT_PERCENT = 302,
+ PIPE = 303,
+ PROLOGUE = 304,
+ SEMICOLON = 305,
+ TAG = 306,
+ TAG_ANY = 307,
+ TAG_NONE = 308,
+ INT = 309,
PERCENT_PARAM = 310,
PERCENT_UNION = 311,
PERCENT_EMPTY = 312
};
#endif
-/* Tokens. */
-#define GRAM_EOF 0
-#define STRING 258
-#define INT 259
-#define PERCENT_TOKEN 260
-#define PERCENT_NTERM 261
-#define PERCENT_TYPE 262
-#define PERCENT_DESTRUCTOR 263
-#define PERCENT_PRINTER 264
-#define PERCENT_LEFT 265
-#define PERCENT_RIGHT 266
-#define PERCENT_NONASSOC 267
-#define PERCENT_PRECEDENCE 268
-#define PERCENT_PREC 269
-#define PERCENT_DPREC 270
-#define PERCENT_MERGE 271
-#define PERCENT_CODE 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_FLAG 279
-#define PERCENT_FILE_PREFIX 280
-#define PERCENT_GLR_PARSER 281
-#define PERCENT_INITIAL_ACTION 282
-#define PERCENT_LANGUAGE 283
-#define PERCENT_NAME_PREFIX 284
-#define PERCENT_NO_DEFAULT_PREC 285
-#define PERCENT_NO_LINES 286
-#define PERCENT_NONDETERMINISTIC_PARSER 287
-#define PERCENT_OUTPUT 288
-#define PERCENT_REQUIRE 289
-#define PERCENT_SKELETON 290
-#define PERCENT_START 291
-#define PERCENT_TOKEN_TABLE 292
-#define PERCENT_VERBOSE 293
-#define PERCENT_YACC 294
-#define BRACED_CODE 295
-#define BRACED_PREDICATE 296
-#define BRACKETED_ID 297
-#define CHAR 298
-#define EPILOGUE 299
-#define EQUAL 300
-#define ID 301
-#define ID_COLON 302
-#define PERCENT_PERCENT 303
-#define PIPE 304
-#define PROLOGUE 305
-#define SEMICOLON 306
-#define TAG 307
-#define TAG_ANY 308
-#define TAG_NONE 309
-#define PERCENT_PARAM 310
-#define PERCENT_UNION 311
-#define PERCENT_EMPTY 312
/* Value type. */
#if ! defined GRAM_STYPE && ! defined GRAM_STYPE_IS_DECLARED
typedef union GRAM_STYPE GRAM_STYPE;
union GRAM_STYPE
{
-#line 105 "src/parse-gram.y" /* yacc.c:373 */
+#line 161 "src/parse-gram.y" /* yacc.c:372 */
+unsigned char character;
+#line 168 "src/parse-gram.y" /* yacc.c:372 */
- assoc assoc;
char *code;
char const *chars;
- int integer;
- named_ref *named_ref;
- symbol *symbol;
- symbol_list *list;
- uniqstr uniqstr;
- unsigned char character;
-
-#line 243 "src/parse-gram.y" /* yacc.c:373 */
-
- param_type param;
-
-#line 419 "src/parse-gram.y" /* yacc.c:373 */
+#line 179 "src/parse-gram.y" /* yacc.c:372 */
+uniqstr uniqstr;
+#line 187 "src/parse-gram.y" /* yacc.c:372 */
+int integer;
+#line 191 "src/parse-gram.y" /* yacc.c:372 */
+symbol *symbol;
+#line 196 "src/parse-gram.y" /* yacc.c:372 */
+assoc assoc;
+#line 199 "src/parse-gram.y" /* yacc.c:372 */
+symbol_list *list;
+#line 202 "src/parse-gram.y" /* yacc.c:372 */
+named_ref *named_ref;
+#line 229 "src/parse-gram.y" /* yacc.c:372 */
+param_type param;
+#line 404 "src/parse-gram.y" /* yacc.c:372 */
code_props_type code_type;
+#line 642 "src/parse-gram.y" /* yacc.c:372 */
-#line 325 "src/parse-gram.c" /* yacc.c:373 */
+ struct
+ {
+ char const *chars;
+ muscle_kind kind;
+ } value;
+
+#line 230 "src/parse-gram.c" /* yacc.c:372 */
};
# define GRAM_STYPE_IS_TRIVIAL 1
# define GRAM_STYPE_IS_DECLARED 1
@@ -349,9 +254,25 @@ int gram_parse (void);
/* Copy the second part of user declarations. */
-#line 353 "src/parse-gram.c" /* yacc.c:376 */
+#line 258 "src/parse-gram.c" /* yacc.c:375 */
/* Unqualified %code blocks. */
-#line 54 "src/parse-gram.y" /* yacc.c:377 */
+#line 27 "src/parse-gram.y" /* yacc.c:376 */
+
+#include
+#include "system.h"
+
+#include "c-ctype.h"
+#include "complain.h"
+#include "conflicts.h"
+#include "files.h"
+#include "getargs.h"
+#include "gram.h"
+#include "named-ref.h"
+#include "quotearg.h"
+#include "reader.h"
+#include "scan-gram.h"
+#include "scan-code.h"
+#include "xmemdup0.h"
static int current_prec = 0;
static location current_lhs_location;
@@ -363,27 +284,27 @@ int gram_parse (void);
/** Set the new current left-hand side symbol, possibly common
* to several right-hand side parts of rule.
*/
- static
- void
- current_lhs (symbol *sym, location loc, named_ref *ref)
- {
- current_lhs_symbol = sym;
- current_lhs_location = loc;
- /* In order to simplify memory management, named references for lhs
- are always assigned by deep copy into the current symbol_list
- node. This is because a single named-ref in the grammar may
- result in several uses when the user factors lhs between several
- rules using "|". Therefore free the parser's original copy. */
- free (current_lhs_named_ref);
- current_lhs_named_ref = ref;
- }
+ static void current_lhs (symbol *sym, location loc, named_ref *ref);
+
+ #define YYLLOC_DEFAULT(Current, Rhs, N) \
+ (Current) = lloc_default (Rhs, N)
+ static YYLTYPE lloc_default (YYLTYPE const *, int);
+
+ #define YY_LOCATION_PRINT(File, Loc) \
+ location_print (Loc, File)
+
+ static void version_check (location const *loc, char const *version);
+
+ static void gram_error (location const *, char const *);
+
+ /* A string that describes a char (e.g., 'a' -> "'a'"). */
+ static char const *char_name (char);
#define YYTYPE_INT16 int_fast16_t
#define YYTYPE_INT8 int_fast8_t
#define YYTYPE_UINT16 uint_fast16_t
#define YYTYPE_UINT8 uint_fast8_t
-
-#line 232 "src/parse-gram.y" /* yacc.c:377 */
+#line 219 "src/parse-gram.y" /* yacc.c:376 */
/** Add a lex-param and/or a parse-param.
*
@@ -394,8 +315,7 @@ int gram_parse (void);
static void add_param (param_type type, char *decl, location loc);
static param_type current_param = param_none;
-
-#line 399 "src/parse-gram.c" /* yacc.c:377 */
+#line 319 "src/parse-gram.c" /* yacc.c:376 */
#ifdef short
# undef short
@@ -452,19 +372,28 @@ typedef short int yytype_int16;
# endif
#endif
+#ifndef __attribute__
+/* This feature is available in gcc versions 2.5 and later. */
+# if (! defined __GNUC__ || __GNUC__ < 2 \
+ || (__GNUC__ == 2 && __GNUC_MINOR__ < 5))
+# define __attribute__(Spec) /* empty */
+# endif
+#endif
+
/* Suppress unused-variable warnings by "using" E. */
-#ifdef __GNUC__
+#if ! defined lint || defined __GNUC__
# define YYUSE(E) ((void) (E))
#else
# define YYUSE(E) /* empty */
#endif
+
#if 1
/* The parser invokes alloca or malloc; define the necessary symbols. */
# ifdef YYSTACK_ALLOC
- /* Pacify GCC's `empty if-body' warning. */
+ /* Pacify GCC's 'empty if-body' warning. */
# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
# ifndef YYSTACK_ALLOC_MAXIMUM
/* The OS might guarantee only one guard page at the bottom of the stack,
@@ -569,16 +498,16 @@ union yyalloc
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 3
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 158
+#define YYLAST 165
/* YYNTOKENS -- Number of terminals. */
#define YYNTOKENS 58
/* YYNNTS -- Number of nonterminals. */
#define YYNNTS 38
/* YYNRULES -- Number of rules. */
-#define YYNRULES 110
+#define YYNRULES 111
/* YYNSTATES -- Number of states. */
-#define YYNSTATES 144
+#define YYNSTATES 145
/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
by yylex, with out-of-bounds checking. */
@@ -630,18 +559,18 @@ static const yytype_uint8 yytranslate[] =
/* YYRLINE[YYN] -- Source line where rule number YYN was defined. */
static const yytype_uint16 yyrline[] =
{
- 0, 268, 268, 277, 278, 282, 283, 293, 297, 302,
- 303, 308, 313, 314, 315, 316, 321, 330, 331, 332,
- 333, 334, 335, 335, 336, 337, 361, 362, 363, 364,
- 368, 369, 378, 379, 380, 384, 396, 400, 404, 411,
- 422, 423, 433, 434, 438, 450, 450, 455, 455, 460,
- 471, 486, 487, 488, 489, 493, 494, 499, 501, 506,
- 507, 512, 514, 519, 520, 524, 525, 529, 530, 531,
- 536, 541, 546, 552, 558, 569, 570, 579, 580, 586,
- 587, 588, 595, 595, 603, 604, 605, 610, 613, 615,
- 617, 619, 621, 623, 625, 630, 631, 641, 642, 647,
- 648, 649, 658, 678, 680, 689, 694, 695, 700, 708,
- 709
+ 0, 252, 252, 261, 262, 266, 267, 277, 281, 286,
+ 287, 292, 298, 299, 300, 301, 306, 315, 316, 317,
+ 318, 319, 320, 320, 321, 322, 346, 347, 348, 349,
+ 353, 354, 363, 364, 365, 369, 381, 385, 389, 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, 673, 693, 695, 704, 709, 710, 715,
+ 723, 724
};
#endif
@@ -650,10 +579,10 @@ static const yytype_uint16 yyrline[] =
First, the terminals, then, starting at YYNTOKENS, nonterminals. */
static const char *const yytname[] =
{
- "\"end of file\"", "error", "$undefined", "\"string\"", "\"integer\"",
- "\"%token\"", "\"%nterm\"", "\"%type\"", "\"%destructor\"",
- "\"%printer\"", "\"%left\"", "\"%right\"", "\"%nonassoc\"",
- "\"%precedence\"", "\"%prec\"", "\"%dprec\"", "\"%merge\"", "\"%code\"",
+ "\"end of file\"", "error", "$undefined", "\"string\"", "\"%token\"",
+ "\"%nterm\"", "\"%type\"", "\"%destructor\"", "\"%printer\"",
+ "\"%left\"", "\"%right\"", "\"%nonassoc\"", "\"%precedence\"",
+ "\"%prec\"", "\"%dprec\"", "\"%merge\"", "\"%code\"",
"\"%default-prec\"", "\"%define\"", "\"%defines\"", "\"%error-verbose\"",
"\"%expect\"", "\"%expect-rr\"", "\"%\"", "\"%file-prefix\"",
"\"%glr-parser\"", "\"%initial-action\"", "\"%language\"",
@@ -663,16 +592,15 @@ static const char *const yytname[] =
"\"%yacc\"", "\"{...}\"", "\"%?{...}\"", "\"[identifier]\"", "\"char\"",
"\"epilogue\"", "\"=\"", "\"identifier\"", "\"identifier:\"", "\"%%\"",
"\"|\"", "\"%{...%}\"", "\";\"", "\"\"", "\"<*>\"", "\"<>\"",
- "\"%param\"", "\"%union\"", "\"%empty\"", "$accept", "input",
- "prologue_declarations", "prologue_declaration", "$@1", "params",
- "grammar_declaration", "code_props_type", "union_name",
+ "\"integer\"", "\"%param\"", "\"%union\"", "\"%empty\"", "$accept",
+ "input", "prologue_declarations", "prologue_declaration", "$@1",
+ "params", "grammar_declaration", "code_props_type", "union_name",
"symbol_declaration", "$@2", "$@3", "precedence_declaration",
"precedence_declarator", "tag.opt", "symbols.prec", "symbol.prec",
"symbols.1", "generic_symlist", "generic_symlist_item", "tag",
"symbol_def", "symbol_defs.1", "grammar", "rules_or_grammar_declaration",
- "rules", "$@4", "rhses.1", "rhs", "named_ref.opt", "variable",
- "content.opt", "braceless", "id", "id_colon", "symbol", "string_as_id",
- "epilogue.opt", YY_NULL
+ "rules", "$@4", "rhses.1", "rhs", "named_ref.opt", "variable", "value",
+ "braceless", "id", "id_colon", "symbol", "string_as_id", "epilogue.opt", YY_NULL
};
#endif
@@ -690,35 +618,35 @@ static const yytype_uint16 yytoknum[] =
};
# endif
-#define YYPACT_NINF -99
+#define YYPACT_NINF -115
#define yypact_value_is_default(Yystate) \
- (!!((Yystate) == (-99)))
+ (!!((Yystate) == (-115)))
-#define YYTABLE_NINF -110
+#define YYTABLE_NINF -111
#define yytable_value_is_error(Yytable_value) \
0
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
-static const yytype_int16 yypact[] =
+static const yytype_int8 yypact[] =
{
- -99, 5, 102, -99, -99, -99, -48, -99, -99, -99,
- -99, -99, -99, 19, -99, 27, 52, -99, 56, 60,
- -99, 67, -99, 34, 73, 76, -99, -99, -99, 86,
- 87, 88, 0, -99, -99, -99, 15, -99, -99, -99,
- 46, -99, -99, 54, -99, -99, 45, 4, 4, 0,
- -99, 58, -99, -99, -99, 31, -99, -99, -99, -99,
- -99, -99, -99, -99, -99, -99, -99, -99, -99, -99,
- -99, -99, 49, -99, 50, 1, -99, -99, 61, 62,
- -99, 58, 32, -99, 0, -99, -99, 4, 84, 4,
- 0, -99, -99, -99, -99, -99, -99, -99, 72, -99,
- -99, -99, -99, -99, 64, -99, -99, -99, -99, 32,
- -99, -99, -99, 0, -99, 101, -99, 114, -99, -99,
- -99, -99, -99, -99, -99, -99, -99, 12, 26, -99,
- -99, 0, 138, 66, 61, -99, -99, 61, 26, -99,
- -99, -99, -99, -99
+ -115, 16, 109, -115, -115, -115, -28, -115, -115, -115,
+ -115, -115, -115, -14, -115, 25, 23, -115, -27, -20,
+ -115, 39, -115, 7, 48, 71, -115, -115, -115, 72,
+ 73, 74, -2, -115, -115, -115, 56, -115, -115, -115,
+ 33, -115, -115, 40, -115, -115, 37, 54, 54, -2,
+ -115, 50, -115, -115, -115, 2, -115, -115, -115, -115,
+ -115, -115, -115, -115, -115, -115, -115, -115, -115, -115,
+ -115, -115, 51, -115, 53, 3, -115, -115, 49, 65,
+ -115, 50, 42, -115, -2, -115, -115, 54, -1, 54,
+ -2, -115, -115, -115, -115, -115, -115, -115, -115, 63,
+ -115, -115, -115, -115, -115, 69, -115, -115, -115, -115,
+ 42, -115, -115, -115, -2, -115, 38, -115, 106, -115,
+ -115, -115, -115, -115, -115, -115, -115, -115, -15, 41,
+ -115, -115, -2, 57, 59, 49, -115, -115, 49, 41,
+ -115, -115, -115, -115, -115
};
/* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
@@ -731,34 +659,34 @@ static const yytype_uint8 yydefact[] =
7, 0, 15, 0, 0, 0, 37, 19, 20, 0,
0, 0, 0, 26, 27, 28, 0, 6, 29, 22,
42, 4, 5, 0, 33, 32, 55, 0, 0, 0,
- 102, 0, 38, 98, 97, 99, 10, 12, 13, 14,
- 16, 17, 18, 21, 24, 25, 108, 104, 103, 106,
- 34, 107, 0, 105, 0, 0, 77, 79, 95, 0,
+ 103, 0, 38, 98, 97, 99, 10, 12, 13, 14,
+ 16, 17, 18, 21, 24, 25, 109, 105, 104, 107,
+ 34, 108, 0, 106, 0, 0, 77, 79, 95, 0,
43, 0, 0, 56, 0, 70, 75, 48, 71, 46,
- 49, 61, 39, 101, 100, 8, 81, 80, 0, 78,
- 2, 96, 82, 31, 23, 44, 67, 68, 69, 35,
- 63, 66, 65, 50, 57, 59, 76, 72, 73, 62,
- 110, 87, 30, 64, 58, 60, 74, 83, 84, 87,
- 86, 0, 0, 0, 95, 90, 91, 95, 85, 92,
- 93, 94, 89, 88
+ 49, 61, 39, 101, 100, 8, 102, 81, 80, 0,
+ 78, 2, 96, 82, 31, 23, 44, 67, 68, 69,
+ 35, 63, 66, 65, 50, 57, 59, 76, 72, 73,
+ 62, 111, 87, 30, 64, 58, 60, 74, 83, 84,
+ 87, 86, 0, 0, 0, 95, 90, 91, 95, 85,
+ 92, 93, 94, 89, 88
};
/* YYPGOTO[NTERM-NUM]. */
-static const yytype_int16 yypgoto[] =
+static const yytype_int8 yypgoto[] =
{
- -99, -99, -99, -99, -99, -99, 141, -99, -99, -99,
- -99, -99, -99, -99, -99, -99, 33, -99, -99, 35,
- -99, -7, 97, -99, 74, -99, -99, -99, 18, -98,
- -99, -99, -13, 6, -99, -32, -73, -99
+ -115, -115, -115, -115, -115, -115, 120, -115, -115, -115,
+ -115, -115, -115, -115, -115, -115, 9, -115, -115, 14,
+ -115, -50, 100, -115, 75, -115, -115, -115, 19, -114,
+ -115, -115, -33, -18, -115, -32, -82, -115
};
/* YYDEFGOTO[NTERM-NUM]. */
static const yytype_int16 yydefgoto[] =
{
- -1, 1, 2, 41, 79, 104, 74, 43, 81, 44,
- 48, 47, 45, 46, 84, 113, 114, 90, 109, 110,
- 111, 86, 87, 75, 76, 77, 121, 127, 128, 102,
- 55, 95, 52, 69, 78, 112, 71, 100
+ -1, 1, 2, 41, 79, 105, 74, 43, 81, 44,
+ 48, 47, 45, 46, 84, 114, 115, 90, 110, 111,
+ 112, 86, 87, 75, 76, 77, 122, 128, 129, 103,
+ 55, 95, 52, 69, 78, 113, 71, 101
};
/* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If
@@ -766,63 +694,65 @@ static const yytype_int16 yydefgoto[] =
number is the opposite. If YYTABLE_NINF, syntax error. */
static const yytype_int16 yytable[] =
{
- 70, -109, 72, 66, 49, 3, 4, 5, 6, 7,
- 8, 9, 10, 11, 12, 118, 72, 91, 13, 14,
- 4, 5, 6, 7, 8, 9, 10, 11, 12, 66,
- 53, 26, 13, 14, 93, 66, 142, 32, 92, 143,
- 131, 132, 133, 67, 126, 26, 68, 67, 73, 98,
- 68, 32, 115, 88, 88, 56, 85, 40, 119, 50,
- 57, 129, 73, 130, 58, 51, 134, 135, 105, 67,
- 59, 40, 68, 54, 60, 67, 61, 94, 68, 62,
- 116, 115, 116, 136, 106, 107, 108, 66, 117, 63,
- 64, 65, 80, 88, 82, 88, 137, 83, 50, 139,
- 96, 97, 103, 101, 122, 125, 137, 4, 5, 6,
- 7, 8, 9, 10, 11, 12, 120, 66, 141, 13,
- 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
- 24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
- 34, 35, 140, 42, 123, 89, 124, 138, 0, 99,
- 36, 0, 37, 38, 0, 0, 0, 39, 40
+ 70, 66, 66, -110, 72, 93, 119, 4, 5, 6,
+ 7, 8, 9, 10, 11, 12, 3, 91, 92, 13,
+ 14, 143, 96, 49, 144, 50, 56, 57, 53, 88,
+ 88, 51, 26, 130, 58, 131, 127, 117, 32, 117,
+ 67, 50, 59, 68, 66, 66, 60, 94, 106, 73,
+ 99, 61, 116, 118, 132, 133, 134, 72, 120, 40,
+ 4, 5, 6, 7, 8, 9, 10, 11, 12, 88,
+ 54, 88, 13, 14, 62, 63, 64, 65, 80, 82,
+ 135, 136, 116, 67, 67, 26, 68, 68, 83, 50,
+ 102, 32, 126, 107, 108, 109, 67, 138, 137, 68,
+ 140, 97, 73, 98, 104, 85, 121, 138, 123, 66,
+ 142, 141, 40, 4, 5, 6, 7, 8, 9, 10,
+ 11, 12, 42, 125, 124, 13, 14, 15, 16, 17,
+ 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
+ 28, 29, 30, 31, 32, 33, 34, 35, 89, 139,
+ 100, 0, 0, 0, 0, 0, 36, 0, 37, 38,
+ 0, 0, 0, 0, 39, 40
};
static const yytype_int16 yycheck[] =
{
- 32, 0, 1, 3, 52, 0, 5, 6, 7, 8,
- 9, 10, 11, 12, 13, 88, 1, 49, 17, 18,
- 5, 6, 7, 8, 9, 10, 11, 12, 13, 3,
- 3, 30, 17, 18, 3, 3, 134, 36, 51, 137,
- 14, 15, 16, 43, 117, 30, 46, 43, 47, 48,
- 46, 36, 84, 47, 48, 3, 52, 56, 90, 40,
- 4, 49, 47, 51, 4, 46, 40, 41, 81, 43,
- 3, 56, 46, 46, 40, 43, 3, 46, 46, 3,
- 87, 113, 89, 57, 52, 53, 54, 3, 4, 3,
- 3, 3, 46, 87, 40, 89, 128, 52, 40, 131,
- 51, 51, 40, 42, 40, 4, 138, 5, 6, 7,
- 8, 9, 10, 11, 12, 13, 44, 3, 52, 17,
- 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
- 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
- 38, 39, 4, 2, 109, 48, 113, 129, -1, 75,
- 48, -1, 50, 51, -1, -1, -1, 55, 56
+ 32, 3, 3, 0, 1, 3, 88, 4, 5, 6,
+ 7, 8, 9, 10, 11, 12, 0, 49, 51, 16,
+ 17, 135, 55, 51, 138, 39, 3, 54, 3, 47,
+ 48, 45, 29, 48, 54, 50, 118, 87, 35, 89,
+ 42, 39, 3, 45, 3, 3, 39, 45, 81, 46,
+ 47, 3, 84, 54, 13, 14, 15, 1, 90, 56,
+ 4, 5, 6, 7, 8, 9, 10, 11, 12, 87,
+ 45, 89, 16, 17, 3, 3, 3, 3, 45, 39,
+ 39, 40, 114, 42, 42, 29, 45, 45, 51, 39,
+ 41, 35, 54, 51, 52, 53, 42, 129, 57, 45,
+ 132, 50, 46, 50, 39, 51, 43, 139, 39, 3,
+ 51, 54, 56, 4, 5, 6, 7, 8, 9, 10,
+ 11, 12, 2, 114, 110, 16, 17, 18, 19, 20,
+ 21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
+ 31, 32, 33, 34, 35, 36, 37, 38, 48, 130,
+ 75, -1, -1, -1, -1, -1, 47, -1, 49, 50,
+ -1, -1, -1, -1, 55, 56
};
/* 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, 10,
- 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, 48, 50, 51, 55,
- 56, 61, 64, 65, 67, 70, 71, 69, 68, 52,
- 40, 46, 90, 3, 46, 88, 3, 4, 4, 3,
- 40, 3, 3, 3, 3, 3, 3, 43, 46, 91,
- 93, 94, 1, 47, 64, 81, 82, 83, 92, 62,
- 46, 66, 40, 52, 72, 52, 79, 80, 91, 80,
- 75, 93, 90, 3, 46, 89, 51, 51, 48, 82,
- 95, 42, 87, 40, 63, 90, 52, 53, 54, 76,
- 77, 78, 93, 73, 74, 93, 79, 4, 94, 93,
- 44, 84, 40, 77, 74, 4, 94, 85, 86, 49,
- 51, 14, 15, 16, 40, 41, 57, 93, 86, 93,
- 4, 52, 87, 87
+ 0, 59, 60, 0, 4, 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, 47, 49, 50, 55,
+ 56, 61, 64, 65, 67, 70, 71, 69, 68, 51,
+ 39, 45, 90, 3, 45, 88, 3, 54, 54, 3,
+ 39, 3, 3, 3, 3, 3, 3, 42, 45, 91,
+ 93, 94, 1, 46, 64, 81, 82, 83, 92, 62,
+ 45, 66, 39, 51, 72, 51, 79, 80, 91, 80,
+ 75, 93, 90, 3, 45, 89, 90, 50, 50, 47,
+ 82, 95, 41, 87, 39, 63, 90, 51, 52, 53,
+ 76, 77, 78, 93, 73, 74, 93, 79, 54, 94,
+ 93, 43, 84, 39, 77, 74, 54, 94, 85, 86,
+ 48, 50, 13, 14, 15, 39, 40, 57, 93, 86,
+ 93, 54, 51, 87, 87
};
/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
@@ -838,8 +768,8 @@ static const yytype_uint8 yyr1[] =
79, 79, 79, 79, 79, 80, 80, 81, 81, 82,
82, 82, 84, 83, 85, 85, 85, 86, 86, 86,
86, 86, 86, 86, 86, 87, 87, 88, 88, 89,
- 89, 89, 90, 91, 91, 92, 93, 93, 94, 95,
- 95
+ 89, 89, 89, 90, 91, 91, 92, 93, 93, 94,
+ 95, 95
};
/* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */
@@ -855,8 +785,8 @@ static const yytype_uint8 yyr2[] =
1, 1, 2, 2, 3, 1, 2, 1, 2, 1,
2, 2, 0, 4, 1, 3, 2, 0, 3, 3,
2, 2, 3, 3, 3, 0, 1, 1, 1, 0,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 0,
- 2
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 0, 2
};
@@ -1011,79 +941,79 @@ yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvalue
# endif
switch (yytype)
{
- case 3: /* "string" */
-#line 192 "src/parse-gram.y" /* yacc.c:707 */
+ case 3: /* "string" */
+#line 174 "src/parse-gram.y" /* yacc.c:701 */
{ fputs (quotearg_style (c_quoting_style, ((*yyvaluep).chars)), yyo); }
-#line 1018 "src/parse-gram.c" /* yacc.c:707 */
- break;
-
- case 4: /* "integer" */
-#line 205 "src/parse-gram.y" /* yacc.c:707 */
- { fprintf (yyo, "%d", ((*yyvaluep).integer)); }
-#line 1024 "src/parse-gram.c" /* yacc.c:707 */
+#line 948 "src/parse-gram.c" /* yacc.c:701 */
break;
- case 24: /* "%" */
-#line 201 "src/parse-gram.y" /* yacc.c:707 */
+ case 23: /* "%" */
+#line 184 "src/parse-gram.y" /* yacc.c:701 */
{ fprintf (yyo, "%%%s", ((*yyvaluep).uniqstr)); }
-#line 1030 "src/parse-gram.c" /* yacc.c:707 */
+#line 954 "src/parse-gram.c" /* yacc.c:701 */
break;
- case 40: /* "{...}" */
-#line 194 "src/parse-gram.y" /* yacc.c:707 */
+ case 39: /* "{...}" */
+#line 176 "src/parse-gram.y" /* yacc.c:701 */
{ fprintf (yyo, "{\n%s\n}", ((*yyvaluep).code)); }
-#line 1036 "src/parse-gram.c" /* yacc.c:707 */
+#line 960 "src/parse-gram.c" /* yacc.c:701 */
break;
- case 42: /* "[identifier]" */
-#line 199 "src/parse-gram.y" /* yacc.c:707 */
+ case 41: /* "[identifier]" */
+#line 182 "src/parse-gram.y" /* yacc.c:701 */
{ fprintf (yyo, "[%s]", ((*yyvaluep).uniqstr)); }
-#line 1042 "src/parse-gram.c" /* yacc.c:707 */
+#line 966 "src/parse-gram.c" /* yacc.c:701 */
break;
- case 43: /* "char" */
-#line 186 "src/parse-gram.y" /* yacc.c:707 */
+ case 42: /* "char" */
+#line 163 "src/parse-gram.y" /* yacc.c:701 */
{ fputs (char_name (((*yyvaluep).character)), yyo); }
-#line 1048 "src/parse-gram.c" /* yacc.c:707 */
+#line 972 "src/parse-gram.c" /* yacc.c:701 */
break;
- case 44: /* "epilogue" */
-#line 194 "src/parse-gram.y" /* yacc.c:707 */
+ case 43: /* "epilogue" */
+#line 176 "src/parse-gram.y" /* yacc.c:701 */
{ fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); }
-#line 1054 "src/parse-gram.c" /* yacc.c:707 */
+#line 978 "src/parse-gram.c" /* yacc.c:701 */
break;
- case 46: /* "identifier" */
-#line 198 "src/parse-gram.y" /* yacc.c:707 */
+ case 45: /* "identifier" */
+#line 181 "src/parse-gram.y" /* yacc.c:701 */
{ fputs (((*yyvaluep).uniqstr), yyo); }
-#line 1060 "src/parse-gram.c" /* yacc.c:707 */
+#line 984 "src/parse-gram.c" /* yacc.c:701 */
break;
- case 47: /* "identifier:" */
-#line 200 "src/parse-gram.y" /* yacc.c:707 */
+ case 46: /* "identifier:" */
+#line 183 "src/parse-gram.y" /* yacc.c:701 */
{ fprintf (yyo, "%s:", ((*yyvaluep).uniqstr)); }
-#line 1066 "src/parse-gram.c" /* yacc.c:707 */
+#line 990 "src/parse-gram.c" /* yacc.c:701 */
break;
- case 50: /* "%{...%}" */
-#line 194 "src/parse-gram.y" /* yacc.c:707 */
+ case 49: /* "%{...%}" */
+#line 176 "src/parse-gram.y" /* yacc.c:701 */
{ fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); }
-#line 1072 "src/parse-gram.c" /* yacc.c:707 */
+#line 996 "src/parse-gram.c" /* yacc.c:701 */
break;
- case 52: /* "" */
-#line 202 "src/parse-gram.y" /* yacc.c:707 */
+ case 51: /* "" */
+#line 185 "src/parse-gram.y" /* yacc.c:701 */
{ fprintf (yyo, "<%s>", ((*yyvaluep).uniqstr)); }
-#line 1078 "src/parse-gram.c" /* yacc.c:707 */
+#line 1002 "src/parse-gram.c" /* yacc.c:701 */
+ break;
+
+ case 54: /* "integer" */
+#line 189 "src/parse-gram.y" /* yacc.c:701 */
+ { fprintf (yyo, "%d", ((*yyvaluep).integer)); }
+#line 1008 "src/parse-gram.c" /* yacc.c:701 */
break;
case 55: /* "%param" */
-#line 248 "src/parse-gram.y" /* yacc.c:707 */
+#line 232 "src/parse-gram.y" /* yacc.c:701 */
{
switch (((*yyvaluep).param))
{
#define CASE(In, Out) \
- case param_ ## In: fputs ("%" #Out, stderr); break
+ case param_ ## In: fputs ("%" #Out, yyo); break
CASE (lex, lex-param);
CASE (parse, parse-param);
CASE (both, param);
@@ -1091,69 +1021,77 @@ yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvalue
case param_none: aver (false); break;
}
}
-#line 1095 "src/parse-gram.c" /* yacc.c:707 */
+#line 1025 "src/parse-gram.c" /* yacc.c:701 */
break;
case 65: /* code_props_type */
-#line 420 "src/parse-gram.y" /* yacc.c:707 */
+#line 405 "src/parse-gram.y" /* yacc.c:701 */
{ fprintf (yyo, "%s", code_props_type_string (((*yyvaluep).code_type))); }
-#line 1101 "src/parse-gram.c" /* yacc.c:707 */
+#line 1031 "src/parse-gram.c" /* yacc.c:701 */
break;
case 74: /* symbol.prec */
-#line 208 "src/parse-gram.y" /* yacc.c:707 */
+#line 193 "src/parse-gram.y" /* yacc.c:701 */
{ fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); }
-#line 1107 "src/parse-gram.c" /* yacc.c:707 */
+#line 1037 "src/parse-gram.c" /* yacc.c:701 */
break;
case 78: /* tag */
-#line 202 "src/parse-gram.y" /* yacc.c:707 */
+#line 185 "src/parse-gram.y" /* yacc.c:701 */
{ fprintf (yyo, "<%s>", ((*yyvaluep).uniqstr)); }
-#line 1113 "src/parse-gram.c" /* yacc.c:707 */
+#line 1043 "src/parse-gram.c" /* yacc.c:701 */
break;
case 88: /* variable */
-#line 198 "src/parse-gram.y" /* yacc.c:707 */
+#line 181 "src/parse-gram.y" /* yacc.c:701 */
{ fputs (((*yyvaluep).uniqstr), yyo); }
-#line 1119 "src/parse-gram.c" /* yacc.c:707 */
+#line 1049 "src/parse-gram.c" /* yacc.c:701 */
break;
- case 89: /* content.opt */
-#line 194 "src/parse-gram.y" /* yacc.c:707 */
- { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); }
-#line 1125 "src/parse-gram.c" /* yacc.c:707 */
+ case 89: /* value */
+#line 651 "src/parse-gram.y" /* yacc.c:701 */
+ {
+ switch (((*yyvaluep).value).kind)
+ {
+ case muscle_code: fprintf (yyo, "{%s}", ((*yyvaluep).value).chars); break;
+ case muscle_keyword: fprintf (yyo, "%s", ((*yyvaluep).value).chars); break;
+ case muscle_string: fprintf (yyo, "\"%s\"", ((*yyvaluep).value).chars); break;
+ }
+}
+#line 1062 "src/parse-gram.c" /* yacc.c:701 */
break;
case 90: /* braceless */
-#line 194 "src/parse-gram.y" /* yacc.c:707 */
+#line 176 "src/parse-gram.y" /* yacc.c:701 */
{ fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); }
-#line 1131 "src/parse-gram.c" /* yacc.c:707 */
+#line 1068 "src/parse-gram.c" /* yacc.c:701 */
break;
case 91: /* id */
-#line 208 "src/parse-gram.y" /* yacc.c:707 */
+#line 193 "src/parse-gram.y" /* yacc.c:701 */
{ fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); }
-#line 1137 "src/parse-gram.c" /* yacc.c:707 */
+#line 1074 "src/parse-gram.c" /* yacc.c:701 */
break;
case 92: /* id_colon */
-#line 209 "src/parse-gram.y" /* yacc.c:707 */
+#line 194 "src/parse-gram.y" /* yacc.c:701 */
{ fprintf (yyo, "%s:", ((*yyvaluep).symbol)->tag); }
-#line 1143 "src/parse-gram.c" /* yacc.c:707 */
+#line 1080 "src/parse-gram.c" /* yacc.c:701 */
break;
case 93: /* symbol */
-#line 208 "src/parse-gram.y" /* yacc.c:707 */
+#line 193 "src/parse-gram.y" /* yacc.c:701 */
{ fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); }
-#line 1149 "src/parse-gram.c" /* yacc.c:707 */
+#line 1086 "src/parse-gram.c" /* yacc.c:701 */
break;
case 94: /* string_as_id */
-#line 208 "src/parse-gram.y" /* yacc.c:707 */
+#line 193 "src/parse-gram.y" /* yacc.c:701 */
{ fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); }
-#line 1155 "src/parse-gram.c" /* yacc.c:707 */
+#line 1092 "src/parse-gram.c" /* yacc.c:701 */
break;
+
default:
break;
}
@@ -1731,11 +1669,7 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocatio
yymsg = "Deleting";
YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
- switch (yytype)
- {
- default:
- break;
- }
+ YYUSE (yytype);
}
@@ -1794,9 +1728,9 @@ YYLTYPE yylloc = yyloc_default;
int yyerrstatus;
/* The stacks and their tools:
- `yyss': related to states.
- `yyvs': related to semantic values.
- `yyls': related to locations.
+ 'yyss': related to states.
+ 'yyvs': related to semantic values.
+ 'yyls': related to locations.
Refer to the stacks through separate pointers, to allow yyoverflow
to reallocate them elsewhere. */
@@ -1866,14 +1800,15 @@ YYLTYPE yylloc = yyloc_default;
yychar = YYEMPTY; /* Cause a token to be read. */
/* User initialization code. */
-#line 97 "src/parse-gram.y" /* yacc.c:1452 */
+#line 87 "src/parse-gram.y" /* yacc.c:1446 */
{
/* Bison's grammar can initial empty locations, hence a default
location is needed. */
boundary_set (&yylloc.start, current_file, 1, 1);
boundary_set (&yylloc.end, current_file, 1, 1);
}
-#line 1877 "src/parse-gram.c" /* yacc.c:1452 */
+
+#line 1812 "src/parse-gram.c" /* yacc.c:1446 */
yylsp[0] = yylloc;
goto yysetstate;
@@ -2050,7 +1985,7 @@ yyreduce:
yylen = yyr2[yyn];
/* If YYLEN is nonzero, implement the default value of the action:
- `$$ = $1'.
+ '$$ = $1'.
Otherwise, the following line sets YYVAL to garbage.
This behavior is undocumented and Bison
@@ -2067,7 +2002,7 @@ yyreduce:
switch (yyn)
{
case 6:
-#line 284 "src/parse-gram.y" /* yacc.c:1669 */
+#line 268 "src/parse-gram.y" /* yacc.c:1663 */
{
code_props plain_code;
code_props_plain_init (&plain_code, (yyvsp[0].chars), (yylsp[0]));
@@ -2077,79 +2012,80 @@ yyreduce:
plain_code.code, (yylsp[0]));
code_scanner_last_string_free ();
}
-#line 2081 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2016 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 7:
-#line 294 "src/parse-gram.y" /* yacc.c:1669 */
+#line 278 "src/parse-gram.y" /* yacc.c:1663 */
{
muscle_percent_define_ensure ((yyvsp[0].uniqstr), (yylsp[0]), true);
}
-#line 2089 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2024 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 8:
-#line 298 "src/parse-gram.y" /* yacc.c:1669 */
+#line 282 "src/parse-gram.y" /* yacc.c:1663 */
{
- muscle_percent_define_insert ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].chars),
+ muscle_percent_define_insert ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].value).kind, (yyvsp[0].value).chars,
MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
}
-#line 2098 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2033 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 9:
-#line 302 "src/parse-gram.y" /* yacc.c:1669 */
+#line 286 "src/parse-gram.y" /* yacc.c:1663 */
{ defines_flag = true; }
-#line 2104 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2039 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 10:
-#line 304 "src/parse-gram.y" /* yacc.c:1669 */
+#line 288 "src/parse-gram.y" /* yacc.c:1663 */
{
defines_flag = true;
spec_defines_file = xstrdup ((yyvsp[0].chars));
}
-#line 2113 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2048 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 11:
-#line 309 "src/parse-gram.y" /* yacc.c:1669 */
+#line 293 "src/parse-gram.y" /* yacc.c:1663 */
{
- muscle_percent_define_insert ("parse.error", (yylsp[0]), "verbose",
+ muscle_percent_define_insert ("parse.error", (yylsp[0]), muscle_keyword,
+ "verbose",
MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
}
-#line 2122 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2058 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 12:
-#line 313 "src/parse-gram.y" /* yacc.c:1669 */
+#line 298 "src/parse-gram.y" /* yacc.c:1663 */
{ expected_sr_conflicts = (yyvsp[0].integer); }
-#line 2128 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2064 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 13:
-#line 314 "src/parse-gram.y" /* yacc.c:1669 */
+#line 299 "src/parse-gram.y" /* yacc.c:1663 */
{ expected_rr_conflicts = (yyvsp[0].integer); }
-#line 2134 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2070 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 14:
-#line 315 "src/parse-gram.y" /* yacc.c:1669 */
+#line 300 "src/parse-gram.y" /* yacc.c:1663 */
{ spec_file_prefix = (yyvsp[0].chars); }
-#line 2140 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2076 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 15:
-#line 317 "src/parse-gram.y" /* yacc.c:1669 */
+#line 302 "src/parse-gram.y" /* yacc.c:1663 */
{
nondeterministic_parser = true;
glr_parser = true;
}
-#line 2149 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2085 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 16:
-#line 322 "src/parse-gram.y" /* yacc.c:1669 */
+#line 307 "src/parse-gram.y" /* yacc.c:1663 */
{
code_props action;
code_props_symbol_action_init (&action, (yyvsp[0].code), (yylsp[0]));
@@ -2158,59 +2094,59 @@ yyreduce:
muscle_code_grow ("initial_action", action.code, (yylsp[0]));
code_scanner_last_string_free ();
}
-#line 2162 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2098 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 17:
-#line 330 "src/parse-gram.y" /* yacc.c:1669 */
+#line 315 "src/parse-gram.y" /* yacc.c:1663 */
{ language_argmatch ((yyvsp[0].chars), grammar_prio, (yylsp[-1])); }
-#line 2168 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2104 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 18:
-#line 331 "src/parse-gram.y" /* yacc.c:1669 */
+#line 316 "src/parse-gram.y" /* yacc.c:1663 */
{ spec_name_prefix = (yyvsp[0].chars); }
-#line 2174 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2110 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 19:
-#line 332 "src/parse-gram.y" /* yacc.c:1669 */
+#line 317 "src/parse-gram.y" /* yacc.c:1663 */
{ no_lines_flag = true; }
-#line 2180 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2116 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 20:
-#line 333 "src/parse-gram.y" /* yacc.c:1669 */
+#line 318 "src/parse-gram.y" /* yacc.c:1663 */
{ nondeterministic_parser = true; }
-#line 2186 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2122 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 21:
-#line 334 "src/parse-gram.y" /* yacc.c:1669 */
+#line 319 "src/parse-gram.y" /* yacc.c:1663 */
{ spec_outfile = (yyvsp[0].chars); }
-#line 2192 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2128 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 22:
-#line 335 "src/parse-gram.y" /* yacc.c:1669 */
+#line 320 "src/parse-gram.y" /* yacc.c:1663 */
{ current_param = (yyvsp[0].param); }
-#line 2198 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2134 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 23:
-#line 335 "src/parse-gram.y" /* yacc.c:1669 */
+#line 320 "src/parse-gram.y" /* yacc.c:1663 */
{ current_param = param_none; }
-#line 2204 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2140 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 24:
-#line 336 "src/parse-gram.y" /* yacc.c:1669 */
+#line 321 "src/parse-gram.y" /* yacc.c:1663 */
{ version_check (&(yylsp[0]), (yyvsp[0].chars)); }
-#line 2210 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2146 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 25:
-#line 338 "src/parse-gram.y" /* yacc.c:1669 */
+#line 323 "src/parse-gram.y" /* yacc.c:1663 */
{
char const *skeleton_user = (yyvsp[0].chars);
if (strchr (skeleton_user, '/'))
@@ -2234,49 +2170,49 @@ yyreduce:
}
skeleton_arg (skeleton_user, grammar_prio, (yylsp[-1]));
}
-#line 2238 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2174 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 26:
-#line 361 "src/parse-gram.y" /* yacc.c:1669 */
+#line 346 "src/parse-gram.y" /* yacc.c:1663 */
{ token_table_flag = true; }
-#line 2244 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2180 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 27:
-#line 362 "src/parse-gram.y" /* yacc.c:1669 */
+#line 347 "src/parse-gram.y" /* yacc.c:1663 */
{ report_flag |= report_states; }
-#line 2250 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2186 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 28:
-#line 363 "src/parse-gram.y" /* yacc.c:1669 */
+#line 348 "src/parse-gram.y" /* yacc.c:1663 */
{ yacc_flag = true; }
-#line 2256 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2192 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 30:
-#line 368 "src/parse-gram.y" /* yacc.c:1669 */
+#line 353 "src/parse-gram.y" /* yacc.c:1663 */
{ add_param (current_param, (yyvsp[0].code), (yylsp[0])); }
-#line 2262 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2198 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 31:
-#line 369 "src/parse-gram.y" /* yacc.c:1669 */
+#line 354 "src/parse-gram.y" /* yacc.c:1663 */
{ add_param (current_param, (yyvsp[0].code), (yylsp[0])); }
-#line 2268 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2204 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 34:
-#line 381 "src/parse-gram.y" /* yacc.c:1669 */
+#line 366 "src/parse-gram.y" /* yacc.c:1663 */
{
grammar_start_symbol_set ((yyvsp[0].symbol), (yylsp[0]));
}
-#line 2276 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2212 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 35:
-#line 385 "src/parse-gram.y" /* yacc.c:1669 */
+#line 370 "src/parse-gram.y" /* yacc.c:1663 */
{
code_props code;
code_props_symbol_action_init (&code, (yyvsp[-1].code), (yylsp[-1]));
@@ -2288,111 +2224,111 @@ yyreduce:
symbol_list_free ((yyvsp[0].list));
}
}
-#line 2292 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2228 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 36:
-#line 397 "src/parse-gram.y" /* yacc.c:1669 */
+#line 382 "src/parse-gram.y" /* yacc.c:1663 */
{
default_prec = true;
}
-#line 2300 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2236 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 37:
-#line 401 "src/parse-gram.y" /* yacc.c:1669 */
+#line 386 "src/parse-gram.y" /* yacc.c:1663 */
{
default_prec = false;
}
-#line 2308 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2244 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 38:
-#line 405 "src/parse-gram.y" /* yacc.c:1669 */
+#line 390 "src/parse-gram.y" /* yacc.c:1663 */
{
/* Do not invoke muscle_percent_code_grow here since it invokes
muscle_user_name_list_grow. */
muscle_code_grow ("percent_code()", (yyvsp[0].chars), (yylsp[0]));
code_scanner_last_string_free ();
}
-#line 2319 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2255 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 39:
-#line 412 "src/parse-gram.y" /* yacc.c:1669 */
+#line 397 "src/parse-gram.y" /* yacc.c:1663 */
{
muscle_percent_code_grow ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].chars), (yylsp[0]));
code_scanner_last_string_free ();
}
-#line 2328 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2264 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 40:
-#line 422 "src/parse-gram.y" /* yacc.c:1669 */
+#line 407 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.code_type) = destructor; }
-#line 2334 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2270 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 41:
-#line 423 "src/parse-gram.y" /* yacc.c:1669 */
+#line 408 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.code_type) = printer; }
-#line 2340 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2276 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 42:
-#line 433 "src/parse-gram.y" /* yacc.c:1669 */
+#line 418 "src/parse-gram.y" /* yacc.c:1663 */
{}
-#line 2346 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2282 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 43:
-#line 434 "src/parse-gram.y" /* yacc.c:1669 */
+#line 419 "src/parse-gram.y" /* yacc.c:1663 */
{ muscle_code_grow ("union_name", (yyvsp[0].uniqstr), (yylsp[0])); }
-#line 2352 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2288 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 44:
-#line 439 "src/parse-gram.y" /* yacc.c:1669 */
+#line 424 "src/parse-gram.y" /* yacc.c:1663 */
{
union_seen = true;
muscle_code_grow ("union_members", (yyvsp[0].chars), (yylsp[0]));
code_scanner_last_string_free ();
}
-#line 2362 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2298 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 45:
-#line 450 "src/parse-gram.y" /* yacc.c:1669 */
+#line 435 "src/parse-gram.y" /* yacc.c:1663 */
{ current_class = nterm_sym; }
-#line 2368 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2304 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 46:
-#line 451 "src/parse-gram.y" /* yacc.c:1669 */
+#line 436 "src/parse-gram.y" /* yacc.c:1663 */
{
current_class = unknown_sym;
current_type = NULL;
}
-#line 2377 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2313 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 47:
-#line 455 "src/parse-gram.y" /* yacc.c:1669 */
+#line 440 "src/parse-gram.y" /* yacc.c:1663 */
{ current_class = token_sym; }
-#line 2383 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2319 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 48:
-#line 456 "src/parse-gram.y" /* yacc.c:1669 */
+#line 441 "src/parse-gram.y" /* yacc.c:1663 */
{
current_class = unknown_sym;
current_type = NULL;
}
-#line 2392 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2328 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 49:
-#line 461 "src/parse-gram.y" /* yacc.c:1669 */
+#line 446 "src/parse-gram.y" /* yacc.c:1663 */
{
symbol_list *list;
tag_seen = true;
@@ -2400,11 +2336,11 @@ yyreduce:
symbol_type_set (list->content.sym, (yyvsp[-1].uniqstr), (yylsp[-1]));
symbol_list_free ((yyvsp[0].list));
}
-#line 2404 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2340 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 50:
-#line 472 "src/parse-gram.y" /* yacc.c:1669 */
+#line 457 "src/parse-gram.y" /* yacc.c:1663 */
{
symbol_list *list;
++current_prec;
@@ -2416,332 +2352,345 @@ yyreduce:
symbol_list_free ((yyvsp[0].list));
current_type = NULL;
}
-#line 2420 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2356 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 51:
-#line 486 "src/parse-gram.y" /* yacc.c:1669 */
+#line 471 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.assoc) = left_assoc; }
-#line 2426 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2362 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 52:
-#line 487 "src/parse-gram.y" /* yacc.c:1669 */
+#line 472 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.assoc) = right_assoc; }
-#line 2432 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2368 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 53:
-#line 488 "src/parse-gram.y" /* yacc.c:1669 */
+#line 473 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.assoc) = non_assoc; }
-#line 2438 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2374 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 54:
-#line 489 "src/parse-gram.y" /* yacc.c:1669 */
+#line 474 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.assoc) = precedence_assoc; }
-#line 2444 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2380 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 55:
-#line 493 "src/parse-gram.y" /* yacc.c:1669 */
+#line 478 "src/parse-gram.y" /* yacc.c:1663 */
{ current_type = NULL; }
-#line 2450 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2386 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 56:
-#line 494 "src/parse-gram.y" /* yacc.c:1669 */
+#line 479 "src/parse-gram.y" /* yacc.c:1663 */
{ current_type = (yyvsp[0].uniqstr); tag_seen = true; }
-#line 2456 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2392 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 57:
-#line 500 "src/parse-gram.y" /* yacc.c:1669 */
+#line 485 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
-#line 2462 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2398 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 58:
-#line 502 "src/parse-gram.y" /* yacc.c:1669 */
+#line 487 "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 2468 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2404 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 59:
-#line 506 "src/parse-gram.y" /* yacc.c:1669 */
- { (yyval.symbol) = (yyvsp[0].symbol); }
-#line 2474 "src/parse-gram.c" /* yacc.c:1669 */
+#line 492 "src/parse-gram.y" /* yacc.c:1663 */
+ {
+ (yyval.symbol) = (yyvsp[0].symbol);
+ symbol_class_set ((yyvsp[0].symbol), token_sym, (yylsp[0]), false);
+ }
+#line 2413 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 60:
-#line 507 "src/parse-gram.y" /* yacc.c:1669 */
- { (yyval.symbol) = (yyvsp[-1].symbol); symbol_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer), (yylsp[0])); }
-#line 2480 "src/parse-gram.c" /* yacc.c:1669 */
+#line 497 "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 2423 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 61:
-#line 513 "src/parse-gram.y" /* yacc.c:1669 */
+#line 507 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
-#line 2486 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2429 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 62:
-#line 515 "src/parse-gram.y" /* yacc.c:1669 */
+#line 509 "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 2492 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2435 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 63:
-#line 519 "src/parse-gram.y" /* yacc.c:1669 */
+#line 513 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.list) = (yyvsp[0].list); }
-#line 2498 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2441 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 64:
-#line 520 "src/parse-gram.y" /* yacc.c:1669 */
+#line 514 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.list) = symbol_list_append ((yyvsp[-1].list), (yyvsp[0].list)); }
-#line 2504 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2447 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 65:
-#line 524 "src/parse-gram.y" /* yacc.c:1669 */
+#line 518 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
-#line 2510 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2453 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 66:
-#line 525 "src/parse-gram.y" /* yacc.c:1669 */
+#line 519 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.list) = symbol_list_type_new ((yyvsp[0].uniqstr), (yylsp[0])); }
-#line 2516 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2459 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 68:
-#line 530 "src/parse-gram.y" /* yacc.c:1669 */
+#line 524 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.uniqstr) = uniqstr_new ("*"); }
-#line 2522 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2465 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 69:
-#line 531 "src/parse-gram.y" /* yacc.c:1669 */
+#line 525 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.uniqstr) = uniqstr_new (""); }
-#line 2528 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2471 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 70:
-#line 537 "src/parse-gram.y" /* yacc.c:1669 */
+#line 531 "src/parse-gram.y" /* yacc.c:1663 */
{
current_type = (yyvsp[0].uniqstr);
tag_seen = true;
}
-#line 2537 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2480 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 71:
-#line 542 "src/parse-gram.y" /* yacc.c:1669 */
+#line 536 "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 2546 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2489 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 72:
-#line 547 "src/parse-gram.y" /* yacc.c:1669 */
+#line 541 "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 2556 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2499 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 73:
-#line 553 "src/parse-gram.y" /* yacc.c:1669 */
+#line 547 "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 2566 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2509 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 74:
-#line 559 "src/parse-gram.y" /* yacc.c:1669 */
+#line 553 "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 2577 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2520 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 81:
-#line 589 "src/parse-gram.y" /* yacc.c:1669 */
+#line 583 "src/parse-gram.y" /* yacc.c:1663 */
{
yyerrok;
}
-#line 2585 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2528 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 82:
-#line 595 "src/parse-gram.y" /* yacc.c:1669 */
+#line 589 "src/parse-gram.y" /* yacc.c:1663 */
{ current_lhs ((yyvsp[-1].symbol), (yylsp[-1]), (yyvsp[0].named_ref)); }
-#line 2591 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2534 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 83:
-#line 596 "src/parse-gram.y" /* yacc.c:1669 */
+#line 590 "src/parse-gram.y" /* yacc.c:1663 */
{
/* Free the current lhs. */
current_lhs (0, (yylsp[-3]), 0);
}
-#line 2600 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2543 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 84:
-#line 603 "src/parse-gram.y" /* yacc.c:1669 */
+#line 597 "src/parse-gram.y" /* yacc.c:1663 */
{ grammar_current_rule_end ((yylsp[0])); }
-#line 2606 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2549 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 85:
-#line 604 "src/parse-gram.y" /* yacc.c:1669 */
+#line 598 "src/parse-gram.y" /* yacc.c:1663 */
{ grammar_current_rule_end ((yylsp[0])); }
-#line 2612 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2555 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 87:
-#line 611 "src/parse-gram.y" /* yacc.c:1669 */
+#line 605 "src/parse-gram.y" /* yacc.c:1663 */
{ grammar_current_rule_begin (current_lhs_symbol, current_lhs_location,
current_lhs_named_ref); }
-#line 2619 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2562 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 88:
-#line 614 "src/parse-gram.y" /* yacc.c:1669 */
+#line 608 "src/parse-gram.y" /* yacc.c:1663 */
{ grammar_current_rule_symbol_append ((yyvsp[-1].symbol), (yylsp[-1]), (yyvsp[0].named_ref)); }
-#line 2625 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2568 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 89:
-#line 616 "src/parse-gram.y" /* yacc.c:1669 */
+#line 610 "src/parse-gram.y" /* yacc.c:1663 */
{ grammar_current_rule_action_append ((yyvsp[-1].code), (yylsp[-1]), (yyvsp[0].named_ref), false); }
-#line 2631 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2574 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 90:
-#line 618 "src/parse-gram.y" /* yacc.c:1669 */
+#line 612 "src/parse-gram.y" /* yacc.c:1663 */
{ grammar_current_rule_action_append ((yyvsp[0].code), (yylsp[0]), NULL, true); }
-#line 2637 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2580 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 91:
-#line 620 "src/parse-gram.y" /* yacc.c:1669 */
+#line 614 "src/parse-gram.y" /* yacc.c:1663 */
{ grammar_current_rule_empty_set ((yylsp[0])); }
-#line 2643 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2586 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 92:
-#line 622 "src/parse-gram.y" /* yacc.c:1669 */
+#line 616 "src/parse-gram.y" /* yacc.c:1663 */
{ grammar_current_rule_prec_set ((yyvsp[0].symbol), (yylsp[0])); }
-#line 2649 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2592 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 93:
-#line 624 "src/parse-gram.y" /* yacc.c:1669 */
+#line 618 "src/parse-gram.y" /* yacc.c:1663 */
{ grammar_current_rule_dprec_set ((yyvsp[0].integer), (yylsp[0])); }
-#line 2655 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2598 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 94:
-#line 626 "src/parse-gram.y" /* yacc.c:1669 */
+#line 620 "src/parse-gram.y" /* yacc.c:1663 */
{ grammar_current_rule_merge_set ((yyvsp[0].uniqstr), (yylsp[0])); }
-#line 2661 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2604 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 95:
-#line 630 "src/parse-gram.y" /* yacc.c:1669 */
+#line 624 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.named_ref) = 0; }
-#line 2667 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2610 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 96:
-#line 631 "src/parse-gram.y" /* yacc.c:1669 */
+#line 625 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.named_ref) = named_ref_new((yyvsp[0].uniqstr), (yylsp[0])); }
-#line 2673 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2616 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 98:
-#line 642 "src/parse-gram.y" /* yacc.c:1669 */
+#line 636 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.uniqstr) = uniqstr_new ((yyvsp[0].chars)); }
-#line 2679 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2622 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 99:
-#line 647 "src/parse-gram.y" /* yacc.c:1669 */
- { (yyval.chars) = ""; }
-#line 2685 "src/parse-gram.c" /* yacc.c:1669 */
+#line 661 "src/parse-gram.y" /* yacc.c:1663 */
+ { (yyval.value).kind = muscle_keyword; (yyval.value).chars = ""; }
+#line 2628 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 100:
-#line 648 "src/parse-gram.y" /* yacc.c:1669 */
- { (yyval.chars) = (yyvsp[0].uniqstr); }
-#line 2691 "src/parse-gram.c" /* yacc.c:1669 */
+#line 662 "src/parse-gram.y" /* yacc.c:1663 */
+ { (yyval.value).kind = muscle_keyword; (yyval.value).chars = (yyvsp[0].uniqstr); }
+#line 2634 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 101:
-#line 649 "src/parse-gram.y" /* yacc.c:1669 */
- { (yyval.chars) = (yyvsp[0].chars); }
-#line 2697 "src/parse-gram.c" /* yacc.c:1669 */
+#line 663 "src/parse-gram.y" /* yacc.c:1663 */
+ { (yyval.value).kind = muscle_string; (yyval.value).chars = (yyvsp[0].chars); }
+#line 2640 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 102:
-#line 659 "src/parse-gram.y" /* yacc.c:1669 */
+#line 664 "src/parse-gram.y" /* yacc.c:1663 */
+ { (yyval.value).kind = muscle_code; (yyval.value).chars = (yyvsp[0].chars); }
+#line 2646 "src/parse-gram.c" /* yacc.c:1663 */
+ break;
+
+ case 103:
+#line 674 "src/parse-gram.y" /* yacc.c:1663 */
{
code_props plain_code;
- (yyvsp[0].code)[strlen ((yyvsp[0].code)) - 1] = '\n';
+ (yyvsp[0].code)[strlen ((yyvsp[0].code)) - 1] = '\0';
code_props_plain_init (&plain_code, (yyvsp[0].code)+1, (yylsp[0]));
code_props_translate_code (&plain_code);
gram_scanner_last_string_free ();
(yyval.chars) = plain_code.code;
}
-#line 2710 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2659 "src/parse-gram.c" /* yacc.c:1663 */
break;
- case 103:
-#line 679 "src/parse-gram.y" /* yacc.c:1669 */
+ case 104:
+#line 694 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); }
-#line 2716 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2665 "src/parse-gram.c" /* yacc.c:1663 */
break;
- case 104:
-#line 681 "src/parse-gram.y" /* yacc.c:1669 */
+ case 105:
+#line 696 "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 2726 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2675 "src/parse-gram.c" /* yacc.c:1663 */
break;
- case 105:
-#line 689 "src/parse-gram.y" /* yacc.c:1669 */
+ case 106:
+#line 704 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); }
-#line 2732 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2681 "src/parse-gram.c" /* yacc.c:1663 */
break;
- case 108:
-#line 701 "src/parse-gram.y" /* yacc.c:1669 */
+ case 109:
+#line 716 "src/parse-gram.y" /* yacc.c:1663 */
{
(yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[0].chars)), (yylsp[0]));
symbol_class_set ((yyval.symbol), token_sym, (yylsp[0]), false);
}
-#line 2741 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2690 "src/parse-gram.c" /* yacc.c:1663 */
break;
- case 110:
-#line 710 "src/parse-gram.y" /* yacc.c:1669 */
+ case 111:
+#line 725 "src/parse-gram.y" /* yacc.c:1663 */
{
code_props plain_code;
code_props_plain_init (&plain_code, (yyvsp[0].chars), (yylsp[0]));
@@ -2750,11 +2699,11 @@ yyreduce:
muscle_code_grow ("epilogue", plain_code.code, (yylsp[0]));
code_scanner_last_string_free ();
}
-#line 2754 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2703 "src/parse-gram.c" /* yacc.c:1663 */
break;
-#line 2758 "src/parse-gram.c" /* yacc.c:1669 */
+#line 2707 "src/parse-gram.c" /* yacc.c:1663 */
default: break;
}
if (yychar_backup != yychar)
@@ -2780,7 +2729,7 @@ yyreduce:
*++yyvsp = yyval;
*++yylsp = yyloc;
- /* Now `shift' the result of the reduction. Determine what state
+ /* Now 'shift' the result of the reduction. Determine what state
that goes to, based on the state we popped back to and the rule
number reduced by. */
@@ -3001,7 +2950,7 @@ yyreturn:
#endif
return yyresult;
}
-#line 720 "src/parse-gram.y" /* yacc.c:1929 */
+#line 735 "src/parse-gram.y" /* yacc.c:1923 */
/* Return the location of the left-hand side of a rule whose
@@ -3115,3 +3064,18 @@ char_name (char c)
return quotearg_style (escape_quoting_style, buf);
}
}
+
+static
+void
+current_lhs (symbol *sym, location loc, named_ref *ref)
+{
+ current_lhs_symbol = sym;
+ current_lhs_location = loc;
+ /* In order to simplify memory management, named references for lhs
+ are always assigned by deep copy into the current symbol_list
+ node. This is because a single named-ref in the grammar may
+ result in several uses when the user factors lhs between several
+ rules using "|". Therefore free the parser's original copy. */
+ free (current_lhs_named_ref);
+ current_lhs_named_ref = ref;
+}