X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/e436fa677c748f52929996590d3e46b5f984d6dc..975bb564319aa4f4204c48aba265757ba207a80f:/src/parse-gram.c diff --git a/src/parse-gram.c b/src/parse-gram.c index 8539085b..09a00e2c 100644 --- a/src/parse-gram.c +++ b/src/parse-gram.c @@ -1,8 +1,9 @@ -/* A Bison parser, made by GNU Bison 2.5.1_rc2.741-bfd9. */ +/* A Bison parser, made by GNU Bison 3.0. */ /* Bison implementation for Yacc-like parsers in C - Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2014 Free Software Foundation, + Inc. 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 @@ -44,13 +45,13 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.5.1_rc2.741-bfd9" +#define YYBISON_VERSION "3.0" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" /* Pure parsers. */ -#define YYPURE 1 +#define YYPURE 2 /* Push parsers. */ #define YYPUSH 0 @@ -58,91 +59,36 @@ /* Pull parsers. */ #define YYPULL 1 -/* Using locations. */ -#define YYLSP_NEEDED 1 +/* "%code top" blocks. */ +#line 27 "src/parse-gram.y" /* yacc.c:316 */ + /* On column 0 to please syntax-check. */ +#include + +#line 68 "src/parse-gram.c" /* yacc.c:316 */ +/* Substitute the type names. */ +#define YYSTYPE GRAM_STYPE +#define YYLTYPE GRAM_LTYPE /* 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 - -/* Copy the first part of user declarations. */ -/* Line 269 of yacc.c */ -#line 1 "src/parse-gram.y" -/* Bison Grammar Parser -*- C -*- - - Copyright (C) 2002-2012 Free Software Foundation, Inc. - - This file is part of Bison, the GNU Compiler Compiler. - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . */ - -#include -#include "system.h" - -#include "complain.h" -#include "conflicts.h" -#include "files.h" -#include "getargs.h" -#include "gram.h" -#include "muscle-tab.h" -#include "named-ref.h" -#include "quotearg.h" -#include "reader.h" -#include "symlist.h" -#include "scan-gram.h" -#include "scan-code.h" -#include "xmemdup0.h" - -#define YYLLOC_DEFAULT(Current, Rhs, N) (Current) = lloc_default (Rhs, N) -static YYLTYPE lloc_default (YYLTYPE const *, int); -#define YY_LOCATION_PRINT(File, Loc) \ - location_print (File, Loc) -static void version_check (location const *loc, char const *version); - -/* Request detailed syntax error messages, and pass them to GRAM_ERROR. - FIXME: depends on the undocumented availability of YYLLOC. */ -#undef yyerror -#define yyerror(Msg) \ - gram_error (&yylloc, Msg) -static void gram_error (location const *, char const *); - -static char const *char_name (char); +/* Copy the first part of user declarations. */ -/* Line 269 of yacc.c */ -#line 132 "src/parse-gram.c" +#line 82 "src/parse-gram.c" /* yacc.c:339 */ -# ifndef YY_NULL +# ifndef YY_NULLPTR # if defined __cplusplus && 201103L <= __cplusplus -# define YY_NULL nullptr +# define YY_NULLPTR nullptr # else -# define YY_NULL 0 +# define YY_NULLPTR 0 # endif # endif -/* Enabling traces. */ -#ifndef YYDEBUG -# define YYDEBUG 1 -#endif - /* Enabling verbose error messages. */ #ifdef YYERROR_VERBOSE # undef YYERROR_VERBOSE @@ -151,17 +97,32 @@ static char const *char_name (char); # define YYERROR_VERBOSE 1 #endif -/* Enabling the token table. */ -#ifndef YYTOKEN_TABLE -# define YYTOKEN_TABLE 0 +/* In a future release of Bison, this section will be replaced + by #include "src/parse-gram.h". */ +#ifndef YY_GRAM_SRC_PARSE_GRAM_H_INCLUDED +# define YY_GRAM_SRC_PARSE_GRAM_H_INCLUDED +/* Debug traces. */ +#ifndef GRAM_DEBUG +# if defined YYDEBUG +#if YYDEBUG +# define GRAM_DEBUG 1 +# else +# define GRAM_DEBUG 0 +# endif +# else /* ! defined YYDEBUG */ +# define GRAM_DEBUG 1 +# endif /* ! defined YYDEBUG */ +#endif /* ! defined GRAM_DEBUG */ +#if GRAM_DEBUG +extern int gram_debug; #endif - /* "%code requires" blocks. */ -/* Line 291 of yacc.c */ -#line 221 "src/parse-gram.y" +#line 21 "src/parse-gram.y" /* yacc.c:355 */ + + #include "symlist.h" + #include "symtab.h" +#line 221 "src/parse-gram.y" /* yacc.c:355 */ -# ifndef PARAM_TYPE -# define PARAM_TYPE typedef enum { param_none = 0, @@ -169,186 +130,154 @@ static char const *char_name (char); param_parse = 1 << 1, param_both = param_lex | param_parse } param_type; -# endif +#line 645 "src/parse-gram.y" /* yacc.c:355 */ +#include "muscle-tab.h" +#line 136 "src/parse-gram.c" /* yacc.c:355 */ -/* Line 291 of yacc.c */ -#line 177 "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, - BRACED_PREDICATE = 296, - BRACKETED_ID = 297, - CHAR = 298, - EPILOGUE = 299, - EQUAL = 300, - ID = 301, - ID_COLON = 302, - PERCENT_PERCENT = 303, - PIPE = 304, - PROLOGUE = 305, - SEMICOLON = 306, - TAG = 307, - TAG_ANY = 308, - TAG_NONE = 309, - PERCENT_PARAM = 310, - PERCENT_UNION = 311 - }; +/* Token type. */ +#ifndef GRAM_TOKENTYPE +# define GRAM_TOKENTYPE + enum gram_tokentype + { + GRAM_EOF = 0, + STRING = 258, + PERCENT_TOKEN = 259, + PERCENT_NTERM = 260, + PERCENT_TYPE = 261, + PERCENT_DESTRUCTOR = 262, + PERCENT_PRINTER = 263, + PERCENT_LEFT = 264, + PERCENT_RIGHT = 265, + PERCENT_NONASSOC = 266, + PERCENT_PRECEDENCE = 267, + PERCENT_PREC = 268, + PERCENT_DPREC = 269, + PERCENT_MERGE = 270, + PERCENT_CODE = 271, + PERCENT_DEFAULT_PREC = 272, + PERCENT_DEFINE = 273, + PERCENT_DEFINES = 274, + PERCENT_ERROR_VERBOSE = 275, + PERCENT_EXPECT = 276, + PERCENT_EXPECT_RR = 277, + PERCENT_FLAG = 278, + PERCENT_FILE_PREFIX = 279, + PERCENT_GLR_PARSER = 280, + PERCENT_INITIAL_ACTION = 281, + PERCENT_LANGUAGE = 282, + PERCENT_NAME_PREFIX = 283, + PERCENT_NO_DEFAULT_PREC = 284, + PERCENT_NO_LINES = 285, + PERCENT_NONDETERMINISTIC_PARSER = 286, + PERCENT_OUTPUT = 287, + PERCENT_REQUIRE = 288, + PERCENT_SKELETON = 289, + PERCENT_START = 290, + PERCENT_TOKEN_TABLE = 291, + PERCENT_VERBOSE = 292, + PERCENT_YACC = 293, + BRACED_CODE = 294, + BRACED_PREDICATE = 295, + BRACKETED_ID = 296, + CHAR = 297, + EPILOGUE = 298, + EQUAL = 299, + ID = 300, + ID_COLON = 301, + PERCENT_PERCENT = 302, + PIPE = 303, + PROLOGUE = 304, + SEMICOLON = 305, + TAG = 306, + TAG_ANY = 307, + TAG_NONE = 308, + INT = 309, + PERCENT_PARAM = 310, + PERCENT_UNION = 311, + PERCENT_EMPTY = 312 + }; #endif -/* Tokens. */ -#define GRAM_EOF 0 -#define STRING 258 -#define INT 259 -#define PERCENT_TOKEN 260 -#define PERCENT_NTERM 261 -#define PERCENT_TYPE 262 -#define PERCENT_DESTRUCTOR 263 -#define PERCENT_PRINTER 264 -#define PERCENT_LEFT 265 -#define PERCENT_RIGHT 266 -#define PERCENT_NONASSOC 267 -#define PERCENT_PRECEDENCE 268 -#define PERCENT_PREC 269 -#define PERCENT_DPREC 270 -#define PERCENT_MERGE 271 -#define PERCENT_CODE 272 -#define PERCENT_DEFAULT_PREC 273 -#define PERCENT_DEFINE 274 -#define PERCENT_DEFINES 275 -#define PERCENT_ERROR_VERBOSE 276 -#define PERCENT_EXPECT 277 -#define PERCENT_EXPECT_RR 278 -#define PERCENT_FLAG 279 -#define PERCENT_FILE_PREFIX 280 -#define PERCENT_GLR_PARSER 281 -#define PERCENT_INITIAL_ACTION 282 -#define PERCENT_LANGUAGE 283 -#define PERCENT_NAME_PREFIX 284 -#define PERCENT_NO_DEFAULT_PREC 285 -#define PERCENT_NO_LINES 286 -#define PERCENT_NONDETERMINISTIC_PARSER 287 -#define PERCENT_OUTPUT 288 -#define PERCENT_REQUIRE 289 -#define PERCENT_SKELETON 290 -#define PERCENT_START 291 -#define PERCENT_TOKEN_TABLE 292 -#define PERCENT_VERBOSE 293 -#define PERCENT_YACC 294 -#define BRACED_CODE 295 -#define BRACED_PREDICATE 296 -#define BRACKETED_ID 297 -#define CHAR 298 -#define EPILOGUE 299 -#define EQUAL 300 -#define ID 301 -#define ID_COLON 302 -#define PERCENT_PERCENT 303 -#define PIPE 304 -#define PROLOGUE 305 -#define SEMICOLON 306 -#define TAG 307 -#define TAG_ANY 308 -#define TAG_NONE 309 -#define PERCENT_PARAM 310 -#define PERCENT_UNION 311 - - - - -#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED -typedef union YYSTYPE + +/* Value type. */ +#if ! defined GRAM_STYPE && ! defined GRAM_STYPE_IS_DECLARED +typedef union GRAM_STYPE GRAM_STYPE; +union GRAM_STYPE { -/* Line 296 of yacc.c */ -#line 107 "src/parse-gram.y" - - assoc assoc; - char *code; - char const *chars; - int integer; - named_ref *named_ref; - symbol *symbol; - symbol_list *list; - uniqstr uniqstr; - unsigned char character; - -/* Line 296 of yacc.c */ -#line 245 "src/parse-gram.y" - - param_type param; - - -/* Line 296 of yacc.c */ -#line 325 "src/parse-gram.c" -} YYSTYPE; -# define YYSTYPE_IS_TRIVIAL 1 -# define yystype YYSTYPE /* obsolescent; will be withdrawn */ -# define YYSTYPE_IS_DECLARED 1 +#line 182 "src/parse-gram.y" /* yacc.c:355 */ +unsigned char character; +#line 186 "src/parse-gram.y" /* yacc.c:355 */ +char *code; +#line 191 "src/parse-gram.y" /* yacc.c:355 */ +uniqstr uniqstr; +#line 199 "src/parse-gram.y" /* yacc.c:355 */ +int integer; +#line 203 "src/parse-gram.y" /* yacc.c:355 */ +symbol *symbol; +#line 208 "src/parse-gram.y" /* yacc.c:355 */ +assoc assoc; +#line 211 "src/parse-gram.y" /* yacc.c:355 */ +symbol_list *list; +#line 214 "src/parse-gram.y" /* yacc.c:355 */ +named_ref *named_ref; +#line 241 "src/parse-gram.y" /* yacc.c:355 */ +param_type param; +#line 409 "src/parse-gram.y" /* yacc.c:355 */ +code_props_type code_type; +#line 647 "src/parse-gram.y" /* yacc.c:355 */ + + struct + { + char const *chars; + muscle_kind kind; + } value; + +#line 235 "src/parse-gram.c" /* yacc.c:355 */ +}; +# define GRAM_STYPE_IS_TRIVIAL 1 +# define GRAM_STYPE_IS_DECLARED 1 #endif -#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED -typedef struct YYLTYPE +/* Location type. */ +#if ! defined GRAM_LTYPE && ! defined GRAM_LTYPE_IS_DECLARED +typedef struct GRAM_LTYPE GRAM_LTYPE; +struct GRAM_LTYPE { int first_line; int first_column; int last_line; int last_column; -} YYLTYPE; -# define yyltype YYLTYPE /* obsolescent; will be withdrawn */ -# define YYLTYPE_IS_DECLARED 1 -# define YYLTYPE_IS_TRIVIAL 1 +}; +# define GRAM_LTYPE_IS_DECLARED 1 +# define GRAM_LTYPE_IS_TRIVIAL 1 #endif + +int gram_parse (void); + +#endif /* !YY_GRAM_SRC_PARSE_GRAM_H_INCLUDED */ + /* Copy the second part of user declarations. */ -/* Line 346 of yacc.c */ -#line 349 "src/parse-gram.c" +#line 263 "src/parse-gram.c" /* yacc.c:358 */ /* Unqualified %code blocks. */ -/* Line 347 of yacc.c */ -#line 56 "src/parse-gram.y" +#line 33 "src/parse-gram.y" /* yacc.c:359 */ + + #include "system.h" + + #include "c-ctype.h" + #include "complain.h" + #include "conflicts.h" + #include "files.h" + #include "getargs.h" + #include "gram.h" + #include "named-ref.h" + #include "quotearg.h" + #include "reader.h" + #include "scan-gram.h" + #include "scan-code.h" + #include "xmemdup0.h" static int current_prec = 0; static location current_lhs_location; @@ -360,28 +289,43 @@ typedef struct YYLTYPE /** Set the new current left-hand side symbol, possibly common * to several right-hand side parts of rule. */ - static - void - current_lhs(symbol *sym, location loc, named_ref *ref) - { - current_lhs_symbol = sym; - current_lhs_location = loc; - /* In order to simplify memory management, named references for lhs - are always assigned by deep copy into the current symbol_list - node. This is because a single named-ref in the grammar may - result in several uses when the user factors lhs between several - rules using "|". Therefore free the parser's original copy. */ - free (current_lhs_named_ref); - current_lhs_named_ref = ref; - } + static void current_lhs (symbol *sym, location loc, named_ref *ref); + + #define YYLLOC_DEFAULT(Current, Rhs, N) \ + (Current) = lloc_default (Rhs, N) + static YYLTYPE lloc_default (YYLTYPE const *, int); + + #define YY_LOCATION_PRINT(File, Loc) \ + location_print (Loc, File) + + /* Strip initial '{' and final '}' (must be first and last characters). + Return the result. */ + static char *strip_braces (char *code); + + /* Convert CODE by calling code_props_plain_init if PLAIN, otherwise + code_props_symbol_action_init. Call + gram_scanner_last_string_free to release the latest string from + the scanner (should be CODE). */ + static char const *translate_code (char *code, location loc, bool plain); + + /* Convert CODE by calling code_props_plain_init after having + stripped the first and last characters (expected to be '{', and + '}'). Call gram_scanner_last_string_free to release the latest + string from the scanner (should be CODE). */ + static char const *translate_code_braceless (char *code, location loc); + + static void version_check (location const *loc, char const *version); + + static void gram_error (location const *, char const *); + + /* A string that describes a char (e.g., 'a' -> "'a'"). */ + static char const *char_name (char); #define YYTYPE_INT16 int_fast16_t #define YYTYPE_INT8 int_fast8_t #define YYTYPE_UINT16 uint_fast16_t #define YYTYPE_UINT8 uint_fast8_t - -/* Line 347 of yacc.c */ -#line 234 "src/parse-gram.y" +#line 231 "src/parse-gram.y" /* yacc.c:359 */ /** Add a lex-param and/or a parse-param. * @@ -392,9 +336,7 @@ typedef struct YYLTYPE static void add_param (param_type type, char *decl, location loc); static param_type current_param = param_none; - -/* Line 347 of yacc.c */ -#line 398 "src/parse-gram.c" +#line 339 "src/parse-gram.c" /* yacc.c:359 */ #ifdef short # undef short @@ -408,11 +350,8 @@ typedef unsigned char yytype_uint8; #ifdef YYTYPE_INT8 typedef YYTYPE_INT8 yytype_int8; -#elif (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -typedef signed char yytype_int8; #else -typedef short int yytype_int8; +typedef signed char yytype_int8; #endif #ifdef YYTYPE_UINT16 @@ -432,8 +371,7 @@ typedef short int yytype_int16; # define YYSIZE_T __SIZE_TYPE__ # elif defined size_t # define YYSIZE_T size_t -# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# elif ! defined YYSIZE_T # include /* INFRINGES ON USER NAME SPACE */ # define YYSIZE_T size_t # else @@ -447,46 +385,56 @@ typedef short int yytype_int16; # if defined YYENABLE_NLS && YYENABLE_NLS # if ENABLE_NLS # include /* INFRINGES ON USER NAME SPACE */ -# define YY_(msgid) dgettext ("bison-runtime", msgid) +# define YY_(Msgid) dgettext ("bison-runtime", Msgid) # endif # endif # ifndef YY_ -# define YY_(msgid) msgid +# define YY_(Msgid) Msgid +# endif +#endif + +#ifndef __attribute__ +/* This feature is available in gcc versions 2.5 and later. */ +# if (! defined __GNUC__ || __GNUC__ < 2 \ + || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)) +# define __attribute__(Spec) /* empty */ # endif #endif /* Suppress unused-variable warnings by "using" E. */ #if ! defined lint || defined __GNUC__ -# define YYUSE(e) ((void) (e)) +# define YYUSE(E) ((void) (E)) #else -# define YYUSE(e) /* empty */ +# define YYUSE(E) /* empty */ #endif -/* Identity function, used to suppress warnings about constant conditions. */ -#ifndef lint -# define YYID(n) (n) +#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__ +/* Suppress an incorrect diagnostic about yylval being uninitialized. */ +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\ + _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"") +# define YY_IGNORE_MAYBE_UNINITIALIZED_END \ + _Pragma ("GCC diagnostic pop") #else -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static int -YYID (int yyi) -#else -static int -YYID (yyi) - int yyi; +# define YY_INITIAL_VALUE(Value) Value #endif -{ - return yyi; -} +#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +# define YY_IGNORE_MAYBE_UNINITIALIZED_END +#endif +#ifndef YY_INITIAL_VALUE +# define YY_INITIAL_VALUE(Value) /* Nothing. */ #endif + #if 1 /* The parser invokes alloca or malloc; define the necessary symbols. */ # ifdef YYSTACK_ALLOC - /* Pacify GCC's `empty if-body' warning. */ -# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0)) + /* Pacify GCC's 'empty if-body' warning. */ +# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0) # ifndef YYSTACK_ALLOC_MAXIMUM /* The OS might guarantee only one guard page at the bottom of the stack, and a page size can be as small as 4096 bytes. So we cannot safely @@ -510,15 +458,13 @@ YYID (yyi) # endif # ifndef YYMALLOC # define YYMALLOC malloc -# if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# if ! defined malloc && ! defined EXIT_SUCCESS void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ # endif # endif # ifndef YYFREE # define YYFREE free -# if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# if ! defined free && ! defined EXIT_SUCCESS void free (void *); /* INFRINGES ON USER NAME SPACE */ # endif # endif @@ -529,8 +475,8 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */ #if (! defined yyoverflow \ && (! defined __cplusplus \ - || (defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL \ - && defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) + || (defined GRAM_LTYPE_IS_TRIVIAL && GRAM_LTYPE_IS_TRIVIAL \ + && defined GRAM_STYPE_IS_TRIVIAL && GRAM_STYPE_IS_TRIVIAL))) /* A type that is properly aligned for any stack member. */ union yyalloc @@ -565,7 +511,7 @@ union yyalloc yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ yyptr += yynewbytes / sizeof (*yyptr); \ } \ - while (YYID (0)) + while (0) #endif @@ -584,7 +530,7 @@ union yyalloc for (yyi = 0; yyi < (Count); yyi++) \ (Dst)[yyi] = (Src)[yyi]; \ } \ - while (YYID (0)) + while (0) # endif # endif #endif /* !YYCOPY_NEEDED */ @@ -592,21 +538,21 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 3 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 163 +#define YYLAST 164 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 57 +#define YYNTOKENS 58 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 36 +#define YYNNTS 37 /* YYNRULES -- Number of rules. */ #define YYNRULES 110 /* YYNSTATES -- Number of states. */ -#define YYNSTATES 149 +#define YYNSTATES 144 /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned by yylex, with out-of-bounds checking. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 311 +#define YYMAXUTOK 312 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -646,37 +592,37 @@ static const yytype_uint8 yytranslate[] = 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, - 55, 56 + 55, 56, 57 }; -#if YYDEBUG - /* YYRLINEYYN -- Source line where rule number YYN was defined. */ +#if GRAM_DEBUG + /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 270, 270, 278, 280, 284, 285, 295, 299, 304, - 305, 310, 315, 316, 317, 318, 319, 324, 333, 334, - 335, 336, 337, 338, 339, 340, 340, 341, 342, 366, - 367, 368, 369, 373, 374, 383, 384, 385, 389, 396, - 403, 407, 411, 418, 433, 434, 438, 450, 450, 455, - 455, 460, 471, 486, 487, 488, 489, 493, 494, 499, - 501, 506, 507, 512, 514, 519, 520, 524, 525, 526, - 527, 532, 537, 542, 548, 554, 565, 566, 575, 576, - 582, 583, 584, 591, 591, 599, 600, 601, 606, 608, - 610, 612, 614, 616, 618, 623, 625, 635, 636, 641, - 642, 643, 652, 672, 674, 683, 688, 689, 694, 701, - 703 + 0, 264, 264, 273, 274, 278, 279, 285, 289, 294, + 295, 300, 306, 307, 308, 309, 314, 319, 320, 321, + 322, 323, 324, 324, 325, 326, 350, 351, 352, 353, + 357, 358, 367, 368, 369, 373, 385, 389, 393, 401, + 412, 413, 423, 424, 428, 440, 440, 445, 445, 450, + 461, 476, 477, 478, 479, 483, 484, 489, 491, 496, + 501, 511, 513, 518, 519, 523, 524, 528, 529, 530, + 535, 540, 545, 551, 557, 568, 569, 578, 579, 585, + 586, 587, 594, 594, 602, 603, 604, 609, 612, 614, + 616, 618, 620, 622, 624, 629, 630, 640, 641, 666, + 667, 668, 669, 681, 683, 692, 697, 698, 703, 711, + 712 }; #endif -#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE +#if GRAM_DEBUG || YYERROR_VERBOSE || 1 /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. First, the terminals, then, starting at YYNTOKENS, nonterminals. */ static const char *const yytname[] = { - "\"end of file\"", "error", "$undefined", "\"string\"", "\"integer\"", - "\"%token\"", "\"%nterm\"", "\"%type\"", "\"%destructor\"", - "\"%printer\"", "\"%left\"", "\"%right\"", "\"%nonassoc\"", - "\"%precedence\"", "\"%prec\"", "\"%dprec\"", "\"%merge\"", "\"%code\"", + "\"end of file\"", "error", "$undefined", "\"string\"", "\"%token\"", + "\"%nterm\"", "\"%type\"", "\"%destructor\"", "\"%printer\"", + "\"%left\"", "\"%right\"", "\"%nonassoc\"", "\"%precedence\"", + "\"%prec\"", "\"%dprec\"", "\"%merge\"", "\"%code\"", "\"%default-prec\"", "\"%define\"", "\"%defines\"", "\"%error-verbose\"", "\"%expect\"", "\"%expect-rr\"", "\"%\"", "\"%file-prefix\"", "\"%glr-parser\"", "\"%initial-action\"", "\"%language\"", @@ -686,15 +632,15 @@ static const char *const yytname[] = "\"%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", YY_NULL + "\"integer\"", "\"%param\"", "\"%union\"", "\"%empty\"", "$accept", + "input", "prologue_declarations", "prologue_declaration", "$@1", + "params", "grammar_declaration", "code_props_type", "union_name", + "symbol_declaration", "$@2", "$@3", "precedence_declaration", + "precedence_declarator", "tag.opt", "symbols.prec", "symbol.prec", + "symbols.1", "generic_symlist", "generic_symlist_item", "tag", + "symbol_def", "symbol_defs.1", "grammar", "rules_or_grammar_declaration", + "rules", "$@4", "rhses.1", "rhs", "named_ref.opt", "variable", "value", + "id", "id_colon", "symbol", "string_as_id", "epilogue.opt", YY_NULLPTR }; #endif @@ -708,177 +654,177 @@ static const yytype_uint16 yytoknum[] = 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, - 305, 306, 307, 308, 309, 310, 311 + 305, 306, 307, 308, 309, 310, 311, 312 }; # endif -#define YYPACT_NINF -50 +#define YYPACT_NINF -113 -#define yypact_value_is_default(yystate) \ - ((yystate) == (-50)) +#define yypact_value_is_default(Yystate) \ + (!!((Yystate) == (-113))) #define YYTABLE_NINF -110 -#define yytable_value_is_error(yytable_value) \ - YYID (0) +#define yytable_value_is_error(Yytable_value) \ + 0 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing - STATE-NUM. */ -static const yytype_int16 yypact[] = + STATE-NUM. */ +static const yytype_int8 yypact[] = { - -50, 4, 107, -50, -50, -50, -20, 3, 11, -50, - -50, -50, -50, 14, -50, 12, 68, -50, 72, 73, - -50, 0, -50, 45, 86, 2, -50, -50, -50, 17, - 95, 96, 32, -50, -50, -50, 16, -50, -50, -50, - 54, -50, -50, -50, -50, 49, -2, -2, 32, 27, - 27, -50, 63, -50, -50, -50, 37, -50, -50, -50, - -50, 101, -50, -50, -50, 103, -50, 104, -50, -50, - -50, -50, -50, -50, -50, -50, 57, -50, 58, 1, - -50, -50, 79, 70, -50, 63, -50, 32, -50, -50, - -2, 64, -2, 32, -50, -50, -50, -50, 27, -50, - -50, 27, -50, -50, -50, -50, -50, -50, -50, -50, - -50, 78, -50, -50, -50, -50, -50, 83, -50, 32, - -50, 143, -50, 145, -50, -50, -50, -50, -50, -50, - -50, -50, -50, 43, 50, -50, -50, 32, 146, 97, - 79, -50, 79, 50, -50, -50, -50, -50, -50 + -113, 16, 108, -113, -113, -113, -27, -113, -113, -113, + -113, -113, -113, -24, -113, 23, 24, -113, -21, -15, + -113, 29, -113, 3, 38, 42, -113, -113, -113, 44, + 47, 71, 31, -113, -113, -113, 55, -113, -113, -113, + 30, -113, -113, 39, -113, -113, 26, -22, -22, 31, + -113, 48, -113, -113, 1, -113, -113, -113, -113, -113, + -113, -113, -113, -113, -113, -113, -113, -113, -113, -113, + -113, 45, -113, 50, 2, -113, -113, 57, 49, -113, + 52, 41, -113, 31, -113, -113, -22, -2, -22, 31, + -113, -113, -113, -113, -113, -113, -113, -113, 46, -113, + -113, -113, -113, -113, 63, -113, -113, -113, -113, 41, + -113, -113, -113, 31, -113, 51, -113, 100, -113, -113, + -113, -113, -113, -113, -113, -113, -113, -20, 40, -113, + -113, 31, 53, 58, 57, -113, -113, 57, 40, -113, + -113, -113, -113, -113 }; - /* 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. */ + /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. + Performed when YYTABLE does not specify something else to do. Zero + means the default is an error. */ static const yytype_uint8 yydefact[] = { - 3, 0, 0, 1, 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, 102, 0, 42, 98, 97, 99, 10, 12, 13, - 14, 0, 17, 18, 19, 0, 23, 0, 27, 28, - 108, 104, 103, 106, 37, 107, 0, 105, 0, 0, - 78, 80, 95, 0, 45, 0, 58, 0, 71, 76, - 50, 72, 48, 51, 63, 68, 69, 70, 38, 65, - 67, 39, 43, 101, 100, 8, 15, 20, 24, 82, - 81, 0, 79, 2, 96, 83, 34, 26, 46, 52, - 59, 61, 77, 73, 74, 64, 66, 110, 88, 33, - 60, 62, 75, 84, 85, 88, 87, 0, 0, 0, - 95, 91, 95, 86, 92, 93, 94, 90, 89 + 3, 0, 0, 1, 47, 45, 0, 40, 41, 51, + 52, 53, 54, 0, 36, 0, 9, 11, 0, 0, + 7, 0, 15, 0, 0, 0, 37, 19, 20, 0, + 0, 0, 0, 26, 27, 28, 0, 6, 29, 22, + 42, 4, 5, 0, 33, 32, 55, 0, 0, 0, + 38, 0, 98, 97, 99, 10, 12, 13, 14, 16, + 17, 18, 21, 24, 25, 108, 104, 103, 106, 34, + 107, 0, 105, 0, 0, 77, 79, 95, 0, 43, + 0, 0, 56, 0, 70, 75, 48, 71, 46, 49, + 61, 39, 101, 102, 100, 8, 81, 80, 0, 78, + 2, 96, 82, 31, 23, 44, 67, 68, 69, 35, + 63, 66, 65, 50, 57, 59, 76, 72, 73, 62, + 110, 87, 30, 64, 58, 60, 74, 83, 84, 87, + 86, 0, 0, 0, 95, 90, 91, 95, 85, 92, + 93, 94, 89, 88 }; - /* YYPGOTO[NTERM-NUM]. */ -static const yytype_int16 yypgoto[] = + /* YYPGOTO[NTERM-NUM]. */ +static const yytype_int8 yypgoto[] = { - -50, -50, -50, -50, -50, -50, 149, -50, -50, -50, - -50, -50, -50, -50, -50, 33, -50, 106, -42, -4, - 112, -50, 74, -50, -50, -50, 19, -45, -50, -50, - -16, -8, -50, -32, -49, -50 + -113, -113, -113, -113, -113, -113, 102, -113, -113, -113, + -113, -113, -113, -113, -113, -113, 8, -113, -113, 13, + -113, -50, 75, -113, 73, -113, -113, -113, 19, -112, + -113, -113, 22, -113, -32, -82, -113 }; - /* YYDEFGOTO[NTERM-NUM]. */ + /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -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 + -1, 1, 2, 41, 78, 104, 73, 43, 80, 44, + 48, 47, 45, 46, 83, 113, 114, 89, 109, 110, + 111, 85, 86, 74, 75, 76, 121, 127, 128, 102, + 54, 95, 68, 77, 112, 70, 100 }; - /* 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. */ + /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If + positive, shift that token. If negative, reduce the rule whose + number is the opposite. If YYTABLE_NINF, syntax error. */ static const yytype_int16 yytable[] = { - 74, -109, 76, 60, 3, 64, 4, 5, 6, 7, - 8, 9, 10, 11, 12, 54, 94, 76, 13, 14, - 66, 4, 5, 6, 7, 8, 9, 10, 11, 12, - 70, 26, 48, 13, 14, 70, 102, 32, 91, 91, - 103, 71, 124, 49, 72, 61, 26, 65, 77, 111, - 88, 50, 32, 70, 51, 121, 126, 40, 55, 126, - 52, 125, 67, 77, 137, 138, 139, 70, 123, 118, - 71, 57, 40, 72, 132, 71, 58, 59, 72, 95, - 96, 97, 91, 104, 91, 62, 122, 121, 122, 63, - 140, 141, 135, 71, 136, 147, 72, 148, 68, 69, - 84, 86, 142, 51, 106, 144, 107, 108, 109, 110, - 116, 142, 4, 5, 6, 7, 8, 9, 10, 11, - 12, 114, 127, 129, 13, 14, 15, 16, 17, 18, + 69, 65, -109, 71, 92, 118, 4, 5, 6, 7, + 8, 9, 10, 11, 12, 50, 3, 90, 13, 14, + 66, 51, 142, 67, 49, 143, 52, 55, 129, 84, + 130, 26, 58, 56, 65, 126, 116, 32, 116, 57, + 93, 60, 59, 65, 65, 61, 94, 62, 72, 98, + 63, 115, 117, 131, 132, 133, 71, 119, 40, 4, + 5, 6, 7, 8, 9, 10, 11, 12, 53, 87, + 87, 13, 14, 66, 64, 79, 67, 82, 81, 134, + 135, 115, 66, 66, 26, 67, 67, 91, 103, 120, + 32, 105, 106, 107, 108, 96, 137, 136, 101, 139, + 97, 72, 122, 65, 42, 125, 137, 140, 87, 141, + 87, 40, 4, 5, 6, 7, 8, 9, 10, 11, + 12, 124, 123, 88, 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, 146, - 145, 42, 130, 112, 143, 36, 101, 37, 38, 92, - 0, 0, 39, 40 + 29, 30, 31, 32, 33, 34, 35, 99, 138, 0, + 0, 0, 0, 0, 0, 36, 0, 37, 38, 0, + 0, 0, 0, 39, 40 }; static const yytype_int16 yycheck[] = { - 32, 0, 1, 3, 0, 3, 5, 6, 7, 8, - 9, 10, 11, 12, 13, 3, 48, 1, 17, 18, - 3, 5, 6, 7, 8, 9, 10, 11, 12, 13, - 3, 30, 52, 17, 18, 3, 52, 36, 46, 47, - 3, 43, 91, 40, 46, 45, 30, 45, 47, 48, - 52, 40, 36, 3, 40, 87, 98, 56, 46, 101, - 46, 93, 45, 47, 14, 15, 16, 3, 4, 85, - 43, 3, 56, 46, 123, 43, 4, 4, 46, 52, - 53, 54, 90, 46, 92, 40, 90, 119, 92, 3, - 40, 41, 49, 43, 51, 140, 46, 142, 3, 3, - 46, 52, 134, 40, 3, 137, 3, 3, 51, 51, - 40, 143, 5, 6, 7, 8, 9, 10, 11, 12, - 13, 42, 44, 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, 52, - 4, 2, 119, 79, 135, 48, 50, 50, 51, 47, - -1, -1, 55, 56 + 32, 3, 0, 1, 3, 87, 4, 5, 6, 7, + 8, 9, 10, 11, 12, 39, 0, 49, 16, 17, + 42, 45, 134, 45, 51, 137, 3, 3, 48, 51, + 50, 29, 3, 54, 3, 117, 86, 35, 88, 54, + 39, 3, 39, 3, 3, 3, 45, 3, 46, 47, + 3, 83, 54, 13, 14, 15, 1, 89, 56, 4, + 5, 6, 7, 8, 9, 10, 11, 12, 45, 47, + 48, 16, 17, 42, 3, 45, 45, 51, 39, 39, + 40, 113, 42, 42, 29, 45, 45, 39, 39, 43, + 35, 39, 51, 52, 53, 50, 128, 57, 41, 131, + 50, 46, 39, 3, 2, 54, 138, 54, 86, 51, + 88, 56, 4, 5, 6, 7, 8, 9, 10, 11, + 12, 113, 109, 48, 16, 17, 18, 19, 20, 21, + 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, + 32, 33, 34, 35, 36, 37, 38, 74, 129, -1, + -1, -1, -1, -1, -1, 47, -1, 49, 50, -1, + -1, -1, -1, 55, 56 }; - /* STOS_[STATE-NUM] -- The (internal number of the) accessing - symbol of state STATE-NUM. */ + /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing + symbol of state STATE-NUM. */ static const yytype_uint8 yystos[] = { - 0, 58, 59, 0, 5, 6, 7, 8, 9, 10, - 11, 12, 13, 17, 18, 19, 20, 21, 22, 23, - 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, - 34, 35, 36, 37, 38, 39, 48, 50, 51, 55, - 56, 60, 63, 65, 68, 69, 67, 66, 52, 40, - 40, 40, 46, 87, 3, 46, 85, 3, 4, 4, - 3, 45, 40, 3, 3, 45, 3, 45, 3, 3, - 3, 43, 46, 88, 90, 91, 1, 47, 63, 78, - 79, 80, 89, 61, 46, 64, 52, 70, 52, 76, - 77, 88, 77, 73, 90, 52, 53, 54, 74, 75, - 90, 74, 87, 3, 46, 86, 3, 3, 3, 51, - 51, 48, 79, 92, 42, 84, 40, 62, 87, 71, - 72, 90, 76, 4, 91, 90, 75, 44, 81, 40, - 72, 4, 91, 82, 83, 49, 51, 14, 15, 16, - 40, 41, 90, 83, 90, 4, 52, 84, 84 + 0, 59, 60, 0, 4, 5, 6, 7, 8, 9, + 10, 11, 12, 16, 17, 18, 19, 20, 21, 22, + 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, + 33, 34, 35, 36, 37, 38, 47, 49, 50, 55, + 56, 61, 64, 65, 67, 70, 71, 69, 68, 51, + 39, 45, 3, 45, 88, 3, 54, 54, 3, 39, + 3, 3, 3, 3, 3, 3, 42, 45, 90, 92, + 93, 1, 46, 64, 81, 82, 83, 91, 62, 45, + 66, 39, 51, 72, 51, 79, 80, 90, 80, 75, + 92, 39, 3, 39, 45, 89, 50, 50, 47, 82, + 94, 41, 87, 39, 63, 39, 51, 52, 53, 76, + 77, 78, 92, 73, 74, 92, 79, 54, 93, 92, + 43, 84, 39, 77, 74, 54, 93, 85, 86, 48, + 50, 13, 14, 15, 39, 40, 57, 92, 86, 92, + 54, 51, 87, 87 }; - /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ + /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint8 yyr1[] = { - 0, 57, 58, 59, 59, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 61, 60, 60, 60, 60, - 60, 60, 60, 62, 62, 63, 63, 63, 63, 63, - 63, 63, 63, 63, 64, 64, 63, 66, 65, 67, - 65, 65, 68, 69, 69, 69, 69, 70, 70, 71, - 71, 72, 72, 73, 73, 74, 74, 75, 75, 75, - 75, 76, 76, 76, 76, 76, 77, 77, 78, 78, - 79, 79, 79, 81, 80, 82, 82, 82, 83, 83, - 83, 83, 83, 83, 83, 84, 84, 85, 85, 86, - 86, 86, 87, 88, 88, 89, 90, 90, 91, 92, - 92 + 0, 58, 59, 60, 60, 61, 61, 61, 61, 61, + 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, + 61, 61, 62, 61, 61, 61, 61, 61, 61, 61, + 63, 63, 64, 64, 64, 64, 64, 64, 64, 64, + 65, 65, 66, 66, 64, 68, 67, 69, 67, 67, + 70, 71, 71, 71, 71, 72, 72, 73, 73, 74, + 74, 75, 75, 76, 76, 77, 77, 78, 78, 78, + 79, 79, 79, 79, 79, 80, 80, 81, 81, 82, + 82, 82, 84, 83, 85, 85, 85, 86, 86, 86, + 86, 86, 86, 86, 86, 87, 87, 88, 88, 89, + 89, 89, 89, 90, 90, 91, 92, 92, 93, 94, + 94 }; - /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ + /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ static const yytype_uint8 yyr2[] = { 0, 2, 4, 0, 2, 1, 1, 1, 3, 1, - 2, 1, 2, 2, 2, 3, 1, 2, 2, 2, - 3, 1, 1, 2, 3, 0, 3, 2, 2, 1, - 1, 1, 1, 2, 1, 1, 1, 2, 3, 3, - 1, 1, 2, 3, 0, 1, 3, 0, 3, 0, - 3, 3, 3, 1, 1, 1, 1, 0, 1, 1, - 2, 1, 2, 1, 2, 1, 2, 1, 1, 1, - 1, 1, 1, 2, 2, 3, 1, 2, 1, 2, - 1, 2, 2, 0, 4, 1, 3, 2, 0, 3, - 3, 2, 3, 3, 3, 0, 1, 1, 1, 0, + 2, 1, 2, 2, 2, 1, 2, 2, 2, 1, + 1, 2, 0, 3, 2, 2, 1, 1, 1, 1, + 2, 1, 1, 1, 2, 3, 1, 1, 2, 3, + 1, 1, 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, 1, 2, 2, 3, 1, 2, 1, 2, 1, + 2, 2, 0, 4, 1, 3, 2, 0, 3, 3, + 2, 2, 3, 3, 3, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 2 }; @@ -894,21 +840,6 @@ static const yytype_uint8 yyr2[] = #define YYERROR goto yyerrorlab -/* 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. 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) #define YYBACKUP(Token, Value) \ @@ -924,12 +855,12 @@ do \ } \ else \ { \ - yyerror (YY_("syntax error: cannot back up")); \ + yyerror (&yylloc, YY_("syntax error: cannot back up")); \ YYERROR; \ } \ -while (YYID (0)) - +while (0) +/* Error token number */ #define YYTERROR 1 #define YYERRCODE 256 @@ -938,11 +869,10 @@ while (YYID (0)) If N is 0, then set CURRENT to the empty location which ends the previous symbol: RHS[0] (always defined). */ -#define YYRHSLOC(Rhs, K) ((Rhs)[K]) #ifndef YYLLOC_DEFAULT # define YYLLOC_DEFAULT(Current, Rhs, N) \ do \ - if (YYID (N)) \ + if (N) \ { \ (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ @@ -956,36 +886,14 @@ while (YYID (0)) (Current).first_column = (Current).last_column = \ YYRHSLOC (Rhs, 0).last_column; \ } \ - while (YYID (0)) + while (0) #endif +#define YYRHSLOC(Rhs, K) ((Rhs)[K]) -/* YY_LOCATION_PRINT -- Print the location on the stream. - This macro was not mandated originally: define only if we know - we won't break user code: when these are the locations we know. */ - -#ifndef YY_LOCATION_PRINT -# 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, \ - (Loc).last_line, (Loc).last_column) -# else -# define YY_LOCATION_PRINT(File, Loc) ((void) 0) -# endif -#endif - - -/* YYLEX -- calling `yylex' with the right arguments. */ - -#ifdef YYLEX_PARAM -# define YYLEX yylex (&yylval, &yylloc, YYLEX_PARAM) -#else -# define YYLEX yylex (&yylval, &yylloc) -#endif /* Enable debugging if requested. */ -#if YYDEBUG +#if GRAM_DEBUG # ifndef YYFPRINTF # include /* INFRINGES ON USER NAME SPACE */ @@ -996,7 +904,52 @@ while (YYID (0)) do { \ if (yydebug) \ YYFPRINTF Args; \ -} while (YYID (0)) +} while (0) + + +/* YY_LOCATION_PRINT -- Print the location on the stream. + This macro was not mandated originally: define only if we know + we won't break user code: when these are the locations we know. */ + +#ifndef YY_LOCATION_PRINT +# if defined GRAM_LTYPE_IS_TRIVIAL && GRAM_LTYPE_IS_TRIVIAL + +/* Print *YYLOCP on YYO. Private, do not rely on its existence. */ + +__attribute__((__unused__)) +static unsigned +yy_location_print_ (FILE *yyo, YYLTYPE const * const yylocp) +{ + unsigned res = 0; + int end_col = 0 != yylocp->last_column ? yylocp->last_column - 1 : 0; + if (0 <= yylocp->first_line) + { + res += YYFPRINTF (yyo, "%d", yylocp->first_line); + if (0 <= yylocp->first_column) + res += YYFPRINTF (yyo, ".%d", yylocp->first_column); + } + if (0 <= yylocp->last_line) + { + if (yylocp->first_line < yylocp->last_line) + { + res += YYFPRINTF (yyo, "-%d", yylocp->last_line); + if (0 <= end_col) + res += YYFPRINTF (yyo, ".%d", end_col); + } + else if (0 <= end_col && yylocp->first_column < end_col) + res += YYFPRINTF (yyo, "-%d", end_col); + } + return res; + } + +# define YY_LOCATION_PRINT(File, Loc) \ + yy_location_print_ (File, &(Loc)) + +# else +# define YY_LOCATION_PRINT(File, Loc) ((void) 0) +# endif +#endif + # define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ do { \ @@ -1007,29 +960,18 @@ do { \ Type, Value, Location); \ YYFPRINTF (stderr, "\n"); \ } \ -} while (YYID (0)) +} while (0) -/*--------------------------------. -| Print this symbol on YYOUTPUT. | -`--------------------------------*/ +/*----------------------------------------. +| Print this symbol's value on YYOUTPUT. | +`----------------------------------------*/ -/*ARGSUSED*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static void 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; - YYSTYPE const * const yyvaluep; - YYLTYPE const * const yylocationp; -#endif { FILE *yyo = yyoutput; - YYUSE(yyo); + YYUSE (yyo); YYUSE (yylocationp); if (!yyvaluep) return; @@ -1039,197 +981,157 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp) # endif switch (yytype) { - case 3: // "string" - -/* Line 755 of yacc.c */ -#line 194 "src/parse-gram.y" - { fputs (quotearg_style (c_quoting_style, ((*yyvaluep).chars)), stderr); } -/* Line 755 of yacc.c */ -#line 1049 "src/parse-gram.c" + case 3: /* "string" */ +#line 188 "src/parse-gram.y" /* yacc.c:684 */ + { fputs (quotearg_style (c_quoting_style, ((*yyvaluep).code)), yyo); } +#line 987 "src/parse-gram.c" /* yacc.c:684 */ break; - case 4: // "integer" - -/* Line 755 of yacc.c */ -#line 207 "src/parse-gram.y" - { fprintf (stderr, "%d", ((*yyvaluep).integer)); } -/* Line 755 of yacc.c */ -#line 1058 "src/parse-gram.c" + case 23: /* "%" */ +#line 196 "src/parse-gram.y" /* yacc.c:684 */ + { fprintf (yyo, "%%%s", ((*yyvaluep).uniqstr)); } +#line 993 "src/parse-gram.c" /* yacc.c:684 */ break; - case 24: // "%" - -/* Line 755 of yacc.c */ -#line 203 "src/parse-gram.y" - { fprintf (stderr, "%%%s", ((*yyvaluep).uniqstr)); } -/* Line 755 of yacc.c */ -#line 1067 "src/parse-gram.c" + case 39: /* "{...}" */ +#line 189 "src/parse-gram.y" /* yacc.c:684 */ + { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).code)); } +#line 999 "src/parse-gram.c" /* yacc.c:684 */ break; - case 40: // "{...}" - -/* Line 755 of yacc.c */ -#line 196 "src/parse-gram.y" - { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).code)); } -/* Line 755 of yacc.c */ -#line 1076 "src/parse-gram.c" + case 40: /* "%?{...}" */ +#line 189 "src/parse-gram.y" /* yacc.c:684 */ + { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).code)); } +#line 1005 "src/parse-gram.c" /* yacc.c:684 */ break; - case 42: // "[identifier]" - -/* Line 755 of yacc.c */ -#line 201 "src/parse-gram.y" - { fprintf (stderr, "[%s]", ((*yyvaluep).uniqstr)); } -/* Line 755 of yacc.c */ -#line 1085 "src/parse-gram.c" + case 41: /* "[identifier]" */ +#line 194 "src/parse-gram.y" /* yacc.c:684 */ + { fprintf (yyo, "[%s]", ((*yyvaluep).uniqstr)); } +#line 1011 "src/parse-gram.c" /* yacc.c:684 */ break; - case 43: // "char" - -/* Line 755 of yacc.c */ -#line 188 "src/parse-gram.y" - { fputs (char_name (((*yyvaluep).character)), stderr); } -/* Line 755 of yacc.c */ -#line 1094 "src/parse-gram.c" + case 42: /* "char" */ +#line 184 "src/parse-gram.y" /* yacc.c:684 */ + { fputs (char_name (((*yyvaluep).character)), yyo); } +#line 1017 "src/parse-gram.c" /* yacc.c:684 */ break; - case 44: // "epilogue" - -/* Line 755 of yacc.c */ -#line 196 "src/parse-gram.y" - { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); } -/* Line 755 of yacc.c */ -#line 1103 "src/parse-gram.c" + case 43: /* "epilogue" */ +#line 189 "src/parse-gram.y" /* yacc.c:684 */ + { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).code)); } +#line 1023 "src/parse-gram.c" /* yacc.c:684 */ break; - case 46: // "identifier" - -/* Line 755 of yacc.c */ -#line 200 "src/parse-gram.y" - { fputs (((*yyvaluep).uniqstr), stderr); } -/* Line 755 of yacc.c */ -#line 1112 "src/parse-gram.c" + case 45: /* "identifier" */ +#line 193 "src/parse-gram.y" /* yacc.c:684 */ + { fputs (((*yyvaluep).uniqstr), yyo); } +#line 1029 "src/parse-gram.c" /* yacc.c:684 */ break; - case 47: // "identifier:" - -/* Line 755 of yacc.c */ -#line 202 "src/parse-gram.y" - { fprintf (stderr, "%s:", ((*yyvaluep).uniqstr)); } -/* Line 755 of yacc.c */ -#line 1121 "src/parse-gram.c" + case 46: /* "identifier:" */ +#line 195 "src/parse-gram.y" /* yacc.c:684 */ + { fprintf (yyo, "%s:", ((*yyvaluep).uniqstr)); } +#line 1035 "src/parse-gram.c" /* yacc.c:684 */ break; - case 50: // "%{...%}" - -/* Line 755 of yacc.c */ -#line 196 "src/parse-gram.y" - { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); } -/* Line 755 of yacc.c */ -#line 1130 "src/parse-gram.c" + case 49: /* "%{...%}" */ +#line 189 "src/parse-gram.y" /* yacc.c:684 */ + { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).code)); } +#line 1041 "src/parse-gram.c" /* yacc.c:684 */ break; - case 52: // "" - -/* Line 755 of yacc.c */ -#line 204 "src/parse-gram.y" - { fprintf (stderr, "<%s>", ((*yyvaluep).uniqstr)); } -/* Line 755 of yacc.c */ -#line 1139 "src/parse-gram.c" + case 51: /* "" */ +#line 197 "src/parse-gram.y" /* yacc.c:684 */ + { fprintf (yyo, "<%s>", ((*yyvaluep).uniqstr)); } +#line 1047 "src/parse-gram.c" /* yacc.c:684 */ break; - case 55: // "%param" + case 54: /* "integer" */ +#line 201 "src/parse-gram.y" /* yacc.c:684 */ + { fprintf (yyo, "%d", ((*yyvaluep).integer)); } +#line 1053 "src/parse-gram.c" /* yacc.c:684 */ + break; -/* Line 755 of yacc.c */ -#line 250 "src/parse-gram.y" - { + case 55: /* "%param" */ +#line 244 "src/parse-gram.y" /* yacc.c:684 */ + { 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); + case param_ ## In: fputs ("%" #Out, yyo); break + CASE (lex, lex-param); + CASE (parse, parse-param); + CASE (both, param); #undef CASE case param_none: aver (false); break; } } -/* Line 755 of yacc.c */ -#line 1159 "src/parse-gram.c" +#line 1070 "src/parse-gram.c" /* yacc.c:684 */ break; - case 72: // symbol.prec - -/* Line 755 of yacc.c */ -#line 210 "src/parse-gram.y" - { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); } -/* Line 755 of yacc.c */ -#line 1168 "src/parse-gram.c" + case 65: /* code_props_type */ +#line 410 "src/parse-gram.y" /* yacc.c:684 */ + { fprintf (yyo, "%s", code_props_type_string (((*yyvaluep).code_type))); } +#line 1076 "src/parse-gram.c" /* yacc.c:684 */ break; - case 85: // variable - -/* Line 755 of yacc.c */ -#line 200 "src/parse-gram.y" - { fputs (((*yyvaluep).uniqstr), stderr); } -/* Line 755 of yacc.c */ -#line 1177 "src/parse-gram.c" + case 74: /* symbol.prec */ +#line 205 "src/parse-gram.y" /* yacc.c:684 */ + { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); } +#line 1082 "src/parse-gram.c" /* yacc.c:684 */ break; - case 86: // content.opt - -/* Line 755 of yacc.c */ -#line 196 "src/parse-gram.y" - { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); } -/* Line 755 of yacc.c */ -#line 1186 "src/parse-gram.c" + case 78: /* tag */ +#line 197 "src/parse-gram.y" /* yacc.c:684 */ + { fprintf (yyo, "<%s>", ((*yyvaluep).uniqstr)); } +#line 1088 "src/parse-gram.c" /* yacc.c:684 */ break; - case 87: // braceless - -/* Line 755 of yacc.c */ -#line 196 "src/parse-gram.y" - { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); } -/* Line 755 of yacc.c */ -#line 1195 "src/parse-gram.c" + case 88: /* variable */ +#line 193 "src/parse-gram.y" /* yacc.c:684 */ + { fputs (((*yyvaluep).uniqstr), yyo); } +#line 1094 "src/parse-gram.c" /* yacc.c:684 */ break; - case 88: // id - -/* Line 755 of yacc.c */ -#line 210 "src/parse-gram.y" - { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); } -/* Line 755 of yacc.c */ -#line 1204 "src/parse-gram.c" + case 89: /* value */ +#line 656 "src/parse-gram.y" /* yacc.c:684 */ + { + switch (((*yyvaluep).value).kind) + { + case muscle_code: fprintf (yyo, "{%s}", ((*yyvaluep).value).chars); break; + case muscle_keyword: fprintf (yyo, "%s", ((*yyvaluep).value).chars); break; + case muscle_string: fprintf (yyo, "\"%s\"", ((*yyvaluep).value).chars); break; + } +} +#line 1107 "src/parse-gram.c" /* yacc.c:684 */ break; - case 89: // id_colon - -/* Line 755 of yacc.c */ -#line 211 "src/parse-gram.y" - { fprintf (stderr, "%s:", ((*yyvaluep).symbol)->tag); } -/* Line 755 of yacc.c */ -#line 1213 "src/parse-gram.c" + case 90: /* id */ +#line 205 "src/parse-gram.y" /* yacc.c:684 */ + { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); } +#line 1113 "src/parse-gram.c" /* yacc.c:684 */ break; - case 90: // symbol - -/* Line 755 of yacc.c */ -#line 210 "src/parse-gram.y" - { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); } -/* Line 755 of yacc.c */ -#line 1222 "src/parse-gram.c" + case 91: /* id_colon */ +#line 206 "src/parse-gram.y" /* yacc.c:684 */ + { fprintf (yyo, "%s:", ((*yyvaluep).symbol)->tag); } +#line 1119 "src/parse-gram.c" /* yacc.c:684 */ break; - case 91: // string_as_id + case 92: /* symbol */ +#line 205 "src/parse-gram.y" /* yacc.c:684 */ + { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); } +#line 1125 "src/parse-gram.c" /* yacc.c:684 */ + break; -/* Line 755 of yacc.c */ -#line 210 "src/parse-gram.y" - { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); } -/* Line 755 of yacc.c */ -#line 1231 "src/parse-gram.c" + case 93: /* string_as_id */ +#line 205 "src/parse-gram.y" /* yacc.c:684 */ + { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); } +#line 1131 "src/parse-gram.c" /* yacc.c:684 */ break; + default: break; } @@ -1240,23 +1142,11 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp) | Print this symbol on YYOUTPUT. | `--------------------------------*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static void 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; - YYSTYPE const * const yyvaluep; - YYLTYPE const * const yylocationp; -#endif { - if (yytype < YYNTOKENS) - YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); - else - YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); + YYFPRINTF (yyoutput, "%s %s (", + yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]); YY_LOCATION_PRINT (yyoutput, *yylocationp); YYFPRINTF (yyoutput, ": "); @@ -1269,16 +1159,8 @@ yy_symbol_print (yyoutput, yytype, yyvaluep, yylocationp) | TOP (included). | `------------------------------------------------------------------*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static void yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop) -#else -static void -yy_stack_print (yybottom, yytop) - yytype_int16 *yybottom; - yytype_int16 *yytop; -#endif { YYFPRINTF (stderr, "Stack now"); for (; yybottom <= yytop; yybottom++) @@ -1293,25 +1175,15 @@ yy_stack_print (yybottom, yytop) do { \ if (yydebug) \ yy_stack_print ((Bottom), (Top)); \ -} while (YYID (0)) +} while (0) /*------------------------------------------------. | Report that the YYRULE is going to be reduced. | `------------------------------------------------*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static void yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, YYLTYPE *yylsp, int yyrule) -#else -static void -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]; @@ -1334,17 +1206,17 @@ yy_reduce_print (yyssp, yyvsp, yylsp, yyrule) do { \ if (yydebug) \ yy_reduce_print (yyssp, yyvsp, yylsp, Rule); \ -} while (YYID (0)) +} while (0) /* Nonzero means print parse trace. It is left uninitialized so that multiple parsers can coexist. */ int yydebug; -#else /* !YYDEBUG */ +#else /* !GRAM_DEBUG */ # define YYDPRINTF(Args) # define YY_SYMBOL_PRINT(Title, Type, Value, Location) # define YY_STACK_PRINT(Bottom, Top) # define YY_REDUCE_PRINT(Rule) -#endif /* !YYDEBUG */ +#endif /* !GRAM_DEBUG */ /* YYINITDEPTH -- initial size of the parser's stacks. */ @@ -1375,7 +1247,7 @@ int yydebug; required. Return 1 if memory is exhausted. */ static int yy_lac_stack_realloc (YYSIZE_T *yycapacity, YYSIZE_T yyadd, -#if YYDEBUG +#if GRAM_DEBUG char const *yydebug_prefix, char const *yydebug_suffix, #endif @@ -1465,7 +1337,7 @@ do { \ goto yyerrlab; \ } \ } \ -} while (YYID (0)) +} while (0) /* Discard any previous initial lookahead context because of Event, which may be a lookahead change or an invalidation of the currently @@ -1478,7 +1350,7 @@ do { \ the parser stacks to try to find a new initial context in which the current lookahead is syntactically acceptable. If it fails to find such a context, it discards the lookahead. */ -#if YYDEBUG +#if GRAM_DEBUG # define YY_LAC_DISCARD(Event) \ do { \ if (yy_lac_established) \ @@ -1488,7 +1360,7 @@ do { \ Event "\n"); \ yy_lac_established = 0; \ } \ -} while (YYID (0)) +} while (0) #else # define YY_LAC_DISCARD(Event) yy_lac_established = 0 #endif @@ -1581,7 +1453,7 @@ yy_lac (yytype_int16 *yyesa, yytype_int16 **yyes, else { if (yy_lac_stack_realloc (yyes_capacity, 1, -#if YYDEBUG +#if GRAM_DEBUG " (", ")", #endif yyes, yyesa, &yyesp, yyes_prev)) @@ -1604,15 +1476,8 @@ yy_lac (yytype_int16 *yyesa, yytype_int16 **yyes, # define yystrlen strlen # else /* Return the length of YYSTR. */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static YYSIZE_T yystrlen (const char *yystr) -#else -static YYSIZE_T -yystrlen (yystr) - const char *yystr; -#endif { YYSIZE_T yylen; for (yylen = 0; yystr[yylen]; yylen++) @@ -1628,16 +1493,8 @@ yystrlen (yystr) # else /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in YYDEST. */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static char * yystpcpy (char *yydest, const char *yysrc) -#else -static char * -yystpcpy (yydest, yysrc) - char *yydest; - const char *yysrc; -#endif { char *yyd = yydest; const char *yys = yysrc; @@ -1713,12 +1570,11 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, yytype_int16 *yyesa, yytype_int16 **yyes, YYSIZE_T *yyes_capacity, yytype_int16 *yyssp, int yytoken) { - YYSIZE_T yysize0 = yytnamerr (YY_NULL, yytname[yytoken]); + YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]); YYSIZE_T yysize = yysize0; - YYSIZE_T yysize1; enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; /* Internationalized format string. */ - const char *yyformat = YY_NULL; + const char *yyformat = YY_NULLPTR; /* Arguments of yyformat. */ char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; /* Number of reported tokens (one for the "unexpected", one per @@ -1726,10 +1582,6 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, int yycount = 0; /* There are many possibilities here to consider: - - Assume YYFAIL is not used. It's too flawed to consider. See - - for details. YYERROR is fine as it does not invoke this - function. - If this state is a consistent state with a default action, then the only way this function was invoked is if the default action is an error action. In that case, don't check for expected @@ -1776,14 +1628,16 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, break; } yyarg[yycount++] = yytname[yyx]; - yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]); - if (! (yysize <= yysize1 - && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) - return 2; - yysize = yysize1; + { + YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]); + if (! (yysize <= yysize1 + && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + return 2; + yysize = yysize1; + } } } -# if YYDEBUG +# if GRAM_DEBUG else if (yydebug) YYFPRINTF (stderr, "No expected tokens.\n"); # endif @@ -1804,10 +1658,12 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, # undef YYCASE_ } - yysize1 = yysize + yystrlen (yyformat); - if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) - return 2; - yysize = yysize1; + { + YYSIZE_T yysize1 = yysize + yystrlen (yyformat); + if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + return 2; + yysize = yysize1; + } if (*yymsg_alloc < yysize) { @@ -1844,86 +1700,47 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, | Release the memory associated to this symbol. | `-----------------------------------------------*/ -/*ARGSUSED*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static void yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocationp) -#else -static void -yydestruct (yymsg, yytype, yyvaluep, yylocationp) - const char *yymsg; - int yytype; - YYSTYPE *yyvaluep; - YYLTYPE *yylocationp; -#endif { - YYUSE(yyvaluep); + YYUSE (yyvaluep); YYUSE (yylocationp); if (!yymsg) yymsg = "Deleting"; YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); - switch (yytype) - { - default: - break; - } + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN + YYUSE (yytype); + YY_IGNORE_MAYBE_UNINITIALIZED_END } -/* Prevent warnings from -Wmissing-prototypes. */ -#ifdef YYPARSE_PARAM -#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 __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -int yyparse (void); -#else -int yyparse (); -#endif -#endif /* ! YYPARSE_PARAM */ /*----------. | yyparse. | `----------*/ -#ifdef YYPARSE_PARAM -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -int -yyparse (void *YYPARSE_PARAM) -#else -int -yyparse (YYPARSE_PARAM) - void *YYPARSE_PARAM; -#endif -#else /* ! YYPARSE_PARAM */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) int yyparse (void) -#else -int -yyparse () - -#endif -#endif { /* The lookahead symbol. */ int yychar; + /* The semantic value of the lookahead symbol. */ -YYSTYPE yylval; +/* Default value used for initialization, for pacifying older GCCs + or non-GCC compilers. */ +YY_INITIAL_VALUE (static YYSTYPE yyval_default;) +YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); /* Location data for the lookahead symbol. */ -YYLTYPE yylloc; +static YYLTYPE yyloc_default +# if defined GRAM_LTYPE_IS_TRIVIAL && GRAM_LTYPE_IS_TRIVIAL + = { 1, 1, 1, 1 } +# endif +; +YYLTYPE yylloc = yyloc_default; /* Number of syntax errors so far. */ int yynerrs; @@ -1933,9 +1750,9 @@ YYLTYPE yylloc; int yyerrstatus; /* The stacks and their tools: - `yyss': related to states. - `yyvs': related to semantic values. - `yyls': related to locations. + 'yyss': related to states. + 'yyvs': related to semantic values. + 'yyls': related to locations. Refer to the stacks through separate pointers, to allow yyoverflow to reallocate them elsewhere. */ @@ -1968,7 +1785,7 @@ YYLTYPE yylloc; int yyn; int yyresult; /* Lookahead token as an internal (translated) token number. */ - int yytoken; + int yytoken = 0; /* The variables used to return semantic value and location from the action routines. */ YYSTYPE yyval; @@ -1987,10 +1804,9 @@ YYLTYPE yylloc; Keep to zero when no symbol should be popped. */ int yylen = 0; - yytoken = 0; - yyss = yyssa; - yyvs = yyvsa; - yyls = yylsa; + yyssp = yyss = yyssa; + yyvsp = yyvs = yyvsa; + yylsp = yyls = yylsa; yystacksize = YYINITDEPTH; yyes = yyesa; @@ -2005,33 +1821,17 @@ YYLTYPE yylloc; yynerrs = 0; 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 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 = 1; -#endif - /* User initialization code. */ -/* Line 1528 of yacc.c */ -#line 99 "src/parse-gram.y" +#line 108 "src/parse-gram.y" /* yacc.c:1429 */ { /* Bison's grammar can initial empty locations, hence a default location is needed. */ boundary_set (&yylloc.start, current_file, 1, 1); boundary_set (&yylloc.end, current_file, 1, 1); } -/* Line 1528 of yacc.c */ -#line 2033 "src/parse-gram.c" - yylsp[0] = yylloc; +#line 1833 "src/parse-gram.c" /* yacc.c:1429 */ + yylsp[0] = yylloc; goto yysetstate; /*------------------------------------------------------------. @@ -2137,7 +1937,7 @@ yybackup: if (yychar == YYEMPTY) { YYDPRINTF ((stderr, "Reading a token: ")); - yychar = YYLEX; + yychar = yylex (&yylval, &yylloc); } if (yychar <= YYEOF) @@ -2182,7 +1982,9 @@ yybackup: YY_LAC_DISCARD ("shift"); yystate = yyn; + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN *++yyvsp = yylval; + YY_IGNORE_MAYBE_UNINITIALIZED_END *++yylsp = yylloc; goto yynewstate; @@ -2205,7 +2007,7 @@ yyreduce: yylen = yyr2[yyn]; /* If YYLEN is nonzero, implement the default value of the action: - `$$ = $1'. + '$$ = $1'. Otherwise, the following line sets YYVAL to garbage. This behavior is undocumented and Bison @@ -2222,215 +2024,145 @@ yyreduce: switch (yyn) { case 6: -/* Line 1744 of yacc.c */ -#line 286 "src/parse-gram.y" +#line 280 "src/parse-gram.y" /* yacc.c:1646 */ { - 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])); + translate_code ((yyvsp[0].code), (yylsp[0]), true), (yylsp[0])); code_scanner_last_string_free (); } -/* Line 1744 of yacc.c */ -#line 2238 "src/parse-gram.c" +#line 2033 "src/parse-gram.c" /* yacc.c:1646 */ break; case 7: -/* Line 1744 of yacc.c */ -#line 296 "src/parse-gram.y" +#line 286 "src/parse-gram.y" /* yacc.c:1646 */ { muscle_percent_define_ensure ((yyvsp[0].uniqstr), (yylsp[0]), true); } -/* Line 1744 of yacc.c */ -#line 2248 "src/parse-gram.c" +#line 2041 "src/parse-gram.c" /* yacc.c:1646 */ break; case 8: -/* Line 1744 of yacc.c */ -#line 300 "src/parse-gram.y" +#line 290 "src/parse-gram.y" /* yacc.c:1646 */ { - muscle_percent_define_insert ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].chars), + muscle_percent_define_insert ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].value).kind, (yyvsp[0].value).chars, MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE); } -/* Line 1744 of yacc.c */ -#line 2259 "src/parse-gram.c" +#line 2050 "src/parse-gram.c" /* yacc.c:1646 */ break; case 9: -/* Line 1744 of yacc.c */ -#line 304 "src/parse-gram.y" +#line 294 "src/parse-gram.y" /* yacc.c:1646 */ { defines_flag = true; } -/* Line 1744 of yacc.c */ -#line 2267 "src/parse-gram.c" +#line 2056 "src/parse-gram.c" /* yacc.c:1646 */ break; case 10: -/* Line 1744 of yacc.c */ -#line 306 "src/parse-gram.y" +#line 296 "src/parse-gram.y" /* yacc.c:1646 */ { defines_flag = true; - spec_defines_file = xstrdup ((yyvsp[0].chars)); + spec_defines_file = xstrdup ((yyvsp[0].code)); } -/* Line 1744 of yacc.c */ -#line 2278 "src/parse-gram.c" +#line 2065 "src/parse-gram.c" /* yacc.c:1646 */ break; case 11: -/* Line 1744 of yacc.c */ -#line 311 "src/parse-gram.y" +#line 301 "src/parse-gram.y" /* yacc.c:1646 */ { - muscle_percent_define_insert ("parse.error", (yylsp[0]), "verbose", + muscle_percent_define_insert ("parse.error", (yylsp[0]), muscle_keyword, + "verbose", MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE); } -/* Line 1744 of yacc.c */ -#line 2289 "src/parse-gram.c" +#line 2075 "src/parse-gram.c" /* yacc.c:1646 */ break; case 12: -/* Line 1744 of yacc.c */ -#line 315 "src/parse-gram.y" +#line 306 "src/parse-gram.y" /* yacc.c:1646 */ { expected_sr_conflicts = (yyvsp[0].integer); } -/* Line 1744 of yacc.c */ -#line 2297 "src/parse-gram.c" +#line 2081 "src/parse-gram.c" /* yacc.c:1646 */ break; case 13: -/* Line 1744 of yacc.c */ -#line 316 "src/parse-gram.y" +#line 307 "src/parse-gram.y" /* yacc.c:1646 */ { expected_rr_conflicts = (yyvsp[0].integer); } -/* Line 1744 of yacc.c */ -#line 2305 "src/parse-gram.c" +#line 2087 "src/parse-gram.c" /* yacc.c:1646 */ break; case 14: -/* Line 1744 of yacc.c */ -#line 317 "src/parse-gram.y" - { spec_file_prefix = (yyvsp[0].chars); } -/* Line 1744 of yacc.c */ -#line 2313 "src/parse-gram.c" +#line 308 "src/parse-gram.y" /* yacc.c:1646 */ + { spec_file_prefix = (yyvsp[0].code); } +#line 2093 "src/parse-gram.c" /* yacc.c:1646 */ break; case 15: -/* Line 1744 of yacc.c */ -#line 318 "src/parse-gram.y" - { spec_file_prefix = (yyvsp[0].chars); } -/* Line 1744 of yacc.c */ -#line 2321 "src/parse-gram.c" - break; - - case 16: -/* Line 1744 of yacc.c */ -#line 320 "src/parse-gram.y" +#line 310 "src/parse-gram.y" /* yacc.c:1646 */ { nondeterministic_parser = true; glr_parser = true; } -/* Line 1744 of yacc.c */ -#line 2332 "src/parse-gram.c" +#line 2102 "src/parse-gram.c" /* yacc.c:1646 */ break; - case 17: -/* Line 1744 of yacc.c */ -#line 325 "src/parse-gram.y" + case 16: +#line 315 "src/parse-gram.y" /* yacc.c:1646 */ { - 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])); + muscle_code_grow ("initial_action", translate_code ((yyvsp[0].code), (yylsp[0]), false), (yylsp[0])); code_scanner_last_string_free (); } -/* Line 1744 of yacc.c */ -#line 2347 "src/parse-gram.c" +#line 2111 "src/parse-gram.c" /* yacc.c:1646 */ + break; + + case 17: +#line 319 "src/parse-gram.y" /* yacc.c:1646 */ + { language_argmatch ((yyvsp[0].code), grammar_prio, (yylsp[-1])); } +#line 2117 "src/parse-gram.c" /* yacc.c:1646 */ break; case 18: -/* Line 1744 of yacc.c */ -#line 333 "src/parse-gram.y" - { language_argmatch ((yyvsp[0].chars), grammar_prio, (yylsp[-1])); } -/* Line 1744 of yacc.c */ -#line 2355 "src/parse-gram.c" +#line 320 "src/parse-gram.y" /* yacc.c:1646 */ + { spec_name_prefix = (yyvsp[0].code); } +#line 2123 "src/parse-gram.c" /* yacc.c:1646 */ break; case 19: -/* Line 1744 of yacc.c */ -#line 334 "src/parse-gram.y" - { spec_name_prefix = (yyvsp[0].chars); } -/* Line 1744 of yacc.c */ -#line 2363 "src/parse-gram.c" +#line 321 "src/parse-gram.y" /* yacc.c:1646 */ + { no_lines_flag = true; } +#line 2129 "src/parse-gram.c" /* yacc.c:1646 */ break; case 20: -/* Line 1744 of yacc.c */ -#line 335 "src/parse-gram.y" - { spec_name_prefix = (yyvsp[0].chars); } -/* Line 1744 of yacc.c */ -#line 2371 "src/parse-gram.c" +#line 322 "src/parse-gram.y" /* yacc.c:1646 */ + { nondeterministic_parser = true; } +#line 2135 "src/parse-gram.c" /* yacc.c:1646 */ break; case 21: -/* Line 1744 of yacc.c */ -#line 336 "src/parse-gram.y" - { no_lines_flag = true; } -/* Line 1744 of yacc.c */ -#line 2379 "src/parse-gram.c" +#line 323 "src/parse-gram.y" /* yacc.c:1646 */ + { spec_outfile = (yyvsp[0].code); } +#line 2141 "src/parse-gram.c" /* yacc.c:1646 */ break; case 22: -/* Line 1744 of yacc.c */ -#line 337 "src/parse-gram.y" - { nondeterministic_parser = true; } -/* Line 1744 of yacc.c */ -#line 2387 "src/parse-gram.c" +#line 324 "src/parse-gram.y" /* yacc.c:1646 */ + { current_param = (yyvsp[0].param); } +#line 2147 "src/parse-gram.c" /* yacc.c:1646 */ break; case 23: -/* Line 1744 of yacc.c */ -#line 338 "src/parse-gram.y" - { spec_outfile = (yyvsp[0].chars); } -/* Line 1744 of yacc.c */ -#line 2395 "src/parse-gram.c" +#line 324 "src/parse-gram.y" /* yacc.c:1646 */ + { current_param = param_none; } +#line 2153 "src/parse-gram.c" /* yacc.c:1646 */ break; case 24: -/* Line 1744 of yacc.c */ -#line 339 "src/parse-gram.y" - { spec_outfile = (yyvsp[0].chars); } -/* Line 1744 of yacc.c */ -#line 2403 "src/parse-gram.c" +#line 325 "src/parse-gram.y" /* yacc.c:1646 */ + { version_check (&(yylsp[0]), (yyvsp[0].code)); } +#line 2159 "src/parse-gram.c" /* yacc.c:1646 */ break; case 25: -/* Line 1744 of yacc.c */ -#line 340 "src/parse-gram.y" - { current_param = (yyvsp[0].param); } -/* Line 1744 of yacc.c */ -#line 2411 "src/parse-gram.c" - break; - - case 26: -/* Line 1744 of yacc.c */ -#line 340 "src/parse-gram.y" - { current_param = param_none; } -/* Line 1744 of yacc.c */ -#line 2419 "src/parse-gram.c" - break; - - case 27: -/* Line 1744 of yacc.c */ -#line 341 "src/parse-gram.y" - { version_check (&(yylsp[0]), (yyvsp[0].chars)); } -/* Line 1744 of yacc.c */ -#line 2427 "src/parse-gram.c" - break; - - case 28: -/* Line 1744 of yacc.c */ -#line 343 "src/parse-gram.y" +#line 327 "src/parse-gram.y" /* yacc.c:1646 */ { - char const *skeleton_user = (yyvsp[0].chars); + char const *skeleton_user = (yyvsp[0].code); if (strchr (skeleton_user, '/')) { size_t dir_length = strlen (current_file); @@ -2452,199 +2184,166 @@ yyreduce: } skeleton_arg (skeleton_user, grammar_prio, (yylsp[-1])); } -/* Line 1744 of yacc.c */ -#line 2457 "src/parse-gram.c" +#line 2187 "src/parse-gram.c" /* yacc.c:1646 */ break; - case 29: -/* Line 1744 of yacc.c */ -#line 366 "src/parse-gram.y" + case 26: +#line 350 "src/parse-gram.y" /* yacc.c:1646 */ { token_table_flag = true; } -/* Line 1744 of yacc.c */ -#line 2465 "src/parse-gram.c" +#line 2193 "src/parse-gram.c" /* yacc.c:1646 */ break; - case 30: -/* Line 1744 of yacc.c */ -#line 367 "src/parse-gram.y" + case 27: +#line 351 "src/parse-gram.y" /* yacc.c:1646 */ { report_flag |= report_states; } -/* Line 1744 of yacc.c */ -#line 2473 "src/parse-gram.c" +#line 2199 "src/parse-gram.c" /* yacc.c:1646 */ break; - case 31: -/* Line 1744 of yacc.c */ -#line 368 "src/parse-gram.y" + case 28: +#line 352 "src/parse-gram.y" /* yacc.c:1646 */ { yacc_flag = true; } -/* Line 1744 of yacc.c */ -#line 2481 "src/parse-gram.c" +#line 2205 "src/parse-gram.c" /* yacc.c:1646 */ break; - case 33: -/* Line 1744 of yacc.c */ -#line 373 "src/parse-gram.y" + case 30: +#line 357 "src/parse-gram.y" /* yacc.c:1646 */ { add_param (current_param, (yyvsp[0].code), (yylsp[0])); } -/* Line 1744 of yacc.c */ -#line 2489 "src/parse-gram.c" +#line 2211 "src/parse-gram.c" /* yacc.c:1646 */ break; - case 34: -/* Line 1744 of yacc.c */ -#line 374 "src/parse-gram.y" + case 31: +#line 358 "src/parse-gram.y" /* yacc.c:1646 */ { add_param (current_param, (yyvsp[0].code), (yylsp[0])); } -/* Line 1744 of yacc.c */ -#line 2497 "src/parse-gram.c" +#line 2217 "src/parse-gram.c" /* yacc.c:1646 */ break; - case 37: -/* Line 1744 of yacc.c */ -#line 386 "src/parse-gram.y" + case 34: +#line 370 "src/parse-gram.y" /* yacc.c:1646 */ { grammar_start_symbol_set ((yyvsp[0].symbol), (yylsp[0])); } -/* Line 1744 of yacc.c */ -#line 2507 "src/parse-gram.c" +#line 2225 "src/parse-gram.c" /* yacc.c:1646 */ break; - case 38: -/* Line 1744 of yacc.c */ -#line 390 "src/parse-gram.y" + case 35: +#line 374 "src/parse-gram.y" /* yacc.c:1646 */ { - symbol_list *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 1744 of yacc.c */ -#line 2520 "src/parse-gram.c" - break; - - case 39: -/* Line 1744 of yacc.c */ -#line 397 "src/parse-gram.y" - { - symbol_list *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)); + code_props code; + code_props_symbol_action_init (&code, (yyvsp[-1].code), (yylsp[-1])); + code_props_translate_code (&code); + { + symbol_list *list; + for (list = (yyvsp[0].list); list; list = list->next) + symbol_list_code_props_set (list, (yyvsp[-2].code_type), &code); + symbol_list_free ((yyvsp[0].list)); + } } -/* Line 1744 of yacc.c */ -#line 2533 "src/parse-gram.c" +#line 2241 "src/parse-gram.c" /* yacc.c:1646 */ break; - case 40: -/* Line 1744 of yacc.c */ -#line 404 "src/parse-gram.y" + case 36: +#line 386 "src/parse-gram.y" /* yacc.c:1646 */ { default_prec = true; } -/* Line 1744 of yacc.c */ -#line 2543 "src/parse-gram.c" +#line 2249 "src/parse-gram.c" /* yacc.c:1646 */ break; - case 41: -/* Line 1744 of yacc.c */ -#line 408 "src/parse-gram.y" + case 37: +#line 390 "src/parse-gram.y" /* yacc.c:1646 */ { default_prec = false; } -/* Line 1744 of yacc.c */ -#line 2553 "src/parse-gram.c" +#line 2257 "src/parse-gram.c" /* yacc.c:1646 */ break; - case 42: -/* Line 1744 of yacc.c */ -#line 412 "src/parse-gram.y" + case 38: +#line 394 "src/parse-gram.y" /* yacc.c:1646 */ { /* 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])); + muscle_code_grow ("percent_code()", + translate_code_braceless ((yyvsp[0].code), (yylsp[0])), (yylsp[0])); code_scanner_last_string_free (); } -/* Line 1744 of yacc.c */ -#line 2566 "src/parse-gram.c" +#line 2269 "src/parse-gram.c" /* yacc.c:1646 */ break; - case 43: -/* Line 1744 of yacc.c */ -#line 419 "src/parse-gram.y" + case 39: +#line 402 "src/parse-gram.y" /* yacc.c:1646 */ { - muscle_percent_code_grow ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].chars), (yylsp[0])); + muscle_percent_code_grow ((yyvsp[-1].uniqstr), (yylsp[-1]), translate_code_braceless ((yyvsp[0].code), (yylsp[0])), (yylsp[0])); code_scanner_last_string_free (); } -/* Line 1744 of yacc.c */ -#line 2577 "src/parse-gram.c" +#line 2278 "src/parse-gram.c" /* yacc.c:1646 */ break; - case 44: -/* Line 1744 of yacc.c */ -#line 433 "src/parse-gram.y" + case 40: +#line 412 "src/parse-gram.y" /* yacc.c:1646 */ + { (yyval.code_type) = destructor; } +#line 2284 "src/parse-gram.c" /* yacc.c:1646 */ + break; + + case 41: +#line 413 "src/parse-gram.y" /* yacc.c:1646 */ + { (yyval.code_type) = printer; } +#line 2290 "src/parse-gram.c" /* yacc.c:1646 */ + break; + + case 42: +#line 423 "src/parse-gram.y" /* yacc.c:1646 */ {} -/* Line 1744 of yacc.c */ -#line 2585 "src/parse-gram.c" +#line 2296 "src/parse-gram.c" /* yacc.c:1646 */ break; - case 45: -/* Line 1744 of yacc.c */ -#line 434 "src/parse-gram.y" + case 43: +#line 424 "src/parse-gram.y" /* yacc.c:1646 */ { muscle_code_grow ("union_name", (yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1744 of yacc.c */ -#line 2593 "src/parse-gram.c" +#line 2302 "src/parse-gram.c" /* yacc.c:1646 */ break; - case 46: -/* Line 1744 of yacc.c */ -#line 439 "src/parse-gram.y" + case 44: +#line 429 "src/parse-gram.y" /* yacc.c:1646 */ { union_seen = true; - muscle_code_grow ("stype", (yyvsp[0].chars), (yylsp[0])); + muscle_code_grow ("union_members", translate_code_braceless ((yyvsp[0].code), (yylsp[0])), (yylsp[0])); code_scanner_last_string_free (); } -/* Line 1744 of yacc.c */ -#line 2605 "src/parse-gram.c" +#line 2312 "src/parse-gram.c" /* yacc.c:1646 */ break; - case 47: -/* Line 1744 of yacc.c */ -#line 450 "src/parse-gram.y" + case 45: +#line 440 "src/parse-gram.y" /* yacc.c:1646 */ { current_class = nterm_sym; } -/* Line 1744 of yacc.c */ -#line 2613 "src/parse-gram.c" +#line 2318 "src/parse-gram.c" /* yacc.c:1646 */ break; - case 48: -/* Line 1744 of yacc.c */ -#line 451 "src/parse-gram.y" + case 46: +#line 441 "src/parse-gram.y" /* yacc.c:1646 */ { current_class = unknown_sym; current_type = NULL; } -/* Line 1744 of yacc.c */ -#line 2624 "src/parse-gram.c" +#line 2327 "src/parse-gram.c" /* yacc.c:1646 */ break; - case 49: -/* Line 1744 of yacc.c */ -#line 455 "src/parse-gram.y" + case 47: +#line 445 "src/parse-gram.y" /* yacc.c:1646 */ { current_class = token_sym; } -/* Line 1744 of yacc.c */ -#line 2632 "src/parse-gram.c" +#line 2333 "src/parse-gram.c" /* yacc.c:1646 */ break; - case 50: -/* Line 1744 of yacc.c */ -#line 456 "src/parse-gram.y" + case 48: +#line 446 "src/parse-gram.y" /* yacc.c:1646 */ { current_class = unknown_sym; current_type = NULL; } -/* Line 1744 of yacc.c */ -#line 2643 "src/parse-gram.c" +#line 2342 "src/parse-gram.c" /* yacc.c:1646 */ break; - case 51: -/* Line 1744 of yacc.c */ -#line 461 "src/parse-gram.y" + case 49: +#line 451 "src/parse-gram.y" /* yacc.c:1646 */ { symbol_list *list; tag_seen = true; @@ -2652,13 +2351,11 @@ yyreduce: symbol_type_set (list->content.sym, (yyvsp[-1].uniqstr), (yylsp[-1])); symbol_list_free ((yyvsp[0].list)); } -/* Line 1744 of yacc.c */ -#line 2657 "src/parse-gram.c" +#line 2354 "src/parse-gram.c" /* yacc.c:1646 */ break; - case 52: -/* Line 1744 of yacc.c */ -#line 472 "src/parse-gram.y" + case 50: +#line 462 "src/parse-gram.y" /* yacc.c:1646 */ { symbol_list *list; ++current_prec; @@ -2670,427 +2367,341 @@ yyreduce: symbol_list_free ((yyvsp[0].list)); current_type = NULL; } -/* Line 1744 of yacc.c */ -#line 2675 "src/parse-gram.c" +#line 2370 "src/parse-gram.c" /* yacc.c:1646 */ break; - case 53: -/* Line 1744 of yacc.c */ -#line 486 "src/parse-gram.y" + case 51: +#line 476 "src/parse-gram.y" /* yacc.c:1646 */ { (yyval.assoc) = left_assoc; } -/* Line 1744 of yacc.c */ -#line 2683 "src/parse-gram.c" +#line 2376 "src/parse-gram.c" /* yacc.c:1646 */ break; - case 54: -/* Line 1744 of yacc.c */ -#line 487 "src/parse-gram.y" + case 52: +#line 477 "src/parse-gram.y" /* yacc.c:1646 */ { (yyval.assoc) = right_assoc; } -/* Line 1744 of yacc.c */ -#line 2691 "src/parse-gram.c" +#line 2382 "src/parse-gram.c" /* yacc.c:1646 */ break; - case 55: -/* Line 1744 of yacc.c */ -#line 488 "src/parse-gram.y" + case 53: +#line 478 "src/parse-gram.y" /* yacc.c:1646 */ { (yyval.assoc) = non_assoc; } -/* Line 1744 of yacc.c */ -#line 2699 "src/parse-gram.c" +#line 2388 "src/parse-gram.c" /* yacc.c:1646 */ break; - case 56: -/* Line 1744 of yacc.c */ -#line 489 "src/parse-gram.y" + case 54: +#line 479 "src/parse-gram.y" /* yacc.c:1646 */ { (yyval.assoc) = precedence_assoc; } -/* Line 1744 of yacc.c */ -#line 2707 "src/parse-gram.c" +#line 2394 "src/parse-gram.c" /* yacc.c:1646 */ break; - case 57: -/* Line 1744 of yacc.c */ -#line 493 "src/parse-gram.y" + case 55: +#line 483 "src/parse-gram.y" /* yacc.c:1646 */ { current_type = NULL; } -/* Line 1744 of yacc.c */ -#line 2715 "src/parse-gram.c" +#line 2400 "src/parse-gram.c" /* yacc.c:1646 */ break; - case 58: -/* Line 1744 of yacc.c */ -#line 494 "src/parse-gram.y" + case 56: +#line 484 "src/parse-gram.y" /* yacc.c:1646 */ { current_type = (yyvsp[0].uniqstr); tag_seen = true; } -/* Line 1744 of yacc.c */ -#line 2723 "src/parse-gram.c" +#line 2406 "src/parse-gram.c" /* yacc.c:1646 */ break; - case 59: -/* Line 1744 of yacc.c */ -#line 500 "src/parse-gram.y" + case 57: +#line 490 "src/parse-gram.y" /* yacc.c:1646 */ { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); } -/* Line 1744 of yacc.c */ -#line 2731 "src/parse-gram.c" +#line 2412 "src/parse-gram.c" /* yacc.c:1646 */ + break; + + case 58: +#line 492 "src/parse-gram.y" /* yacc.c:1646 */ + { (yyval.list) = symbol_list_append ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); } +#line 2418 "src/parse-gram.c" /* yacc.c:1646 */ + break; + + case 59: +#line 497 "src/parse-gram.y" /* yacc.c:1646 */ + { + (yyval.symbol) = (yyvsp[0].symbol); + symbol_class_set ((yyvsp[0].symbol), token_sym, (yylsp[0]), false); + } +#line 2427 "src/parse-gram.c" /* yacc.c:1646 */ break; case 60: -/* Line 1744 of yacc.c */ -#line 502 "src/parse-gram.y" - { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); } -/* Line 1744 of yacc.c */ -#line 2739 "src/parse-gram.c" +#line 502 "src/parse-gram.y" /* yacc.c:1646 */ + { + (yyval.symbol) = (yyvsp[-1].symbol); + symbol_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer), (yylsp[0])); + symbol_class_set ((yyvsp[-1].symbol), token_sym, (yylsp[-1]), false); + } +#line 2437 "src/parse-gram.c" /* yacc.c:1646 */ break; case 61: -/* Line 1744 of yacc.c */ -#line 506 "src/parse-gram.y" - { (yyval.symbol) = (yyvsp[0].symbol); } -/* Line 1744 of yacc.c */ -#line 2747 "src/parse-gram.c" +#line 512 "src/parse-gram.y" /* yacc.c:1646 */ + { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); } +#line 2443 "src/parse-gram.c" /* yacc.c:1646 */ break; case 62: -/* Line 1744 of yacc.c */ -#line 507 "src/parse-gram.y" - { (yyval.symbol) = (yyvsp[-1].symbol); symbol_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer), (yylsp[0])); } -/* Line 1744 of yacc.c */ -#line 2755 "src/parse-gram.c" +#line 514 "src/parse-gram.y" /* yacc.c:1646 */ + { (yyval.list) = symbol_list_append ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); } +#line 2449 "src/parse-gram.c" /* yacc.c:1646 */ break; case 63: -/* Line 1744 of yacc.c */ -#line 513 "src/parse-gram.y" - { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); } -/* Line 1744 of yacc.c */ -#line 2763 "src/parse-gram.c" +#line 518 "src/parse-gram.y" /* yacc.c:1646 */ + { (yyval.list) = (yyvsp[0].list); } +#line 2455 "src/parse-gram.c" /* yacc.c:1646 */ break; case 64: -/* Line 1744 of yacc.c */ -#line 515 "src/parse-gram.y" - { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); } -/* Line 1744 of yacc.c */ -#line 2771 "src/parse-gram.c" +#line 519 "src/parse-gram.y" /* yacc.c:1646 */ + { (yyval.list) = symbol_list_append ((yyvsp[-1].list), (yyvsp[0].list)); } +#line 2461 "src/parse-gram.c" /* yacc.c:1646 */ break; case 65: -/* Line 1744 of yacc.c */ -#line 519 "src/parse-gram.y" - { (yyval.list) = (yyvsp[0].list); } -/* Line 1744 of yacc.c */ -#line 2779 "src/parse-gram.c" +#line 523 "src/parse-gram.y" /* yacc.c:1646 */ + { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); } +#line 2467 "src/parse-gram.c" /* yacc.c:1646 */ break; case 66: -/* Line 1744 of yacc.c */ -#line 520 "src/parse-gram.y" - { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), (yyvsp[0].list)); } -/* Line 1744 of yacc.c */ -#line 2787 "src/parse-gram.c" - break; - - case 67: -/* Line 1744 of yacc.c */ -#line 524 "src/parse-gram.y" - { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); } -/* Line 1744 of yacc.c */ -#line 2795 "src/parse-gram.c" +#line 524 "src/parse-gram.y" /* yacc.c:1646 */ + { (yyval.list) = symbol_list_type_new ((yyvsp[0].uniqstr), (yylsp[0])); } +#line 2473 "src/parse-gram.c" /* yacc.c:1646 */ break; case 68: -/* Line 1744 of yacc.c */ -#line 525 "src/parse-gram.y" - { (yyval.list) = symbol_list_type_new ((yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1744 of yacc.c */ -#line 2803 "src/parse-gram.c" +#line 529 "src/parse-gram.y" /* yacc.c:1646 */ + { (yyval.uniqstr) = uniqstr_new ("*"); } +#line 2479 "src/parse-gram.c" /* yacc.c:1646 */ break; case 69: -/* Line 1744 of yacc.c */ -#line 526 "src/parse-gram.y" - { (yyval.list) = symbol_list_default_tagged_new ((yylsp[0])); } -/* Line 1744 of yacc.c */ -#line 2811 "src/parse-gram.c" +#line 530 "src/parse-gram.y" /* yacc.c:1646 */ + { (yyval.uniqstr) = uniqstr_new (""); } +#line 2485 "src/parse-gram.c" /* yacc.c:1646 */ break; case 70: -/* Line 1744 of yacc.c */ -#line 527 "src/parse-gram.y" - { (yyval.list) = symbol_list_default_tagless_new ((yylsp[0])); } -/* Line 1744 of yacc.c */ -#line 2819 "src/parse-gram.c" +#line 536 "src/parse-gram.y" /* yacc.c:1646 */ + { + current_type = (yyvsp[0].uniqstr); + tag_seen = true; + } +#line 2494 "src/parse-gram.c" /* yacc.c:1646 */ break; case 71: -/* Line 1744 of yacc.c */ -#line 533 "src/parse-gram.y" +#line 541 "src/parse-gram.y" /* yacc.c:1646 */ { - current_type = (yyvsp[0].uniqstr); - tag_seen = true; - } -/* Line 1744 of yacc.c */ -#line 2830 "src/parse-gram.c" + symbol_class_set ((yyvsp[0].symbol), current_class, (yylsp[0]), true); + symbol_type_set ((yyvsp[0].symbol), current_type, (yylsp[0])); + } +#line 2503 "src/parse-gram.c" /* yacc.c:1646 */ break; case 72: -/* Line 1744 of yacc.c */ -#line 538 "src/parse-gram.y" - { - symbol_class_set ((yyvsp[0].symbol), current_class, (yylsp[0]), true); - symbol_type_set ((yyvsp[0].symbol), current_type, (yylsp[0])); - } -/* Line 1744 of yacc.c */ -#line 2841 "src/parse-gram.c" - break; - - case 73: -/* Line 1744 of yacc.c */ -#line 543 "src/parse-gram.y" +#line 546 "src/parse-gram.y" /* yacc.c:1646 */ { 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 1744 of yacc.c */ -#line 2853 "src/parse-gram.c" +#line 2513 "src/parse-gram.c" /* yacc.c:1646 */ break; - case 74: -/* Line 1744 of yacc.c */ -#line 549 "src/parse-gram.y" + case 73: +#line 552 "src/parse-gram.y" /* yacc.c:1646 */ { 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 1744 of yacc.c */ -#line 2865 "src/parse-gram.c" +#line 2523 "src/parse-gram.c" /* yacc.c:1646 */ break; - case 75: -/* Line 1744 of yacc.c */ -#line 555 "src/parse-gram.y" + case 74: +#line 558 "src/parse-gram.y" /* yacc.c:1646 */ { 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 1744 of yacc.c */ -#line 2878 "src/parse-gram.c" +#line 2534 "src/parse-gram.c" /* yacc.c:1646 */ break; - case 82: -/* Line 1744 of yacc.c */ -#line 585 "src/parse-gram.y" + case 81: +#line 588 "src/parse-gram.y" /* yacc.c:1646 */ { yyerrok; } -/* Line 1744 of yacc.c */ -#line 2888 "src/parse-gram.c" +#line 2542 "src/parse-gram.c" /* yacc.c:1646 */ break; - case 83: -/* Line 1744 of yacc.c */ -#line 591 "src/parse-gram.y" + case 82: +#line 594 "src/parse-gram.y" /* yacc.c:1646 */ { current_lhs ((yyvsp[-1].symbol), (yylsp[-1]), (yyvsp[0].named_ref)); } -/* Line 1744 of yacc.c */ -#line 2896 "src/parse-gram.c" +#line 2548 "src/parse-gram.c" /* yacc.c:1646 */ break; - case 84: -/* Line 1744 of yacc.c */ -#line 592 "src/parse-gram.y" + case 83: +#line 595 "src/parse-gram.y" /* yacc.c:1646 */ { /* Free the current lhs. */ current_lhs (0, (yylsp[-3]), 0); } -/* Line 1744 of yacc.c */ -#line 2907 "src/parse-gram.c" +#line 2557 "src/parse-gram.c" /* yacc.c:1646 */ break; - case 85: -/* Line 1744 of yacc.c */ -#line 599 "src/parse-gram.y" + case 84: +#line 602 "src/parse-gram.y" /* yacc.c:1646 */ { grammar_current_rule_end ((yylsp[0])); } -/* Line 1744 of yacc.c */ -#line 2915 "src/parse-gram.c" +#line 2563 "src/parse-gram.c" /* yacc.c:1646 */ break; - case 86: -/* Line 1744 of yacc.c */ -#line 600 "src/parse-gram.y" + case 85: +#line 603 "src/parse-gram.y" /* yacc.c:1646 */ { grammar_current_rule_end ((yylsp[0])); } -/* Line 1744 of yacc.c */ -#line 2923 "src/parse-gram.c" +#line 2569 "src/parse-gram.c" /* yacc.c:1646 */ break; - case 88: -/* Line 1744 of yacc.c */ -#line 606 "src/parse-gram.y" + case 87: +#line 610 "src/parse-gram.y" /* yacc.c:1646 */ { grammar_current_rule_begin (current_lhs_symbol, current_lhs_location, current_lhs_named_ref); } -/* Line 1744 of yacc.c */ -#line 2932 "src/parse-gram.c" +#line 2576 "src/parse-gram.c" /* yacc.c:1646 */ break; - case 89: -/* Line 1744 of yacc.c */ -#line 609 "src/parse-gram.y" + case 88: +#line 613 "src/parse-gram.y" /* yacc.c:1646 */ { grammar_current_rule_symbol_append ((yyvsp[-1].symbol), (yylsp[-1]), (yyvsp[0].named_ref)); } -/* Line 1744 of yacc.c */ -#line 2940 "src/parse-gram.c" +#line 2582 "src/parse-gram.c" /* yacc.c:1646 */ break; - case 90: -/* Line 1744 of yacc.c */ -#line 611 "src/parse-gram.y" + case 89: +#line 615 "src/parse-gram.y" /* yacc.c:1646 */ { grammar_current_rule_action_append ((yyvsp[-1].code), (yylsp[-1]), (yyvsp[0].named_ref), false); } -/* Line 1744 of yacc.c */ -#line 2948 "src/parse-gram.c" +#line 2588 "src/parse-gram.c" /* yacc.c:1646 */ break; - case 91: -/* Line 1744 of yacc.c */ -#line 613 "src/parse-gram.y" + case 90: +#line 617 "src/parse-gram.y" /* yacc.c:1646 */ { grammar_current_rule_action_append ((yyvsp[0].code), (yylsp[0]), NULL, true); } -/* Line 1744 of yacc.c */ -#line 2956 "src/parse-gram.c" +#line 2594 "src/parse-gram.c" /* yacc.c:1646 */ + break; + + case 91: +#line 619 "src/parse-gram.y" /* yacc.c:1646 */ + { grammar_current_rule_empty_set ((yylsp[0])); } +#line 2600 "src/parse-gram.c" /* yacc.c:1646 */ break; case 92: -/* Line 1744 of yacc.c */ -#line 615 "src/parse-gram.y" +#line 621 "src/parse-gram.y" /* yacc.c:1646 */ { grammar_current_rule_prec_set ((yyvsp[0].symbol), (yylsp[0])); } -/* Line 1744 of yacc.c */ -#line 2964 "src/parse-gram.c" +#line 2606 "src/parse-gram.c" /* yacc.c:1646 */ break; case 93: -/* Line 1744 of yacc.c */ -#line 617 "src/parse-gram.y" +#line 623 "src/parse-gram.y" /* yacc.c:1646 */ { grammar_current_rule_dprec_set ((yyvsp[0].integer), (yylsp[0])); } -/* Line 1744 of yacc.c */ -#line 2972 "src/parse-gram.c" +#line 2612 "src/parse-gram.c" /* yacc.c:1646 */ break; case 94: -/* Line 1744 of yacc.c */ -#line 619 "src/parse-gram.y" +#line 625 "src/parse-gram.y" /* yacc.c:1646 */ { grammar_current_rule_merge_set ((yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1744 of yacc.c */ -#line 2980 "src/parse-gram.c" +#line 2618 "src/parse-gram.c" /* yacc.c:1646 */ break; case 95: -/* Line 1744 of yacc.c */ -#line 623 "src/parse-gram.y" +#line 629 "src/parse-gram.y" /* yacc.c:1646 */ { (yyval.named_ref) = 0; } -/* Line 1744 of yacc.c */ -#line 2988 "src/parse-gram.c" +#line 2624 "src/parse-gram.c" /* yacc.c:1646 */ break; case 96: -/* Line 1744 of yacc.c */ -#line 625 "src/parse-gram.y" - { (yyval.named_ref) = named_ref_new((yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1744 of yacc.c */ -#line 2996 "src/parse-gram.c" +#line 630 "src/parse-gram.y" /* yacc.c:1646 */ + { (yyval.named_ref) = named_ref_new ((yyvsp[0].uniqstr), (yylsp[0])); } +#line 2630 "src/parse-gram.c" /* yacc.c:1646 */ break; case 98: -/* Line 1744 of yacc.c */ -#line 636 "src/parse-gram.y" - { (yyval.uniqstr) = uniqstr_new ((yyvsp[0].chars)); } -/* Line 1744 of yacc.c */ -#line 3004 "src/parse-gram.c" +#line 641 "src/parse-gram.y" /* yacc.c:1646 */ + { (yyval.uniqstr) = uniqstr_new ((yyvsp[0].code)); } +#line 2636 "src/parse-gram.c" /* yacc.c:1646 */ break; case 99: -/* Line 1744 of yacc.c */ -#line 641 "src/parse-gram.y" - { (yyval.chars) = ""; } -/* Line 1744 of yacc.c */ -#line 3012 "src/parse-gram.c" +#line 666 "src/parse-gram.y" /* yacc.c:1646 */ + { (yyval.value).kind = muscle_keyword; (yyval.value).chars = ""; } +#line 2642 "src/parse-gram.c" /* yacc.c:1646 */ break; case 100: -/* Line 1744 of yacc.c */ -#line 642 "src/parse-gram.y" - { (yyval.chars) = (yyvsp[0].uniqstr); } -/* Line 1744 of yacc.c */ -#line 3020 "src/parse-gram.c" +#line 667 "src/parse-gram.y" /* yacc.c:1646 */ + { (yyval.value).kind = muscle_keyword; (yyval.value).chars = (yyvsp[0].uniqstr); } +#line 2648 "src/parse-gram.c" /* yacc.c:1646 */ + break; + + case 101: +#line 668 "src/parse-gram.y" /* yacc.c:1646 */ + { (yyval.value).kind = muscle_string; (yyval.value).chars = (yyvsp[0].code); } +#line 2654 "src/parse-gram.c" /* yacc.c:1646 */ break; case 102: -/* Line 1744 of yacc.c */ -#line 653 "src/parse-gram.y" - { - 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 1744 of yacc.c */ -#line 3035 "src/parse-gram.c" +#line 669 "src/parse-gram.y" /* yacc.c:1646 */ + { (yyval.value).kind = muscle_code; (yyval.value).chars = strip_braces ((yyvsp[0].code)); } +#line 2660 "src/parse-gram.c" /* yacc.c:1646 */ break; case 103: -/* Line 1744 of yacc.c */ -#line 673 "src/parse-gram.y" +#line 682 "src/parse-gram.y" /* yacc.c:1646 */ { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1744 of yacc.c */ -#line 3043 "src/parse-gram.c" +#line 2666 "src/parse-gram.c" /* yacc.c:1646 */ break; case 104: -/* Line 1744 of yacc.c */ -#line 675 "src/parse-gram.y" +#line 684 "src/parse-gram.y" /* yacc.c:1646 */ { (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 1744 of yacc.c */ -#line 3055 "src/parse-gram.c" +#line 2676 "src/parse-gram.c" /* yacc.c:1646 */ break; case 105: -/* Line 1744 of yacc.c */ -#line 683 "src/parse-gram.y" +#line 692 "src/parse-gram.y" /* yacc.c:1646 */ { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1744 of yacc.c */ -#line 3063 "src/parse-gram.c" +#line 2682 "src/parse-gram.c" /* yacc.c:1646 */ break; case 108: -/* Line 1744 of yacc.c */ -#line 695 "src/parse-gram.y" +#line 704 "src/parse-gram.y" /* yacc.c:1646 */ { - (yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[0].chars)), (yylsp[0])); + (yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[0].code)), (yylsp[0])); symbol_class_set ((yyval.symbol), token_sym, (yylsp[0]), false); } -/* Line 1744 of yacc.c */ -#line 3074 "src/parse-gram.c" +#line 2691 "src/parse-gram.c" /* yacc.c:1646 */ break; case 110: -/* Line 1744 of yacc.c */ -#line 704 "src/parse-gram.y" +#line 713 "src/parse-gram.y" /* yacc.c:1646 */ { - 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])); + muscle_code_grow ("epilogue", translate_code ((yyvsp[0].code), (yylsp[0]), true), (yylsp[0])); code_scanner_last_string_free (); } -/* Line 1744 of yacc.c */ -#line 3089 "src/parse-gram.c" +#line 2700 "src/parse-gram.c" /* yacc.c:1646 */ break; -/* Line 1744 of yacc.c */ -#line 3094 "src/parse-gram.c" +#line 2704 "src/parse-gram.c" /* yacc.c:1646 */ default: break; } if (yychar_backup != yychar) @@ -3116,7 +2727,7 @@ yyreduce: *++yyvsp = yyval; *++yylsp = yyloc; - /* Now `shift' the result of the reduction. Determine what state + /* Now 'shift' the result of the reduction. Determine what state that goes to, based on the state we popped back to and the rule number reduced by. */ @@ -3131,9 +2742,9 @@ yyreduce: goto yynewstate; -/*------------------------------------. -| yyerrlab -- here on detecting error | -`------------------------------------*/ +/*--------------------------------------. +| yyerrlab -- here on detecting error. | +`--------------------------------------*/ yyerrlab: /* Make sure we have latest lookahead translation. See comments at user semantic actions for why this is necessary. */ @@ -3144,7 +2755,7 @@ yyerrlab: { ++yynerrs; #if ! YYERROR_VERBOSE - yyerror (YY_("syntax error")); + yyerror (&yylloc, YY_("syntax error")); #else # define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \ yyesa, &yyes, &yyes_capacity, \ @@ -3174,7 +2785,7 @@ yyerrlab: yymsgp = yymsg; } } - yyerror (yymsgp); + yyerror (&yylloc, yymsgp); if (yysyntax_error_status == 2) goto yyexhaustedlab; } @@ -3220,7 +2831,7 @@ yyerrorlab: goto yyerrorlab; yyerror_range[1] = yylsp[1-yylen]; - /* Do not reclaim the symbols of the rule which action triggered + /* Do not reclaim the symbols of the rule whose action triggered this YYERROR. */ YYPOPSTACK (yylen); yylen = 0; @@ -3265,7 +2876,9 @@ yyerrlab1: current lookahead token, the shift below will for sure. */ YY_LAC_DISCARD ("error recovery"); + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN *++yyvsp = yylval; + YY_IGNORE_MAYBE_UNINITIALIZED_END yyerror_range[2] = yylloc; /* Using YYLLOC is tempting, but would change the location of @@ -3299,7 +2912,7 @@ yyabortlab: | yyexhaustedlab -- memory exhaustion comes here. | `-------------------------------------------------*/ yyexhaustedlab: - yyerror (YY_("memory exhausted")); + yyerror (&yylloc, YY_("memory exhausted")); yyresult = 2; /* Fall through. */ #endif @@ -3313,7 +2926,7 @@ yyreturn: yydestruct ("Cleanup: discarding lookahead", yytoken, &yylval, &yylloc); } - /* Do not reclaim the symbols of the rule which action triggered + /* Do not reclaim the symbols of the rule whose action triggered this YYABORT or YYACCEPT. */ YYPOPSTACK (yylen); YY_STACK_PRINT (yyss, yyssp); @@ -3333,13 +2946,9 @@ yyreturn: if (yymsg != yymsgbuf) YYSTACK_FREE (yymsg); #endif - /* Make sure YYID is used. */ - return YYID (yyresult); + return yyresult; } - -/* Line 2004 of yacc.c */ -#line 714 "src/parse-gram.y" - +#line 719 "src/parse-gram.y" /* yacc.c:1906 */ /* Return the location of the left-hand side of a rule whose @@ -3371,6 +2980,33 @@ lloc_default (YYLTYPE const *rhs, int n) return loc; } +static +char *strip_braces (char *code) +{ + code[strlen (code) - 1] = 0; + return code + 1; +} + +static +char const * +translate_code (char *code, location loc, bool plain) +{ + code_props plain_code; + if (plain) + code_props_plain_init (&plain_code, code, loc); + else + code_props_symbol_action_init (&plain_code, code, loc); + code_props_translate_code (&plain_code); + gram_scanner_last_string_free (); + return plain_code.code; +} + +static +char const * +translate_code_braceless (char *code, location loc) +{ + return translate_code (strip_braces (code), loc, true); +} static void add_param (param_type type, char *decl, location loc) @@ -3393,15 +3029,17 @@ add_param (param_type type, char *decl, location loc) /* Strip the surrounding '{' and '}', and any blanks just inside the braces. */ - while (*--p == ' ' || *p == '\t') - continue; + --p; + while (c_isspace ((unsigned char) *p)) + --p; p[1] = '\0'; - while (*++decl == ' ' || *decl == '\t') - continue; + ++decl; + while (c_isspace ((unsigned char) *decl)) + ++decl; } if (! name_start) - complain_at (loc, _("missing identifier in parameter declaration")); + complain (&loc, complaint, _("missing identifier in parameter declaration")); else { char *name = xmemdup0 (name_start, strspn (name_start, alphanum)); @@ -3421,8 +3059,8 @@ version_check (location const *loc, char const *version) { if (strverscmp (version, PACKAGE_VERSION) > 0) { - complain_at (*loc, "require bison %s, but have %s", - version, PACKAGE_VERSION); + complain (loc, complaint, "require bison %s, but have %s", + version, PACKAGE_VERSION); exit (EX_MISMATCH); } } @@ -3430,7 +3068,7 @@ version_check (location const *loc, char const *version) static void gram_error (location const *loc, char const *msg) { - complain_at (*loc, "%s", msg); + complain (loc, complaint, "%s", msg); } char const * @@ -3451,3 +3089,18 @@ char_name (char c) return quotearg_style (escape_quoting_style, buf); } } + +static +void +current_lhs (symbol *sym, location loc, named_ref *ref) +{ + current_lhs_symbol = sym; + current_lhs_location = loc; + /* In order to simplify memory management, named references for lhs + are always assigned by deep copy into the current symbol_list + node. This is because a single named-ref in the grammar may + result in several uses when the user factors lhs between several + rules using "|". Therefore free the parser's original copy. */ + free (current_lhs_named_ref); + current_lhs_named_ref = ref; +}