X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/58d7a1a1c7497ba51a35fcf991c5b047f692fe18..86e5b4402f4e8ede509a4043420aa6e3d3c6cae2:/src/parse-gram.c diff --git a/src/parse-gram.c b/src/parse-gram.c index dfadce4d..4fef5a2f 100644 --- a/src/parse-gram.c +++ b/src/parse-gram.c @@ -1,14 +1,13 @@ -/* A Bison parser, made by GNU Bison 2.1b. */ +/* A Bison parser, made by GNU Bison 2.4.483-4ad39-dirty. */ -/* 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-2010 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 +15,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 +44,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.1b" +#define YYBISON_VERSION "2.4.483-4ad39-dirty" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -55,145 +52,37 @@ /* 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 - -/* Tokens. */ -#ifndef YYTOKENTYPE -# define YYTOKENTYPE - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ - enum yytokentype { - 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_PREC = 268, - PERCENT_DPREC = 269, - PERCENT_MERGE = 270, - PERCENT_DEBUG = 271, - PERCENT_DEFAULT_PREC = 272, - PERCENT_DEFINE = 273, - PERCENT_DEFINES = 274, - PERCENT_ERROR_VERBOSE = 275, - PERCENT_EXPECT = 276, - PERCENT_EXPECT_RR = 277, - PERCENT_FILE_PREFIX = 278, - PERCENT_GLR_PARSER = 279, - PERCENT_INITIAL_ACTION = 280, - PERCENT_LEX_PARAM = 281, - PERCENT_LOCATIONS = 282, - PERCENT_NAME_PREFIX = 283, - PERCENT_NO_DEFAULT_PREC = 284, - PERCENT_NO_LINES = 285, - PERCENT_NONDETERMINISTIC_PARSER = 286, - PERCENT_OUTPUT = 287, - PERCENT_PARSE_PARAM = 288, - PERCENT_PURE_PARSER = 289, - PERCENT_REQUIRE = 290, - PERCENT_SKELETON = 291, - PERCENT_START = 292, - PERCENT_TOKEN_TABLE = 293, - PERCENT_VERBOSE = 294, - PERCENT_YACC = 295, - BRACED_CODE = 296, - CHAR = 297, - EPILOGUE = 298, - EQUAL = 299, - ID = 300, - ID_COLON = 301, - PERCENT_PERCENT = 302, - PIPE = 303, - PROLOGUE = 304, - SEMICOLON = 305, - TYPE = 306, - PERCENT_UNION = 307 - }; -#endif -/* Tokens. */ -#define GRAM_EOF 0 -#define STRING 258 -#define INT 259 -#define PERCENT_TOKEN 260 -#define PERCENT_NTERM 261 -#define PERCENT_TYPE 262 -#define PERCENT_DESTRUCTOR 263 -#define PERCENT_PRINTER 264 -#define PERCENT_LEFT 265 -#define PERCENT_RIGHT 266 -#define PERCENT_NONASSOC 267 -#define PERCENT_PREC 268 -#define PERCENT_DPREC 269 -#define PERCENT_MERGE 270 -#define PERCENT_DEBUG 271 -#define PERCENT_DEFAULT_PREC 272 -#define PERCENT_DEFINE 273 -#define PERCENT_DEFINES 274 -#define PERCENT_ERROR_VERBOSE 275 -#define PERCENT_EXPECT 276 -#define PERCENT_EXPECT_RR 277 -#define PERCENT_FILE_PREFIX 278 -#define PERCENT_GLR_PARSER 279 -#define PERCENT_INITIAL_ACTION 280 -#define PERCENT_LEX_PARAM 281 -#define PERCENT_LOCATIONS 282 -#define PERCENT_NAME_PREFIX 283 -#define PERCENT_NO_DEFAULT_PREC 284 -#define PERCENT_NO_LINES 285 -#define PERCENT_NONDETERMINISTIC_PARSER 286 -#define PERCENT_OUTPUT 287 -#define PERCENT_PARSE_PARAM 288 -#define PERCENT_PURE_PARSER 289 -#define PERCENT_REQUIRE 290 -#define PERCENT_SKELETON 291 -#define PERCENT_START 292 -#define PERCENT_TOKEN_TABLE 293 -#define PERCENT_VERBOSE 294 -#define PERCENT_YACC 295 -#define BRACED_CODE 296 -#define CHAR 297 -#define EPILOGUE 298 -#define EQUAL 299 -#define ID 300 -#define ID_COLON 301 -#define PERCENT_PERCENT 302 -#define PIPE 303 -#define PROLOGUE 304 -#define SEMICOLON 305 -#define TYPE 306 -#define PERCENT_UNION 307 - - - +#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 1 "../../src/parse-gram.y" +/* Line 252 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-2010 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, @@ -202,10 +91,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" @@ -215,13 +101,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); @@ -238,27 +124,10 @@ static void version_check (location const *loc, char const *version); gram_error (&yylloc, Msg) static void gram_error (location const *, char const *); -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 +static char const *char_name (char); +/* Line 252 of yacc.c */ +#line 131 "src/parse-gram.c" /* Enabling traces. */ #ifndef YYDEBUG @@ -278,24 +147,174 @@ static int current_prec = 0; # define YYTOKEN_TABLE 0 #endif +/* "%code requires" blocks. */ +/* Line 272 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 272 of yacc.c */ +#line 168 "src/parse-gram.c" + +/* Tokens. */ +#ifndef YYTOKENTYPE +# define YYTOKENTYPE + /* Put the tokens into the symbol table, so that GDB and other debuggers + know about them. */ + enum yytokentype { + 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, + 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, + PERCENT_PARAM = 309, + PERCENT_UNION = 310 + }; +#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 BRACKETED_ID 296 +#define CHAR 297 +#define EPILOGUE 298 +#define EQUAL 299 +#define ID 300 +#define ID_COLON 301 +#define PERCENT_PERCENT 302 +#define PIPE 303 +#define PROLOGUE 304 +#define SEMICOLON 305 +#define TAG 306 +#define TAG_ANY 307 +#define TAG_NONE 308 +#define PERCENT_PARAM 309 +#define PERCENT_UNION 310 + + + + #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 95 "../../src/parse-gram.y" { +/* Line 277 of yacc.c */ +#line 87 "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 193 of yacc.c. */ -#line 295 "../../src/parse-gram.c" - YYSTYPE; + +/* Line 277 of yacc.c */ +#line 225 "src/parse-gram.y" + + param_type param; + + +/* Line 277 of yacc.c */ +#line 314 "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 @@ -314,9 +333,39 @@ typedef struct YYLTYPE /* Copy the second part of user declarations. */ +/* Line 327 of yacc.c */ +#line 338 "src/parse-gram.c" +/* Unqualified %code blocks. */ +/* Line 328 of yacc.c */ +#line 55 "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 328 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 216 of yacc.c. */ -#line 320 "../../src/parse-gram.c" + +/* Line 328 of yacc.c */ +#line 369 "src/parse-gram.c" #ifdef short # undef short @@ -366,7 +415,7 @@ typedef short int yytype_int16; #define YYSIZE_MAXIMUM ((YYSIZE_T) -1) #ifndef YY_ -# if YYENABLE_NLS +# if defined YYENABLE_NLS && YYENABLE_NLS # if ENABLE_NLS # include /* INFRINGES ON USER NAME SPACE */ # define YY_(msgid) dgettext ("bison-runtime", msgid) @@ -391,14 +440,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 @@ -480,9 +529,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. */ @@ -517,12 +566,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); \ } \ @@ -533,25 +582,27 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 3 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 134 +#define YYLAST 162 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 53 +#define YYNTOKENS 56 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 27 +#define YYNNTS 36 /* YYNRULES -- Number of rules. */ -#define YYNRULES 85 -/* YYNRULES -- Number of states. */ -#define YYNSTATES 120 +#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 307 +#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, @@ -584,65 +635,25 @@ static const yytype_uint8 yytranslate[] = 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, 41, 42, 43, 44, - 45, 46, 47, 48, 49, 50, 51, 52 + 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, + 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, 18, 21, - 25, 27, 29, 32, 35, 39, 41, 44, 47, 49, - 53, 55, 57, 61, 64, 66, 69, 72, 74, 76, - 78, 80, 82, 84, 87, 91, 95, 97, 99, 100, - 102, 106, 107, 111, 112, 116, 120, 124, 126, 128, - 130, 131, 133, 135, 138, 140, 142, 145, 148, 152, - 154, 157, 159, 162, 164, 167, 170, 171, 175, 177, - 181, 184, 185, 188, 191, 195, 199, 203, 205, 207, - 209, 211, 213, 215, 217, 218 -}; - -/* YYRHS -- A `-1'-separated list of the rules' RHS. */ -static const yytype_int8 yyrhs[] = -{ - 54, 0, -1, 55, 47, 68, 79, -1, -1, 55, - 56, -1, 57, -1, 49, -1, 16, -1, 18, 78, - -1, 18, 78, 78, -1, 19, -1, 20, -1, 21, - 4, -1, 22, 4, -1, 23, 44, 78, -1, 24, - -1, 25, 41, -1, 26, 41, -1, 27, -1, 28, - 44, 78, -1, 30, -1, 31, -1, 32, 44, 78, - -1, 33, 41, -1, 34, -1, 35, 78, -1, 36, - 78, -1, 38, -1, 39, -1, 40, -1, 50, -1, - 62, -1, 59, -1, 37, 76, -1, 8, 41, 65, - -1, 9, 41, 65, -1, 17, -1, 29, -1, -1, - 45, -1, 52, 58, 41, -1, -1, 6, 60, 67, - -1, -1, 5, 61, 67, -1, 7, 51, 65, -1, - 63, 64, 65, -1, 10, -1, 11, -1, 12, -1, - -1, 51, -1, 76, -1, 65, 76, -1, 51, -1, - 74, -1, 74, 4, -1, 74, 77, -1, 74, 4, - 77, -1, 66, -1, 67, 66, -1, 69, -1, 68, - 69, -1, 70, -1, 57, 50, -1, 1, 50, -1, - -1, 75, 71, 72, -1, 73, -1, 72, 48, 73, - -1, 72, 50, -1, -1, 73, 76, -1, 73, 41, - -1, 73, 13, 76, -1, 73, 14, 4, -1, 73, - 15, 51, -1, 45, -1, 42, -1, 46, -1, 74, - -1, 77, -1, 3, -1, 3, -1, -1, 47, 43, - -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, 195, 195, 203, 205, 209, 210, 212, 213, 218, - 219, 220, 221, 222, 223, 224, 229, 233, 234, 235, - 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, - 246, 250, 251, 252, 256, 264, 272, 276, 290, 291, - 295, 317, 317, 322, 322, 327, 337, 352, 353, 354, - 358, 359, 364, 365, 370, 374, 379, 385, 391, 402, - 403, 412, 413, 419, 420, 421, 428, 428, 432, 433, - 434, 439, 440, 442, 445, 447, 449, 462, 463, 472, - 477, 478, 483, 492, 497, 499 + 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 @@ -653,29 +664,32 @@ static const char *const yytname[] = { "\"end of file\"", "error", "$undefined", "\"string\"", "\"integer\"", "\"%token\"", "\"%nterm\"", "\"%type\"", "\"%destructor\"", - "\"%printer\"", "\"%left\"", "\"%right\"", "\"%nonassoc\"", "\"%prec\"", - "\"%dprec\"", "\"%merge\"", "\"%debug\"", "\"%default-prec\"", - "\"%define\"", "\"%defines\"", "\"%error-verbose\"", "\"%expect\"", - "\"%expect-rr\"", "\"%file-prefix\"", "\"%glr-parser\"", - "\"%initial-action\"", "\"%lex-param\"", "\"%locations\"", + "\"%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\"", "\"%parse-param\"", - "\"%pure-parser\"", "\"%require\"", "\"%skeleton\"", "\"%start\"", - "\"%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 + "\"%nondeterministic-parser\"", "\"%output\"", "\"%require\"", + "\"%skeleton\"", "\"%start\"", "\"%token-table\"", "\"%verbose\"", + "\"%yacc\"", "\"{...}\"", "\"[identifier]\"", "\"char\"", "\"epilogue\"", + "\"=\"", "\"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, @@ -683,151 +697,180 @@ 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 + 305, 306, 307, 308, 309, 310 }; # endif -/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ -static const yytype_uint8 yyr1[] = +#define YYPACT_NINF -137 + +#define yypact_value_is_default(yystate) \ + ((yystate) == (-137)) + +#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, 53, 54, 55, 55, 56, 56, 56, 56, 56, - 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, - 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, - 56, 57, 57, 57, 57, 57, 57, 57, 58, 58, - 57, 60, 59, 61, 59, 59, 62, 63, 63, 63, - 64, 64, 65, 65, 66, 66, 66, 66, 66, 67, - 67, 68, 68, 69, 69, 69, 71, 70, 72, 72, - 72, 73, 73, 73, 73, 73, 73, 74, 74, 75, - 76, 76, 77, 78, 79, 79 + -137, 20, 106, -137, -137, -137, 19, -1, 36, -137, + -137, -137, -137, 13, -137, 0, 79, -137, 89, 90, + -137, 41, -137, 55, 93, 46, -137, -137, -137, 47, + 94, 95, 35, -137, -137, -137, 16, -137, -137, -137, + 54, -137, -137, -137, -137, 49, 33, 33, 35, 12, + 12, -137, 61, -137, -137, -137, 29, -137, -137, -137, + -137, 100, -137, -137, -137, 101, -137, 103, -137, -137, + -137, -137, -137, -137, -137, -137, 57, -137, 58, 1, + -137, -137, 68, 80, -137, 61, -137, 35, -137, -137, + 33, 56, 33, 35, -137, -137, -137, -137, 12, -137, + -137, 12, -137, -137, -137, -137, -137, -137, -137, -137, + -137, 78, -137, -137, -137, -137, -137, 82, -137, 35, + -137, 142, -137, 144, -137, -137, -137, -137, -137, -137, + -137, -137, -137, 18, 27, -137, -137, 35, 145, 97, + 68, 68, 27, -137, -137, -137, -137, -137 }; -/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ -static const yytype_uint8 yyr2[] = + /* 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[] = { - 0, 2, 4, 0, 2, 1, 1, 1, 2, 3, - 1, 1, 2, 2, 3, 1, 2, 2, 1, 3, - 1, 1, 3, 2, 1, 2, 2, 1, 1, 1, - 1, 1, 1, 2, 3, 3, 1, 1, 0, 1, - 3, 0, 3, 0, 3, 3, 3, 1, 1, 1, - 0, 1, 1, 2, 1, 1, 2, 2, 3, 1, - 2, 1, 2, 1, 2, 2, 0, 3, 1, 3, - 2, 0, 2, 2, 3, 3, 3, 1, 1, 1, - 1, 1, 1, 1, 0, 2 + 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 }; -/* 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. */ -static const yytype_uint8 yydefact[] = + /* YYPGOTO[NTERM-NUM]. */ +static const yytype_int16 yypgoto[] = { - 3, 0, 0, 1, 43, 41, 0, 0, 0, 47, - 48, 49, 7, 36, 0, 10, 11, 0, 0, 0, - 15, 0, 0, 18, 0, 37, 20, 21, 0, 0, - 24, 0, 0, 0, 27, 28, 29, 0, 6, 30, - 38, 4, 5, 32, 31, 50, 0, 0, 0, 0, - 0, 83, 8, 12, 13, 0, 16, 17, 0, 0, - 23, 25, 26, 82, 78, 77, 80, 33, 81, 0, - 79, 0, 0, 61, 63, 66, 39, 0, 51, 0, - 54, 59, 44, 55, 42, 45, 52, 34, 35, 9, - 14, 19, 22, 65, 64, 0, 62, 2, 71, 40, - 46, 60, 56, 57, 53, 85, 67, 68, 58, 71, - 70, 0, 0, 0, 73, 72, 69, 74, 75, 76 + -137, -137, -137, -137, -137, -137, 148, -137, -137, -137, + -137, -137, -137, -137, -137, 32, -137, 102, -9, -4, + 107, -137, 83, -137, -137, -137, 22, -136, -137, -137, + -12, -11, -137, -32, -40, -137 }; -/* YYDEFGOTO[NTERM-NUM]. */ -static const yytype_int8 yydefgoto[] = + /* YYDEFGOTO[NTERM-NUM]. */ +static const yytype_int16 yydefgoto[] = { - -1, 1, 2, 41, 71, 77, 43, 47, 46, 44, - 45, 79, 85, 81, 82, 72, 73, 74, 98, 106, - 107, 66, 75, 86, 68, 52, 97 + -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 }; -/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing - STATE-NUM. */ -#define YYPACT_NINF -70 -static const yytype_int8 yypact[] = + /* 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[] = { - -70, 5, 79, -70, -70, -70, -19, -4, 8, -70, - -70, -70, -70, -70, 47, -70, -70, 54, 61, 25, - -70, 38, 39, -70, 37, -70, -70, -70, 48, 41, - -70, 47, 47, 26, -70, -70, -70, 14, -70, -70, - 49, -70, -70, -70, -70, 42, 19, 19, 26, 26, - 26, -70, 47, -70, -70, 47, -70, -70, 47, 47, - -70, -70, -70, -70, -70, -70, -70, -70, -70, 70, - -70, 71, 1, -70, -70, -70, -70, 81, -70, 26, - -70, -70, 19, 13, 19, 26, -70, 26, 26, -70, - -70, -70, -70, -70, -70, 80, -70, -70, -70, -70, - 26, -70, 121, -70, -70, -70, -8, 31, -70, -70, - -70, 26, 123, 74, -70, -70, 31, -70, -70, -70 + 74, -108, 76, 54, 146, 147, 4, 5, 6, 7, + 8, 9, 10, 11, 12, 70, 94, 76, 13, 14, + 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, + 70, 26, 103, 13, 14, 91, 91, 32, 70, 49, + 102, 137, 138, 139, 60, 55, 26, 77, 111, 64, + 66, 124, 32, 51, 71, 121, 40, 72, 52, 70, + 123, 125, 77, 95, 96, 97, 135, 140, 136, 71, + 48, 40, 72, 118, 104, 71, 50, 71, 72, 91, + 72, 91, 57, 132, 88, 61, 122, 121, 122, 126, + 65, 67, 126, 58, 59, 62, 63, 68, 69, 84, + 86, 51, 141, 106, 107, 143, 108, 109, 110, 114, + 141, 4, 5, 6, 7, 8, 9, 10, 11, 12, + 116, 127, 129, 13, 14, 15, 16, 17, 18, 19, + 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, + 30, 31, 32, 33, 34, 35, 131, 70, 145, 144, + 42, 130, 101, 36, 92, 37, 38, 142, 0, 0, + 39, 40, 112 }; -/* YYPGOTO[NTERM-NUM]. */ -static const yytype_int16 yypgoto[] = +static const yytype_int16 yycheck[] = { - -70, -70, -70, -70, 128, -70, -70, -70, -70, -70, - -70, -70, -22, -7, 85, -70, 62, -70, -70, -70, - 24, -43, -70, -33, -69, 4, -70 + 32, 0, 1, 3, 140, 141, 5, 6, 7, 8, + 9, 10, 11, 12, 13, 3, 48, 1, 17, 18, + 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, + 3, 30, 3, 17, 18, 46, 47, 36, 3, 40, + 52, 14, 15, 16, 3, 45, 30, 46, 47, 3, + 3, 91, 36, 40, 42, 87, 55, 45, 45, 3, + 4, 93, 46, 51, 52, 53, 48, 40, 50, 42, + 51, 55, 45, 85, 45, 42, 40, 42, 45, 90, + 45, 92, 3, 123, 51, 44, 90, 119, 92, 98, + 44, 44, 101, 4, 4, 40, 3, 3, 3, 45, + 51, 40, 134, 3, 3, 137, 3, 50, 50, 41, + 142, 5, 6, 7, 8, 9, 10, 11, 12, 13, + 40, 43, 40, 17, 18, 19, 20, 21, 22, 23, + 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, + 34, 35, 36, 37, 38, 39, 4, 3, 51, 4, + 2, 119, 50, 47, 47, 49, 50, 135, -1, -1, + 54, 55, 79 }; -/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If - positive, shift that token. If negative, reduce the rule which - number is the opposite. If zero, do what YYDEFACT says. - If YYTABLE_NINF, syntax error. */ -#define YYTABLE_NINF -85 -static const yytype_int8 yytable[] = + /* STOS_[STATE-NUM] -- The (internal number of the) accessing + symbol of state STATE-NUM. */ +static const yytype_uint8 yystos[] = { - 67, -84, 69, 83, 83, 3, 4, 5, 6, 7, - 8, 9, 10, 11, 103, 69, 63, 102, 13, 4, - 5, 6, 7, 8, 9, 10, 11, 87, 88, 63, - 25, 13, 48, 108, 63, 61, 62, 49, 33, 83, - 109, 83, 110, 25, 111, 112, 113, 70, 95, 50, - 51, 33, 104, 40, 104, 104, 89, 100, 53, 90, - 70, 64, 91, 92, 65, 54, 40, 104, 64, 55, - 80, 65, 114, 64, 115, 101, 65, 101, 117, 56, - 57, 58, 60, 115, 4, 5, 6, 7, 8, 9, - 10, 11, 59, 78, 76, 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, - 93, 94, 99, 105, 63, 119, 37, 118, 38, 39, - 42, 40, 84, 116, 96 + 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, 47, 49, 50, 54, + 55, 59, 62, 64, 67, 68, 66, 65, 51, 40, + 40, 40, 45, 86, 3, 45, 84, 3, 4, 4, + 3, 44, 40, 3, 3, 44, 3, 44, 3, 3, + 3, 42, 45, 87, 89, 90, 1, 46, 62, 77, + 78, 79, 88, 60, 45, 63, 51, 69, 51, 75, + 76, 87, 76, 72, 89, 51, 52, 53, 73, 74, + 89, 73, 86, 3, 45, 85, 3, 3, 3, 50, + 50, 47, 78, 91, 41, 83, 40, 61, 86, 70, + 71, 89, 75, 4, 90, 89, 74, 43, 80, 40, + 71, 4, 90, 81, 82, 48, 50, 14, 15, 16, + 40, 89, 82, 89, 4, 51, 83, 83 }; -static const yytype_uint8 yycheck[] = + /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ +static const yytype_uint8 yyr1[] = { - 33, 0, 1, 46, 47, 0, 5, 6, 7, 8, - 9, 10, 11, 12, 83, 1, 3, 4, 17, 5, - 6, 7, 8, 9, 10, 11, 12, 49, 50, 3, - 29, 17, 51, 102, 3, 31, 32, 41, 37, 82, - 48, 84, 50, 29, 13, 14, 15, 46, 47, 41, - 3, 37, 85, 52, 87, 88, 52, 79, 4, 55, - 46, 42, 58, 59, 45, 4, 52, 100, 42, 44, - 51, 45, 41, 42, 107, 82, 45, 84, 111, 41, - 41, 44, 41, 116, 5, 6, 7, 8, 9, 10, - 11, 12, 44, 51, 45, 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, - 50, 50, 41, 43, 3, 51, 47, 4, 49, 50, - 2, 52, 47, 109, 72 + 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 }; -/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing - symbol of state STATE-NUM. */ -static const yytype_uint8 yystos[] = + /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ +static const yytype_uint8 yyr2[] = { - 0, 54, 55, 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, 47, 49, 50, - 52, 56, 57, 59, 62, 63, 61, 60, 51, 41, - 41, 3, 78, 4, 4, 44, 41, 41, 44, 44, - 41, 78, 78, 3, 42, 45, 74, 76, 77, 1, - 46, 57, 68, 69, 70, 75, 45, 58, 51, 64, - 51, 66, 67, 74, 67, 65, 76, 65, 65, 78, - 78, 78, 78, 50, 50, 47, 69, 79, 71, 41, - 65, 66, 4, 77, 76, 43, 72, 73, 77, 48, - 50, 13, 14, 15, 41, 76, 73, 76, 4, 51 + 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) @@ -840,9 +883,18 @@ static const yytype_uint8 yystos[] = /* Like YYERROR except do call yyerror. This remains here temporarily to ease the transition to the new meaning of YYERROR, for GCC. - Once GCC version 2 has supplanted version 1, this can go. */ + Once GCC version 2 has supplanted version 1, this can go. However, + YYFAIL appears to be in use. Nevertheless, it is formally deprecated + in Bison 2.4.2's NEWS entry, where a plan to phase it out is + discussed. */ #define YYFAIL goto yyerrlab +#if defined YYFAIL + /* This is here to suppress warnings from the GCC cpp's + -Wunused-macros. Normally we don't worry about that warning, but + some users do, and we want to make it easy for users to remove + YYFAIL uses, which will produce warnings from Bison 2.5. */ +#endif #define YYRECOVERING() (!!yyerrstatus) @@ -852,7 +904,6 @@ do \ { \ yychar = (Token); \ yylval = (Value); \ - yytoken = YYTRANSLATE (yychar); \ YYPOPSTACK (1); \ goto yybackup; \ } \ @@ -899,7 +950,7 @@ while (YYID (0)) we won't break user code: when these are the locations we know. */ #ifndef YY_LOCATION_PRINT -# if YYLTYPE_IS_TRIVIAL +# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL # define YY_LOCATION_PRINT(File, Loc) \ fprintf (File, "%d.%d-%d.%d", \ (Loc).first_line, (Loc).first_column, \ @@ -952,14 +1003,14 @@ do { \ #if (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) static void -yy_symbol_value_print (FILE *yyoutput, int yytype, const YYSTYPE * const yyvaluep, const YYLTYPE * const yylocationp) +yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp) #else static void yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp) FILE *yyoutput; int yytype; - const YYSTYPE * const yyvaluep; - const YYLTYPE * const yylocationp; + YYSTYPE const * const yyvaluep; + YYLTYPE const * const yylocationp; #endif { if (!yyvaluep) @@ -973,76 +1024,197 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp) # endif switch (yytype) { - case 3: /* "\"string\"" */ -#line 175 "../../src/parse-gram.y" - { fprintf (stderr, "\"%s\"", (yyvaluep->chars)); }; -#line 980 "../../src/parse-gram.c" - break; - case 4: /* "\"integer\"" */ -#line 184 "../../src/parse-gram.y" - { fprintf (stderr, "%d", (yyvaluep->integer)); }; -#line 985 "../../src/parse-gram.c" - break; - case 41: /* "\"{...}\"" */ -#line 176 "../../src/parse-gram.y" - { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -#line 990 "../../src/parse-gram.c" - break; - case 42: /* "\"char\"" */ -#line 172 "../../src/parse-gram.y" - { fprintf (stderr, "'%c' (%d)", (yyvaluep->character), (yyvaluep->character)); }; -#line 995 "../../src/parse-gram.c" - break; - case 43: /* "\"epilogue\"" */ -#line 176 "../../src/parse-gram.y" - { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -#line 1000 "../../src/parse-gram.c" - break; - case 45: /* "\"identifier\"" */ -#line 180 "../../src/parse-gram.y" - { fprintf (stderr, "%s", (yyvaluep->uniqstr)); }; -#line 1005 "../../src/parse-gram.c" - break; - case 46: /* "\"identifier:\"" */ -#line 181 "../../src/parse-gram.y" - { fprintf (stderr, "%s:", (yyvaluep->uniqstr)); }; -#line 1010 "../../src/parse-gram.c" - break; - case 49: /* "\"%{...%}\"" */ -#line 176 "../../src/parse-gram.y" - { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -#line 1015 "../../src/parse-gram.c" - break; - case 51: /* "\"type\"" */ -#line 179 "../../src/parse-gram.y" - { fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); }; -#line 1020 "../../src/parse-gram.c" - break; - case 74: /* "id" */ -#line 187 "../../src/parse-gram.y" - { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; -#line 1025 "../../src/parse-gram.c" - break; - case 75: /* "id_colon" */ -#line 188 "../../src/parse-gram.y" - { fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); }; -#line 1030 "../../src/parse-gram.c" - break; - case 76: /* "symbol" */ -#line 187 "../../src/parse-gram.y" - { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; -#line 1035 "../../src/parse-gram.c" - break; - case 77: /* "string_as_id" */ -#line 187 "../../src/parse-gram.y" - { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; -#line 1040 "../../src/parse-gram.c" - break; - case 78: /* "string_content" */ -#line 175 "../../src/parse-gram.y" - { fprintf (stderr, "\"%s\"", (yyvaluep->chars)); }; -#line 1045 "../../src/parse-gram.c" - break; + case 3: // "string" + +/* Line 729 of yacc.c */ +#line 174 "src/parse-gram.y" + { fputs (quotearg_style (c_quoting_style, ((*yyvaluep).chars)), stderr); } +/* Line 729 of yacc.c */ +#line 1034 "src/parse-gram.c" + break; + + case 4: // "integer" + +/* Line 729 of yacc.c */ +#line 187 "src/parse-gram.y" + { fprintf (stderr, "%d", ((*yyvaluep).integer)); } +/* Line 729 of yacc.c */ +#line 1043 "src/parse-gram.c" + break; + + case 24: // "%" + +/* Line 729 of yacc.c */ +#line 183 "src/parse-gram.y" + { fprintf (stderr, "%%%s", ((*yyvaluep).uniqstr)); } +/* Line 729 of yacc.c */ +#line 1052 "src/parse-gram.c" + break; + + case 40: // "{...}" + +/* Line 729 of yacc.c */ +#line 176 "src/parse-gram.y" + { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).code)); } +/* Line 729 of yacc.c */ +#line 1061 "src/parse-gram.c" + break; + + case 41: // "[identifier]" + +/* Line 729 of yacc.c */ +#line 181 "src/parse-gram.y" + { fprintf (stderr, "[%s]", ((*yyvaluep).uniqstr)); } +/* Line 729 of yacc.c */ +#line 1070 "src/parse-gram.c" + break; + + case 42: // "char" + +/* Line 729 of yacc.c */ +#line 168 "src/parse-gram.y" + { fputs (char_name (((*yyvaluep).character)), stderr); } +/* Line 729 of yacc.c */ +#line 1079 "src/parse-gram.c" + break; + + case 43: // "epilogue" + +/* Line 729 of yacc.c */ +#line 176 "src/parse-gram.y" + { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); } +/* Line 729 of yacc.c */ +#line 1088 "src/parse-gram.c" + break; + + case 45: // "identifier" + +/* Line 729 of yacc.c */ +#line 180 "src/parse-gram.y" + { fputs (((*yyvaluep).uniqstr), stderr); } +/* Line 729 of yacc.c */ +#line 1097 "src/parse-gram.c" + break; + + case 46: // "identifier:" + +/* Line 729 of yacc.c */ +#line 182 "src/parse-gram.y" + { fprintf (stderr, "%s:", ((*yyvaluep).uniqstr)); } +/* Line 729 of yacc.c */ +#line 1106 "src/parse-gram.c" + break; + + case 49: // "%{...%}" + +/* Line 729 of yacc.c */ +#line 176 "src/parse-gram.y" + { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); } +/* Line 729 of yacc.c */ +#line 1115 "src/parse-gram.c" + break; + + case 51: // "" + +/* Line 729 of yacc.c */ +#line 184 "src/parse-gram.y" + { fprintf (stderr, "<%s>", ((*yyvaluep).uniqstr)); } +/* Line 729 of yacc.c */ +#line 1124 "src/parse-gram.c" + break; + + case 54: // "%param" + +/* Line 729 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 729 of yacc.c */ +#line 1144 "src/parse-gram.c" + break; + + case 71: // symbol.prec + +/* Line 729 of yacc.c */ +#line 190 "src/parse-gram.y" + { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); } +/* Line 729 of yacc.c */ +#line 1153 "src/parse-gram.c" + break; + + case 84: // variable + +/* Line 729 of yacc.c */ +#line 180 "src/parse-gram.y" + { fputs (((*yyvaluep).uniqstr), stderr); } +/* Line 729 of yacc.c */ +#line 1162 "src/parse-gram.c" + break; + + case 85: // content.opt + +/* Line 729 of yacc.c */ +#line 176 "src/parse-gram.y" + { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); } +/* Line 729 of yacc.c */ +#line 1171 "src/parse-gram.c" + break; + + case 86: // braceless + +/* Line 729 of yacc.c */ +#line 176 "src/parse-gram.y" + { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); } +/* Line 729 of yacc.c */ +#line 1180 "src/parse-gram.c" + break; + + case 87: // id + +/* Line 729 of yacc.c */ +#line 190 "src/parse-gram.y" + { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); } +/* Line 729 of yacc.c */ +#line 1189 "src/parse-gram.c" + break; + + case 88: // id_colon + +/* Line 729 of yacc.c */ +#line 191 "src/parse-gram.y" + { fprintf (stderr, "%s:", ((*yyvaluep).symbol)->tag); } +/* Line 729 of yacc.c */ +#line 1198 "src/parse-gram.c" + break; + + case 89: // symbol + +/* Line 729 of yacc.c */ +#line 190 "src/parse-gram.y" + { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); } +/* Line 729 of yacc.c */ +#line 1207 "src/parse-gram.c" + break; + + case 90: // string_as_id + +/* Line 729 of yacc.c */ +#line 190 "src/parse-gram.y" + { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); } +/* Line 729 of yacc.c */ +#line 1216 "src/parse-gram.c" + break; + default: break; } @@ -1056,14 +1228,14 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp) #if (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) static void -yy_symbol_print (FILE *yyoutput, int yytype, const YYSTYPE * const yyvaluep, const YYLTYPE * const yylocationp) +yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp) #else static void yy_symbol_print (yyoutput, yytype, yyvaluep, yylocationp) FILE *yyoutput; int yytype; - const YYSTYPE * const yyvaluep; - const YYLTYPE * const yylocationp; + YYSTYPE const * const yyvaluep; + YYLTYPE const * const yylocationp; #endif { if (yytype < YYNTOKENS) @@ -1085,17 +1257,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"); } @@ -1113,36 +1288,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 @@ -1240,7 +1416,7 @@ yytnamerr (char *yyres, const char *yystr) { if (*yystr == '"') { - size_t yyn = 0; + YYSIZE_T yyn = 0; char const *yyp = yystr; for (;;) @@ -1275,111 +1451,121 @@ 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, - 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) +/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message + about the unexpected token YYTOKEN while in state YYSTATE. + + Return 0 if *YYMSG was successfully written. Return 1 if an ordinary + "syntax error" message will suffice instead. Return 2 if *YYMSG is + not large enough to hold the message. In the last case, also set + *YYMSG_ALLOC to either (a) the required number of bytes or (b) zero + if the required number of bytes is too large to store. */ +static int +yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, + int yystate, int yytoken) { int yyn = yypact[yystate]; - if (! (YYPACT_NINF < yyn && yyn < YYLAST)) - return 0; + if (! (YYPACT_NINF < yyn && yyn <= YYLAST)) + return 1; 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; + 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); + if (! (yysize <= yysize1 + && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + { + /* Overflow. */ + *yymsg_alloc = 0; + return 2; + } yysize = yysize1; - yyfmt = yystpcpy (yyfmt, yyprefix); - yyprefix = yyor; } - yyf = YY_(yyformat); - yysize1 = yysize + yystrlen (yyf); - yysize_overflow |= (yysize1 < yysize); + 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); + if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + { + /* Overflow. */ + *yymsg_alloc = 0; + return 2; + } yysize = yysize1; - if (yysize_overflow) - return YYSIZE_MAXIMUM; - - if (yyresult) - { - /* Avoid sprintf, as that infringes on the user's name space. - Don't have undefined behavior even if the translation - 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++; - } - } - } - return yysize; + if (*yymsg_alloc < yysize) + { + *yymsg_alloc = 2 * yysize; + if (! (yysize <= *yymsg_alloc + && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM)) + *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM; + return 2; + } + + /* Avoid sprintf, as that infringes on the user's name space. + Don't have undefined behavior even if the translation + produced a string with the wrong number of "%s"s. */ + { + char *yyp = *yymsg; + int yyi = 0; + while ((*yyp = *yyformat) != '\0') + if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount) + { + yyp += yytnamerr (yyp, yyarg[yyi++]); + yyformat += 2; + } + else + { + yyp++; + yyformat++; + } + } + return 0; } } #endif /* YYERROR_VERBOSE */ @@ -1412,23 +1598,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 (); @@ -1436,10 +1622,6 @@ int yyparse (); #endif /* ! YYPARSE_PARAM */ - - - - /*----------. | yyparse. | `----------*/ @@ -1466,102 +1648,112 @@ yyparse () #endif #endif { - /* The look-ahead symbol. */ +/* The lookahead symbol. */ int yychar; -/* The semantic value of the look-ahead symbol. */ +/* The semantic value of the lookahead symbol. */ YYSTYPE yylval; -/* Number of syntax errors so far. */ -int yynerrs; -/* Location data for the look-ahead symbol. */ +/* 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; - /* Look-ahead 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; - YYSIZE_T yystacksize = YYINITDEPTH; + /* The locations where the error started and ended. */ + YYLTYPE yyerror_range[3]; + 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 + +#if defined YYLTYPE_IS_TRIVIAL && 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 86 "../../src/parse-gram.y" +/* User initialization code. */ +/* Line 1214 of yacc.c */ +#line 79 "src/parse-gram.y" { /* Bison's grammar can initial empty locations, hence a default location is needed. */ - boundary_set (&yylloc.start, current_file, 1, 0); - boundary_set (&yylloc.end, current_file, 1, 0); + boundary_set (&yylloc.start, current_file, 1, 1); + boundary_set (&yylloc.end, current_file, 1, 1); } -/* Line 1078 of yacc.c. */ -#line 1564 "../../src/parse-gram.c" +/* Line 1214 of yacc.c */ +#line 1755 "src/parse-gram.c" yylsp[0] = yylloc; + goto yysetstate; /*------------------------------------------------------------. @@ -1598,6 +1790,7 @@ YYLTYPE yylloc; &yyvs1, yysize * sizeof (*yyvsp), &yyls1, yysize * sizeof (*yylsp), &yystacksize); + yyls = yyls1; yyss = yyss1; yyvs = yyvs1; @@ -1619,9 +1812,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); @@ -1642,6 +1835,9 @@ YYLTYPE yylloc; YYDPRINTF ((stderr, "Entering state %d\n", yystate)); + if (yystate == YYFINAL) + YYACCEPT; + goto yybackup; /*-----------. @@ -1650,16 +1846,16 @@ YYLTYPE yylloc; yybackup: /* Do appropriate processing given the current state. Read a - look-ahead token if we need one and don't already have one. */ + lookahead token if we need one and don't already have one. */ - /* First try to decide what to do without reference to look-ahead token. */ + /* 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 look-ahead token if don't already have one. */ + /* Not known => get a lookahead token if don't already have one. */ - /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */ + /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */ if (yychar == YYEMPTY) { YYDPRINTF ((stderr, "Reading a token: ")); @@ -1685,26 +1881,22 @@ 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) yyerrstatus--; - /* Shift the look-ahead token. */ + /* 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; @@ -1745,434 +1937,870 @@ yyreduce: switch (yyn) { case 6: -#line 210 "../../src/parse-gram.y" - { prologue_augment (translate_code ((yyvsp[(1) - (1)].chars), (yylsp[(1) - (1)])), - (yylsp[(1) - (1)])); } +/* Line 1427 of yacc.c */ +#line 266 "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 (union_seen ? "post_prologue" : "pre_prologue", + plain_code.code, (yylsp[0])); + code_scanner_last_string_free (); + } +/* Line 1427 of yacc.c */ +#line 1953 "src/parse-gram.c" break; case 7: -#line 212 "../../src/parse-gram.y" - { debug_flag = true; } +/* Line 1427 of yacc.c */ +#line 276 "src/parse-gram.y" + { + muscle_percent_define_ensure ((yyvsp[0].uniqstr), (yylsp[0]), true); + } +/* Line 1427 of yacc.c */ +#line 1963 "src/parse-gram.c" break; case 8: -#line 214 "../../src/parse-gram.y" +/* Line 1427 of yacc.c */ +#line 280 "src/parse-gram.y" { - static char one[] = "1"; - muscle_insert ((yyvsp[(2) - (2)].chars), one); + muscle_percent_define_insert ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].chars), + MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE); } +/* Line 1427 of yacc.c */ +#line 1974 "src/parse-gram.c" break; case 9: -#line 218 "../../src/parse-gram.y" - { muscle_insert ((yyvsp[(2) - (3)].chars), (yyvsp[(3) - (3)].chars)); } +/* Line 1427 of yacc.c */ +#line 284 "src/parse-gram.y" + { defines_flag = true; } +/* Line 1427 of yacc.c */ +#line 1982 "src/parse-gram.c" break; case 10: -#line 219 "../../src/parse-gram.y" - { defines_flag = true; } +/* Line 1427 of yacc.c */ +#line 286 "src/parse-gram.y" + { + defines_flag = true; + spec_defines_file = xstrdup ((yyvsp[0].chars)); + } +/* Line 1427 of yacc.c */ +#line 1993 "src/parse-gram.c" break; case 11: -#line 220 "../../src/parse-gram.y" - { error_verbose = true; } +/* Line 1427 of yacc.c */ +#line 291 "src/parse-gram.y" + { + muscle_percent_define_insert ("parse.error", (yylsp[0]), "verbose", + MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE); + } +/* Line 1427 of yacc.c */ +#line 2004 "src/parse-gram.c" break; case 12: -#line 221 "../../src/parse-gram.y" - { expected_sr_conflicts = (yyvsp[(2) - (2)].integer); } +/* Line 1427 of yacc.c */ +#line 295 "src/parse-gram.y" + { expected_sr_conflicts = (yyvsp[0].integer); } +/* Line 1427 of yacc.c */ +#line 2012 "src/parse-gram.c" break; case 13: -#line 222 "../../src/parse-gram.y" - { expected_rr_conflicts = (yyvsp[(2) - (2)].integer); } +/* Line 1427 of yacc.c */ +#line 296 "src/parse-gram.y" + { expected_rr_conflicts = (yyvsp[0].integer); } +/* Line 1427 of yacc.c */ +#line 2020 "src/parse-gram.c" break; case 14: -#line 223 "../../src/parse-gram.y" - { spec_file_prefix = (yyvsp[(3) - (3)].chars); } +/* Line 1427 of yacc.c */ +#line 297 "src/parse-gram.y" + { spec_file_prefix = (yyvsp[0].chars); } +/* Line 1427 of yacc.c */ +#line 2028 "src/parse-gram.c" break; case 15: -#line 225 "../../src/parse-gram.y" - { - nondeterministic_parser = true; - glr_parser = true; - } +/* Line 1427 of yacc.c */ +#line 298 "src/parse-gram.y" + { spec_file_prefix = (yyvsp[0].chars); } +/* Line 1427 of yacc.c */ +#line 2036 "src/parse-gram.c" break; case 16: -#line 230 "../../src/parse-gram.y" +/* Line 1427 of yacc.c */ +#line 300 "src/parse-gram.y" { - muscle_code_grow ("initial_action", translate_symbol_action ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])), (yylsp[(2) - (2)])); + nondeterministic_parser = true; + glr_parser = true; } +/* Line 1427 of yacc.c */ +#line 2047 "src/parse-gram.c" break; case 17: -#line 233 "../../src/parse-gram.y" - { add_param ("lex_param", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); } +/* Line 1427 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 1427 of yacc.c */ +#line 2062 "src/parse-gram.c" break; case 18: -#line 234 "../../src/parse-gram.y" - { locations_flag = true; } +/* Line 1427 of yacc.c */ +#line 313 "src/parse-gram.y" + { language_argmatch ((yyvsp[0].chars), grammar_prio, (yylsp[-1])); } +/* Line 1427 of yacc.c */ +#line 2070 "src/parse-gram.c" break; case 19: -#line 235 "../../src/parse-gram.y" - { spec_name_prefix = (yyvsp[(3) - (3)].chars); } +/* Line 1427 of yacc.c */ +#line 314 "src/parse-gram.y" + { spec_name_prefix = (yyvsp[0].chars); } +/* Line 1427 of yacc.c */ +#line 2078 "src/parse-gram.c" break; case 20: -#line 236 "../../src/parse-gram.y" - { no_lines_flag = true; } +/* Line 1427 of yacc.c */ +#line 315 "src/parse-gram.y" + { spec_name_prefix = (yyvsp[0].chars); } +/* Line 1427 of yacc.c */ +#line 2086 "src/parse-gram.c" break; case 21: -#line 237 "../../src/parse-gram.y" - { nondeterministic_parser = true; } +/* Line 1427 of yacc.c */ +#line 316 "src/parse-gram.y" + { no_lines_flag = true; } +/* Line 1427 of yacc.c */ +#line 2094 "src/parse-gram.c" break; case 22: -#line 238 "../../src/parse-gram.y" - { spec_outfile = (yyvsp[(3) - (3)].chars); } +/* Line 1427 of yacc.c */ +#line 317 "src/parse-gram.y" + { nondeterministic_parser = true; } +/* Line 1427 of yacc.c */ +#line 2102 "src/parse-gram.c" break; case 23: -#line 239 "../../src/parse-gram.y" - { add_param ("parse_param", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); } +/* Line 1427 of yacc.c */ +#line 318 "src/parse-gram.y" + { spec_outfile = (yyvsp[0].chars); } +/* Line 1427 of yacc.c */ +#line 2110 "src/parse-gram.c" break; case 24: -#line 240 "../../src/parse-gram.y" - { pure_parser = true; } +/* Line 1427 of yacc.c */ +#line 319 "src/parse-gram.y" + { spec_outfile = (yyvsp[0].chars); } +/* Line 1427 of yacc.c */ +#line 2118 "src/parse-gram.c" break; case 25: -#line 241 "../../src/parse-gram.y" - { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); } +/* Line 1427 of yacc.c */ +#line 320 "src/parse-gram.y" + { current_param = (yyvsp[0].param); } +/* Line 1427 of yacc.c */ +#line 2126 "src/parse-gram.c" break; case 26: -#line 242 "../../src/parse-gram.y" - { skeleton = (yyvsp[(2) - (2)].chars); } +/* Line 1427 of yacc.c */ +#line 320 "src/parse-gram.y" + { current_param = param_none; } +/* Line 1427 of yacc.c */ +#line 2134 "src/parse-gram.c" break; case 27: -#line 243 "../../src/parse-gram.y" - { token_table_flag = true; } +/* Line 1427 of yacc.c */ +#line 321 "src/parse-gram.y" + { version_check (&(yylsp[0]), (yyvsp[0].chars)); } +/* Line 1427 of yacc.c */ +#line 2142 "src/parse-gram.c" break; case 28: -#line 244 "../../src/parse-gram.y" - { report_flag = report_states; } +/* Line 1427 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 1427 of yacc.c */ +#line 2172 "src/parse-gram.c" break; case 29: -#line 245 "../../src/parse-gram.y" +/* Line 1427 of yacc.c */ +#line 346 "src/parse-gram.y" + { token_table_flag = true; } +/* Line 1427 of yacc.c */ +#line 2180 "src/parse-gram.c" + break; + + case 30: +/* Line 1427 of yacc.c */ +#line 347 "src/parse-gram.y" + { report_flag |= report_states; } +/* Line 1427 of yacc.c */ +#line 2188 "src/parse-gram.c" + break; + + case 31: +/* Line 1427 of yacc.c */ +#line 348 "src/parse-gram.y" { yacc_flag = true; } +/* Line 1427 of yacc.c */ +#line 2196 "src/parse-gram.c" break; case 33: -#line 253 "../../src/parse-gram.y" +/* Line 1427 of yacc.c */ +#line 353 "src/parse-gram.y" + { add_param (current_param, (yyvsp[0].code), (yylsp[0])); } +/* Line 1427 of yacc.c */ +#line 2204 "src/parse-gram.c" + break; + + case 34: +/* Line 1427 of yacc.c */ +#line 354 "src/parse-gram.y" + { add_param (current_param, (yyvsp[0].code), (yylsp[0])); } +/* Line 1427 of yacc.c */ +#line 2212 "src/parse-gram.c" + break; + + case 37: +/* Line 1427 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 1427 of yacc.c */ +#line 2222 "src/parse-gram.c" break; - case 34: -#line 257 "../../src/parse-gram.y" + case 38: +/* Line 1427 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 1427 of yacc.c */ +#line 2235 "src/parse-gram.c" break; - case 35: -#line 265 "../../src/parse-gram.y" + case 39: +/* Line 1427 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 1427 of yacc.c */ +#line 2248 "src/parse-gram.c" break; - case 36: -#line 273 "../../src/parse-gram.y" + case 40: +/* Line 1427 of yacc.c */ +#line 384 "src/parse-gram.y" { default_prec = true; } +/* Line 1427 of yacc.c */ +#line 2258 "src/parse-gram.c" break; - case 37: -#line 277 "../../src/parse-gram.y" + case 41: +/* Line 1427 of yacc.c */ +#line 388 "src/parse-gram.y" { default_prec = false; } +/* Line 1427 of yacc.c */ +#line 2268 "src/parse-gram.c" break; - case 38: -#line 290 "../../src/parse-gram.y" - {} + case 42: +/* Line 1427 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 1427 of yacc.c */ +#line 2281 "src/parse-gram.c" break; - case 39: -#line 291 "../../src/parse-gram.y" - { muscle_code_grow ("union_name", (yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } + case 43: +/* Line 1427 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 1427 of yacc.c */ +#line 2292 "src/parse-gram.c" break; - case 40: -#line 296 "../../src/parse-gram.y" - { - char const *body = (yyvsp[(3) - (3)].chars); + case 44: +/* Line 1427 of yacc.c */ +#line 413 "src/parse-gram.y" + {} +/* Line 1427 of yacc.c */ +#line 2300 "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 1427 of yacc.c */ +#line 414 "src/parse-gram.y" + { muscle_code_grow ("union_name", (yyvsp[0].uniqstr), (yylsp[0])); } +/* Line 1427 of yacc.c */ +#line 2308 "src/parse-gram.c" + break; - typed = true; - muscle_code_grow ("stype", body, (yylsp[(3) - (3)])); + case 46: +/* Line 1427 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 1427 of yacc.c */ +#line 2320 "src/parse-gram.c" break; - case 41: -#line 317 "../../src/parse-gram.y" + case 47: +/* Line 1427 of yacc.c */ +#line 430 "src/parse-gram.y" { current_class = nterm_sym; } +/* Line 1427 of yacc.c */ +#line 2328 "src/parse-gram.c" break; - case 42: -#line 318 "../../src/parse-gram.y" + case 48: +/* Line 1427 of yacc.c */ +#line 431 "src/parse-gram.y" { current_class = unknown_sym; current_type = NULL; } +/* Line 1427 of yacc.c */ +#line 2339 "src/parse-gram.c" break; - case 43: -#line 322 "../../src/parse-gram.y" + case 49: +/* Line 1427 of yacc.c */ +#line 435 "src/parse-gram.y" { current_class = token_sym; } +/* Line 1427 of yacc.c */ +#line 2347 "src/parse-gram.c" break; - case 44: -#line 323 "../../src/parse-gram.y" + case 50: +/* Line 1427 of yacc.c */ +#line 436 "src/parse-gram.y" { current_class = unknown_sym; current_type = NULL; } +/* Line 1427 of yacc.c */ +#line 2358 "src/parse-gram.c" break; - case 45: -#line 328 "../../src/parse-gram.y" + case 51: +/* Line 1427 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 1427 of yacc.c */ +#line 2372 "src/parse-gram.c" break; - case 46: -#line 338 "../../src/parse-gram.y" + case 52: +/* Line 1427 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 1427 of yacc.c */ +#line 2390 "src/parse-gram.c" break; - case 47: -#line 352 "../../src/parse-gram.y" + case 53: +/* Line 1427 of yacc.c */ +#line 466 "src/parse-gram.y" { (yyval.assoc) = left_assoc; } +/* Line 1427 of yacc.c */ +#line 2398 "src/parse-gram.c" break; - case 48: -#line 353 "../../src/parse-gram.y" + case 54: +/* Line 1427 of yacc.c */ +#line 467 "src/parse-gram.y" { (yyval.assoc) = right_assoc; } +/* Line 1427 of yacc.c */ +#line 2406 "src/parse-gram.c" break; - case 49: -#line 354 "../../src/parse-gram.y" + case 55: +/* Line 1427 of yacc.c */ +#line 468 "src/parse-gram.y" { (yyval.assoc) = non_assoc; } +/* Line 1427 of yacc.c */ +#line 2414 "src/parse-gram.c" break; - case 50: -#line 358 "../../src/parse-gram.y" + case 56: +/* Line 1427 of yacc.c */ +#line 469 "src/parse-gram.y" + { (yyval.assoc) = precedence_assoc; } +/* Line 1427 of yacc.c */ +#line 2422 "src/parse-gram.c" + break; + + case 57: +/* Line 1427 of yacc.c */ +#line 473 "src/parse-gram.y" { current_type = NULL; } +/* Line 1427 of yacc.c */ +#line 2430 "src/parse-gram.c" break; - case 51: -#line 359 "../../src/parse-gram.y" - { current_type = (yyvsp[(1) - (1)].uniqstr); } + case 58: +/* Line 1427 of yacc.c */ +#line 474 "src/parse-gram.y" + { current_type = (yyvsp[0].uniqstr); tag_seen = true; } +/* Line 1427 of yacc.c */ +#line 2438 "src/parse-gram.c" break; - case 52: -#line 364 "../../src/parse-gram.y" - { (yyval.list) = symbol_list_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); } + case 59: +/* Line 1427 of yacc.c */ +#line 480 "src/parse-gram.y" + { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); } +/* Line 1427 of yacc.c */ +#line 2446 "src/parse-gram.c" break; - case 53: -#line 365 "../../src/parse-gram.y" - { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); } + case 60: +/* Line 1427 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 1427 of yacc.c */ +#line 2454 "src/parse-gram.c" break; - case 54: -#line 371 "../../src/parse-gram.y" + case 61: +/* Line 1427 of yacc.c */ +#line 486 "src/parse-gram.y" + { (yyval.symbol) = (yyvsp[0].symbol); } +/* Line 1427 of yacc.c */ +#line 2462 "src/parse-gram.c" + break; + + case 62: +/* Line 1427 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 1427 of yacc.c */ +#line 2470 "src/parse-gram.c" + break; + + case 63: +/* Line 1427 of yacc.c */ +#line 493 "src/parse-gram.y" + { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); } +/* Line 1427 of yacc.c */ +#line 2478 "src/parse-gram.c" + break; + + case 64: +/* Line 1427 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 1427 of yacc.c */ +#line 2486 "src/parse-gram.c" + break; + + case 65: +/* Line 1427 of yacc.c */ +#line 499 "src/parse-gram.y" + { (yyval.list) = (yyvsp[0].list); } +/* Line 1427 of yacc.c */ +#line 2494 "src/parse-gram.c" + break; + + case 66: +/* Line 1427 of yacc.c */ +#line 500 "src/parse-gram.y" + { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), (yyvsp[0].list)); } +/* Line 1427 of yacc.c */ +#line 2502 "src/parse-gram.c" + break; + + case 67: +/* Line 1427 of yacc.c */ +#line 504 "src/parse-gram.y" + { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); } +/* Line 1427 of yacc.c */ +#line 2510 "src/parse-gram.c" + break; + + case 68: +/* Line 1427 of yacc.c */ +#line 505 "src/parse-gram.y" + { (yyval.list) = symbol_list_type_new ((yyvsp[0].uniqstr), (yylsp[0])); } +/* Line 1427 of yacc.c */ +#line 2518 "src/parse-gram.c" + break; + + case 69: +/* Line 1427 of yacc.c */ +#line 506 "src/parse-gram.y" + { (yyval.list) = symbol_list_default_tagged_new ((yylsp[0])); } +/* Line 1427 of yacc.c */ +#line 2526 "src/parse-gram.c" + break; + + case 70: +/* Line 1427 of yacc.c */ +#line 507 "src/parse-gram.y" + { (yyval.list) = symbol_list_default_tagless_new ((yylsp[0])); } +/* Line 1427 of yacc.c */ +#line 2534 "src/parse-gram.c" + break; + + case 71: +/* Line 1427 of yacc.c */ +#line 513 "src/parse-gram.y" { - current_type = (yyvsp[(1) - (1)].uniqstr); + current_type = (yyvsp[0].uniqstr); + tag_seen = true; } +/* Line 1427 of yacc.c */ +#line 2545 "src/parse-gram.c" break; - case 55: -#line 375 "../../src/parse-gram.y" + case 72: +/* Line 1427 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 1427 of yacc.c */ +#line 2556 "src/parse-gram.c" break; - case 56: -#line 380 "../../src/parse-gram.y" + case 73: +/* Line 1427 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 1427 of yacc.c */ +#line 2568 "src/parse-gram.c" break; - case 57: -#line 386 "../../src/parse-gram.y" + case 74: +/* Line 1427 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 1427 of yacc.c */ +#line 2580 "src/parse-gram.c" break; - case 58: -#line 392 "../../src/parse-gram.y" + case 75: +/* Line 1427 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 1427 of yacc.c */ +#line 2593 "src/parse-gram.c" break; - case 65: -#line 422 "../../src/parse-gram.y" + case 82: +/* Line 1427 of yacc.c */ +#line 565 "src/parse-gram.y" { yyerrok; } +/* Line 1427 of yacc.c */ +#line 2603 "src/parse-gram.c" break; - case 66: -#line 428 "../../src/parse-gram.y" - { current_lhs = (yyvsp[(1) - (1)].symbol); current_lhs_location = (yylsp[(1) - (1)]); } + case 83: +/* Line 1427 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 1427 of yacc.c */ +#line 2612 "src/parse-gram.c" break; - case 68: -#line 432 "../../src/parse-gram.y" - { grammar_current_rule_end ((yylsp[(1) - (1)])); } + case 85: +/* Line 1427 of yacc.c */ +#line 576 "src/parse-gram.y" + { grammar_current_rule_end ((yylsp[0])); } +/* Line 1427 of yacc.c */ +#line 2620 "src/parse-gram.c" break; - case 69: -#line 433 "../../src/parse-gram.y" - { grammar_current_rule_end ((yylsp[(3) - (3)])); } + case 86: +/* Line 1427 of yacc.c */ +#line 577 "src/parse-gram.y" + { grammar_current_rule_end ((yylsp[0])); } +/* Line 1427 of yacc.c */ +#line 2628 "src/parse-gram.c" break; - case 71: -#line 439 "../../src/parse-gram.y" - { grammar_current_rule_begin (current_lhs, current_lhs_location); } + case 88: +/* Line 1427 of yacc.c */ +#line 583 "src/parse-gram.y" + { grammar_current_rule_begin (current_lhs, current_lhs_location, + current_lhs_named_ref); } +/* Line 1427 of yacc.c */ +#line 2637 "src/parse-gram.c" break; - case 72: -#line 441 "../../src/parse-gram.y" - { grammar_current_rule_symbol_append ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); } + case 89: +/* Line 1427 of yacc.c */ +#line 586 "src/parse-gram.y" + { grammar_current_rule_symbol_append ((yyvsp[-1].symbol), (yylsp[-1]), (yyvsp[0].named_ref)); } +/* Line 1427 of yacc.c */ +#line 2645 "src/parse-gram.c" break; - case 73: -#line 443 "../../src/parse-gram.y" - { grammar_current_rule_action_append (gram_last_string, - gram_last_braced_code_loc); } + case 90: +/* Line 1427 of yacc.c */ +#line 588 "src/parse-gram.y" + { grammar_current_rule_action_append ((yyvsp[-1].code), (yylsp[-1]), (yyvsp[0].named_ref)); } +/* Line 1427 of yacc.c */ +#line 2653 "src/parse-gram.c" break; - case 74: -#line 446 "../../src/parse-gram.y" - { grammar_current_rule_prec_set ((yyvsp[(3) - (3)].symbol), (yylsp[(3) - (3)])); } + case 91: +/* Line 1427 of yacc.c */ +#line 590 "src/parse-gram.y" + { grammar_current_rule_prec_set ((yyvsp[0].symbol), (yylsp[0])); } +/* Line 1427 of yacc.c */ +#line 2661 "src/parse-gram.c" break; - case 75: -#line 448 "../../src/parse-gram.y" - { grammar_current_rule_dprec_set ((yyvsp[(3) - (3)].integer), (yylsp[(3) - (3)])); } + case 92: +/* Line 1427 of yacc.c */ +#line 592 "src/parse-gram.y" + { grammar_current_rule_dprec_set ((yyvsp[0].integer), (yylsp[0])); } +/* Line 1427 of yacc.c */ +#line 2669 "src/parse-gram.c" break; - case 76: -#line 450 "../../src/parse-gram.y" - { grammar_current_rule_merge_set ((yyvsp[(3) - (3)].uniqstr), (yylsp[(3) - (3)])); } + case 93: +/* Line 1427 of yacc.c */ +#line 594 "src/parse-gram.y" + { grammar_current_rule_merge_set ((yyvsp[0].uniqstr), (yylsp[0])); } +/* Line 1427 of yacc.c */ +#line 2677 "src/parse-gram.c" break; - case 77: -#line 462 "../../src/parse-gram.y" - { (yyval.symbol) = symbol_get ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } + case 94: +/* Line 1427 of yacc.c */ +#line 598 "src/parse-gram.y" + { (yyval.named_ref) = 0; } +/* Line 1427 of yacc.c */ +#line 2685 "src/parse-gram.c" break; - case 78: -#line 463 "../../src/parse-gram.y" - { char cp[4] = { '\'', (yyvsp[(1) - (1)].character), '\'', 0 }; - (yyval.symbol) = symbol_get (quotearg_style (escape_quoting_style, cp), - (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)])); - } + case 95: +/* Line 1427 of yacc.c */ +#line 600 "src/parse-gram.y" + { (yyval.named_ref) = named_ref_new((yyvsp[0].uniqstr), (yylsp[0])); } +/* Line 1427 of yacc.c */ +#line 2693 "src/parse-gram.c" break; - case 79: -#line 472 "../../src/parse-gram.y" - { (yyval.symbol) = symbol_get ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } + case 97: +/* Line 1427 of yacc.c */ +#line 612 "src/parse-gram.y" + { (yyval.uniqstr) = uniqstr_new ((yyvsp[0].chars)); } +/* Line 1427 of yacc.c */ +#line 2701 "src/parse-gram.c" break; - case 82: -#line 484 "../../src/parse-gram.y" + case 98: +/* Line 1427 of yacc.c */ +#line 617 "src/parse-gram.y" + { (yyval.chars) = ""; } +/* Line 1427 of yacc.c */ +#line 2709 "src/parse-gram.c" + break; + + case 99: +/* Line 1427 of yacc.c */ +#line 618 "src/parse-gram.y" + { (yyval.chars) = (yyvsp[0].uniqstr); } +/* Line 1427 of yacc.c */ +#line 2717 "src/parse-gram.c" + break; + + case 101: +/* Line 1427 of yacc.c */ +#line 629 "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); + 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 1427 of yacc.c */ +#line 2732 "src/parse-gram.c" break; - case 83: -#line 493 "../../src/parse-gram.y" - { (yyval.chars) = (yyvsp[(1) - (1)].chars); } + case 102: +/* Line 1427 of yacc.c */ +#line 649 "src/parse-gram.y" + { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); } +/* Line 1427 of yacc.c */ +#line 2740 "src/parse-gram.c" break; - case 85: -#line 500 "../../src/parse-gram.y" + case 103: +/* Line 1427 of yacc.c */ +#line 651 "src/parse-gram.y" { - muscle_code_grow ("epilogue", translate_code ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])), (yylsp[(2) - (2)])); + (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 1427 of yacc.c */ +#line 2752 "src/parse-gram.c" + break; + + case 104: +/* Line 1427 of yacc.c */ +#line 659 "src/parse-gram.y" + { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); } +/* Line 1427 of yacc.c */ +#line 2760 "src/parse-gram.c" + break; + + case 107: +/* Line 1427 of yacc.c */ +#line 671 "src/parse-gram.y" + { + (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 1427 of yacc.c */ +#line 2771 "src/parse-gram.c" + break; + + case 109: +/* Line 1427 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 1427 of yacc.c */ +#line 2786 "src/parse-gram.c" break; -/* Line 1267 of yacc.c. */ -#line 2174 "../../src/parse-gram.c" +/* Line 1427 of yacc.c */ +#line 2791 "src/parse-gram.c" default: break; } + /* User semantic actions sometimes alter yychar, and that requires + that yytoken be updated with the new translation. We take the + approach of translating immediately before every use of yytoken. + One alternative is translating here after every semantic action, + but that translation would be missed if the semantic action invokes + YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or + if it invokes YYBACKUP. In the case of YYABORT or YYACCEPT, an + incorrect destructor might then be invoked immediately. In the + case of YYERROR or YYBACKUP, subsequent parser actions might lead + to an incorrect destructor call or verbose syntax error message + before the lookahead is translated. */ YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); YYPOPSTACK (yylen); @@ -2201,6 +2829,10 @@ yyreduce: | yyerrlab -- here on detecting error | `------------------------------------*/ yyerrlab: + /* Make sure we have latest lookahead translation. See comments at + user semantic actions for why this is necessary. */ + yytoken = YYTRANSLATE (yychar); + /* If not already recovering from an error, report this error. */ if (!yyerrstatus) { @@ -2208,45 +2840,36 @@ yyerrlab: #if ! YYERROR_VERBOSE yyerror (YY_("syntax error")); #else - { - YYSIZE_T yysize = yysyntax_error (0, yystate, yychar); - if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM) - { - YYSIZE_T yyalloc = 2 * yysize; - if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM)) - yyalloc = YYSTACK_ALLOC_MAXIMUM; - if (yymsg != yymsgbuf) - YYSTACK_FREE (yymsg); - yymsg = (char *) YYSTACK_ALLOC (yyalloc); - if (yymsg) - yymsg_alloc = yyalloc; - else - { - yymsg = yymsgbuf; - yymsg_alloc = sizeof yymsgbuf; - } - } - - if (0 < yysize && yysize <= yymsg_alloc) - { - (void) yysyntax_error (yymsg, yystate, yychar); - yyerror (yymsg); - } - else - { - yyerror (YY_("syntax error")); - if (yysize != 0) - goto yyexhaustedlab; - } - } + while (1) + { + int yysyntax_error_status = + yysyntax_error (&yymsg_alloc, &yymsg, yystate, yytoken); + if (yysyntax_error_status == 2 && 0 < yymsg_alloc) + { + if (yymsg != yymsgbuf) + YYSTACK_FREE (yymsg); + yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc); + if (yymsg) + continue; + yymsg = yymsgbuf; + yymsg_alloc = sizeof yymsgbuf; + } + if (yysyntax_error_status == 0) + yyerror (yymsg); + else + yyerror (YY_("syntax error")); + if (yysyntax_error_status == 2) + goto yyexhaustedlab; + break; + } #endif } - yyerror_range[0] = yylloc; + yyerror_range[1] = yylloc; if (yyerrstatus == 3) { - /* If just tried and failed to reuse look-ahead token after an + /* If just tried and failed to reuse lookahead token after an error, discard it. */ if (yychar <= YYEOF) @@ -2263,7 +2886,7 @@ yyerrlab: } } - /* Else will try to reuse look-ahead token after shifting the error + /* Else will try to reuse lookahead token after shifting the error token. */ goto yyerrlab1; @@ -2279,7 +2902,7 @@ yyerrorlab: if (/*CONSTCOND*/ 0) goto yyerrorlab; - yyerror_range[0] = yylsp[1-yylen]; + yyerror_range[1] = yylsp[1-yylen]; /* Do not reclaim the symbols of the rule which action triggered this YYERROR. */ YYPOPSTACK (yylen); @@ -2298,7 +2921,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) @@ -2313,7 +2936,7 @@ yyerrlab1: if (yyssp == yyss) YYABORT; - yyerror_range[0] = *yylsp; + yyerror_range[1] = *yylsp; yydestruct ("Error: popping", yystos[yystate], yyvsp, yylsp); YYPOPSTACK (1); @@ -2321,15 +2944,12 @@ yyerrlab1: YY_STACK_PRINT (yyss, yyssp); } - if (yyn == YYFINAL) - YYACCEPT; - *++yyvsp = yylval; - yyerror_range[1] = yylloc; + yyerror_range[2] = yylloc; /* Using YYLLOC is tempting, but would change the location of - the look-ahead. YYLOC is available though. */ - YYLLOC_DEFAULT (yyloc, (yyerror_range - 1), 2); + the lookahead. YYLOC is available though. */ + YYLLOC_DEFAULT (yyloc, yyerror_range, 2); *++yylsp = yyloc; /* Shift the error token. */ @@ -2353,7 +2973,7 @@ yyabortlab: yyresult = 1; goto yyreturn; -#ifndef yyoverflow +#if !defined(yyoverflow) || YYERROR_VERBOSE /*-------------------------------------------------. | yyexhaustedlab -- memory exhaustion comes here. | `-------------------------------------------------*/ @@ -2364,9 +2984,14 @@ yyexhaustedlab: #endif yyreturn: - if (yychar != YYEOF && yychar != YYEMPTY) - yydestruct ("Cleanup: discarding lookahead", - yytoken, &yylval, &yylloc); + if (yychar != YYEMPTY) + { + /* Make sure we have latest lookahead translation. See comments at + user semantic actions for why this is necessary. */ + yytoken = YYTRANSLATE (yychar); + yydestruct ("Cleanup: discarding lookahead", + yytoken, &yylval, &yylloc); + } /* Do not reclaim the symbols of the rule which action triggered this YYABORT or YYACCEPT. */ YYPOPSTACK (yylen); @@ -2385,11 +3010,12 @@ yyreturn: if (yymsg != yymsgbuf) YYSTACK_FREE (yymsg); #endif - return yyresult; + /* Make sure YYID is used. */ + return YYID (yyresult); } - -#line 506 "../../src/parse-gram.y" +/* Line 1657 of yacc.c */ +#line 690 "src/parse-gram.y" @@ -2423,34 +3049,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")); @@ -2467,13 +3092,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) { @@ -2497,3 +3126,15 @@ token_name (int type) return yytname[YYTRANSLATE (type)]; } +static char const * +char_name (char c) +{ + if (c == '\'') + return "'\\''"; + else + { + char buf[4]; + buf[0] = '\''; buf[1] = c; buf[2] = '\''; buf[3] = '\0'; + return quotearg_style (escape_quoting_style, buf); + } +}