X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/8ec0a172bcae50565b68288a32c0dd9368eee8ad..43aabb70a95ecbd20c76797c53554641c3576db4:/src/parse-gram.c
diff --git a/src/parse-gram.c b/src/parse-gram.c
index 3e8a8776..b083a20d 100644
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -1,14 +1,14 @@
-/* A Bison parser, made by GNU Bison 2.3+. */
+/* A Bison parser, made by GNU Bison 2.4.404-c6ab. */
-/* Skeleton implementation for Bison's Yacc-like parsers in C
+/* Implementation for Bison's Yacc-like parsers in C
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
- Free Software Foundation, Inc.
+ Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +16,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA. */
+ along with this program. If not, see . */
/* As a special exception, you may create a larger work that contains
part or all of the Bison parser skeleton and distribute that work
@@ -47,7 +45,7 @@
#define YYBISON 1
/* Bison version. */
-#define YYBISON_VERSION "2.3+"
+#define YYBISON_VERSION "2.4.404-c6ab"
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
@@ -55,31 +53,38 @@
/* Pure parsers. */
#define YYPURE 1
+/* Push parsers. */
+#define YYPUSH 0
+
+/* Pull parsers. */
+#define YYPULL 1
+
/* Using locations. */
#define YYLSP_NEEDED 1
/* Substitute the variable and function names. */
-#define yyparse gram_parse
-#define yylex gram_lex
-#define yyerror gram_error
-#define yylval gram_lval
-#define yychar gram_char
-#define yydebug gram_debug
-#define yynerrs gram_nerrs
-#define yylloc gram_lloc
+#define yyparse gram_parse
+#define yylex gram_lex
+#define yyerror gram_error
+#define yylval gram_lval
+#define yychar gram_char
+#define yydebug gram_debug
+#define yynerrs gram_nerrs
+#define yylloc gram_lloc
/* Copy the first part of user declarations. */
-/* Line 164 of yacc.c. */
-#line 1 "../../src/parse-gram.y"
+/* Line 253 of yacc.c */
+#line 1 "src/parse-gram.y"
/* Bison Grammar Parser -*- C -*-
- Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+ Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
- This program is free software; you can redistribute it and/or modify
+ This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
@@ -88,10 +93,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301 USA
-*/
+ along with this program. If not, see . */
#include
#include "system.h"
@@ -101,13 +103,13 @@
#include "files.h"
#include "getargs.h"
#include "gram.h"
-#include "muscle_tab.h"
+#include "muscle-tab.h"
+#include "named-ref.h"
#include "quotearg.h"
#include "reader.h"
#include "symlist.h"
#include "scan-gram.h"
#include "scan-code.h"
-#include "strverscmp.h"
#define YYLLOC_DEFAULT(Current, Rhs, N) (Current) = lloc_default (Rhs, N)
static YYLTYPE lloc_default (YYLTYPE const *, int);
@@ -126,27 +128,8 @@ static void gram_error (location const *, char const *);
static char const *char_name (char);
-static void add_param (char const *, char *, location);
-
-static symbol_class current_class = unknown_sym;
-static uniqstr current_type = 0;
-static symbol *current_lhs;
-static location current_lhs_location;
-static int current_prec = 0;
-
-#ifdef UINT_FAST8_MAX
-# define YYTYPE_UINT8 uint_fast8_t
-#endif
-#ifdef INT_FAST8_MAX
-# define YYTYPE_INT8 int_fast8_t
-#endif
-#ifdef UINT_FAST16_MAX
-# define YYTYPE_UINT16 uint_fast16_t
-#endif
-#ifdef INT_FAST16_MAX
-# define YYTYPE_INT16 int_fast16_t
-#endif
-
+/* Line 253 of yacc.c */
+#line 133 "src/parse-gram.c"
/* Enabling traces. */
#ifndef YYDEBUG
@@ -166,6 +149,24 @@ static int current_prec = 0;
# define YYTOKEN_TABLE 0
#endif
+/* "%code requires" blocks. */
+/* Line 273 of yacc.c */
+#line 201 "src/parse-gram.y"
+
+# ifndef PARAM_TYPE
+# define PARAM_TYPE
+ typedef enum
+ {
+ param_none = 0,
+ param_lex = 1 << 0,
+ param_parse = 1 << 1,
+ param_both = param_lex | param_parse
+ } param_type;
+# endif
+
+
+/* Line 273 of yacc.c */
+#line 170 "src/parse-gram.c"
/* Tokens. */
#ifndef YYTOKENTYPE
@@ -184,50 +185,49 @@ static int current_prec = 0;
PERCENT_LEFT = 265,
PERCENT_RIGHT = 266,
PERCENT_NONASSOC = 267,
- PERCENT_PREC = 268,
- PERCENT_DPREC = 269,
- PERCENT_MERGE = 270,
- PERCENT_AFTER_HEADER = 271,
- PERCENT_BEFORE_HEADER = 272,
- PERCENT_DEBUG = 273,
- PERCENT_DEFAULT_PREC = 274,
- PERCENT_DEFINE = 275,
- PERCENT_DEFINES = 276,
- PERCENT_END_HEADER = 277,
- PERCENT_ERROR_VERBOSE = 278,
- PERCENT_EXPECT = 279,
- PERCENT_EXPECT_RR = 280,
- PERCENT_FILE_PREFIX = 281,
- PERCENT_GLR_PARSER = 282,
- PERCENT_INITIAL_ACTION = 283,
- PERCENT_LEX_PARAM = 284,
- PERCENT_LOCATIONS = 285,
- PERCENT_NAME_PREFIX = 286,
- PERCENT_NO_DEFAULT_PREC = 287,
- PERCENT_NO_LINES = 288,
- PERCENT_NONDETERMINISTIC_PARSER = 289,
- PERCENT_OUTPUT = 290,
- PERCENT_PARSE_PARAM = 291,
- PERCENT_PURE_PARSER = 292,
- PERCENT_REQUIRE = 293,
- PERCENT_SKELETON = 294,
- PERCENT_START = 295,
- PERCENT_START_HEADER = 296,
- PERCENT_TOKEN_TABLE = 297,
- PERCENT_VERBOSE = 298,
- PERCENT_YACC = 299,
- BRACED_CODE = 300,
- CHAR = 301,
- EPILOGUE = 302,
- EQUAL = 303,
- ID = 304,
- ID_COLON = 305,
- PERCENT_PERCENT = 306,
- PIPE = 307,
- PROLOGUE = 308,
- SEMICOLON = 309,
- TYPE = 310,
- PERCENT_UNION = 311
+ 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,
+ CHAR = 296,
+ EPILOGUE = 297,
+ EQUAL = 298,
+ ID = 299,
+ ID_COLON = 300,
+ PERCENT_PERCENT = 301,
+ PIPE = 302,
+ PROLOGUE = 303,
+ SEMICOLON = 304,
+ TAG = 305,
+ TAG_ANY = 306,
+ TAG_NONE = 307,
+ BRACKETED_ID = 308,
+ PERCENT_PARAM = 309,
+ PERCENT_UNION = 310
};
#endif
/* Tokens. */
@@ -242,73 +242,81 @@ static int current_prec = 0;
#define PERCENT_LEFT 265
#define PERCENT_RIGHT 266
#define PERCENT_NONASSOC 267
-#define PERCENT_PREC 268
-#define PERCENT_DPREC 269
-#define PERCENT_MERGE 270
-#define PERCENT_AFTER_HEADER 271
-#define PERCENT_BEFORE_HEADER 272
-#define PERCENT_DEBUG 273
-#define PERCENT_DEFAULT_PREC 274
-#define PERCENT_DEFINE 275
-#define PERCENT_DEFINES 276
-#define PERCENT_END_HEADER 277
-#define PERCENT_ERROR_VERBOSE 278
-#define PERCENT_EXPECT 279
-#define PERCENT_EXPECT_RR 280
-#define PERCENT_FILE_PREFIX 281
-#define PERCENT_GLR_PARSER 282
-#define PERCENT_INITIAL_ACTION 283
-#define PERCENT_LEX_PARAM 284
-#define PERCENT_LOCATIONS 285
-#define PERCENT_NAME_PREFIX 286
-#define PERCENT_NO_DEFAULT_PREC 287
-#define PERCENT_NO_LINES 288
-#define PERCENT_NONDETERMINISTIC_PARSER 289
-#define PERCENT_OUTPUT 290
-#define PERCENT_PARSE_PARAM 291
-#define PERCENT_PURE_PARSER 292
-#define PERCENT_REQUIRE 293
-#define PERCENT_SKELETON 294
-#define PERCENT_START 295
-#define PERCENT_START_HEADER 296
-#define PERCENT_TOKEN_TABLE 297
-#define PERCENT_VERBOSE 298
-#define PERCENT_YACC 299
-#define BRACED_CODE 300
-#define CHAR 301
-#define EPILOGUE 302
-#define EQUAL 303
-#define ID 304
-#define ID_COLON 305
-#define PERCENT_PERCENT 306
-#define PIPE 307
-#define PROLOGUE 308
-#define SEMICOLON 309
-#define TYPE 310
-#define PERCENT_UNION 311
+#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 CHAR 296
+#define EPILOGUE 297
+#define EQUAL 298
+#define ID 299
+#define ID_COLON 300
+#define PERCENT_PERCENT 301
+#define PIPE 302
+#define PROLOGUE 303
+#define SEMICOLON 304
+#define TAG 305
+#define TAG_ANY 306
+#define TAG_NONE 307
+#define BRACKETED_ID 308
+#define PERCENT_PARAM 309
+#define PERCENT_UNION 310
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
-/* Line 195 of yacc.c. */
-#line 97 "../../src/parse-gram.y"
{
+/* Line 278 of yacc.c */
+#line 88 "src/parse-gram.y"
+
+ assoc assoc;
+ char *code;
+ char const *chars;
+ int integer;
+ named_ref *named_ref;
symbol *symbol;
symbol_list *list;
- int integer;
- char *chars;
- assoc assoc;
uniqstr uniqstr;
unsigned char character;
-}
-/* Line 195 of yacc.c. */
-#line 308 "../../src/parse-gram.c"
- YYSTYPE;
+
+/* Line 278 of yacc.c */
+#line 225 "src/parse-gram.y"
+
+ param_type param;
+
+
+/* Line 278 of yacc.c */
+#line 316 "src/parse-gram.c"
+} YYSTYPE;
+# define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
-# define YYSTYPE_IS_TRIVIAL 1
#endif
#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED
@@ -327,8 +335,39 @@ typedef struct YYLTYPE
/* Copy the second part of user declarations. */
-/* Line 219 of yacc.c. */
-#line 332 "../../src/parse-gram.c"
+/* Line 328 of yacc.c */
+#line 340 "src/parse-gram.c"
+/* Unqualified %code blocks. */
+/* Line 329 of yacc.c */
+#line 56 "src/parse-gram.y"
+
+ static int current_prec = 0;
+ static location current_lhs_location;
+ static named_ref *current_lhs_named_ref;
+ static symbol *current_lhs;
+ static symbol_class current_class = unknown_sym;
+ static uniqstr current_type = NULL;
+
+ #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 329 of yacc.c */
+#line 214 "src/parse-gram.y"
+
+ /** Add a lex-param and/or a parse-param.
+ *
+ * \param type where to push this formal argument.
+ * \param decl the formal argument. Destroyed.
+ * \param loc the location in the source.
+ */
+ static void add_param (param_type type, char *decl, location loc);
+ static param_type current_param = param_none;
+
+
+/* Line 329 of yacc.c */
+#line 371 "src/parse-gram.c"
#ifdef short
# undef short
@@ -403,14 +442,14 @@ typedef short int yytype_int16;
#if (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
static int
-YYID (int i)
+YYID (int yyi)
#else
static int
-YYID (i)
- int i;
+YYID (yyi)
+ int yyi;
#endif
{
- return i;
+ return yyi;
}
#endif
@@ -492,9 +531,9 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */
/* A type that is properly aligned for any stack member. */
union yyalloc
{
- yytype_int16 yyss;
- YYSTYPE yyvs;
- YYLTYPE yyls;
+ yytype_int16 yyss_alloc;
+ YYSTYPE yyvs_alloc;
+ YYLTYPE yyls_alloc;
};
/* The size of the maximum gap between one aligned stack and the next. */
@@ -529,12 +568,12 @@ union yyalloc
elements in the stack, and YYPTR gives the new location of the
stack. Advance YYPTR to a properly aligned location for the next
stack. */
-# define YYSTACK_RELOCATE(Stack) \
+# define YYSTACK_RELOCATE(Stack_alloc, Stack) \
do \
{ \
YYSIZE_T yynewbytes; \
- YYCOPY (&yyptr->Stack, Stack, yysize); \
- Stack = &yyptr->Stack; \
+ YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \
+ Stack = &yyptr->Stack_alloc; \
yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
yyptr += yynewbytes / sizeof (*yyptr); \
} \
@@ -545,25 +584,27 @@ union yyalloc
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 3
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 192
+#define YYLAST 190
/* YYNTOKENS -- Number of terminals. */
-#define YYNTOKENS 57
+#define YYNTOKENS 56
/* YYNNTS -- Number of nonterminals. */
-#define YYNNTS 27
+#define YYNNTS 36
/* YYNRULES -- Number of rules. */
-#define YYNRULES 89
-/* YYNRULES -- Number of states. */
-#define YYNSTATES 128
+#define YYNRULES 109
+/* YYNSTATES -- Number of states. */
+#define YYNSTATES 148
-/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
+/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
+ by yylex, with out-of-bounds checking. */
#define YYUNDEFTOK 2
-#define YYMAXUTOK 311
+#define YYMAXUTOK 310
#define YYTRANSLATE(YYX) \
((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
-/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */
+/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
+ as returned by yylex, without out-of-bounds checking. */
static const yytype_uint8 yytranslate[] =
{
0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
@@ -597,66 +638,24 @@ static const yytype_uint8 yytranslate[] =
25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
- 55, 56
+ 55
};
#if YYDEBUG
-/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
- YYRHS. */
-static const yytype_uint8 yyprhs[] =
-{
- 0, 0, 3, 8, 9, 12, 14, 16, 19, 22,
- 24, 27, 31, 33, 36, 38, 41, 44, 48, 50,
- 53, 56, 58, 62, 64, 66, 70, 73, 75, 78,
- 81, 84, 86, 88, 90, 92, 94, 96, 99, 103,
- 107, 109, 111, 112, 114, 118, 119, 123, 124, 128,
- 132, 136, 138, 140, 142, 143, 145, 147, 150, 152,
- 154, 157, 160, 164, 166, 169, 171, 174, 176, 179,
- 182, 183, 187, 189, 193, 196, 197, 200, 203, 207,
- 211, 215, 217, 219, 221, 223, 225, 227, 229, 230
-};
-
-/* YYRHS -- A `-1'-separated list of the rules' RHS. */
-static const yytype_int8 yyrhs[] =
-{
- 58, 0, -1, 59, 51, 72, 83, -1, -1, 59,
- 60, -1, 61, -1, 53, -1, 16, 45, -1, 17,
- 45, -1, 18, -1, 20, 82, -1, 20, 82, 82,
- -1, 21, -1, 22, 45, -1, 23, -1, 24, 4,
- -1, 25, 4, -1, 26, 48, 82, -1, 27, -1,
- 28, 45, -1, 29, 45, -1, 30, -1, 31, 48,
- 82, -1, 33, -1, 34, -1, 35, 48, 82, -1,
- 36, 45, -1, 37, -1, 38, 82, -1, 39, 82,
- -1, 41, 45, -1, 42, -1, 43, -1, 44, -1,
- 54, -1, 66, -1, 63, -1, 40, 80, -1, 8,
- 45, 69, -1, 9, 45, 69, -1, 19, -1, 32,
- -1, -1, 49, -1, 56, 62, 45, -1, -1, 6,
- 64, 71, -1, -1, 5, 65, 71, -1, 7, 55,
- 69, -1, 67, 68, 69, -1, 10, -1, 11, -1,
- 12, -1, -1, 55, -1, 80, -1, 69, 80, -1,
- 55, -1, 78, -1, 78, 4, -1, 78, 81, -1,
- 78, 4, 81, -1, 70, -1, 71, 70, -1, 73,
- -1, 72, 73, -1, 74, -1, 61, 54, -1, 1,
- 54, -1, -1, 79, 75, 76, -1, 77, -1, 76,
- 52, 77, -1, 76, 54, -1, -1, 77, 80, -1,
- 77, 45, -1, 77, 13, 80, -1, 77, 14, 4,
- -1, 77, 15, 55, -1, 49, -1, 46, -1, 50,
- -1, 78, -1, 81, -1, 3, -1, 3, -1, -1,
- 51, 47, -1
-};
-
-/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
+ /* YYRLINEYYN -- Source line where rule number YYN was defined. */
static const yytype_uint16 yyrline[] =
{
- 0, 202, 202, 210, 212, 216, 217, 221, 227, 233,
- 234, 239, 240, 241, 247, 248, 249, 250, 251, 256,
- 260, 261, 262, 263, 264, 265, 266, 267, 268, 269,
- 270, 276, 277, 278, 279, 283, 284, 285, 289, 297,
- 305, 309, 323, 324, 328, 350, 350, 355, 355, 360,
- 370, 385, 386, 387, 391, 392, 397, 398, 403, 407,
- 412, 418, 424, 435, 436, 445, 446, 452, 453, 454,
- 461, 461, 465, 466, 467, 472, 473, 475, 477, 479,
- 481, 494, 496, 505, 510, 511, 516, 525, 530, 532
+ 0, 250, 250, 258, 260, 264, 265, 275, 279, 284,
+ 285, 290, 295, 296, 297, 298, 299, 304, 313, 314,
+ 315, 316, 317, 318, 319, 320, 320, 321, 322, 346,
+ 347, 348, 349, 353, 354, 363, 364, 365, 369, 376,
+ 383, 387, 391, 398, 413, 414, 418, 430, 430, 435,
+ 435, 440, 451, 466, 467, 468, 469, 473, 474, 479,
+ 481, 486, 487, 492, 494, 499, 500, 504, 505, 506,
+ 507, 512, 517, 522, 528, 534, 545, 546, 555, 556,
+ 562, 563, 564, 571, 571, 576, 577, 578, 583, 585,
+ 587, 589, 591, 593, 598, 600, 611, 612, 617, 618,
+ 619, 628, 648, 650, 659, 664, 665, 670, 677, 679
};
#endif
@@ -667,30 +666,32 @@ static const char *const yytname[] =
{
"\"end of file\"", "error", "$undefined", "\"string\"", "\"integer\"",
"\"%token\"", "\"%nterm\"", "\"%type\"", "\"%destructor\"",
- "\"%printer\"", "\"%left\"", "\"%right\"", "\"%nonassoc\"", "\"%prec\"",
- "\"%dprec\"", "\"%merge\"", "\"%after-header\"", "\"%before-header\"",
- "\"%debug\"", "\"%default-prec\"", "\"%define\"", "\"%defines\"",
- "\"%end-header\"", "\"%error-verbose\"", "\"%expect\"", "\"%expect-rr\"",
- "\"%file-prefix\"", "\"%glr-parser\"", "\"%initial-action\"",
- "\"%lex-param\"", "\"%locations\"", "\"%name-prefix\"",
- "\"%no-default-prec\"", "\"%no-lines\"", "\"%nondeterministic-parser\"",
- "\"%output\"", "\"%parse-param\"", "\"%pure-parser\"", "\"%require\"",
- "\"%skeleton\"", "\"%start\"", "\"%start-header\"", "\"%token-table\"",
- "\"%verbose\"", "\"%yacc\"", "\"{...}\"", "\"char\"", "\"epilogue\"",
- "\"=\"", "\"identifier\"", "\"identifier:\"", "\"%%\"", "\"|\"",
- "\"%{...%}\"", "\";\"", "\"type\"", "\"%union\"", "$accept", "input",
- "declarations", "declaration", "grammar_declaration", "union_name",
- "symbol_declaration", "@1", "@2", "precedence_declaration",
- "precedence_declarator", "type.opt", "symbols.1", "symbol_def",
- "symbol_defs.1", "grammar", "rules_or_grammar_declaration", "rules",
- "@3", "rhses.1", "rhs", "id", "id_colon", "symbol", "string_as_id",
- "string_content", "epilogue.opt", 0
+ "\"%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\"",
+ "\"%name-prefix\"", "\"%no-default-prec\"", "\"%no-lines\"",
+ "\"%nondeterministic-parser\"", "\"%output\"", "\"%require\"",
+ "\"%skeleton\"", "\"%start\"", "\"%token-table\"", "\"%verbose\"",
+ "\"%yacc\"", "\"{...}\"", "\"char\"", "\"epilogue\"", "\"=\"",
+ "\"identifier\"", "\"identifier:\"", "\"%%\"", "\"|\"", "\"%{...%}\"",
+ "\";\"", "\"\"", "\"<*>\"", "\"<>\"", "\"[identifier]\"",
+ "\"%param\"", "\"%union\"", "$accept", "input", "prologue_declarations",
+ "prologue_declaration", "$@1", "params", "grammar_declaration",
+ "union_name", "symbol_declaration", "$@2", "$@3",
+ "precedence_declaration", "precedence_declarator", "tag.opt",
+ "symbols.prec", "symbol.prec", "symbols.1", "generic_symlist",
+ "generic_symlist_item", "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", 0
};
#endif
# ifdef YYPRINT
-/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
- token YYLEX-NUM. */
+/* YYTOKNUM[NUM] -- (External) token number corresponding to the
+ (internal) symbol number NUM (which must be that of a token). */
static const yytype_uint16 yytoknum[] =
{
0, 256, 257, 258, 259, 260, 261, 262, 263, 264,
@@ -698,166 +699,186 @@ static const yytype_uint16 yytoknum[] =
275, 276, 277, 278, 279, 280, 281, 282, 283, 284,
285, 286, 287, 288, 289, 290, 291, 292, 293, 294,
295, 296, 297, 298, 299, 300, 301, 302, 303, 304,
- 305, 306, 307, 308, 309, 310, 311
+ 305, 306, 307, 308, 309, 310
};
# endif
-/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
-static const yytype_uint8 yyr1[] =
-{
- 0, 57, 58, 59, 59, 60, 60, 60, 60, 60,
- 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
- 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
- 60, 60, 60, 60, 60, 61, 61, 61, 61, 61,
- 61, 61, 62, 62, 61, 64, 63, 65, 63, 63,
- 66, 67, 67, 67, 68, 68, 69, 69, 70, 70,
- 70, 70, 70, 71, 71, 72, 72, 73, 73, 73,
- 75, 74, 76, 76, 76, 77, 77, 77, 77, 77,
- 77, 78, 78, 79, 80, 80, 81, 82, 83, 83
-};
+#define YYPACT_NINF -88
-/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
-static const yytype_uint8 yyr2[] =
+#define yypact_value_is_default(yystate) \
+ ((yystate) == (-88))
+
+#define YYTABLE_NINF -109
+
+#define yytable_value_is_error(yytable_value) \
+ YYID (0)
+
+ /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+ STATE-NUM. */
+static const yytype_int16 yypact[] =
{
- 0, 2, 4, 0, 2, 1, 1, 2, 2, 1,
- 2, 3, 1, 2, 1, 2, 2, 3, 1, 2,
- 2, 1, 3, 1, 1, 3, 2, 1, 2, 2,
- 2, 1, 1, 1, 1, 1, 1, 2, 3, 3,
- 1, 1, 0, 1, 3, 0, 3, 0, 3, 3,
- 3, 1, 1, 1, 0, 1, 1, 2, 1, 1,
- 2, 2, 3, 1, 2, 1, 2, 1, 2, 2,
- 0, 3, 1, 3, 2, 0, 2, 2, 3, 3,
- 3, 1, 1, 1, 1, 1, 1, 1, 0, 2
+ -88, 38, 109, -88, -88, -88, -8, 13, 41, -88,
+ -88, -88, -88, -17, -88, 14, 51, -88, 53, 78,
+ -88, 2, -88, 43, 81, 17, -88, -88, -88, 30,
+ 82, 83, 36, -88, -88, -88, 58, -88, -88, -88,
+ 45, -88, -88, -88, -88, 40, -1, -1, 36, 0,
+ 0, -88, 52, -88, -88, -88, 18, -88, -88, -88,
+ -88, 88, -88, -88, -88, 90, -88, 92, -88, -88,
+ -88, -88, -88, -88, -88, -88, 47, -88, 48, 1,
+ -88, -88, 46, 60, -88, 52, -88, 36, -88, -88,
+ -1, 31, -1, 36, -88, -88, -88, -88, 0, -88,
+ -88, 0, -88, -88, -88, -88, -88, -88, -88, -88,
+ -88, 56, -88, -88, -88, -88, -88, 61, -88, 36,
+ -88, 100, -88, 103, -88, -88, -88, -88, -88, -88,
+ -88, -88, -88, -23, 146, -88, -88, 36, 104, 57,
+ 46, 46, 146, -88, -88, -88, -88, -88
};
-/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
- STATE-NUM when YYTABLE doesn't specify something else to do. Zero
- means the default is an error. */
+ /* YYDEFACT[S] -- default reduction number in state S. Performed when
+ YYTABLE does not specify something else to do. Zero means the default
+ is an error. */
static const yytype_uint8 yydefact[] =
{
- 3, 0, 0, 1, 47, 45, 0, 0, 0, 51,
- 52, 53, 0, 0, 9, 40, 0, 12, 0, 14,
- 0, 0, 0, 18, 0, 0, 21, 0, 41, 23,
- 24, 0, 0, 27, 0, 0, 0, 0, 31, 32,
- 33, 0, 6, 34, 42, 4, 5, 36, 35, 54,
- 0, 0, 0, 0, 0, 7, 8, 87, 10, 13,
- 15, 16, 0, 19, 20, 0, 0, 26, 28, 29,
- 86, 82, 81, 84, 37, 85, 30, 0, 83, 0,
- 0, 65, 67, 70, 43, 0, 55, 0, 58, 63,
- 48, 59, 46, 49, 56, 38, 39, 11, 17, 22,
- 25, 69, 68, 0, 66, 2, 75, 44, 50, 64,
- 60, 61, 57, 89, 71, 72, 62, 75, 74, 0,
- 0, 0, 77, 76, 73, 78, 79, 80
+ 3, 0, 0, 1, 49, 47, 0, 0, 0, 53,
+ 54, 55, 56, 0, 40, 0, 9, 11, 0, 0,
+ 7, 0, 16, 0, 0, 0, 41, 21, 22, 0,
+ 0, 0, 0, 29, 30, 31, 0, 6, 32, 25,
+ 44, 4, 5, 36, 35, 57, 0, 0, 0, 0,
+ 0, 101, 0, 42, 97, 96, 98, 10, 12, 13,
+ 14, 0, 17, 18, 19, 0, 23, 0, 27, 28,
+ 107, 103, 102, 105, 37, 106, 0, 104, 0, 0,
+ 78, 80, 94, 0, 45, 0, 58, 0, 71, 76,
+ 50, 72, 48, 51, 63, 68, 69, 70, 38, 65,
+ 67, 39, 43, 100, 99, 8, 15, 20, 24, 82,
+ 81, 0, 79, 2, 95, 83, 34, 26, 46, 52,
+ 59, 61, 77, 73, 74, 64, 66, 109, 88, 33,
+ 60, 62, 75, 84, 85, 88, 87, 0, 0, 0,
+ 94, 94, 86, 91, 92, 93, 90, 89
};
-/* YYDEFGOTO[NTERM-NUM]. */
-static const yytype_int8 yydefgoto[] =
+ /* YYPGOTO[NTERM-NUM]. */
+static const yytype_int8 yypgoto[] =
{
- -1, 1, 2, 45, 79, 85, 47, 51, 50, 48,
- 49, 87, 93, 89, 90, 80, 81, 82, 106, 114,
- 115, 73, 83, 94, 75, 58, 105
+ -88, -88, -88, -88, -88, -88, 107, -88, -88, -88,
+ -88, -88, -88, -88, -88, -7, -88, 73, -76, -60,
+ 64, -88, 71, -88, -88, -88, -11, -62, -88, -88,
+ -37, -18, -88, -32, -87, -88
};
-/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
- STATE-NUM. */
-#define YYPACT_NINF -76
-static const yytype_int16 yypact[] =
+ /* YYDEFGOTO[NTERM-NUM]. */
+static const yytype_int16 yydefgoto[] =
{
- -76, 6, 136, -76, -76, -76, -40, -12, -9, -76,
- -76, -76, -5, 1, -76, -76, 40, -76, 5, -76,
- 47, 50, 7, -76, 11, 18, -76, 19, -76, -76,
- -76, 20, 25, -76, 40, 40, -2, 26, -76, -76,
- -76, 84, -76, -76, 27, -76, -76, -76, -76, 14,
- -23, -23, -2, -2, -2, -76, -76, -76, 40, -76,
- -76, -76, 40, -76, -76, 40, 40, -76, -76, -76,
- -76, -76, -76, -76, -76, -76, -76, 21, -76, 23,
- 2, -76, -76, -76, -76, 28, -76, -2, -76, -76,
- -23, 24, -23, -2, -76, -2, -2, -76, -76, -76,
- -76, -76, -76, 31, -76, -76, -76, -76, -2, -76,
- 71, -76, -76, -76, -32, 16, -76, -76, -76, -2,
- 76, 29, -76, -76, 16, -76, -76, -76
+ -1, 1, 2, 41, 83, 117, 78, 85, 43, 47,
+ 46, 44, 45, 87, 119, 120, 93, 98, 99, 89,
+ 90, 79, 80, 81, 128, 133, 134, 115, 56, 105,
+ 53, 73, 82, 100, 75, 113
};
-/* YYPGOTO[NTERM-NUM]. */
-static const yytype_int8 yypgoto[] =
+ /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
+ positive, shift that token. If negative, reduce the rule which
+ number is the opposite. If YYTABLE_NINF, syntax error. */
+static const yytype_int16 yytable[] =
{
- -76, -76, -76, -76, 79, -76, -76, -76, -76, -76,
- -76, -76, -49, -53, 35, -76, 17, -76, -76, -76,
- -35, -26, -76, -36, -75, -17, -76
+ 74, -108, 76, 70, 124, 60, 4, 5, 6, 7,
+ 8, 9, 10, 11, 12, 102, 94, 54, 13, 14,
+ 64, 103, 126, 51, 135, 126, 136, 52, 91, 91,
+ 122, 26, 122, 66, 70, 123, 132, 32, 3, 70,
+ 71, 71, 48, 72, 72, 61, 77, 111, 118, 88,
+ 95, 96, 97, 49, 57, 121, 40, 58, 55, 76,
+ 65, 125, 104, 4, 5, 6, 7, 8, 9, 10,
+ 11, 12, 91, 67, 91, 13, 14, 71, 146, 147,
+ 72, 50, 59, 62, 63, 68, 69, 121, 26, 84,
+ 86, 106, 51, 107, 32, 108, 109, 110, 127, 114,
+ 116, 129, 141, 77, 131, 143, 70, 145, 144, 42,
+ 141, 92, 130, 40, 4, 5, 6, 7, 8, 9,
+ 10, 11, 12, 101, 142, 0, 13, 14, 15, 16,
+ 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
+ 27, 28, 29, 30, 31, 32, 33, 34, 35, 70,
+ 112, 0, 0, 0, 0, 36, 0, 37, 38, 0,
+ 137, 138, 139, 39, 40, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 140, 71, 0, 0,
+ 72
};
-/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
- positive, shift that token. If negative, reduce the rule which
- number is the opposite. If zero, do what YYDEFACT says.
- If YYTABLE_NINF, syntax error. */
-#define YYTABLE_NINF -89
-static const yytype_int8 yytable[] =
+static const yytype_int16 yycheck[] =
{
- 74, 70, -88, 77, 95, 96, 3, 4, 5, 6,
- 7, 8, 9, 10, 11, 52, 111, 68, 69, 70,
- 117, 15, 118, 71, 91, 91, 72, 70, 110, 119,
- 120, 121, 88, 53, 28, 116, 54, 109, 108, 109,
- 55, 97, 36, 57, 71, 98, 56, 72, 99, 100,
- 59, 60, 78, 103, 61, 62, 63, 112, 44, 112,
- 112, 122, 71, 64, 91, 72, 91, 65, 66, 86,
- 67, 76, 112, 107, 70, 101, 84, 102, 113, 123,
- 126, 46, 124, 125, 127, 77, 92, 0, 123, 4,
- 5, 6, 7, 8, 9, 10, 11, 104, 0, 0,
- 0, 0, 0, 15, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 28, 0, 0, 0,
- 0, 0, 0, 0, 36, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 78, 0, 0, 0, 0, 0,
- 44, 4, 5, 6, 7, 8, 9, 10, 11, 0,
- 0, 0, 12, 13, 14, 15, 16, 17, 18, 19,
- 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
- 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
- 40, 0, 0, 0, 0, 0, 0, 41, 0, 42,
- 43, 0, 44
+ 32, 0, 1, 3, 91, 3, 5, 6, 7, 8,
+ 9, 10, 11, 12, 13, 52, 48, 3, 17, 18,
+ 3, 3, 98, 40, 47, 101, 49, 44, 46, 47,
+ 90, 30, 92, 3, 3, 4, 123, 36, 0, 3,
+ 41, 41, 50, 44, 44, 43, 45, 46, 85, 50,
+ 50, 51, 52, 40, 3, 87, 55, 4, 44, 1,
+ 43, 93, 44, 5, 6, 7, 8, 9, 10, 11,
+ 12, 13, 90, 43, 92, 17, 18, 41, 140, 141,
+ 44, 40, 4, 40, 3, 3, 3, 119, 30, 44,
+ 50, 3, 40, 3, 36, 3, 49, 49, 42, 53,
+ 40, 40, 134, 45, 4, 137, 3, 50, 4, 2,
+ 142, 47, 119, 55, 5, 6, 7, 8, 9, 10,
+ 11, 12, 13, 50, 135, -1, 17, 18, 19, 20,
+ 21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
+ 31, 32, 33, 34, 35, 36, 37, 38, 39, 3,
+ 79, -1, -1, -1, -1, 46, -1, 48, 49, -1,
+ 14, 15, 16, 54, 55, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 40, 41, -1, -1,
+ 44
};
-static const yytype_int8 yycheck[] =
+ /* STOS_[STATE-NUM] -- The (internal number of the) accessing
+ symbol of state STATE-NUM. */
+static const yytype_uint8 yystos[] =
{
- 36, 3, 0, 1, 53, 54, 0, 5, 6, 7,
- 8, 9, 10, 11, 12, 55, 91, 34, 35, 3,
- 52, 19, 54, 46, 50, 51, 49, 3, 4, 13,
- 14, 15, 55, 45, 32, 110, 45, 90, 87, 92,
- 45, 58, 40, 3, 46, 62, 45, 49, 65, 66,
- 45, 4, 50, 51, 4, 48, 45, 93, 56, 95,
- 96, 45, 46, 45, 90, 49, 92, 48, 48, 55,
- 45, 45, 108, 45, 3, 54, 49, 54, 47, 115,
- 4, 2, 117, 119, 55, 1, 51, -1, 124, 5,
- 6, 7, 8, 9, 10, 11, 12, 80, -1, -1,
- -1, -1, -1, 19, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 32, -1, -1, -1,
- -1, -1, -1, -1, 40, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 50, -1, -1, -1, -1, -1,
- 56, 5, 6, 7, 8, 9, 10, 11, 12, -1,
- -1, -1, 16, 17, 18, 19, 20, 21, 22, 23,
+ 0, 57, 58, 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, 40, 41, 42, 43,
- 44, -1, -1, -1, -1, -1, -1, 51, -1, 53,
- 54, -1, 56
+ 34, 35, 36, 37, 38, 39, 46, 48, 49, 54,
+ 55, 59, 62, 64, 67, 68, 66, 65, 50, 40,
+ 40, 40, 44, 86, 3, 44, 84, 3, 4, 4,
+ 3, 43, 40, 3, 3, 43, 3, 43, 3, 3,
+ 3, 41, 44, 87, 89, 90, 1, 45, 62, 77,
+ 78, 79, 88, 60, 44, 63, 50, 69, 50, 75,
+ 76, 87, 76, 72, 89, 50, 51, 52, 73, 74,
+ 89, 73, 86, 3, 44, 85, 3, 3, 3, 49,
+ 49, 46, 78, 91, 53, 83, 40, 61, 86, 70,
+ 71, 89, 75, 4, 90, 89, 74, 42, 80, 40,
+ 71, 4, 90, 81, 82, 47, 49, 14, 15, 16,
+ 40, 89, 82, 89, 4, 50, 83, 83
};
-/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
- symbol of state STATE-NUM. */
-static const yytype_uint8 yystos[] =
+ /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
+static const yytype_uint8 yyr1[] =
{
- 0, 58, 59, 0, 5, 6, 7, 8, 9, 10,
- 11, 12, 16, 17, 18, 19, 20, 21, 22, 23,
- 24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
- 34, 35, 36, 37, 38, 39, 40, 41, 42, 43,
- 44, 51, 53, 54, 56, 60, 61, 63, 66, 67,
- 65, 64, 55, 45, 45, 45, 45, 3, 82, 45,
- 4, 4, 48, 45, 45, 48, 48, 45, 82, 82,
- 3, 46, 49, 78, 80, 81, 45, 1, 50, 61,
- 72, 73, 74, 79, 49, 62, 55, 68, 55, 70,
- 71, 78, 71, 69, 80, 69, 69, 82, 82, 82,
- 82, 54, 54, 51, 73, 83, 75, 45, 69, 70,
- 4, 81, 80, 47, 76, 77, 81, 52, 54, 13,
- 14, 15, 45, 80, 77, 80, 4, 55
+ 0, 56, 57, 58, 58, 59, 59, 59, 59, 59,
+ 59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
+ 59, 59, 59, 59, 59, 60, 59, 59, 59, 59,
+ 59, 59, 59, 61, 61, 62, 62, 62, 62, 62,
+ 62, 62, 62, 62, 63, 63, 62, 65, 64, 66,
+ 64, 64, 67, 68, 68, 68, 68, 69, 69, 70,
+ 70, 71, 71, 72, 72, 73, 73, 74, 74, 74,
+ 74, 75, 75, 75, 75, 75, 76, 76, 77, 77,
+ 78, 78, 78, 80, 79, 81, 81, 81, 82, 82,
+ 82, 82, 82, 82, 83, 83, 84, 84, 85, 85,
+ 85, 86, 87, 87, 88, 89, 89, 90, 91, 91
};
+ /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
+static const yytype_uint8 yyr2[] =
+{
+ 0, 2, 4, 0, 2, 1, 1, 1, 3, 1,
+ 2, 1, 2, 2, 2, 3, 1, 2, 2, 2,
+ 3, 1, 1, 2, 3, 0, 3, 2, 2, 1,
+ 1, 1, 1, 2, 1, 1, 1, 2, 3, 3,
+ 1, 1, 2, 3, 0, 1, 3, 0, 3, 0,
+ 3, 3, 3, 1, 1, 1, 1, 0, 1, 1,
+ 2, 1, 2, 1, 2, 1, 2, 1, 1, 1,
+ 1, 1, 1, 2, 2, 3, 1, 2, 1, 2,
+ 1, 2, 2, 0, 4, 1, 3, 2, 0, 3,
+ 3, 3, 3, 3, 0, 1, 1, 1, 0, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 0, 2
+};
+
+
#define yyerrok (yyerrstatus = 0)
#define yyclearin (yychar = YYEMPTY)
#define YYEMPTY (-2)
@@ -1003,104 +1024,179 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
# endif
switch (yytype)
{
- case 3: /* "\"string\"" */
-/* Line 668 of yacc.c. */
-#line 181 "../../src/parse-gram.y"
- { fputs (quotearg_style (c_quoting_style, (yyvaluep->chars)), stderr); };
-/* Line 668 of yacc.c. */
-#line 1012 "../../src/parse-gram.c"
- break;
- case 4: /* "\"integer\"" */
-/* Line 668 of yacc.c. */
-#line 191 "../../src/parse-gram.y"
- { fprintf (stderr, "%d", (yyvaluep->integer)); };
-/* Line 668 of yacc.c. */
-#line 1019 "../../src/parse-gram.c"
- break;
- case 45: /* "\"{...}\"" */
-/* Line 668 of yacc.c. */
-#line 183 "../../src/parse-gram.y"
- { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-/* Line 668 of yacc.c. */
-#line 1026 "../../src/parse-gram.c"
- break;
- case 46: /* "\"char\"" */
-/* Line 668 of yacc.c. */
-#line 178 "../../src/parse-gram.y"
- { fputs (char_name ((yyvaluep->character)), stderr); };
-/* Line 668 of yacc.c. */
-#line 1033 "../../src/parse-gram.c"
- break;
- case 47: /* "\"epilogue\"" */
-/* Line 668 of yacc.c. */
-#line 183 "../../src/parse-gram.y"
- { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-/* Line 668 of yacc.c. */
-#line 1040 "../../src/parse-gram.c"
- break;
- case 49: /* "\"identifier\"" */
-/* Line 668 of yacc.c. */
-#line 187 "../../src/parse-gram.y"
- { fputs ((yyvaluep->uniqstr), stderr); };
-/* Line 668 of yacc.c. */
-#line 1047 "../../src/parse-gram.c"
- break;
- case 50: /* "\"identifier:\"" */
-/* Line 668 of yacc.c. */
-#line 188 "../../src/parse-gram.y"
- { fprintf (stderr, "%s:", (yyvaluep->uniqstr)); };
-/* Line 668 of yacc.c. */
-#line 1054 "../../src/parse-gram.c"
- break;
- case 53: /* "\"%{...%}\"" */
-/* Line 668 of yacc.c. */
-#line 183 "../../src/parse-gram.y"
- { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-/* Line 668 of yacc.c. */
-#line 1061 "../../src/parse-gram.c"
- break;
- case 55: /* "\"type\"" */
-/* Line 668 of yacc.c. */
-#line 186 "../../src/parse-gram.y"
- { fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); };
-/* Line 668 of yacc.c. */
-#line 1068 "../../src/parse-gram.c"
- break;
- case 78: /* "id" */
-/* Line 668 of yacc.c. */
-#line 194 "../../src/parse-gram.y"
- { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
-/* Line 668 of yacc.c. */
-#line 1075 "../../src/parse-gram.c"
- break;
- case 79: /* "id_colon" */
-/* Line 668 of yacc.c. */
-#line 195 "../../src/parse-gram.y"
- { fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); };
-/* Line 668 of yacc.c. */
-#line 1082 "../../src/parse-gram.c"
- break;
- case 80: /* "symbol" */
-/* Line 668 of yacc.c. */
-#line 194 "../../src/parse-gram.y"
- { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
-/* Line 668 of yacc.c. */
-#line 1089 "../../src/parse-gram.c"
- break;
- case 81: /* "string_as_id" */
-/* Line 668 of yacc.c. */
-#line 194 "../../src/parse-gram.y"
- { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
-/* Line 668 of yacc.c. */
-#line 1096 "../../src/parse-gram.c"
- break;
- case 82: /* "string_content" */
-/* Line 668 of yacc.c. */
-#line 181 "../../src/parse-gram.y"
- { fputs (quotearg_style (c_quoting_style, (yyvaluep->chars)), stderr); };
-/* Line 668 of yacc.c. */
-#line 1103 "../../src/parse-gram.c"
- break;
+ case 3: // "string"
+
+/* Line 715 of yacc.c */
+#line 175 "src/parse-gram.y"
+ { fputs (quotearg_style (c_quoting_style, ((*yyvaluep).chars)), stderr); }
+/* Line 715 of yacc.c */
+#line 1034 "src/parse-gram.c"
+ break;
+
+ case 4: // "integer"
+
+/* Line 715 of yacc.c */
+#line 188 "src/parse-gram.y"
+ { fprintf (stderr, "%d", ((*yyvaluep).integer)); }
+/* Line 715 of yacc.c */
+#line 1043 "src/parse-gram.c"
+ break;
+
+ case 24: // "%"
+
+/* Line 715 of yacc.c */
+#line 184 "src/parse-gram.y"
+ { fprintf (stderr, "%%%s", ((*yyvaluep).uniqstr)); }
+/* Line 715 of yacc.c */
+#line 1052 "src/parse-gram.c"
+ break;
+
+ case 40: // "{...}"
+
+/* Line 715 of yacc.c */
+#line 177 "src/parse-gram.y"
+ { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).code)); }
+/* Line 715 of yacc.c */
+#line 1061 "src/parse-gram.c"
+ break;
+
+ case 41: // "char"
+
+/* Line 715 of yacc.c */
+#line 169 "src/parse-gram.y"
+ { fputs (char_name (((*yyvaluep).character)), stderr); }
+/* Line 715 of yacc.c */
+#line 1070 "src/parse-gram.c"
+ break;
+
+ case 42: // "epilogue"
+
+/* Line 715 of yacc.c */
+#line 177 "src/parse-gram.y"
+ { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }
+/* Line 715 of yacc.c */
+#line 1079 "src/parse-gram.c"
+ break;
+
+ case 44: // "identifier"
+
+/* Line 715 of yacc.c */
+#line 182 "src/parse-gram.y"
+ { fputs (((*yyvaluep).uniqstr), stderr); }
+/* Line 715 of yacc.c */
+#line 1088 "src/parse-gram.c"
+ break;
+
+ case 45: // "identifier:"
+
+/* Line 715 of yacc.c */
+#line 183 "src/parse-gram.y"
+ { fprintf (stderr, "%s:", ((*yyvaluep).uniqstr)); }
+/* Line 715 of yacc.c */
+#line 1097 "src/parse-gram.c"
+ break;
+
+ case 48: // "%{...%}"
+
+/* Line 715 of yacc.c */
+#line 177 "src/parse-gram.y"
+ { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }
+/* Line 715 of yacc.c */
+#line 1106 "src/parse-gram.c"
+ break;
+
+ case 50: // ""
+
+/* Line 715 of yacc.c */
+#line 185 "src/parse-gram.y"
+ { fprintf (stderr, "<%s>", ((*yyvaluep).uniqstr)); }
+/* Line 715 of yacc.c */
+#line 1115 "src/parse-gram.c"
+ break;
+
+ case 54: // "%param"
+
+/* Line 715 of yacc.c */
+#line 230 "src/parse-gram.y"
+ {
+ switch (((*yyvaluep).param))
+ {
+#define CASE(In, Out) \
+ case param_ ## In: fputs ("%" #Out, stderr); break
+ CASE(lex, lex-param);
+ CASE(parse, parse-param);
+ CASE(both, param);
+#undef CASE
+ case param_none: aver (false); break;
+ }
+}
+/* Line 715 of yacc.c */
+#line 1135 "src/parse-gram.c"
+ break;
+
+ case 84: // variable
+
+/* Line 715 of yacc.c */
+#line 182 "src/parse-gram.y"
+ { fputs (((*yyvaluep).uniqstr), stderr); }
+/* Line 715 of yacc.c */
+#line 1144 "src/parse-gram.c"
+ break;
+
+ case 85: // content.opt
+
+/* Line 715 of yacc.c */
+#line 177 "src/parse-gram.y"
+ { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }
+/* Line 715 of yacc.c */
+#line 1153 "src/parse-gram.c"
+ break;
+
+ case 86: // braceless
+
+/* Line 715 of yacc.c */
+#line 177 "src/parse-gram.y"
+ { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }
+/* Line 715 of yacc.c */
+#line 1162 "src/parse-gram.c"
+ break;
+
+ case 87: // id
+
+/* Line 715 of yacc.c */
+#line 191 "src/parse-gram.y"
+ { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }
+/* Line 715 of yacc.c */
+#line 1171 "src/parse-gram.c"
+ break;
+
+ case 88: // id_colon
+
+/* Line 715 of yacc.c */
+#line 192 "src/parse-gram.y"
+ { fprintf (stderr, "%s:", ((*yyvaluep).symbol)->tag); }
+/* Line 715 of yacc.c */
+#line 1180 "src/parse-gram.c"
+ break;
+
+ case 89: // symbol
+
+/* Line 715 of yacc.c */
+#line 191 "src/parse-gram.y"
+ { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }
+/* Line 715 of yacc.c */
+#line 1189 "src/parse-gram.c"
+ break;
+
+ case 90: // string_as_id
+
+/* Line 715 of yacc.c */
+#line 191 "src/parse-gram.y"
+ { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }
+/* Line 715 of yacc.c */
+#line 1198 "src/parse-gram.c"
+ break;
+
default:
break;
}
@@ -1143,17 +1239,20 @@ yy_symbol_print (yyoutput, yytype, yyvaluep, yylocationp)
#if (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
static void
-yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
+yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
#else
static void
-yy_stack_print (bottom, top)
- yytype_int16 *bottom;
- yytype_int16 *top;
+yy_stack_print (yybottom, yytop)
+ yytype_int16 *yybottom;
+ yytype_int16 *yytop;
#endif
{
YYFPRINTF (stderr, "Stack now");
- for (; bottom <= top; ++bottom)
- YYFPRINTF (stderr, " %d", *bottom);
+ for (; yybottom <= yytop; yybottom++)
+ {
+ int yybot = *yybottom;
+ YYFPRINTF (stderr, " %d", yybot);
+ }
YYFPRINTF (stderr, "\n");
}
@@ -1171,35 +1270,37 @@ do { \
#if (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
static void
-yy_reduce_print (YYSTYPE *yyvsp, YYLTYPE *yylsp, int yyrule)
+yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, YYLTYPE *yylsp, int yyrule)
#else
static void
-yy_reduce_print (yyvsp, yylsp, yyrule)
+yy_reduce_print (yyssp, yyvsp, yylsp, yyrule)
+ yytype_int16 *yyssp;
YYSTYPE *yyvsp;
YYLTYPE *yylsp;
int yyrule;
#endif
{
+ unsigned long int yylno = yyrline[yyrule];
int yynrhs = yyr2[yyrule];
int yyi;
- unsigned long int yylno = yyrline[yyrule];
YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
- yyrule - 1, yylno);
+ yyrule - 1, yylno);
/* The symbols being reduced. */
for (yyi = 0; yyi < yynrhs; yyi++)
{
- fprintf (stderr, " $%d = ", yyi + 1);
- yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
- &(yyvsp[(yyi + 1) - (yynrhs)])
- , &(yylsp[(yyi + 1) - (yynrhs)]) );
- fprintf (stderr, "\n");
+ YYFPRINTF (stderr, " $%d = ", yyi + 1);
+ yy_symbol_print (stderr,
+ yystos[yyssp[yyi + 1 - yynrhs]],
+ &(yyvsp[(yyi + 1) - (yynrhs)])
+ , &(yylsp[(yyi + 1) - (yynrhs)]) );
+ YYFPRINTF (stderr, "\n");
}
}
# define YY_REDUCE_PRINT(Rule) \
do { \
if (yydebug) \
- yy_reduce_print (yyvsp, yylsp, Rule); \
+ yy_reduce_print (yyssp, yyvsp, yylsp, Rule); \
} while (YYID (0))
/* Nonzero means print parse trace. It is left uninitialized so that
@@ -1333,14 +1434,14 @@ yytnamerr (char *yyres, const char *yystr)
# endif
/* Copy into YYRESULT an error message about the unexpected token
- YYCHAR while in state YYSTATE. Return the number of bytes copied,
+ YYTOKEN while in state YYSTATE. Return the number of bytes copied,
including the terminating null byte. If YYRESULT is null, do not
copy anything; just return the number of bytes that would be
copied. As a special case, return 0 if an ordinary "syntax error"
message will do. Return YYSIZE_MAXIMUM if overflow occurs during
size calculation. */
static YYSIZE_T
-yysyntax_error (char *yyresult, int yystate, int yychar)
+yysyntax_error (char *yyresult, int yystate, int yytoken)
{
int yyn = yypact[yystate];
@@ -1348,67 +1449,62 @@ yysyntax_error (char *yyresult, int yystate, int yychar)
return 0;
else
{
- int yytype = YYTRANSLATE (yychar);
- YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
+ YYSIZE_T yysize0 = yytnamerr (0, yytname[yytoken]);
YYSIZE_T yysize = yysize0;
YYSIZE_T yysize1;
int yysize_overflow = 0;
enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+ /* Internationalized format string. */
+ const char *yyformat = 0;
+ /* Arguments of yyformat. */
char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
- int yyx;
-
-# if 0
- /* This is so xgettext sees the translatable formats that are
- constructed on the fly. */
- YY_("syntax error, unexpected %s");
- YY_("syntax error, unexpected %s, expecting %s");
- YY_("syntax error, unexpected %s, expecting %s or %s");
- YY_("syntax error, unexpected %s, expecting %s or %s or %s");
- YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
-# endif
- char *yyfmt;
- char const *yyf;
- static char const yyunexpected[] = "syntax error, unexpected %s";
- static char const yyexpecting[] = ", expecting %s";
- static char const yyor[] = " or %s";
- char yyformat[sizeof yyunexpected
- + sizeof yyexpecting - 1
- + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
- * (sizeof yyor - 1))];
- char const *yyprefix = yyexpecting;
/* Start YYX at -YYN if negative to avoid negative indexes in
- YYCHECK. */
+ YYCHECK. In other words, skip the first -YYN actions for this
+ state because they are default actions. */
int yyxbegin = yyn < 0 ? -yyn : 0;
/* Stay within bounds of both yycheck and yytname. */
int yychecklim = YYLAST - yyn + 1;
int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
- int yycount = 1;
+ /* Number of reported tokens (one for the "unexpected", one per
+ "expected"). */
+ int yycount = 0;
+ int yyx;
- yyarg[0] = yytname[yytype];
- yyfmt = yystpcpy (yyformat, yyunexpected);
+ yyarg[yycount++] = yytname[yytoken];
for (yyx = yyxbegin; yyx < yyxend; ++yyx)
- if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+ if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
+ && !yytable_value_is_error (yytable[yyx + yyn]))
{
if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
{
yycount = 1;
yysize = yysize0;
- yyformat[sizeof yyunexpected - 1] = '\0';
break;
}
yyarg[yycount++] = yytname[yyx];
yysize1 = yysize + yytnamerr (0, yytname[yyx]);
yysize_overflow |= (yysize1 < yysize);
yysize = yysize1;
- yyfmt = yystpcpy (yyfmt, yyprefix);
- yyprefix = yyor;
}
- yyf = YY_(yyformat);
- yysize1 = yysize + yystrlen (yyf);
+ switch (yycount)
+ {
+#define YYCASE_(N, S) \
+ case N: \
+ yyformat = S; \
+ break
+ YYCASE_(1, YY_("syntax error, unexpected %s"));
+ YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
+ YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
+ YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
+ YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
+#undef YYCASE_
+ }
+
+ yysize1 = yysize + yystrlen (yyformat);
yysize_overflow |= (yysize1 < yysize);
yysize = yysize1;
@@ -1422,19 +1518,17 @@ yysyntax_error (char *yyresult, int yystate, int yychar)
produced a string with the wrong number of "%s"s. */
char *yyp = yyresult;
int yyi = 0;
- while ((*yyp = *yyf) != '\0')
- {
- if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
- {
- yyp += yytnamerr (yyp, yyarg[yyi++]);
- yyf += 2;
- }
- else
- {
- yyp++;
- yyf++;
- }
- }
+ while ((*yyp = *yyformat) != '\0')
+ if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
+ {
+ yyp += yytnamerr (yyp, yyarg[yyi++]);
+ yyformat += 2;
+ }
+ else
+ {
+ yyp++;
+ yyformat++;
+ }
}
return yysize;
}
@@ -1469,23 +1563,23 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
switch (yytype)
{
-
default:
break;
}
}
-
-/* Prevent warnings from -Wmissing-prototypes. */
+/* Prevent warnings from -Wmissing-prototypes. */
#ifdef YYPARSE_PARAM
-#if defined __STDC__ || defined __cplusplus
+#if (defined __STDC__ || defined __C99__FUNC__ \
+ || defined __cplusplus || defined _MSC_VER)
int yyparse (void *YYPARSE_PARAM);
#else
int yyparse ();
#endif
#else /* ! YYPARSE_PARAM */
-#if defined __STDC__ || defined __cplusplus
+#if (defined __STDC__ || defined __C99__FUNC__ \
+ || defined __cplusplus || defined _MSC_VER)
int yyparse (void);
#else
int yyparse ();
@@ -1493,10 +1587,6 @@ int yyparse ();
#endif /* ! YYPARSE_PARAM */
-
-
-
-
/*----------.
| yyparse. |
`----------*/
@@ -1523,103 +1613,112 @@ yyparse ()
#endif
#endif
{
- /* The lookahead symbol. */
+/* The lookahead symbol. */
int yychar;
/* The semantic value of the lookahead symbol. */
YYSTYPE yylval;
-/* Number of syntax errors so far. */
-int yynerrs;
/* Location data for the lookahead symbol. */
YYLTYPE yylloc;
- int yystate;
- int yyn;
- int yyresult;
- /* Number of tokens to shift before error messages enabled. */
- int yyerrstatus;
- /* Lookahead token as an internal (translated) token number. */
- int yytoken = 0;
-#if YYERROR_VERBOSE
- /* Buffer for error messages, and its allocated size. */
- char yymsgbuf[128];
- char *yymsg = yymsgbuf;
- YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
-#endif
+ /* Number of syntax errors so far. */
+ int yynerrs;
- /* Three stacks and their tools:
- `yyss': related to states,
- `yyvs': related to semantic values,
- `yyls': related to locations.
+ int yystate;
+ /* Number of tokens to shift before error messages enabled. */
+ int yyerrstatus;
- Refer to the stacks thru separate pointers, to allow yyoverflow
- to reallocate them elsewhere. */
+ /* The stacks and their tools:
+ `yyss': related to states.
+ `yyvs': related to semantic values.
+ `yyls': related to locations.
- /* The state stack. */
- yytype_int16 yyssa[YYINITDEPTH];
- yytype_int16 *yyss = yyssa;
- yytype_int16 *yyssp;
+ Refer to the stacks thru separate pointers, to allow yyoverflow
+ to reallocate them elsewhere. */
- /* The semantic value stack. */
- YYSTYPE yyvsa[YYINITDEPTH];
- YYSTYPE *yyvs = yyvsa;
- YYSTYPE *yyvsp;
+ /* The state stack. */
+ yytype_int16 yyssa[YYINITDEPTH];
+ yytype_int16 *yyss;
+ yytype_int16 *yyssp;
- /* The location stack. */
- YYLTYPE yylsa[YYINITDEPTH];
- YYLTYPE *yyls = yylsa;
- YYLTYPE *yylsp;
- /* The locations where the error started and ended. */
- YYLTYPE yyerror_range[2];
+ /* The semantic value stack. */
+ YYSTYPE yyvsa[YYINITDEPTH];
+ YYSTYPE *yyvs;
+ YYSTYPE *yyvsp;
-#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N), yylsp -= (N))
+ /* The location stack. */
+ YYLTYPE yylsa[YYINITDEPTH];
+ YYLTYPE *yyls;
+ YYLTYPE *yylsp;
+
+ /* The locations where the error started and ended. */
+ YYLTYPE yyerror_range[2];
- YYSIZE_T yystacksize = YYINITDEPTH;
+ YYSIZE_T yystacksize;
+ int yyn;
+ int yyresult;
+ /* Lookahead token as an internal (translated) token number. */
+ int yytoken;
/* The variables used to return semantic value and location from the
action routines. */
YYSTYPE yyval;
YYLTYPE yyloc;
+#if YYERROR_VERBOSE
+ /* Buffer for error messages, and its allocated size. */
+ char yymsgbuf[128];
+ char *yymsg = yymsgbuf;
+ YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#endif
+
+#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N), yylsp -= (N))
+
/* The number of symbols on the RHS of the reduced rule.
Keep to zero when no symbol should be popped. */
int yylen = 0;
+ yytoken = 0;
+ yyss = yyssa;
+ yyvs = yyvsa;
+ yyls = yylsa;
+ yystacksize = YYINITDEPTH;
+
YYDPRINTF ((stderr, "Starting parse\n"));
yystate = 0;
yyerrstatus = 0;
yynerrs = 0;
- yychar = YYEMPTY; /* Cause a token to be read. */
+ yychar = YYEMPTY; /* Cause a token to be read. */
/* Initialize stack pointers.
Waste one element of value and location stack
so that they stay on the same level as the state stack.
The wasted elements are never initialized. */
-
yyssp = yyss;
yyvsp = yyvs;
yylsp = yyls;
+
#if YYLTYPE_IS_TRIVIAL
/* Initialize the default location before parsing starts. */
yylloc.first_line = yylloc.last_line = 1;
- yylloc.first_column = yylloc.last_column = 0;
+ yylloc.first_column = yylloc.last_column = 1;
#endif
-
- /* User initialization code. */
- /* Line 1077 of yacc.c. */
-#line 88 "../../src/parse-gram.y"
+/* User initialization code. */
+/* Line 1183 of yacc.c */
+#line 80 "src/parse-gram.y"
{
/* Bison's grammar can initial empty locations, hence a default
location is needed. */
boundary_set (&yylloc.start, current_file, 1, 1);
boundary_set (&yylloc.end, current_file, 1, 1);
}
-/* Line 1077 of yacc.c. */
-#line 1622 "../../src/parse-gram.c"
+/* Line 1183 of yacc.c */
+#line 1720 "src/parse-gram.c"
yylsp[0] = yylloc;
+
goto yysetstate;
/*------------------------------------------------------------.
@@ -1656,6 +1755,7 @@ YYLTYPE yylloc;
&yyvs1, yysize * sizeof (*yyvsp),
&yyls1, yysize * sizeof (*yylsp),
&yystacksize);
+
yyls = yyls1;
yyss = yyss1;
yyvs = yyvs1;
@@ -1677,9 +1777,9 @@ YYLTYPE yylloc;
(union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
if (! yyptr)
goto yyexhaustedlab;
- YYSTACK_RELOCATE (yyss);
- YYSTACK_RELOCATE (yyvs);
- YYSTACK_RELOCATE (yyls);
+ YYSTACK_RELOCATE (yyss_alloc, yyss);
+ YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+ YYSTACK_RELOCATE (yyls_alloc, yyls);
# undef YYSTACK_RELOCATE
if (yyss1 != yyssa)
YYSTACK_FREE (yyss1);
@@ -1700,6 +1800,9 @@ YYLTYPE yylloc;
YYDPRINTF ((stderr, "Entering state %d\n", yystate));
+ if (yystate == YYFINAL)
+ YYACCEPT;
+
goto yybackup;
/*-----------.
@@ -1712,7 +1815,7 @@ yybackup:
/* First try to decide what to do without reference to lookahead token. */
yyn = yypact[yystate];
- if (yyn == YYPACT_NINF)
+ if (yypact_value_is_default (yyn))
goto yydefault;
/* Not known => get a lookahead token if don't already have one. */
@@ -1743,15 +1846,12 @@ yybackup:
yyn = yytable[yyn];
if (yyn <= 0)
{
- if (yyn == 0 || yyn == YYTABLE_NINF)
+ if (yytable_value_is_error (yyn))
goto yyerrlab;
yyn = -yyn;
goto yyreduce;
}
- if (yyn == YYFINAL)
- YYACCEPT;
-
/* Count tokens shifted since error; after three, turn off error
status. */
if (yyerrstatus)
@@ -1760,9 +1860,8 @@ yybackup:
/* Shift the lookahead token. */
YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
- /* Discard the shifted token unless it is eof. */
- if (yychar != YYEOF)
- yychar = YYEMPTY;
+ /* Discard the shifted token. */
+ yychar = YYEMPTY;
yystate = yyn;
*++yyvsp = yylval;
@@ -1803,537 +1902,857 @@ yyreduce:
switch (yyn)
{
case 6:
-/* Line 1265 of yacc.c. */
-#line 218 "../../src/parse-gram.y"
+/* Line 1396 of yacc.c */
+#line 266 "src/parse-gram.y"
{
- prologue_augment (translate_code ((yyvsp[(1) - (1)].chars), (yylsp[(1) - (1)])), (yylsp[(1) - (1)]), typed);
+ code_props plain_code;
+ code_props_plain_init (&plain_code, (yyvsp[0].chars), (yylsp[0]));
+ code_props_translate_code (&plain_code);
+ gram_scanner_last_string_free ();
+ muscle_code_grow (union_seen ? "post_prologue" : "pre_prologue",
+ plain_code.code, (yylsp[0]));
+ code_scanner_last_string_free ();
}
+/* Line 1396 of yacc.c */
+#line 1918 "src/parse-gram.c"
break;
case 7:
-/* Line 1265 of yacc.c. */
-#line 222 "../../src/parse-gram.y"
+/* Line 1396 of yacc.c */
+#line 276 "src/parse-gram.y"
{
- /* Remove the '{', and replace the '}' with '\n'. */
- (yyvsp[(2) - (2)].chars)[strlen ((yyvsp[(2) - (2)].chars)) - 1] = '\n';
- prologue_augment (translate_code ((yyvsp[(2) - (2)].chars)+1, (yylsp[(2) - (2)])), (yylsp[(2) - (2)]), true);
+ muscle_percent_define_ensure ((yyvsp[0].uniqstr), (yylsp[0]), true);
}
+/* Line 1396 of yacc.c */
+#line 1928 "src/parse-gram.c"
break;
case 8:
-/* Line 1265 of yacc.c. */
-#line 228 "../../src/parse-gram.y"
+/* Line 1396 of yacc.c */
+#line 280 "src/parse-gram.y"
{
- /* Remove the '{', and replace the '}' with '\n'. */
- (yyvsp[(2) - (2)].chars)[strlen ((yyvsp[(2) - (2)].chars)) - 1] = '\n';
- prologue_augment (translate_code ((yyvsp[(2) - (2)].chars)+1, (yylsp[(2) - (2)])), (yylsp[(2) - (2)]), false);
+ muscle_percent_define_insert ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].chars),
+ MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
}
+/* Line 1396 of yacc.c */
+#line 1939 "src/parse-gram.c"
break;
case 9:
-/* Line 1265 of yacc.c. */
-#line 233 "../../src/parse-gram.y"
- { debug_flag = true; }
+/* Line 1396 of yacc.c */
+#line 284 "src/parse-gram.y"
+ { defines_flag = true; }
+/* Line 1396 of yacc.c */
+#line 1947 "src/parse-gram.c"
break;
case 10:
-/* Line 1265 of yacc.c. */
-#line 235 "../../src/parse-gram.y"
+/* Line 1396 of yacc.c */
+#line 286 "src/parse-gram.y"
{
- static char one[] = "1";
- muscle_insert ((yyvsp[(2) - (2)].chars), one);
+ defines_flag = true;
+ spec_defines_file = xstrdup ((yyvsp[0].chars));
}
+/* Line 1396 of yacc.c */
+#line 1958 "src/parse-gram.c"
break;
case 11:
-/* Line 1265 of yacc.c. */
-#line 239 "../../src/parse-gram.y"
- { muscle_insert ((yyvsp[(2) - (3)].chars), (yyvsp[(3) - (3)].chars)); }
+/* Line 1396 of yacc.c */
+#line 291 "src/parse-gram.y"
+ {
+ muscle_percent_define_insert ("parse.error", (yylsp[0]), "verbose",
+ MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
+ }
+/* Line 1396 of yacc.c */
+#line 1969 "src/parse-gram.c"
break;
case 12:
-/* Line 1265 of yacc.c. */
-#line 240 "../../src/parse-gram.y"
- { defines_flag = true; }
+/* Line 1396 of yacc.c */
+#line 295 "src/parse-gram.y"
+ { expected_sr_conflicts = (yyvsp[0].integer); }
+/* Line 1396 of yacc.c */
+#line 1977 "src/parse-gram.c"
break;
case 13:
-/* Line 1265 of yacc.c. */
-#line 242 "../../src/parse-gram.y"
- {
- /* Remove the '{', and replace the '}' with '\n'. */
- (yyvsp[(2) - (2)].chars)[strlen ((yyvsp[(2) - (2)].chars)) - 1] = '\n';
- muscle_code_grow ("end_header", translate_code ((yyvsp[(2) - (2)].chars)+1, (yylsp[(2) - (2)])), (yylsp[(2) - (2)]));
- }
+/* Line 1396 of yacc.c */
+#line 296 "src/parse-gram.y"
+ { expected_rr_conflicts = (yyvsp[0].integer); }
+/* Line 1396 of yacc.c */
+#line 1985 "src/parse-gram.c"
break;
case 14:
-/* Line 1265 of yacc.c. */
-#line 247 "../../src/parse-gram.y"
- { error_verbose = true; }
+/* Line 1396 of yacc.c */
+#line 297 "src/parse-gram.y"
+ { spec_file_prefix = (yyvsp[0].chars); }
+/* Line 1396 of yacc.c */
+#line 1993 "src/parse-gram.c"
break;
case 15:
-/* Line 1265 of yacc.c. */
-#line 248 "../../src/parse-gram.y"
- { expected_sr_conflicts = (yyvsp[(2) - (2)].integer); }
+/* Line 1396 of yacc.c */
+#line 298 "src/parse-gram.y"
+ { spec_file_prefix = (yyvsp[0].chars); }
+/* Line 1396 of yacc.c */
+#line 2001 "src/parse-gram.c"
break;
case 16:
-/* Line 1265 of yacc.c. */
-#line 249 "../../src/parse-gram.y"
- { expected_rr_conflicts = (yyvsp[(2) - (2)].integer); }
+/* Line 1396 of yacc.c */
+#line 300 "src/parse-gram.y"
+ {
+ nondeterministic_parser = true;
+ glr_parser = true;
+ }
+/* Line 1396 of yacc.c */
+#line 2012 "src/parse-gram.c"
break;
case 17:
-/* Line 1265 of yacc.c. */
-#line 250 "../../src/parse-gram.y"
- { spec_file_prefix = (yyvsp[(3) - (3)].chars); }
+/* Line 1396 of yacc.c */
+#line 305 "src/parse-gram.y"
+ {
+ code_props action;
+ code_props_symbol_action_init (&action, (yyvsp[0].code), (yylsp[0]));
+ code_props_translate_code (&action);
+ gram_scanner_last_string_free ();
+ muscle_code_grow ("initial_action", action.code, (yylsp[0]));
+ code_scanner_last_string_free ();
+ }
+/* Line 1396 of yacc.c */
+#line 2027 "src/parse-gram.c"
break;
case 18:
-/* Line 1265 of yacc.c. */
-#line 252 "../../src/parse-gram.y"
- {
- nondeterministic_parser = true;
- glr_parser = true;
- }
+/* Line 1396 of yacc.c */
+#line 313 "src/parse-gram.y"
+ { language_argmatch ((yyvsp[0].chars), grammar_prio, (yylsp[-1])); }
+/* Line 1396 of yacc.c */
+#line 2035 "src/parse-gram.c"
break;
case 19:
-/* Line 1265 of yacc.c. */
-#line 257 "../../src/parse-gram.y"
- {
- muscle_code_grow ("initial_action", translate_symbol_action ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])), (yylsp[(2) - (2)]));
- }
+/* Line 1396 of yacc.c */
+#line 314 "src/parse-gram.y"
+ { spec_name_prefix = (yyvsp[0].chars); }
+/* Line 1396 of yacc.c */
+#line 2043 "src/parse-gram.c"
break;
case 20:
-/* Line 1265 of yacc.c. */
-#line 260 "../../src/parse-gram.y"
- { add_param ("lex_param", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); }
+/* Line 1396 of yacc.c */
+#line 315 "src/parse-gram.y"
+ { spec_name_prefix = (yyvsp[0].chars); }
+/* Line 1396 of yacc.c */
+#line 2051 "src/parse-gram.c"
break;
case 21:
-/* Line 1265 of yacc.c. */
-#line 261 "../../src/parse-gram.y"
- { locations_flag = true; }
+/* Line 1396 of yacc.c */
+#line 316 "src/parse-gram.y"
+ { no_lines_flag = true; }
+/* Line 1396 of yacc.c */
+#line 2059 "src/parse-gram.c"
break;
case 22:
-/* Line 1265 of yacc.c. */
-#line 262 "../../src/parse-gram.y"
- { spec_name_prefix = (yyvsp[(3) - (3)].chars); }
+/* Line 1396 of yacc.c */
+#line 317 "src/parse-gram.y"
+ { nondeterministic_parser = true; }
+/* Line 1396 of yacc.c */
+#line 2067 "src/parse-gram.c"
break;
case 23:
-/* Line 1265 of yacc.c. */
-#line 263 "../../src/parse-gram.y"
- { no_lines_flag = true; }
+/* Line 1396 of yacc.c */
+#line 318 "src/parse-gram.y"
+ { spec_outfile = (yyvsp[0].chars); }
+/* Line 1396 of yacc.c */
+#line 2075 "src/parse-gram.c"
break;
case 24:
-/* Line 1265 of yacc.c. */
-#line 264 "../../src/parse-gram.y"
- { nondeterministic_parser = true; }
+/* Line 1396 of yacc.c */
+#line 319 "src/parse-gram.y"
+ { spec_outfile = (yyvsp[0].chars); }
+/* Line 1396 of yacc.c */
+#line 2083 "src/parse-gram.c"
break;
case 25:
-/* Line 1265 of yacc.c. */
-#line 265 "../../src/parse-gram.y"
- { spec_outfile = (yyvsp[(3) - (3)].chars); }
+/* Line 1396 of yacc.c */
+#line 320 "src/parse-gram.y"
+ { current_param = (yyvsp[0].param); }
+/* Line 1396 of yacc.c */
+#line 2091 "src/parse-gram.c"
break;
case 26:
-/* Line 1265 of yacc.c. */
-#line 266 "../../src/parse-gram.y"
- { add_param ("parse_param", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); }
+/* Line 1396 of yacc.c */
+#line 320 "src/parse-gram.y"
+ { current_param = param_none; }
+/* Line 1396 of yacc.c */
+#line 2099 "src/parse-gram.c"
break;
case 27:
-/* Line 1265 of yacc.c. */
-#line 267 "../../src/parse-gram.y"
- { pure_parser = true; }
+/* Line 1396 of yacc.c */
+#line 321 "src/parse-gram.y"
+ { version_check (&(yylsp[0]), (yyvsp[0].chars)); }
+/* Line 1396 of yacc.c */
+#line 2107 "src/parse-gram.c"
break;
case 28:
-/* Line 1265 of yacc.c. */
-#line 268 "../../src/parse-gram.y"
- { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); }
+/* Line 1396 of yacc.c */
+#line 323 "src/parse-gram.y"
+ {
+ char const *skeleton_user = (yyvsp[0].chars);
+ if (strchr (skeleton_user, '/'))
+ {
+ size_t dir_length = strlen (current_file);
+ char *skeleton_build;
+ while (dir_length && current_file[dir_length - 1] != '/')
+ --dir_length;
+ while (dir_length && current_file[dir_length - 1] == '/')
+ --dir_length;
+ skeleton_build =
+ xmalloc (dir_length + 1 + strlen (skeleton_user) + 1);
+ if (dir_length > 0)
+ {
+ strncpy (skeleton_build, current_file, dir_length);
+ skeleton_build[dir_length++] = '/';
+ }
+ strcpy (skeleton_build + dir_length, skeleton_user);
+ skeleton_user = uniqstr_new (skeleton_build);
+ free (skeleton_build);
+ }
+ skeleton_arg (skeleton_user, grammar_prio, (yylsp[-1]));
+ }
+/* Line 1396 of yacc.c */
+#line 2137 "src/parse-gram.c"
break;
case 29:
-/* Line 1265 of yacc.c. */
-#line 269 "../../src/parse-gram.y"
- { skeleton = (yyvsp[(2) - (2)].chars); }
+/* Line 1396 of yacc.c */
+#line 346 "src/parse-gram.y"
+ { token_table_flag = true; }
+/* Line 1396 of yacc.c */
+#line 2145 "src/parse-gram.c"
break;
case 30:
-/* Line 1265 of yacc.c. */
-#line 271 "../../src/parse-gram.y"
- {
- /* Remove the '{', and replace the '}' with '\n'. */
- (yyvsp[(2) - (2)].chars)[strlen ((yyvsp[(2) - (2)].chars)) - 1] = '\n';
- muscle_code_grow ("start_header", translate_code ((yyvsp[(2) - (2)].chars)+1, (yylsp[(2) - (2)])), (yylsp[(2) - (2)]));
- }
+/* Line 1396 of yacc.c */
+#line 347 "src/parse-gram.y"
+ { report_flag |= report_states; }
+/* Line 1396 of yacc.c */
+#line 2153 "src/parse-gram.c"
break;
case 31:
-/* Line 1265 of yacc.c. */
-#line 276 "../../src/parse-gram.y"
- { token_table_flag = true; }
+/* Line 1396 of yacc.c */
+#line 348 "src/parse-gram.y"
+ { yacc_flag = true; }
+/* Line 1396 of yacc.c */
+#line 2161 "src/parse-gram.c"
break;
- case 32:
-/* Line 1265 of yacc.c. */
-#line 277 "../../src/parse-gram.y"
- { report_flag = report_states; }
+ case 33:
+/* Line 1396 of yacc.c */
+#line 353 "src/parse-gram.y"
+ { add_param (current_param, (yyvsp[0].code), (yylsp[0])); }
+/* Line 1396 of yacc.c */
+#line 2169 "src/parse-gram.c"
break;
- case 33:
-/* Line 1265 of yacc.c. */
-#line 278 "../../src/parse-gram.y"
- { yacc_flag = true; }
+ case 34:
+/* Line 1396 of yacc.c */
+#line 354 "src/parse-gram.y"
+ { add_param (current_param, (yyvsp[0].code), (yylsp[0])); }
+/* Line 1396 of yacc.c */
+#line 2177 "src/parse-gram.c"
break;
case 37:
-/* Line 1265 of yacc.c. */
-#line 286 "../../src/parse-gram.y"
+/* Line 1396 of yacc.c */
+#line 366 "src/parse-gram.y"
{
- grammar_start_symbol_set ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]));
+ grammar_start_symbol_set ((yyvsp[0].symbol), (yylsp[0]));
}
+/* Line 1396 of yacc.c */
+#line 2187 "src/parse-gram.c"
break;
case 38:
-/* Line 1265 of yacc.c. */
-#line 290 "../../src/parse-gram.y"
+/* Line 1396 of yacc.c */
+#line 370 "src/parse-gram.y"
{
symbol_list *list;
- const char *action = translate_symbol_action ((yyvsp[(2) - (3)].chars), (yylsp[(2) - (3)]));
- for (list = (yyvsp[(3) - (3)].list); list; list = list->next)
- symbol_destructor_set (list->sym, action, (yylsp[(2) - (3)]));
- symbol_list_free ((yyvsp[(3) - (3)].list));
+ for (list = (yyvsp[0].list); list; list = list->next)
+ symbol_list_destructor_set (list, (yyvsp[-1].code), (yylsp[-1]));
+ symbol_list_free ((yyvsp[0].list));
}
+/* Line 1396 of yacc.c */
+#line 2200 "src/parse-gram.c"
break;
case 39:
-/* Line 1265 of yacc.c. */
-#line 298 "../../src/parse-gram.y"
+/* Line 1396 of yacc.c */
+#line 377 "src/parse-gram.y"
{
symbol_list *list;
- const char *action = translate_symbol_action ((yyvsp[(2) - (3)].chars), (yylsp[(2) - (3)]));
- for (list = (yyvsp[(3) - (3)].list); list; list = list->next)
- symbol_printer_set (list->sym, action, (yylsp[(2) - (3)]));
- symbol_list_free ((yyvsp[(3) - (3)].list));
+ for (list = (yyvsp[0].list); list; list = list->next)
+ symbol_list_printer_set (list, (yyvsp[-1].code), (yylsp[-1]));
+ symbol_list_free ((yyvsp[0].list));
}
+/* Line 1396 of yacc.c */
+#line 2213 "src/parse-gram.c"
break;
case 40:
-/* Line 1265 of yacc.c. */
-#line 306 "../../src/parse-gram.y"
+/* Line 1396 of yacc.c */
+#line 384 "src/parse-gram.y"
{
default_prec = true;
}
+/* Line 1396 of yacc.c */
+#line 2223 "src/parse-gram.c"
break;
case 41:
-/* Line 1265 of yacc.c. */
-#line 310 "../../src/parse-gram.y"
+/* Line 1396 of yacc.c */
+#line 388 "src/parse-gram.y"
{
default_prec = false;
}
+/* Line 1396 of yacc.c */
+#line 2233 "src/parse-gram.c"
break;
case 42:
-/* Line 1265 of yacc.c. */
-#line 323 "../../src/parse-gram.y"
- {}
+/* Line 1396 of yacc.c */
+#line 392 "src/parse-gram.y"
+ {
+ /* Do not invoke muscle_percent_code_grow here since it invokes
+ muscle_user_name_list_grow. */
+ muscle_code_grow ("percent_code()", (yyvsp[0].chars), (yylsp[0]));
+ code_scanner_last_string_free ();
+ }
+/* Line 1396 of yacc.c */
+#line 2246 "src/parse-gram.c"
break;
case 43:
-/* Line 1265 of yacc.c. */
-#line 324 "../../src/parse-gram.y"
- { muscle_code_grow ("union_name", (yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
+/* Line 1396 of yacc.c */
+#line 399 "src/parse-gram.y"
+ {
+ muscle_percent_code_grow ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].chars), (yylsp[0]));
+ code_scanner_last_string_free ();
+ }
+/* Line 1396 of yacc.c */
+#line 2257 "src/parse-gram.c"
break;
case 44:
-/* Line 1265 of yacc.c. */
-#line 329 "../../src/parse-gram.y"
- {
- char const *body = (yyvsp[(3) - (3)].chars);
+/* Line 1396 of yacc.c */
+#line 413 "src/parse-gram.y"
+ {}
+/* Line 1396 of yacc.c */
+#line 2265 "src/parse-gram.c"
+ break;
- if (typed)
- {
- /* Concatenate the union bodies, turning the first one's
- trailing '}' into '\n', and omitting the second one's '{'. */
- char *code = muscle_find ("stype");
- code[strlen (code) - 1] = '\n';
- body++;
- }
+ case 45:
+/* Line 1396 of yacc.c */
+#line 414 "src/parse-gram.y"
+ { muscle_code_grow ("union_name", (yyvsp[0].uniqstr), (yylsp[0])); }
+/* Line 1396 of yacc.c */
+#line 2273 "src/parse-gram.c"
+ break;
- typed = true;
- muscle_code_grow ("stype", body, (yylsp[(3) - (3)]));
+ case 46:
+/* Line 1396 of yacc.c */
+#line 419 "src/parse-gram.y"
+ {
+ union_seen = true;
+ muscle_code_grow ("stype", (yyvsp[0].chars), (yylsp[0]));
+ code_scanner_last_string_free ();
}
+/* Line 1396 of yacc.c */
+#line 2285 "src/parse-gram.c"
break;
- case 45:
-/* Line 1265 of yacc.c. */
-#line 350 "../../src/parse-gram.y"
+ case 47:
+/* Line 1396 of yacc.c */
+#line 430 "src/parse-gram.y"
{ current_class = nterm_sym; }
+/* Line 1396 of yacc.c */
+#line 2293 "src/parse-gram.c"
break;
- case 46:
-/* Line 1265 of yacc.c. */
-#line 351 "../../src/parse-gram.y"
+ case 48:
+/* Line 1396 of yacc.c */
+#line 431 "src/parse-gram.y"
{
current_class = unknown_sym;
current_type = NULL;
}
+/* Line 1396 of yacc.c */
+#line 2304 "src/parse-gram.c"
break;
- case 47:
-/* Line 1265 of yacc.c. */
-#line 355 "../../src/parse-gram.y"
+ case 49:
+/* Line 1396 of yacc.c */
+#line 435 "src/parse-gram.y"
{ current_class = token_sym; }
+/* Line 1396 of yacc.c */
+#line 2312 "src/parse-gram.c"
break;
- case 48:
-/* Line 1265 of yacc.c. */
-#line 356 "../../src/parse-gram.y"
+ case 50:
+/* Line 1396 of yacc.c */
+#line 436 "src/parse-gram.y"
{
current_class = unknown_sym;
current_type = NULL;
}
+/* Line 1396 of yacc.c */
+#line 2323 "src/parse-gram.c"
break;
- case 49:
-/* Line 1265 of yacc.c. */
-#line 361 "../../src/parse-gram.y"
+ case 51:
+/* Line 1396 of yacc.c */
+#line 441 "src/parse-gram.y"
{
symbol_list *list;
- for (list = (yyvsp[(3) - (3)].list); list; list = list->next)
- symbol_type_set (list->sym, (yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]));
- symbol_list_free ((yyvsp[(3) - (3)].list));
+ tag_seen = true;
+ for (list = (yyvsp[0].list); list; list = list->next)
+ symbol_type_set (list->content.sym, (yyvsp[-1].uniqstr), (yylsp[-1]));
+ symbol_list_free ((yyvsp[0].list));
}
+/* Line 1396 of yacc.c */
+#line 2337 "src/parse-gram.c"
break;
- case 50:
-/* Line 1265 of yacc.c. */
-#line 371 "../../src/parse-gram.y"
+ case 52:
+/* Line 1396 of yacc.c */
+#line 452 "src/parse-gram.y"
{
symbol_list *list;
++current_prec;
- for (list = (yyvsp[(3) - (3)].list); list; list = list->next)
+ for (list = (yyvsp[0].list); list; list = list->next)
{
- symbol_type_set (list->sym, current_type, (yylsp[(2) - (3)]));
- symbol_precedence_set (list->sym, current_prec, (yyvsp[(1) - (3)].assoc), (yylsp[(1) - (3)]));
+ symbol_type_set (list->content.sym, current_type, (yylsp[-1]));
+ symbol_precedence_set (list->content.sym, current_prec, (yyvsp[-2].assoc), (yylsp[-2]));
}
- symbol_list_free ((yyvsp[(3) - (3)].list));
+ symbol_list_free ((yyvsp[0].list));
current_type = NULL;
}
+/* Line 1396 of yacc.c */
+#line 2355 "src/parse-gram.c"
break;
- case 51:
-/* Line 1265 of yacc.c. */
-#line 385 "../../src/parse-gram.y"
+ case 53:
+/* Line 1396 of yacc.c */
+#line 466 "src/parse-gram.y"
{ (yyval.assoc) = left_assoc; }
+/* Line 1396 of yacc.c */
+#line 2363 "src/parse-gram.c"
break;
- case 52:
-/* Line 1265 of yacc.c. */
-#line 386 "../../src/parse-gram.y"
+ case 54:
+/* Line 1396 of yacc.c */
+#line 467 "src/parse-gram.y"
{ (yyval.assoc) = right_assoc; }
+/* Line 1396 of yacc.c */
+#line 2371 "src/parse-gram.c"
break;
- case 53:
-/* Line 1265 of yacc.c. */
-#line 387 "../../src/parse-gram.y"
+ case 55:
+/* Line 1396 of yacc.c */
+#line 468 "src/parse-gram.y"
{ (yyval.assoc) = non_assoc; }
+/* Line 1396 of yacc.c */
+#line 2379 "src/parse-gram.c"
break;
- case 54:
-/* Line 1265 of yacc.c. */
-#line 391 "../../src/parse-gram.y"
+ case 56:
+/* Line 1396 of yacc.c */
+#line 469 "src/parse-gram.y"
+ { (yyval.assoc) = precedence_assoc; }
+/* Line 1396 of yacc.c */
+#line 2387 "src/parse-gram.c"
+ break;
+
+ case 57:
+/* Line 1396 of yacc.c */
+#line 473 "src/parse-gram.y"
{ current_type = NULL; }
+/* Line 1396 of yacc.c */
+#line 2395 "src/parse-gram.c"
break;
- case 55:
-/* Line 1265 of yacc.c. */
-#line 392 "../../src/parse-gram.y"
- { current_type = (yyvsp[(1) - (1)].uniqstr); }
+ case 58:
+/* Line 1396 of yacc.c */
+#line 474 "src/parse-gram.y"
+ { current_type = (yyvsp[0].uniqstr); tag_seen = true; }
+/* Line 1396 of yacc.c */
+#line 2403 "src/parse-gram.c"
break;
- case 56:
-/* Line 1265 of yacc.c. */
-#line 397 "../../src/parse-gram.y"
- { (yyval.list) = symbol_list_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
+ case 59:
+/* Line 1396 of yacc.c */
+#line 480 "src/parse-gram.y"
+ { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
+/* Line 1396 of yacc.c */
+#line 2411 "src/parse-gram.c"
break;
- case 57:
-/* Line 1265 of yacc.c. */
-#line 398 "../../src/parse-gram.y"
- { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); }
+ case 60:
+/* Line 1396 of yacc.c */
+#line 482 "src/parse-gram.y"
+ { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); }
+/* Line 1396 of yacc.c */
+#line 2419 "src/parse-gram.c"
break;
- case 58:
-/* Line 1265 of yacc.c. */
-#line 404 "../../src/parse-gram.y"
+ case 61:
+/* Line 1396 of yacc.c */
+#line 486 "src/parse-gram.y"
+ { (yyval.symbol) = (yyvsp[0].symbol); }
+/* Line 1396 of yacc.c */
+#line 2427 "src/parse-gram.c"
+ break;
+
+ case 62:
+/* Line 1396 of yacc.c */
+#line 487 "src/parse-gram.y"
+ { (yyval.symbol) = (yyvsp[-1].symbol); symbol_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer), (yylsp[0])); }
+/* Line 1396 of yacc.c */
+#line 2435 "src/parse-gram.c"
+ break;
+
+ case 63:
+/* Line 1396 of yacc.c */
+#line 493 "src/parse-gram.y"
+ { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
+/* Line 1396 of yacc.c */
+#line 2443 "src/parse-gram.c"
+ break;
+
+ case 64:
+/* Line 1396 of yacc.c */
+#line 495 "src/parse-gram.y"
+ { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); }
+/* Line 1396 of yacc.c */
+#line 2451 "src/parse-gram.c"
+ break;
+
+ case 65:
+/* Line 1396 of yacc.c */
+#line 499 "src/parse-gram.y"
+ { (yyval.list) = (yyvsp[0].list); }
+/* Line 1396 of yacc.c */
+#line 2459 "src/parse-gram.c"
+ break;
+
+ case 66:
+/* Line 1396 of yacc.c */
+#line 500 "src/parse-gram.y"
+ { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), (yyvsp[0].list)); }
+/* Line 1396 of yacc.c */
+#line 2467 "src/parse-gram.c"
+ break;
+
+ case 67:
+/* Line 1396 of yacc.c */
+#line 504 "src/parse-gram.y"
+ { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
+/* Line 1396 of yacc.c */
+#line 2475 "src/parse-gram.c"
+ break;
+
+ case 68:
+/* Line 1396 of yacc.c */
+#line 505 "src/parse-gram.y"
+ { (yyval.list) = symbol_list_type_new ((yyvsp[0].uniqstr), (yylsp[0])); }
+/* Line 1396 of yacc.c */
+#line 2483 "src/parse-gram.c"
+ break;
+
+ case 69:
+/* Line 1396 of yacc.c */
+#line 506 "src/parse-gram.y"
+ { (yyval.list) = symbol_list_default_tagged_new ((yylsp[0])); }
+/* Line 1396 of yacc.c */
+#line 2491 "src/parse-gram.c"
+ break;
+
+ case 70:
+/* Line 1396 of yacc.c */
+#line 507 "src/parse-gram.y"
+ { (yyval.list) = symbol_list_default_tagless_new ((yylsp[0])); }
+/* Line 1396 of yacc.c */
+#line 2499 "src/parse-gram.c"
+ break;
+
+ case 71:
+/* Line 1396 of yacc.c */
+#line 513 "src/parse-gram.y"
{
- current_type = (yyvsp[(1) - (1)].uniqstr);
+ current_type = (yyvsp[0].uniqstr);
+ tag_seen = true;
}
+/* Line 1396 of yacc.c */
+#line 2510 "src/parse-gram.c"
break;
- case 59:
-/* Line 1265 of yacc.c. */
-#line 408 "../../src/parse-gram.y"
+ case 72:
+/* Line 1396 of yacc.c */
+#line 518 "src/parse-gram.y"
{
- symbol_class_set ((yyvsp[(1) - (1)].symbol), current_class, (yylsp[(1) - (1)]), true);
- symbol_type_set ((yyvsp[(1) - (1)].symbol), current_type, (yylsp[(1) - (1)]));
+ symbol_class_set ((yyvsp[0].symbol), current_class, (yylsp[0]), true);
+ symbol_type_set ((yyvsp[0].symbol), current_type, (yylsp[0]));
}
+/* Line 1396 of yacc.c */
+#line 2521 "src/parse-gram.c"
break;
- case 60:
-/* Line 1265 of yacc.c. */
-#line 413 "../../src/parse-gram.y"
+ case 73:
+/* Line 1396 of yacc.c */
+#line 523 "src/parse-gram.y"
{
- symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true);
- symbol_type_set ((yyvsp[(1) - (2)].symbol), current_type, (yylsp[(1) - (2)]));
- symbol_user_token_number_set ((yyvsp[(1) - (2)].symbol), (yyvsp[(2) - (2)].integer), (yylsp[(2) - (2)]));
+ 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 1396 of yacc.c */
+#line 2533 "src/parse-gram.c"
break;
- case 61:
-/* Line 1265 of yacc.c. */
-#line 419 "../../src/parse-gram.y"
+ case 74:
+/* Line 1396 of yacc.c */
+#line 529 "src/parse-gram.y"
{
- symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true);
- symbol_type_set ((yyvsp[(1) - (2)].symbol), current_type, (yylsp[(1) - (2)]));
- symbol_make_alias ((yyvsp[(1) - (2)].symbol), (yyvsp[(2) - (2)].symbol), (yyloc));
+ 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 1396 of yacc.c */
+#line 2545 "src/parse-gram.c"
break;
- case 62:
-/* Line 1265 of yacc.c. */
-#line 425 "../../src/parse-gram.y"
+ case 75:
+/* Line 1396 of yacc.c */
+#line 535 "src/parse-gram.y"
{
- symbol_class_set ((yyvsp[(1) - (3)].symbol), current_class, (yylsp[(1) - (3)]), true);
- symbol_type_set ((yyvsp[(1) - (3)].symbol), current_type, (yylsp[(1) - (3)]));
- symbol_user_token_number_set ((yyvsp[(1) - (3)].symbol), (yyvsp[(2) - (3)].integer), (yylsp[(2) - (3)]));
- symbol_make_alias ((yyvsp[(1) - (3)].symbol), (yyvsp[(3) - (3)].symbol), (yyloc));
+ 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 1396 of yacc.c */
+#line 2558 "src/parse-gram.c"
break;
- case 69:
-/* Line 1265 of yacc.c. */
-#line 455 "../../src/parse-gram.y"
+ case 82:
+/* Line 1396 of yacc.c */
+#line 565 "src/parse-gram.y"
{
yyerrok;
}
+/* Line 1396 of yacc.c */
+#line 2568 "src/parse-gram.c"
break;
- case 70:
-/* Line 1265 of yacc.c. */
-#line 461 "../../src/parse-gram.y"
- { current_lhs = (yyvsp[(1) - (1)].symbol); current_lhs_location = (yylsp[(1) - (1)]); }
+ case 83:
+/* Line 1396 of yacc.c */
+#line 571 "src/parse-gram.y"
+ { current_lhs = (yyvsp[-1].symbol); current_lhs_location = (yylsp[-1]);
+ current_lhs_named_ref = (yyvsp[0].named_ref); }
+/* Line 1396 of yacc.c */
+#line 2577 "src/parse-gram.c"
break;
- case 72:
-/* Line 1265 of yacc.c. */
-#line 465 "../../src/parse-gram.y"
- { grammar_current_rule_end ((yylsp[(1) - (1)])); }
+ case 85:
+/* Line 1396 of yacc.c */
+#line 576 "src/parse-gram.y"
+ { grammar_current_rule_end ((yylsp[0])); }
+/* Line 1396 of yacc.c */
+#line 2585 "src/parse-gram.c"
break;
- case 73:
-/* Line 1265 of yacc.c. */
-#line 466 "../../src/parse-gram.y"
- { grammar_current_rule_end ((yylsp[(3) - (3)])); }
+ case 86:
+/* Line 1396 of yacc.c */
+#line 577 "src/parse-gram.y"
+ { grammar_current_rule_end ((yylsp[0])); }
+/* Line 1396 of yacc.c */
+#line 2593 "src/parse-gram.c"
break;
- case 75:
-/* Line 1265 of yacc.c. */
-#line 472 "../../src/parse-gram.y"
- { grammar_current_rule_begin (current_lhs, current_lhs_location); }
+ case 88:
+/* Line 1396 of yacc.c */
+#line 583 "src/parse-gram.y"
+ { grammar_current_rule_begin (current_lhs, current_lhs_location,
+ current_lhs_named_ref); }
+/* Line 1396 of yacc.c */
+#line 2602 "src/parse-gram.c"
break;
- case 76:
-/* Line 1265 of yacc.c. */
-#line 474 "../../src/parse-gram.y"
- { grammar_current_rule_symbol_append ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); }
+ case 89:
+/* Line 1396 of yacc.c */
+#line 586 "src/parse-gram.y"
+ { grammar_current_rule_symbol_append ((yyvsp[-1].symbol), (yylsp[-1]), (yyvsp[0].named_ref)); }
+/* Line 1396 of yacc.c */
+#line 2610 "src/parse-gram.c"
break;
- case 77:
-/* Line 1265 of yacc.c. */
-#line 476 "../../src/parse-gram.y"
- { grammar_current_rule_action_append ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); }
+ case 90:
+/* Line 1396 of yacc.c */
+#line 588 "src/parse-gram.y"
+ { grammar_current_rule_action_append ((yyvsp[-1].code), (yylsp[-1]), (yyvsp[0].named_ref)); }
+/* Line 1396 of yacc.c */
+#line 2618 "src/parse-gram.c"
break;
- case 78:
-/* Line 1265 of yacc.c. */
-#line 478 "../../src/parse-gram.y"
- { grammar_current_rule_prec_set ((yyvsp[(3) - (3)].symbol), (yylsp[(3) - (3)])); }
+ case 91:
+/* Line 1396 of yacc.c */
+#line 590 "src/parse-gram.y"
+ { grammar_current_rule_prec_set ((yyvsp[0].symbol), (yylsp[0])); }
+/* Line 1396 of yacc.c */
+#line 2626 "src/parse-gram.c"
break;
- case 79:
-/* Line 1265 of yacc.c. */
-#line 480 "../../src/parse-gram.y"
- { grammar_current_rule_dprec_set ((yyvsp[(3) - (3)].integer), (yylsp[(3) - (3)])); }
+ case 92:
+/* Line 1396 of yacc.c */
+#line 592 "src/parse-gram.y"
+ { grammar_current_rule_dprec_set ((yyvsp[0].integer), (yylsp[0])); }
+/* Line 1396 of yacc.c */
+#line 2634 "src/parse-gram.c"
break;
- case 80:
-/* Line 1265 of yacc.c. */
-#line 482 "../../src/parse-gram.y"
- { grammar_current_rule_merge_set ((yyvsp[(3) - (3)].uniqstr), (yylsp[(3) - (3)])); }
+ case 93:
+/* Line 1396 of yacc.c */
+#line 594 "src/parse-gram.y"
+ { grammar_current_rule_merge_set ((yyvsp[0].uniqstr), (yylsp[0])); }
+/* Line 1396 of yacc.c */
+#line 2642 "src/parse-gram.c"
break;
- case 81:
-/* Line 1265 of yacc.c. */
-#line 495 "../../src/parse-gram.y"
- { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
+ case 94:
+/* Line 1396 of yacc.c */
+#line 598 "src/parse-gram.y"
+ { (yyval.named_ref) = 0; }
+/* Line 1396 of yacc.c */
+#line 2650 "src/parse-gram.c"
break;
- case 82:
-/* Line 1265 of yacc.c. */
-#line 497 "../../src/parse-gram.y"
+ case 95:
+/* Line 1396 of yacc.c */
+#line 600 "src/parse-gram.y"
+ { (yyval.named_ref) = named_ref_new((yyvsp[0].uniqstr), (yylsp[0])); }
+/* Line 1396 of yacc.c */
+#line 2658 "src/parse-gram.c"
+ break;
+
+ case 97:
+/* Line 1396 of yacc.c */
+#line 612 "src/parse-gram.y"
+ { (yyval.uniqstr) = uniqstr_new ((yyvsp[0].chars)); }
+/* Line 1396 of yacc.c */
+#line 2666 "src/parse-gram.c"
+ break;
+
+ case 98:
+/* Line 1396 of yacc.c */
+#line 617 "src/parse-gram.y"
+ { (yyval.chars) = ""; }
+/* Line 1396 of yacc.c */
+#line 2674 "src/parse-gram.c"
+ break;
+
+ case 99:
+/* Line 1396 of yacc.c */
+#line 618 "src/parse-gram.y"
+ { (yyval.chars) = (yyvsp[0].uniqstr); }
+/* Line 1396 of yacc.c */
+#line 2682 "src/parse-gram.c"
+ break;
+
+ case 101:
+/* Line 1396 of yacc.c */
+#line 629 "src/parse-gram.y"
{
- (yyval.symbol) = symbol_get (char_name ((yyvsp[(1) - (1)].character)), (yylsp[(1) - (1)]));
- symbol_class_set ((yyval.symbol), token_sym, (yylsp[(1) - (1)]), false);
- symbol_user_token_number_set ((yyval.symbol), (yyvsp[(1) - (1)].character), (yylsp[(1) - (1)]));
+ code_props plain_code;
+ (yyvsp[0].code)[strlen ((yyvsp[0].code)) - 1] = '\n';
+ 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 1396 of yacc.c */
+#line 2697 "src/parse-gram.c"
break;
- case 83:
-/* Line 1265 of yacc.c. */
-#line 505 "../../src/parse-gram.y"
- { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
+ case 102:
+/* Line 1396 of yacc.c */
+#line 649 "src/parse-gram.y"
+ { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); }
+/* Line 1396 of yacc.c */
+#line 2705 "src/parse-gram.c"
break;
- case 86:
-/* Line 1265 of yacc.c. */
-#line 517 "../../src/parse-gram.y"
+ case 103:
+/* Line 1396 of yacc.c */
+#line 651 "src/parse-gram.y"
{
- (yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[(1) - (1)].chars)), (yylsp[(1) - (1)]));
- symbol_class_set ((yyval.symbol), token_sym, (yylsp[(1) - (1)]), false);
+ (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 1396 of yacc.c */
+#line 2717 "src/parse-gram.c"
break;
- case 87:
-/* Line 1265 of yacc.c. */
-#line 526 "../../src/parse-gram.y"
- { (yyval.chars) = (yyvsp[(1) - (1)].chars); }
+ case 104:
+/* Line 1396 of yacc.c */
+#line 659 "src/parse-gram.y"
+ { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); }
+/* Line 1396 of yacc.c */
+#line 2725 "src/parse-gram.c"
break;
- case 89:
-/* Line 1265 of yacc.c. */
-#line 533 "../../src/parse-gram.y"
+ case 107:
+/* Line 1396 of yacc.c */
+#line 671 "src/parse-gram.y"
{
- muscle_code_grow ("epilogue", translate_code ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])), (yylsp[(2) - (2)]));
+ (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 1396 of yacc.c */
+#line 2736 "src/parse-gram.c"
+ break;
+
+ case 109:
+/* Line 1396 of yacc.c */
+#line 680 "src/parse-gram.y"
+ {
+ code_props plain_code;
+ code_props_plain_init (&plain_code, (yyvsp[0].chars), (yylsp[0]));
+ code_props_translate_code (&plain_code);
gram_scanner_last_string_free ();
+ muscle_code_grow ("epilogue", plain_code.code, (yylsp[0]));
+ code_scanner_last_string_free ();
}
+/* Line 1396 of yacc.c */
+#line 2751 "src/parse-gram.c"
break;
-/* Line 1265 of yacc.c. */
-#line 2337 "../../src/parse-gram.c"
+/* Line 1396 of yacc.c */
+#line 2756 "src/parse-gram.c"
default: break;
}
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -2372,7 +2791,7 @@ yyerrlab:
yyerror (YY_("syntax error"));
#else
{
- YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
+ YYSIZE_T yysize = yysyntax_error (0, yystate, yytoken);
if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
{
YYSIZE_T yyalloc = 2 * yysize;
@@ -2392,7 +2811,7 @@ yyerrlab:
if (0 < yysize && yysize <= yymsg_alloc)
{
- (void) yysyntax_error (yymsg, yystate, yychar);
+ (void) yysyntax_error (yymsg, yystate, yytoken);
yyerror (yymsg);
}
else
@@ -2461,7 +2880,7 @@ yyerrlab1:
for (;;)
{
yyn = yypact[yystate];
- if (yyn != YYPACT_NINF)
+ if (!yypact_value_is_default (yyn))
{
yyn += YYTERROR;
if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
@@ -2484,9 +2903,6 @@ yyerrlab1:
YY_STACK_PRINT (yyss, yyssp);
}
- if (yyn == YYFINAL)
- YYACCEPT;
-
*++yyvsp = yylval;
yyerror_range[1] = yylloc;
@@ -2516,7 +2932,7 @@ yyabortlab:
yyresult = 1;
goto yyreturn;
-#ifndef yyoverflow
+#if !defined(yyoverflow) || YYERROR_VERBOSE
/*-------------------------------------------------.
| yyexhaustedlab -- memory exhaustion comes here. |
`-------------------------------------------------*/
@@ -2527,7 +2943,7 @@ yyexhaustedlab:
#endif
yyreturn:
- if (yychar != YYEOF && yychar != YYEMPTY)
+ if (yychar != YYEMPTY)
yydestruct ("Cleanup: discarding lookahead",
yytoken, &yylval, &yylloc);
/* Do not reclaim the symbols of the rule which action triggered
@@ -2552,9 +2968,8 @@ yyreturn:
return YYID (yyresult);
}
-
-/* Line 1485 of yacc.c. */
-#line 539 "../../src/parse-gram.y"
+/* Line 1615 of yacc.c */
+#line 690 "src/parse-gram.y"
@@ -2588,34 +3003,33 @@ lloc_default (YYLTYPE const *rhs, int n)
}
-/* Add a lex-param or a parse-param (depending on TYPE) with
- declaration DECL and location LOC. */
-
static void
-add_param (char const *type, char *decl, location loc)
+add_param (param_type type, char *decl, location loc)
{
static char const alphanum[26 + 26 + 1 + 10] =
"abcdefghijklmnopqrstuvwxyz"
"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
"_"
"0123456789";
+
char const *name_start = NULL;
- char *p;
-
- /* Stop on last actual character. */
- for (p = decl; p[1]; p++)
- if ((p == decl
- || ! memchr (alphanum, p[-1], sizeof alphanum))
- && memchr (alphanum, p[0], sizeof alphanum - 10))
- name_start = p;
-
- /* Strip the surrounding '{' and '}', and any blanks just inside
- the braces. */
- while (*--p == ' ' || *p == '\t')
- continue;
- p[1] = '\0';
- while (*++decl == ' ' || *decl == '\t')
- continue;
+ {
+ char *p;
+ /* Stop on last actual character. */
+ for (p = decl; p[1]; p++)
+ if ((p == decl
+ || ! memchr (alphanum, p[-1], sizeof alphanum))
+ && memchr (alphanum, p[0], sizeof alphanum - 10))
+ name_start = p;
+
+ /* Strip the surrounding '{' and '}', and any blanks just inside
+ the braces. */
+ while (*--p == ' ' || *p == '\t')
+ continue;
+ p[1] = '\0';
+ while (*++decl == ' ' || *decl == '\t')
+ continue;
+ }
if (! name_start)
complain_at (loc, _("missing identifier in parameter declaration"));
@@ -2632,13 +3046,17 @@ add_param (char const *type, char *decl, location loc)
name = xmalloc (name_len + 1);
memcpy (name, name_start, name_len);
name[name_len] = '\0';
- muscle_pair_list_grow (type, decl, name);
+ if (type & param_lex)
+ muscle_pair_list_grow ("lex_param", decl, name);
+ if (type & param_parse)
+ muscle_pair_list_grow ("parse_param", decl, name);
free (name);
}
gram_scanner_last_string_free ();
}
+
static void
version_check (location const *loc, char const *version)
{
@@ -2674,4 +3092,3 @@ char_name (char c)
return quotearg_style (escape_quoting_style, buf);
}
}
-