X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/52cc1ebda23a97770c69bcd057060486b0f9e980..75ae8299840bbd854fa2474d38402bbb933c6511:/src/parse-gram.c diff --git a/src/parse-gram.c b/src/parse-gram.c index 7a19cf18..2cf9e86c 100644 --- a/src/parse-gram.c +++ b/src/parse-gram.c @@ -1,8 +1,8 @@ -/* A Bison parser, made by GNU Bison 2.6.2.834-6d7b9. */ +/* A Bison parser, made by GNU Bison 2.7.1127-02879-dirty. */ /* 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-2013 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 +44,13 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.6.2.834-6d7b9" +#define YYBISON_VERSION "2.7.1127-02879-dirty" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" /* Pure parsers. */ -#define YYPURE 1 +#define YYPURE 2 /* Push parsers. */ #define YYPUSH 0 @@ -58,23 +58,22 @@ /* Pull parsers. */ #define YYPULL 1 - +/* 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 331 of yacc.c */ -#line 1 "src/parse-gram.y" +#line 1 "src/parse-gram.y" /* yacc.c:356 */ /* Bison Grammar Parser -*- C -*- - Copyright (C) 2002-2012 Free Software Foundation, Inc. + Copyright (C) 2002-2013 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -94,12 +93,12 @@ #include #include "system.h" +#include "c-ctype.h" #include "complain.h" #include "conflicts.h" #include "files.h" #include "getargs.h" #include "gram.h" -#include "muscle-tab.h" #include "named-ref.h" #include "quotearg.h" #include "reader.h" @@ -113,21 +112,16 @@ static YYLTYPE lloc_default (YYLTYPE const *, int); #define YY_LOCATION_PRINT(File, Loc) \ - location_print (File, Loc) + location_print (Loc, File) 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 *); +/* A string that describes a char (e.g., 'a' -> "'a'"). */ static char const *char_name (char); -/* Line 331 of yacc.c */ -#line 131 "src/parse-gram.c" +#line 125 "src/parse-gram.c" /* yacc.c:356 */ # ifndef YY_NULL # if defined __cplusplus && 201103L <= __cplusplus @@ -147,21 +141,26 @@ static char const *char_name (char); /* In a future release of Bison, this section will be replaced by #include "src/parse-gram.h". */ -#ifndef GRAM_SRC_PARSE_GRAM_H -# define GRAM_SRC_PARSE_GRAM_H -/* Enabling traces. */ -#ifndef YYDEBUG -# define YYDEBUG 1 -#endif +#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 345 of yacc.c */ -#line 222 "src/parse-gram.y" +#line 218 "src/parse-gram.y" /* yacc.c:372 */ -# ifndef PARAM_TYPE -# define PARAM_TYPE typedef enum { param_none = 0, @@ -169,189 +168,144 @@ extern int gram_debug; param_parse = 1 << 1, param_both = param_lex | param_parse } param_type; -# endif +#line 649 "src/parse-gram.y" /* yacc.c:372 */ +#include "muscle-tab.h" -/* Line 345 of yacc.c */ -#line 177 "src/parse-gram.c" +#line 176 "src/parse-gram.c" /* yacc.c:372 */ -/* Tokens. */ -#ifndef YYTOKENTYPE -# define YYTOKENTYPE - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ - enum yytokentype +/* Token type. */ +#ifndef GRAM_TOKENTYPE +# define GRAM_TOKENTYPE + enum gram_tokentype { GRAM_EOF = 0, STRING = 258, - INT = 259, - PERCENT_TOKEN = 260, - PERCENT_NTERM = 261, - PERCENT_TYPE = 262, - PERCENT_DESTRUCTOR = 263, - PERCENT_PRINTER = 264, - PERCENT_LEFT = 265, - PERCENT_RIGHT = 266, - PERCENT_NONASSOC = 267, - PERCENT_PRECEDENCE = 268, - PERCENT_PREC = 269, - PERCENT_DPREC = 270, - PERCENT_MERGE = 271, - PERCENT_CODE = 272, - PERCENT_DEFAULT_PREC = 273, - PERCENT_DEFINE = 274, - PERCENT_DEFINES = 275, - PERCENT_ERROR_VERBOSE = 276, - PERCENT_EXPECT = 277, - PERCENT_EXPECT_RR = 278, - PERCENT_FLAG = 279, - PERCENT_FILE_PREFIX = 280, - PERCENT_GLR_PARSER = 281, - PERCENT_INITIAL_ACTION = 282, - PERCENT_LANGUAGE = 283, - PERCENT_NAME_PREFIX = 284, - PERCENT_NO_DEFAULT_PREC = 285, - PERCENT_NO_LINES = 286, - PERCENT_NONDETERMINISTIC_PARSER = 287, - PERCENT_OUTPUT = 288, - PERCENT_REQUIRE = 289, - PERCENT_SKELETON = 290, - PERCENT_START = 291, - PERCENT_TOKEN_TABLE = 292, - PERCENT_VERBOSE = 293, - PERCENT_YACC = 294, - BRACED_CODE = 295, - BRACED_PREDICATE = 296, - BRACKETED_ID = 297, - CHAR = 298, - EPILOGUE = 299, - EQUAL = 300, - ID = 301, - ID_COLON = 302, - PERCENT_PERCENT = 303, - PIPE = 304, - PROLOGUE = 305, - SEMICOLON = 306, - TAG = 307, - TAG_ANY = 308, - TAG_NONE = 309, + PERCENT_TOKEN = 259, + PERCENT_NTERM = 260, + PERCENT_TYPE = 261, + PERCENT_DESTRUCTOR = 262, + PERCENT_PRINTER = 263, + PERCENT_LEFT = 264, + PERCENT_RIGHT = 265, + PERCENT_NONASSOC = 266, + PERCENT_PRECEDENCE = 267, + PERCENT_PREC = 268, + PERCENT_DPREC = 269, + PERCENT_MERGE = 270, + PERCENT_CODE = 271, + PERCENT_DEFAULT_PREC = 272, + PERCENT_DEFINE = 273, + PERCENT_DEFINES = 274, + PERCENT_ERROR_VERBOSE = 275, + PERCENT_EXPECT = 276, + PERCENT_EXPECT_RR = 277, + PERCENT_FLAG = 278, + PERCENT_FILE_PREFIX = 279, + PERCENT_GLR_PARSER = 280, + PERCENT_INITIAL_ACTION = 281, + PERCENT_LANGUAGE = 282, + PERCENT_NAME_PREFIX = 283, + PERCENT_NO_DEFAULT_PREC = 284, + PERCENT_NO_LINES = 285, + PERCENT_NONDETERMINISTIC_PARSER = 286, + PERCENT_OUTPUT = 287, + PERCENT_REQUIRE = 288, + PERCENT_SKELETON = 289, + PERCENT_START = 290, + PERCENT_TOKEN_TABLE = 291, + PERCENT_VERBOSE = 292, + PERCENT_YACC = 293, + BRACED_CODE = 294, + BRACED_PREDICATE = 295, + BRACKETED_ID = 296, + CHAR = 297, + EPILOGUE = 298, + EQUAL = 299, + ID = 300, + ID_COLON = 301, + PERCENT_PERCENT = 302, + PIPE = 303, + PROLOGUE = 304, + SEMICOLON = 305, + TAG = 306, + TAG_ANY = 307, + TAG_NONE = 308, + INT = 309, PERCENT_PARAM = 310, - PERCENT_UNION = 311 + PERCENT_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 345 of yacc.c */ -#line 108 "src/parse-gram.y" +#line 170 "src/parse-gram.y" /* yacc.c:372 */ +unsigned char character; +#line 177 "src/parse-gram.y" /* yacc.c:372 */ - assoc assoc; char *code; char const *chars; - int integer; - named_ref *named_ref; - symbol *symbol; - symbol_list *list; - uniqstr uniqstr; - unsigned char character; -/* Line 345 of yacc.c */ -#line 246 "src/parse-gram.y" +#line 188 "src/parse-gram.y" /* yacc.c:372 */ +uniqstr uniqstr; +#line 196 "src/parse-gram.y" /* yacc.c:372 */ +int integer; +#line 200 "src/parse-gram.y" /* yacc.c:372 */ +symbol *symbol; +#line 205 "src/parse-gram.y" /* yacc.c:372 */ +assoc assoc; +#line 208 "src/parse-gram.y" /* yacc.c:372 */ +symbol_list *list; +#line 211 "src/parse-gram.y" /* yacc.c:372 */ +named_ref *named_ref; +#line 238 "src/parse-gram.y" /* yacc.c:372 */ +param_type param; +#line 413 "src/parse-gram.y" /* yacc.c:372 */ +code_props_type code_type; +#line 651 "src/parse-gram.y" /* yacc.c:372 */ - param_type param; + struct + { + char const *chars; + muscle_kind kind; + } value; -/* Line 345 of yacc.c */ -#line 425 "src/parse-gram.y" -code_props_type code_type; -/* Line 345 of yacc.c */ -#line 326 "src/parse-gram.c" -} YYSTYPE; -# define YYSTYPE_IS_TRIVIAL 1 -# define YYSTYPE_IS_DECLARED 1 +#line 279 "src/parse-gram.c" /* yacc.c:372 */ +}; +# 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_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 /* !GRAM_SRC_PARSE_GRAM_H */ +#endif /* !YY_GRAM_SRC_PARSE_GRAM_H_INCLUDED */ /* Copy the second part of user declarations. */ -/* Line 348 of yacc.c */ -#line 352 "src/parse-gram.c" +#line 307 "src/parse-gram.c" /* yacc.c:375 */ /* Unqualified %code blocks. */ -/* Line 349 of yacc.c */ -#line 57 "src/parse-gram.y" +#line 53 "src/parse-gram.y" /* yacc.c:376 */ static int current_prec = 0; static location current_lhs_location; @@ -365,7 +319,7 @@ int gram_parse (void); */ static void - current_lhs(symbol *sym, location loc, named_ref *ref) + current_lhs (symbol *sym, location loc, named_ref *ref) { current_lhs_symbol = sym; current_lhs_location = loc; @@ -383,8 +337,7 @@ int gram_parse (void); #define YYTYPE_UINT16 uint_fast16_t #define YYTYPE_UINT8 uint_fast8_t -/* Line 349 of yacc.c */ -#line 235 "src/parse-gram.y" +#line 228 "src/parse-gram.y" /* yacc.c:376 */ /** Add a lex-param and/or a parse-param. * @@ -396,8 +349,7 @@ int gram_parse (void); static param_type current_param = param_none; -/* Line 349 of yacc.c */ -#line 401 "src/parse-gram.c" +#line 353 "src/parse-gram.c" /* yacc.c:376 */ #ifdef short # undef short @@ -446,19 +398,19 @@ 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 /* Suppress unused-variable warnings by "using" E. */ #ifdef __GNUC__ -# define YYUSE(e) ((void) (e)) +# define YYUSE(E) ((void) (E)) #else -# define YYUSE(e) /* empty */ +# define YYUSE(E) /* empty */ #endif #if 1 @@ -466,7 +418,7 @@ typedef short int yytype_int16; /* The parser invokes alloca or malloc; define the necessary symbols. */ # ifdef YYSTACK_ALLOC - /* Pacify GCC's `empty if-body' warning. */ + /* Pacify GCC's 'empty if-body' warning. */ # define YYSTACK_FREE(Ptr) do { /* empty */; } while (0) # ifndef YYSTACK_ALLOC_MAXIMUM /* The OS might guarantee only one guard page at the bottom of the stack, @@ -508,8 +460,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 @@ -571,21 +523,21 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 3 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 163 +#define YYLAST 165 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 57 +#define YYNTOKENS 58 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 38 /* YYNRULES -- Number of rules. */ -#define YYNRULES 112 +#define YYNRULES 111 /* YYNSTATES -- Number of states. */ -#define YYNSTATES 149 +#define YYNSTATES 145 /* 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) @@ -625,37 +577,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, 271, 271, 279, 281, 285, 286, 296, 300, 305, - 306, 311, 316, 317, 318, 319, 320, 325, 334, 335, - 336, 337, 338, 339, 340, 341, 341, 342, 343, 367, - 368, 369, 370, 374, 375, 384, 385, 386, 390, 402, - 406, 410, 417, 428, 429, 439, 440, 444, 456, 456, - 461, 461, 466, 477, 492, 493, 494, 495, 499, 500, - 505, 507, 512, 513, 518, 520, 525, 526, 530, 531, - 535, 536, 537, 542, 547, 552, 558, 564, 575, 576, - 585, 586, 592, 593, 594, 601, 601, 609, 610, 611, - 616, 618, 620, 622, 624, 626, 628, 633, 635, 645, - 646, 651, 652, 653, 662, 682, 684, 693, 698, 699, - 704, 711, 713 + 0, 261, 261, 270, 271, 275, 276, 286, 290, 295, + 296, 301, 307, 308, 309, 310, 315, 324, 325, 326, + 327, 328, 329, 329, 330, 331, 355, 356, 357, 358, + 362, 363, 372, 373, 374, 378, 390, 394, 398, 405, + 416, 417, 427, 428, 432, 444, 444, 449, 449, 454, + 465, 480, 481, 482, 483, 487, 488, 493, 495, 500, + 505, 515, 517, 522, 523, 527, 528, 532, 533, 534, + 539, 544, 549, 555, 561, 572, 573, 582, 583, 589, + 590, 591, 598, 598, 606, 607, 608, 613, 616, 618, + 620, 622, 624, 626, 628, 633, 634, 644, 645, 670, + 671, 672, 673, 682, 702, 704, 713, 718, 719, 724, + 732, 733 }; #endif -#if YYDEBUG || YYERROR_VERBOSE || 1 +#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\"", @@ -665,15 +617,15 @@ static const char *const yytname[] = "\"%yacc\"", "\"{...}\"", "\"%?{...}\"", "\"[identifier]\"", "\"char\"", "\"epilogue\"", "\"=\"", "\"identifier\"", "\"identifier:\"", "\"%%\"", "\"|\"", "\"%{...%}\"", "\";\"", "\"\"", "\"<*>\"", "\"<>\"", - "\"%param\"", "\"%union\"", "$accept", "input", "prologue_declarations", - "prologue_declaration", "$@1", "params", "grammar_declaration", - "code_props_type", "union_name", "symbol_declaration", "$@2", "$@3", - "precedence_declaration", "precedence_declarator", "tag.opt", - "symbols.prec", "symbol.prec", "symbols.1", "generic_symlist", - "generic_symlist_item", "tag", "symbol_def", "symbol_defs.1", "grammar", - "rules_or_grammar_declaration", "rules", "$@4", "rhses.1", "rhs", - "named_ref.opt", "variable", "content.opt", "braceless", "id", - "id_colon", "symbol", "string_as_id", "epilogue.opt", YY_NULL + "\"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", + "braceless", "id", "id_colon", "symbol", "string_as_id", "epilogue.opt", YY_NULL }; #endif @@ -687,179 +639,179 @@ 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 -88 +#define YYPACT_NINF -115 -#define yypact_value_is_default(yystate) \ - ((yystate) == (-88)) +#define yypact_value_is_default(Yystate) \ + (!!((Yystate) == (-115))) -#define YYTABLE_NINF -112 +#define YYTABLE_NINF -111 -#define yytable_value_is_error(yytable_value) \ +#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[] = { - -88, 42, 107, -88, -88, -88, 8, -88, -88, -88, - -88, -88, -88, 19, -88, 12, 60, -88, 66, 72, - -88, 2, -88, 39, 83, 35, -88, -88, -88, 36, - 87, 88, 32, -88, -88, -88, 15, -88, -88, -88, - 46, -88, -88, 55, -88, -88, 45, -2, -2, 32, - -88, 58, -88, -88, -88, 31, -88, -88, -88, -88, - 97, -88, -88, -88, 98, -88, 100, -88, -88, -88, - -88, -88, -88, -88, -88, 56, -88, 57, 1, -88, - -88, 62, 69, -88, 58, 0, -88, 32, -88, -88, - -2, 85, -2, 32, -88, -88, -88, -88, -88, -88, - -88, -88, -88, -88, 77, -88, -88, -88, -88, -88, - 70, -88, -88, -88, -88, 0, -88, -88, -88, 32, - -88, 102, -88, 119, -88, -88, -88, -88, -88, -88, - -88, -88, -88, 33, 53, -88, -88, 32, 143, 71, - 62, -88, 62, 53, -88, -88, -88, -88, -88 + -115, 16, 109, -115, -115, -115, -28, -115, -115, -115, + -115, -115, -115, -14, -115, 25, 23, -115, -27, -20, + -115, 39, -115, 7, 48, 71, -115, -115, -115, 72, + 73, 74, -2, -115, -115, -115, 56, -115, -115, -115, + 33, -115, -115, 40, -115, -115, 37, 54, 54, -2, + -115, 50, -115, -115, -115, 2, -115, -115, -115, -115, + -115, -115, -115, -115, -115, -115, -115, -115, -115, -115, + -115, -115, 51, -115, 53, 3, -115, -115, 49, 65, + -115, 50, 42, -115, -2, -115, -115, 54, -1, 54, + -2, -115, -115, -115, -115, -115, -115, -115, -115, 63, + -115, -115, -115, -115, -115, 69, -115, -115, -115, -115, + 42, -115, -115, -115, -2, -115, 38, -115, 106, -115, + -115, -115, -115, -115, -115, -115, -115, -115, -15, 41, + -115, -115, -2, 57, 59, 49, -115, -115, 49, 41, + -115, -115, -115, -115, -115 }; - /* YYDEFACT[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, 50, 48, 0, 43, 44, 54, - 55, 56, 57, 0, 39, 0, 9, 11, 0, 0, - 7, 0, 16, 0, 0, 0, 40, 21, 22, 0, - 0, 0, 0, 29, 30, 31, 0, 6, 32, 25, - 45, 4, 5, 0, 36, 35, 58, 0, 0, 0, - 104, 0, 41, 100, 99, 101, 10, 12, 13, 14, - 0, 17, 18, 19, 0, 23, 0, 27, 28, 110, - 106, 105, 108, 37, 109, 0, 107, 0, 0, 80, - 82, 97, 0, 46, 0, 0, 59, 0, 73, 78, - 51, 74, 49, 52, 64, 42, 103, 102, 8, 15, - 20, 24, 84, 83, 0, 81, 2, 98, 85, 34, - 26, 47, 70, 71, 72, 38, 66, 69, 68, 53, - 60, 62, 79, 75, 76, 65, 112, 90, 33, 67, - 61, 63, 77, 86, 87, 90, 89, 0, 0, 0, - 97, 93, 97, 88, 94, 95, 96, 92, 91 + 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, + 103, 0, 38, 98, 97, 99, 10, 12, 13, 14, + 16, 17, 18, 21, 24, 25, 109, 105, 104, 107, + 34, 108, 0, 106, 0, 0, 77, 79, 95, 0, + 43, 0, 0, 56, 0, 70, 75, 48, 71, 46, + 49, 61, 39, 101, 100, 8, 102, 81, 80, 0, + 78, 2, 96, 82, 31, 23, 44, 67, 68, 69, + 35, 63, 66, 65, 50, 57, 59, 76, 72, 73, + 62, 111, 87, 30, 64, 58, 60, 74, 83, 84, + 87, 86, 0, 0, 0, 95, 90, 91, 95, 85, + 92, 93, 94, 89, 88 }; - /* YYPGOTO[NTERM-NUM]. */ -static const yytype_int16 yypgoto[] = + /* YYPGOTO[NTERM-NUM]. */ +static const yytype_int8 yypgoto[] = { - -88, -88, -88, -88, -88, -88, 146, -88, -88, -88, - -88, -88, -88, -88, -88, -88, 30, -88, -88, 37, - -88, -26, 103, -88, 75, -88, -88, -88, 21, -57, - -88, -88, -11, -18, -88, -32, -87, -88 + -115, -115, -115, -115, -115, -115, 120, -115, -115, -115, + -115, -115, -115, -115, -115, -115, 9, -115, -115, 14, + -115, -50, 100, -115, 75, -115, -115, -115, 19, -114, + -115, -115, -33, -18, -115, -32, -82, -115 }; - /* YYDEFGOTO[NTERM-NUM]. */ + /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 1, 2, 41, 82, 110, 77, 43, 84, 44, - 48, 47, 45, 46, 87, 119, 120, 93, 115, 116, - 117, 89, 90, 78, 79, 80, 127, 133, 134, 108, - 55, 98, 52, 72, 81, 118, 74, 106 + -1, 1, 2, 41, 79, 105, 74, 43, 81, 44, + 48, 47, 45, 46, 84, 114, 115, 90, 110, 111, + 112, 86, 87, 75, 76, 77, 122, 128, 129, 103, + 55, 95, 52, 69, 78, 113, 71, 101 }; - /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If - 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[] = { - 73, -111, 75, 69, 124, 59, 4, 5, 6, 7, - 8, 9, 10, 11, 12, 53, 75, 94, 13, 14, - 4, 5, 6, 7, 8, 9, 10, 11, 12, 91, - 91, 26, 13, 14, 96, 69, 132, 32, 63, 65, - 95, 70, 3, 70, 71, 26, 71, 60, 76, 104, - 88, 32, 112, 113, 114, 121, 69, 40, 54, 50, - 49, 125, 76, 56, 122, 51, 122, 137, 138, 139, - 57, 40, 91, 111, 91, 70, 58, 97, 71, 61, - 64, 66, 135, 147, 136, 148, 62, 121, 69, 123, - 67, 68, 83, 140, 141, 85, 70, 86, 50, 71, - 99, 100, 142, 101, 107, 144, 131, 102, 103, 109, - 128, 142, 4, 5, 6, 7, 8, 9, 10, 11, - 12, 126, 69, 146, 13, 14, 15, 16, 17, 18, - 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, - 29, 30, 31, 32, 33, 34, 35, 145, 42, 130, - 0, 92, 129, 105, 0, 36, 143, 37, 38, 0, - 0, 0, 39, 40 + 70, 66, 66, -110, 72, 93, 119, 4, 5, 6, + 7, 8, 9, 10, 11, 12, 3, 91, 92, 13, + 14, 143, 96, 49, 144, 50, 56, 57, 53, 88, + 88, 51, 26, 130, 58, 131, 127, 117, 32, 117, + 67, 50, 59, 68, 66, 66, 60, 94, 106, 73, + 99, 61, 116, 118, 132, 133, 134, 72, 120, 40, + 4, 5, 6, 7, 8, 9, 10, 11, 12, 88, + 54, 88, 13, 14, 62, 63, 64, 65, 80, 82, + 135, 136, 116, 67, 67, 26, 68, 68, 83, 50, + 102, 32, 126, 107, 108, 109, 67, 138, 137, 68, + 140, 97, 73, 98, 104, 85, 121, 138, 123, 66, + 142, 141, 40, 4, 5, 6, 7, 8, 9, 10, + 11, 12, 42, 125, 124, 13, 14, 15, 16, 17, + 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, + 28, 29, 30, 31, 32, 33, 34, 35, 89, 139, + 100, 0, 0, 0, 0, 0, 36, 0, 37, 38, + 0, 0, 0, 0, 39, 40 }; static const yytype_int16 yycheck[] = { - 32, 0, 1, 3, 91, 3, 5, 6, 7, 8, - 9, 10, 11, 12, 13, 3, 1, 49, 17, 18, - 5, 6, 7, 8, 9, 10, 11, 12, 13, 47, - 48, 30, 17, 18, 3, 3, 123, 36, 3, 3, - 51, 43, 0, 43, 46, 30, 46, 45, 47, 48, - 52, 36, 52, 53, 54, 87, 3, 56, 46, 40, - 52, 93, 47, 3, 90, 46, 92, 14, 15, 16, - 4, 56, 90, 84, 92, 43, 4, 46, 46, 40, - 45, 45, 49, 140, 51, 142, 3, 119, 3, 4, - 3, 3, 46, 40, 41, 40, 43, 52, 40, 46, - 3, 3, 134, 3, 42, 137, 4, 51, 51, 40, - 40, 143, 5, 6, 7, 8, 9, 10, 11, 12, - 13, 44, 3, 52, 17, 18, 19, 20, 21, 22, - 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, - 33, 34, 35, 36, 37, 38, 39, 4, 2, 119, - -1, 48, 115, 78, -1, 48, 135, 50, 51, -1, - -1, -1, 55, 56 + 32, 3, 3, 0, 1, 3, 88, 4, 5, 6, + 7, 8, 9, 10, 11, 12, 0, 49, 51, 16, + 17, 135, 55, 51, 138, 39, 3, 54, 3, 47, + 48, 45, 29, 48, 54, 50, 118, 87, 35, 89, + 42, 39, 3, 45, 3, 3, 39, 45, 81, 46, + 47, 3, 84, 54, 13, 14, 15, 1, 90, 56, + 4, 5, 6, 7, 8, 9, 10, 11, 12, 87, + 45, 89, 16, 17, 3, 3, 3, 3, 45, 39, + 39, 40, 114, 42, 42, 29, 45, 45, 51, 39, + 41, 35, 54, 51, 52, 53, 42, 129, 57, 45, + 132, 50, 46, 50, 39, 51, 43, 139, 39, 3, + 51, 54, 56, 4, 5, 6, 7, 8, 9, 10, + 11, 12, 2, 114, 110, 16, 17, 18, 19, 20, + 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, + 31, 32, 33, 34, 35, 36, 37, 38, 48, 130, + 75, -1, -1, -1, -1, -1, 47, -1, 49, 50, + -1, -1, -1, -1, 55, 56 }; - /* 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, 64, 66, 69, 70, 68, 67, 52, - 40, 46, 89, 3, 46, 87, 3, 4, 4, 3, - 45, 40, 3, 3, 45, 3, 45, 3, 3, 3, - 43, 46, 90, 92, 93, 1, 47, 63, 80, 81, - 82, 91, 61, 46, 65, 40, 52, 71, 52, 78, - 79, 90, 79, 74, 92, 89, 3, 46, 88, 3, - 3, 3, 51, 51, 48, 81, 94, 42, 86, 40, - 62, 89, 52, 53, 54, 75, 76, 77, 92, 72, - 73, 92, 78, 4, 93, 92, 44, 83, 40, 76, - 73, 4, 93, 84, 85, 49, 51, 14, 15, 16, - 40, 41, 92, 85, 92, 4, 52, 86, 86 + 0, 59, 60, 0, 4, 5, 6, 7, 8, 9, + 10, 11, 12, 16, 17, 18, 19, 20, 21, 22, + 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, + 33, 34, 35, 36, 37, 38, 47, 49, 50, 55, + 56, 61, 64, 65, 67, 70, 71, 69, 68, 51, + 39, 45, 90, 3, 45, 88, 3, 54, 54, 3, + 39, 3, 3, 3, 3, 3, 3, 42, 45, 91, + 93, 94, 1, 46, 64, 81, 82, 83, 92, 62, + 45, 66, 39, 51, 72, 51, 79, 80, 91, 80, + 75, 93, 90, 3, 45, 89, 90, 50, 50, 47, + 82, 95, 41, 87, 39, 63, 90, 51, 52, 53, + 76, 77, 78, 93, 73, 74, 93, 79, 54, 94, + 93, 43, 84, 39, 77, 74, 54, 94, 85, 86, + 48, 50, 13, 14, 15, 39, 40, 57, 93, 86, + 93, 54, 51, 87, 87 }; - /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ + /* 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, 64, 64, 65, 65, 63, 67, 66, - 68, 66, 66, 69, 70, 70, 70, 70, 71, 71, - 72, 72, 73, 73, 74, 74, 75, 75, 76, 76, - 77, 77, 77, 78, 78, 78, 78, 78, 79, 79, - 80, 80, 81, 81, 81, 83, 82, 84, 84, 84, - 85, 85, 85, 85, 85, 85, 85, 86, 86, 87, - 87, 88, 88, 88, 89, 90, 90, 91, 92, 92, - 93, 94, 94 + 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, 91, 91, 92, 93, 93, 94, + 95, 95 }; - /* 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, 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, 3, 3, 3, 0, 1, 1, - 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 0, 2 + 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, 1, + 0, 2 }; @@ -888,12 +840,12 @@ do \ } \ else \ { \ - yyerror (YY_("syntax error: cannot back up")); \ + yyerror (&yylloc, YY_("syntax error: cannot back up")); \ YYERROR; \ } \ while (0) - +/* Error token number */ #define YYTERROR 1 #define YYERRCODE 256 @@ -924,32 +876,9 @@ while (0) #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 */ @@ -962,6 +891,51 @@ do { \ YYFPRINTF Args; \ } 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 { \ if (yydebug) \ @@ -982,7 +956,7 @@ static void yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp) { FILE *yyo = yyoutput; - YYUSE(yyo); + YYUSE (yyo); YYUSE (yylocationp); if (!yyvaluep) return; @@ -992,191 +966,154 @@ yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvalue # endif switch (yytype) { - case 3: // "string" -/* Line 707 of yacc.c */ -#line 195 "src/parse-gram.y" - { fputs (quotearg_style (c_quoting_style, ((*yyvaluep).chars)), yyo); } -/* Line 707 of yacc.c */ -#line 1001 "src/parse-gram.c" + case 3: /* "string" */ +#line 183 "src/parse-gram.y" /* yacc.c:706 */ + { fputs (quotearg_style (c_quoting_style, ((*yyvaluep).chars)), yyo); } +#line 973 "src/parse-gram.c" /* yacc.c:706 */ break; - case 4: // "integer" -/* Line 707 of yacc.c */ -#line 208 "src/parse-gram.y" - { fprintf (yyo, "%d", ((*yyvaluep).integer)); } -/* Line 707 of yacc.c */ -#line 1009 "src/parse-gram.c" + case 23: /* "%" */ +#line 193 "src/parse-gram.y" /* yacc.c:706 */ + { fprintf (yyo, "%%%s", ((*yyvaluep).uniqstr)); } +#line 979 "src/parse-gram.c" /* yacc.c:706 */ break; - case 24: // "%" -/* Line 707 of yacc.c */ -#line 204 "src/parse-gram.y" - { fprintf (yyo, "%%%s", ((*yyvaluep).uniqstr)); } -/* Line 707 of yacc.c */ -#line 1017 "src/parse-gram.c" + case 39: /* "{...}" */ +#line 185 "src/parse-gram.y" /* yacc.c:706 */ + { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).code)); } +#line 985 "src/parse-gram.c" /* yacc.c:706 */ break; - case 40: // "{...}" -/* Line 707 of yacc.c */ -#line 197 "src/parse-gram.y" - { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).code)); } -/* Line 707 of yacc.c */ -#line 1025 "src/parse-gram.c" + case 41: /* "[identifier]" */ +#line 191 "src/parse-gram.y" /* yacc.c:706 */ + { fprintf (yyo, "[%s]", ((*yyvaluep).uniqstr)); } +#line 991 "src/parse-gram.c" /* yacc.c:706 */ break; - case 42: // "[identifier]" -/* Line 707 of yacc.c */ -#line 202 "src/parse-gram.y" - { fprintf (yyo, "[%s]", ((*yyvaluep).uniqstr)); } -/* Line 707 of yacc.c */ -#line 1033 "src/parse-gram.c" + case 42: /* "char" */ +#line 172 "src/parse-gram.y" /* yacc.c:706 */ + { fputs (char_name (((*yyvaluep).character)), yyo); } +#line 997 "src/parse-gram.c" /* yacc.c:706 */ break; - case 43: // "char" -/* Line 707 of yacc.c */ -#line 189 "src/parse-gram.y" - { fputs (char_name (((*yyvaluep).character)), yyo); } -/* Line 707 of yacc.c */ -#line 1041 "src/parse-gram.c" + case 43: /* "epilogue" */ +#line 185 "src/parse-gram.y" /* yacc.c:706 */ + { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); } +#line 1003 "src/parse-gram.c" /* yacc.c:706 */ break; - case 44: // "epilogue" -/* Line 707 of yacc.c */ -#line 197 "src/parse-gram.y" - { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); } -/* Line 707 of yacc.c */ -#line 1049 "src/parse-gram.c" + case 45: /* "identifier" */ +#line 190 "src/parse-gram.y" /* yacc.c:706 */ + { fputs (((*yyvaluep).uniqstr), yyo); } +#line 1009 "src/parse-gram.c" /* yacc.c:706 */ break; - case 46: // "identifier" -/* Line 707 of yacc.c */ -#line 201 "src/parse-gram.y" - { fputs (((*yyvaluep).uniqstr), yyo); } -/* Line 707 of yacc.c */ -#line 1057 "src/parse-gram.c" + case 46: /* "identifier:" */ +#line 192 "src/parse-gram.y" /* yacc.c:706 */ + { fprintf (yyo, "%s:", ((*yyvaluep).uniqstr)); } +#line 1015 "src/parse-gram.c" /* yacc.c:706 */ break; - case 47: // "identifier:" -/* Line 707 of yacc.c */ -#line 203 "src/parse-gram.y" - { fprintf (yyo, "%s:", ((*yyvaluep).uniqstr)); } -/* Line 707 of yacc.c */ -#line 1065 "src/parse-gram.c" + case 49: /* "%{...%}" */ +#line 185 "src/parse-gram.y" /* yacc.c:706 */ + { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); } +#line 1021 "src/parse-gram.c" /* yacc.c:706 */ break; - case 50: // "%{...%}" -/* Line 707 of yacc.c */ -#line 197 "src/parse-gram.y" - { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); } -/* Line 707 of yacc.c */ -#line 1073 "src/parse-gram.c" + case 51: /* "" */ +#line 194 "src/parse-gram.y" /* yacc.c:706 */ + { fprintf (yyo, "<%s>", ((*yyvaluep).uniqstr)); } +#line 1027 "src/parse-gram.c" /* yacc.c:706 */ break; - case 52: // "" -/* Line 707 of yacc.c */ -#line 205 "src/parse-gram.y" - { fprintf (yyo, "<%s>", ((*yyvaluep).uniqstr)); } -/* Line 707 of yacc.c */ -#line 1081 "src/parse-gram.c" + case 54: /* "integer" */ +#line 198 "src/parse-gram.y" /* yacc.c:706 */ + { fprintf (yyo, "%d", ((*yyvaluep).integer)); } +#line 1033 "src/parse-gram.c" /* yacc.c:706 */ break; - case 55: // "%param" -/* Line 707 of yacc.c */ -#line 251 "src/parse-gram.y" - { + case 55: /* "%param" */ +#line 241 "src/parse-gram.y" /* yacc.c:706 */ + { 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 707 of yacc.c */ -#line 1100 "src/parse-gram.c" +#line 1050 "src/parse-gram.c" /* yacc.c:706 */ break; - case 64: // code_props_type -/* Line 707 of yacc.c */ -#line 426 "src/parse-gram.y" - { fprintf (yyo, "%s", code_props_type_string (((*yyvaluep).code_type))); } -/* Line 707 of yacc.c */ -#line 1108 "src/parse-gram.c" + case 65: /* code_props_type */ +#line 414 "src/parse-gram.y" /* yacc.c:706 */ + { fprintf (yyo, "%s", code_props_type_string (((*yyvaluep).code_type))); } +#line 1056 "src/parse-gram.c" /* yacc.c:706 */ break; - case 73: // symbol.prec -/* Line 707 of yacc.c */ -#line 211 "src/parse-gram.y" - { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); } -/* Line 707 of yacc.c */ -#line 1116 "src/parse-gram.c" + case 74: /* symbol.prec */ +#line 202 "src/parse-gram.y" /* yacc.c:706 */ + { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); } +#line 1062 "src/parse-gram.c" /* yacc.c:706 */ break; - case 77: // tag -/* Line 707 of yacc.c */ -#line 205 "src/parse-gram.y" - { fprintf (yyo, "<%s>", ((*yyvaluep).uniqstr)); } -/* Line 707 of yacc.c */ -#line 1124 "src/parse-gram.c" + case 78: /* tag */ +#line 194 "src/parse-gram.y" /* yacc.c:706 */ + { fprintf (yyo, "<%s>", ((*yyvaluep).uniqstr)); } +#line 1068 "src/parse-gram.c" /* yacc.c:706 */ break; - case 87: // variable -/* Line 707 of yacc.c */ -#line 201 "src/parse-gram.y" - { fputs (((*yyvaluep).uniqstr), yyo); } -/* Line 707 of yacc.c */ -#line 1132 "src/parse-gram.c" + case 88: /* variable */ +#line 190 "src/parse-gram.y" /* yacc.c:706 */ + { fputs (((*yyvaluep).uniqstr), yyo); } +#line 1074 "src/parse-gram.c" /* yacc.c:706 */ break; - case 88: // content.opt -/* Line 707 of yacc.c */ -#line 197 "src/parse-gram.y" - { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); } -/* Line 707 of yacc.c */ -#line 1140 "src/parse-gram.c" + case 89: /* value */ +#line 660 "src/parse-gram.y" /* yacc.c:706 */ + { + 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 1087 "src/parse-gram.c" /* yacc.c:706 */ break; - case 89: // braceless -/* Line 707 of yacc.c */ -#line 197 "src/parse-gram.y" - { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); } -/* Line 707 of yacc.c */ -#line 1148 "src/parse-gram.c" + case 90: /* braceless */ +#line 185 "src/parse-gram.y" /* yacc.c:706 */ + { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); } +#line 1093 "src/parse-gram.c" /* yacc.c:706 */ break; - case 90: // id -/* Line 707 of yacc.c */ -#line 211 "src/parse-gram.y" - { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); } -/* Line 707 of yacc.c */ -#line 1156 "src/parse-gram.c" + case 91: /* id */ +#line 202 "src/parse-gram.y" /* yacc.c:706 */ + { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); } +#line 1099 "src/parse-gram.c" /* yacc.c:706 */ break; - case 91: // id_colon -/* Line 707 of yacc.c */ -#line 212 "src/parse-gram.y" - { fprintf (yyo, "%s:", ((*yyvaluep).symbol)->tag); } -/* Line 707 of yacc.c */ -#line 1164 "src/parse-gram.c" + case 92: /* id_colon */ +#line 203 "src/parse-gram.y" /* yacc.c:706 */ + { fprintf (yyo, "%s:", ((*yyvaluep).symbol)->tag); } +#line 1105 "src/parse-gram.c" /* yacc.c:706 */ break; - case 92: // symbol -/* Line 707 of yacc.c */ -#line 211 "src/parse-gram.y" - { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); } -/* Line 707 of yacc.c */ -#line 1172 "src/parse-gram.c" + case 93: /* symbol */ +#line 202 "src/parse-gram.y" /* yacc.c:706 */ + { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); } +#line 1111 "src/parse-gram.c" /* yacc.c:706 */ break; - case 93: // string_as_id -/* Line 707 of yacc.c */ -#line 211 "src/parse-gram.y" - { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); } -/* Line 707 of yacc.c */ -#line 1180 "src/parse-gram.c" + case 94: /* string_as_id */ +#line 202 "src/parse-gram.y" /* yacc.c:706 */ + { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); } +#line 1117 "src/parse-gram.c" /* yacc.c:706 */ break; default: @@ -1192,10 +1129,8 @@ yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvalue static void yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp) { - 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, ": "); @@ -1260,12 +1195,12 @@ do { \ /* 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. */ @@ -1296,7 +1231,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 @@ -1399,7 +1334,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) \ @@ -1502,7 +1437,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)) @@ -1621,7 +1556,6 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, { YYSIZE_T yysize0 = yytnamerr (YY_NULL, yytname[yytoken]); YYSIZE_T yysize = yysize0; - YYSIZE_T yysize1; enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; /* Internationalized format string. */ const char *yyformat = YY_NULL; @@ -1678,14 +1612,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_NULL, 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 @@ -1706,10 +1642,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) { @@ -1749,7 +1687,7 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, static void yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocationp) { - YYUSE(yyvaluep); + YYUSE (yyvaluep); YYUSE (yylocationp); if (!yymsg) yymsg = "Deleting"; @@ -1775,11 +1713,40 @@ yyparse (void) /* The lookahead symbol. */ int yychar; + +#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 +/* Default value used for initialization, for pacifying older GCCs + or non-GCC compilers. */ +static YYSTYPE yyval_default; +# define YY_INITIAL_VALUE(Value) = Value +#endif +static YYLTYPE yyloc_default +# if defined GRAM_LTYPE_IS_TRIVIAL && GRAM_LTYPE_IS_TRIVIAL + = { 1, 1, 1, 1 } +# endif +; +#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 + /* The semantic value of the lookahead symbol. */ -YYSTYPE yylval; +YYSTYPE yylval YY_INITIAL_VALUE(yyval_default); /* Location data for the lookahead symbol. */ -YYLTYPE yylloc; +YYLTYPE yylloc = yyloc_default; + /* Number of syntax errors so far. */ int yynerrs; @@ -1789,9 +1756,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. */ @@ -1824,7 +1791,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; @@ -1843,10 +1810,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; @@ -1861,31 +1827,15 @@ 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 1463 of yacc.c */ -#line 100 "src/parse-gram.y" +#line 96 "src/parse-gram.y" /* yacc.c:1451 */ { /* 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 1463 of yacc.c */ -#line 1889 "src/parse-gram.c" +#line 1839 "src/parse-gram.c" /* yacc.c:1451 */ yylsp[0] = yylloc; goto yysetstate; @@ -1992,7 +1942,7 @@ yybackup: if (yychar == YYEMPTY) { YYDPRINTF ((stderr, "Reading a token: ")); - yychar = YYLEX; + yychar = yylex (&yylval, &yylloc); } if (yychar <= YYEOF) @@ -2037,7 +1987,9 @@ yybackup: YY_LAC_DISCARD ("shift"); yystate = yyn; + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN *++yyvsp = yylval; + YY_IGNORE_MAYBE_UNINITIALIZED_END *++yylsp = yylloc; goto yynewstate; @@ -2060,7 +2012,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 @@ -2077,8 +2029,7 @@ yyreduce: switch (yyn) { case 6: -/* Line 1678 of yacc.c */ -#line 287 "src/parse-gram.y" +#line 277 "src/parse-gram.y" /* yacc.c:1668 */ { code_props plain_code; code_props_plain_init (&plain_code, (yyvsp[0].chars), (yylsp[0])); @@ -2088,107 +2039,80 @@ yyreduce: plain_code.code, (yylsp[0])); code_scanner_last_string_free (); } -/* Line 1678 of yacc.c */ -#line 2093 "src/parse-gram.c" +#line 2043 "src/parse-gram.c" /* yacc.c:1668 */ break; case 7: -/* Line 1678 of yacc.c */ -#line 297 "src/parse-gram.y" +#line 287 "src/parse-gram.y" /* yacc.c:1668 */ { muscle_percent_define_ensure ((yyvsp[0].uniqstr), (yylsp[0]), true); } -/* Line 1678 of yacc.c */ -#line 2103 "src/parse-gram.c" +#line 2051 "src/parse-gram.c" /* yacc.c:1668 */ break; case 8: -/* Line 1678 of yacc.c */ -#line 301 "src/parse-gram.y" +#line 291 "src/parse-gram.y" /* yacc.c:1668 */ { - 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 1678 of yacc.c */ -#line 2114 "src/parse-gram.c" +#line 2060 "src/parse-gram.c" /* yacc.c:1668 */ break; case 9: -/* Line 1678 of yacc.c */ -#line 305 "src/parse-gram.y" +#line 295 "src/parse-gram.y" /* yacc.c:1668 */ { defines_flag = true; } -/* Line 1678 of yacc.c */ -#line 2122 "src/parse-gram.c" +#line 2066 "src/parse-gram.c" /* yacc.c:1668 */ break; case 10: -/* Line 1678 of yacc.c */ -#line 307 "src/parse-gram.y" +#line 297 "src/parse-gram.y" /* yacc.c:1668 */ { defines_flag = true; spec_defines_file = xstrdup ((yyvsp[0].chars)); } -/* Line 1678 of yacc.c */ -#line 2133 "src/parse-gram.c" +#line 2075 "src/parse-gram.c" /* yacc.c:1668 */ break; case 11: -/* Line 1678 of yacc.c */ -#line 312 "src/parse-gram.y" +#line 302 "src/parse-gram.y" /* yacc.c:1668 */ { - 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 1678 of yacc.c */ -#line 2144 "src/parse-gram.c" +#line 2085 "src/parse-gram.c" /* yacc.c:1668 */ break; case 12: -/* Line 1678 of yacc.c */ -#line 316 "src/parse-gram.y" +#line 307 "src/parse-gram.y" /* yacc.c:1668 */ { expected_sr_conflicts = (yyvsp[0].integer); } -/* Line 1678 of yacc.c */ -#line 2152 "src/parse-gram.c" +#line 2091 "src/parse-gram.c" /* yacc.c:1668 */ break; case 13: -/* Line 1678 of yacc.c */ -#line 317 "src/parse-gram.y" +#line 308 "src/parse-gram.y" /* yacc.c:1668 */ { expected_rr_conflicts = (yyvsp[0].integer); } -/* Line 1678 of yacc.c */ -#line 2160 "src/parse-gram.c" +#line 2097 "src/parse-gram.c" /* yacc.c:1668 */ break; case 14: -/* Line 1678 of yacc.c */ -#line 318 "src/parse-gram.y" +#line 309 "src/parse-gram.y" /* yacc.c:1668 */ { spec_file_prefix = (yyvsp[0].chars); } -/* Line 1678 of yacc.c */ -#line 2168 "src/parse-gram.c" +#line 2103 "src/parse-gram.c" /* yacc.c:1668 */ break; case 15: -/* Line 1678 of yacc.c */ -#line 319 "src/parse-gram.y" - { spec_file_prefix = (yyvsp[0].chars); } -/* Line 1678 of yacc.c */ -#line 2176 "src/parse-gram.c" - break; - - case 16: -/* Line 1678 of yacc.c */ -#line 321 "src/parse-gram.y" +#line 311 "src/parse-gram.y" /* yacc.c:1668 */ { nondeterministic_parser = true; glr_parser = true; } -/* Line 1678 of yacc.c */ -#line 2187 "src/parse-gram.c" +#line 2112 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 17: -/* Line 1678 of yacc.c */ -#line 326 "src/parse-gram.y" + case 16: +#line 316 "src/parse-gram.y" /* yacc.c:1668 */ { code_props action; code_props_symbol_action_init (&action, (yyvsp[0].code), (yylsp[0])); @@ -2197,93 +2121,59 @@ yyreduce: muscle_code_grow ("initial_action", action.code, (yylsp[0])); code_scanner_last_string_free (); } -/* Line 1678 of yacc.c */ -#line 2202 "src/parse-gram.c" +#line 2125 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 18: -/* Line 1678 of yacc.c */ -#line 334 "src/parse-gram.y" + case 17: +#line 324 "src/parse-gram.y" /* yacc.c:1668 */ { language_argmatch ((yyvsp[0].chars), grammar_prio, (yylsp[-1])); } -/* Line 1678 of yacc.c */ -#line 2210 "src/parse-gram.c" +#line 2131 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 19: -/* Line 1678 of yacc.c */ -#line 335 "src/parse-gram.y" - { spec_name_prefix = (yyvsp[0].chars); } -/* Line 1678 of yacc.c */ -#line 2218 "src/parse-gram.c" - break; - - case 20: -/* Line 1678 of yacc.c */ -#line 336 "src/parse-gram.y" + case 18: +#line 325 "src/parse-gram.y" /* yacc.c:1668 */ { spec_name_prefix = (yyvsp[0].chars); } -/* Line 1678 of yacc.c */ -#line 2226 "src/parse-gram.c" +#line 2137 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 21: -/* Line 1678 of yacc.c */ -#line 337 "src/parse-gram.y" + case 19: +#line 326 "src/parse-gram.y" /* yacc.c:1668 */ { no_lines_flag = true; } -/* Line 1678 of yacc.c */ -#line 2234 "src/parse-gram.c" +#line 2143 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 22: -/* Line 1678 of yacc.c */ -#line 338 "src/parse-gram.y" + case 20: +#line 327 "src/parse-gram.y" /* yacc.c:1668 */ { nondeterministic_parser = true; } -/* Line 1678 of yacc.c */ -#line 2242 "src/parse-gram.c" +#line 2149 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 23: -/* Line 1678 of yacc.c */ -#line 339 "src/parse-gram.y" - { spec_outfile = (yyvsp[0].chars); } -/* Line 1678 of yacc.c */ -#line 2250 "src/parse-gram.c" - break; - - case 24: -/* Line 1678 of yacc.c */ -#line 340 "src/parse-gram.y" + case 21: +#line 328 "src/parse-gram.y" /* yacc.c:1668 */ { spec_outfile = (yyvsp[0].chars); } -/* Line 1678 of yacc.c */ -#line 2258 "src/parse-gram.c" +#line 2155 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 25: -/* Line 1678 of yacc.c */ -#line 341 "src/parse-gram.y" + case 22: +#line 329 "src/parse-gram.y" /* yacc.c:1668 */ { current_param = (yyvsp[0].param); } -/* Line 1678 of yacc.c */ -#line 2266 "src/parse-gram.c" +#line 2161 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 26: -/* Line 1678 of yacc.c */ -#line 341 "src/parse-gram.y" + case 23: +#line 329 "src/parse-gram.y" /* yacc.c:1668 */ { current_param = param_none; } -/* Line 1678 of yacc.c */ -#line 2274 "src/parse-gram.c" +#line 2167 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 27: -/* Line 1678 of yacc.c */ -#line 342 "src/parse-gram.y" + case 24: +#line 330 "src/parse-gram.y" /* yacc.c:1668 */ { version_check (&(yylsp[0]), (yyvsp[0].chars)); } -/* Line 1678 of yacc.c */ -#line 2282 "src/parse-gram.c" +#line 2173 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 28: -/* Line 1678 of yacc.c */ -#line 344 "src/parse-gram.y" + case 25: +#line 332 "src/parse-gram.y" /* yacc.c:1668 */ { char const *skeleton_user = (yyvsp[0].chars); if (strchr (skeleton_user, '/')) @@ -2307,63 +2197,49 @@ yyreduce: } skeleton_arg (skeleton_user, grammar_prio, (yylsp[-1])); } -/* Line 1678 of yacc.c */ -#line 2312 "src/parse-gram.c" +#line 2201 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 29: -/* Line 1678 of yacc.c */ -#line 367 "src/parse-gram.y" + case 26: +#line 355 "src/parse-gram.y" /* yacc.c:1668 */ { token_table_flag = true; } -/* Line 1678 of yacc.c */ -#line 2320 "src/parse-gram.c" +#line 2207 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 30: -/* Line 1678 of yacc.c */ -#line 368 "src/parse-gram.y" + case 27: +#line 356 "src/parse-gram.y" /* yacc.c:1668 */ { report_flag |= report_states; } -/* Line 1678 of yacc.c */ -#line 2328 "src/parse-gram.c" +#line 2213 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 31: -/* Line 1678 of yacc.c */ -#line 369 "src/parse-gram.y" + case 28: +#line 357 "src/parse-gram.y" /* yacc.c:1668 */ { yacc_flag = true; } -/* Line 1678 of yacc.c */ -#line 2336 "src/parse-gram.c" +#line 2219 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 33: -/* Line 1678 of yacc.c */ -#line 374 "src/parse-gram.y" + case 30: +#line 362 "src/parse-gram.y" /* yacc.c:1668 */ { add_param (current_param, (yyvsp[0].code), (yylsp[0])); } -/* Line 1678 of yacc.c */ -#line 2344 "src/parse-gram.c" +#line 2225 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 34: -/* Line 1678 of yacc.c */ -#line 375 "src/parse-gram.y" + case 31: +#line 363 "src/parse-gram.y" /* yacc.c:1668 */ { add_param (current_param, (yyvsp[0].code), (yylsp[0])); } -/* Line 1678 of yacc.c */ -#line 2352 "src/parse-gram.c" +#line 2231 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 37: -/* Line 1678 of yacc.c */ -#line 387 "src/parse-gram.y" + case 34: +#line 375 "src/parse-gram.y" /* yacc.c:1668 */ { grammar_start_symbol_set ((yyvsp[0].symbol), (yylsp[0])); } -/* Line 1678 of yacc.c */ -#line 2362 "src/parse-gram.c" +#line 2239 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 38: -/* Line 1678 of yacc.c */ -#line 391 "src/parse-gram.y" + case 35: +#line 379 "src/parse-gram.y" /* yacc.c:1668 */ { code_props code; code_props_symbol_action_init (&code, (yyvsp[-1].code), (yylsp[-1])); @@ -2375,139 +2251,111 @@ yyreduce: symbol_list_free ((yyvsp[0].list)); } } -/* Line 1678 of yacc.c */ -#line 2380 "src/parse-gram.c" +#line 2255 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 39: -/* Line 1678 of yacc.c */ -#line 403 "src/parse-gram.y" + case 36: +#line 391 "src/parse-gram.y" /* yacc.c:1668 */ { default_prec = true; } -/* Line 1678 of yacc.c */ -#line 2390 "src/parse-gram.c" +#line 2263 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 40: -/* Line 1678 of yacc.c */ -#line 407 "src/parse-gram.y" + case 37: +#line 395 "src/parse-gram.y" /* yacc.c:1668 */ { default_prec = false; } -/* Line 1678 of yacc.c */ -#line 2400 "src/parse-gram.c" +#line 2271 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 41: -/* Line 1678 of yacc.c */ -#line 411 "src/parse-gram.y" + case 38: +#line 399 "src/parse-gram.y" /* yacc.c:1668 */ { /* Do not invoke muscle_percent_code_grow here since it invokes muscle_user_name_list_grow. */ muscle_code_grow ("percent_code()", (yyvsp[0].chars), (yylsp[0])); code_scanner_last_string_free (); } -/* Line 1678 of yacc.c */ -#line 2413 "src/parse-gram.c" +#line 2282 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 42: -/* Line 1678 of yacc.c */ -#line 418 "src/parse-gram.y" + case 39: +#line 406 "src/parse-gram.y" /* yacc.c:1668 */ { muscle_percent_code_grow ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].chars), (yylsp[0])); code_scanner_last_string_free (); } -/* Line 1678 of yacc.c */ -#line 2424 "src/parse-gram.c" +#line 2291 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 43: -/* Line 1678 of yacc.c */ -#line 428 "src/parse-gram.y" + case 40: +#line 416 "src/parse-gram.y" /* yacc.c:1668 */ { (yyval.code_type) = destructor; } -/* Line 1678 of yacc.c */ -#line 2432 "src/parse-gram.c" +#line 2297 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 44: -/* Line 1678 of yacc.c */ -#line 429 "src/parse-gram.y" + case 41: +#line 417 "src/parse-gram.y" /* yacc.c:1668 */ { (yyval.code_type) = printer; } -/* Line 1678 of yacc.c */ -#line 2440 "src/parse-gram.c" +#line 2303 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 45: -/* Line 1678 of yacc.c */ -#line 439 "src/parse-gram.y" + case 42: +#line 427 "src/parse-gram.y" /* yacc.c:1668 */ {} -/* Line 1678 of yacc.c */ -#line 2448 "src/parse-gram.c" +#line 2309 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 46: -/* Line 1678 of yacc.c */ -#line 440 "src/parse-gram.y" + case 43: +#line 428 "src/parse-gram.y" /* yacc.c:1668 */ { muscle_code_grow ("union_name", (yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1678 of yacc.c */ -#line 2456 "src/parse-gram.c" +#line 2315 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 47: -/* Line 1678 of yacc.c */ -#line 445 "src/parse-gram.y" + case 44: +#line 433 "src/parse-gram.y" /* yacc.c:1668 */ { union_seen = true; - muscle_code_grow ("stype", (yyvsp[0].chars), (yylsp[0])); + muscle_code_grow ("union_members", (yyvsp[0].chars), (yylsp[0])); code_scanner_last_string_free (); } -/* Line 1678 of yacc.c */ -#line 2468 "src/parse-gram.c" +#line 2325 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 48: -/* Line 1678 of yacc.c */ -#line 456 "src/parse-gram.y" + case 45: +#line 444 "src/parse-gram.y" /* yacc.c:1668 */ { current_class = nterm_sym; } -/* Line 1678 of yacc.c */ -#line 2476 "src/parse-gram.c" +#line 2331 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 49: -/* Line 1678 of yacc.c */ -#line 457 "src/parse-gram.y" + case 46: +#line 445 "src/parse-gram.y" /* yacc.c:1668 */ { current_class = unknown_sym; current_type = NULL; } -/* Line 1678 of yacc.c */ -#line 2487 "src/parse-gram.c" +#line 2340 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 50: -/* Line 1678 of yacc.c */ -#line 461 "src/parse-gram.y" + case 47: +#line 449 "src/parse-gram.y" /* yacc.c:1668 */ { current_class = token_sym; } -/* Line 1678 of yacc.c */ -#line 2495 "src/parse-gram.c" +#line 2346 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 51: -/* Line 1678 of yacc.c */ -#line 462 "src/parse-gram.y" + case 48: +#line 450 "src/parse-gram.y" /* yacc.c:1668 */ { current_class = unknown_sym; current_type = NULL; } -/* Line 1678 of yacc.c */ -#line 2506 "src/parse-gram.c" +#line 2355 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 52: -/* Line 1678 of yacc.c */ -#line 467 "src/parse-gram.y" + case 49: +#line 455 "src/parse-gram.y" /* yacc.c:1668 */ { symbol_list *list; tag_seen = true; @@ -2515,13 +2363,11 @@ yyreduce: symbol_type_set (list->content.sym, (yyvsp[-1].uniqstr), (yylsp[-1])); symbol_list_free ((yyvsp[0].list)); } -/* Line 1678 of yacc.c */ -#line 2520 "src/parse-gram.c" +#line 2367 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 53: -/* Line 1678 of yacc.c */ -#line 478 "src/parse-gram.y" + case 50: +#line 466 "src/parse-gram.y" /* yacc.c:1668 */ { symbol_list *list; ++current_prec; @@ -2533,412 +2379,345 @@ yyreduce: symbol_list_free ((yyvsp[0].list)); current_type = NULL; } -/* Line 1678 of yacc.c */ -#line 2538 "src/parse-gram.c" +#line 2383 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 54: -/* Line 1678 of yacc.c */ -#line 492 "src/parse-gram.y" + case 51: +#line 480 "src/parse-gram.y" /* yacc.c:1668 */ { (yyval.assoc) = left_assoc; } -/* Line 1678 of yacc.c */ -#line 2546 "src/parse-gram.c" +#line 2389 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 55: -/* Line 1678 of yacc.c */ -#line 493 "src/parse-gram.y" + case 52: +#line 481 "src/parse-gram.y" /* yacc.c:1668 */ { (yyval.assoc) = right_assoc; } -/* Line 1678 of yacc.c */ -#line 2554 "src/parse-gram.c" +#line 2395 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 56: -/* Line 1678 of yacc.c */ -#line 494 "src/parse-gram.y" + case 53: +#line 482 "src/parse-gram.y" /* yacc.c:1668 */ { (yyval.assoc) = non_assoc; } -/* Line 1678 of yacc.c */ -#line 2562 "src/parse-gram.c" +#line 2401 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 57: -/* Line 1678 of yacc.c */ -#line 495 "src/parse-gram.y" + case 54: +#line 483 "src/parse-gram.y" /* yacc.c:1668 */ { (yyval.assoc) = precedence_assoc; } -/* Line 1678 of yacc.c */ -#line 2570 "src/parse-gram.c" +#line 2407 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 58: -/* Line 1678 of yacc.c */ -#line 499 "src/parse-gram.y" + case 55: +#line 487 "src/parse-gram.y" /* yacc.c:1668 */ { current_type = NULL; } -/* Line 1678 of yacc.c */ -#line 2578 "src/parse-gram.c" +#line 2413 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 59: -/* Line 1678 of yacc.c */ -#line 500 "src/parse-gram.y" + case 56: +#line 488 "src/parse-gram.y" /* yacc.c:1668 */ { current_type = (yyvsp[0].uniqstr); tag_seen = true; } -/* Line 1678 of yacc.c */ -#line 2586 "src/parse-gram.c" +#line 2419 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 60: -/* Line 1678 of yacc.c */ -#line 506 "src/parse-gram.y" + case 57: +#line 494 "src/parse-gram.y" /* yacc.c:1668 */ { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); } -/* Line 1678 of yacc.c */ -#line 2594 "src/parse-gram.c" +#line 2425 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 61: -/* Line 1678 of yacc.c */ -#line 508 "src/parse-gram.y" - { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); } -/* Line 1678 of yacc.c */ -#line 2602 "src/parse-gram.c" + case 58: +#line 496 "src/parse-gram.y" /* yacc.c:1668 */ + { (yyval.list) = symbol_list_append ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); } +#line 2431 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 62: -/* Line 1678 of yacc.c */ -#line 512 "src/parse-gram.y" - { (yyval.symbol) = (yyvsp[0].symbol); } -/* Line 1678 of yacc.c */ -#line 2610 "src/parse-gram.c" + case 59: +#line 501 "src/parse-gram.y" /* yacc.c:1668 */ + { + (yyval.symbol) = (yyvsp[0].symbol); + symbol_class_set ((yyvsp[0].symbol), token_sym, (yylsp[0]), false); + } +#line 2440 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 63: -/* Line 1678 of yacc.c */ -#line 513 "src/parse-gram.y" - { (yyval.symbol) = (yyvsp[-1].symbol); symbol_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer), (yylsp[0])); } -/* Line 1678 of yacc.c */ -#line 2618 "src/parse-gram.c" + case 60: +#line 506 "src/parse-gram.y" /* yacc.c:1668 */ + { + (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 2450 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 64: -/* Line 1678 of yacc.c */ -#line 519 "src/parse-gram.y" + case 61: +#line 516 "src/parse-gram.y" /* yacc.c:1668 */ { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); } -/* Line 1678 of yacc.c */ -#line 2626 "src/parse-gram.c" +#line 2456 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 65: -/* Line 1678 of yacc.c */ -#line 521 "src/parse-gram.y" - { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); } -/* Line 1678 of yacc.c */ -#line 2634 "src/parse-gram.c" + case 62: +#line 518 "src/parse-gram.y" /* yacc.c:1668 */ + { (yyval.list) = symbol_list_append ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); } +#line 2462 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 66: -/* Line 1678 of yacc.c */ -#line 525 "src/parse-gram.y" + case 63: +#line 522 "src/parse-gram.y" /* yacc.c:1668 */ { (yyval.list) = (yyvsp[0].list); } -/* Line 1678 of yacc.c */ -#line 2642 "src/parse-gram.c" +#line 2468 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 67: -/* Line 1678 of yacc.c */ -#line 526 "src/parse-gram.y" - { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), (yyvsp[0].list)); } -/* Line 1678 of yacc.c */ -#line 2650 "src/parse-gram.c" + case 64: +#line 523 "src/parse-gram.y" /* yacc.c:1668 */ + { (yyval.list) = symbol_list_append ((yyvsp[-1].list), (yyvsp[0].list)); } +#line 2474 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 68: -/* Line 1678 of yacc.c */ -#line 530 "src/parse-gram.y" + case 65: +#line 527 "src/parse-gram.y" /* yacc.c:1668 */ { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); } -/* Line 1678 of yacc.c */ -#line 2658 "src/parse-gram.c" +#line 2480 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 69: -/* Line 1678 of yacc.c */ -#line 531 "src/parse-gram.y" + case 66: +#line 528 "src/parse-gram.y" /* yacc.c:1668 */ { (yyval.list) = symbol_list_type_new ((yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1678 of yacc.c */ -#line 2666 "src/parse-gram.c" +#line 2486 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 71: -/* Line 1678 of yacc.c */ -#line 536 "src/parse-gram.y" + case 68: +#line 533 "src/parse-gram.y" /* yacc.c:1668 */ { (yyval.uniqstr) = uniqstr_new ("*"); } -/* Line 1678 of yacc.c */ -#line 2674 "src/parse-gram.c" +#line 2492 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 72: -/* Line 1678 of yacc.c */ -#line 537 "src/parse-gram.y" + case 69: +#line 534 "src/parse-gram.y" /* yacc.c:1668 */ { (yyval.uniqstr) = uniqstr_new (""); } -/* Line 1678 of yacc.c */ -#line 2682 "src/parse-gram.c" +#line 2498 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 73: -/* Line 1678 of yacc.c */ -#line 543 "src/parse-gram.y" + case 70: +#line 540 "src/parse-gram.y" /* yacc.c:1668 */ { - current_type = (yyvsp[0].uniqstr); - tag_seen = true; - } -/* Line 1678 of yacc.c */ -#line 2693 "src/parse-gram.c" + current_type = (yyvsp[0].uniqstr); + tag_seen = true; + } +#line 2507 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 74: -/* Line 1678 of yacc.c */ -#line 548 "src/parse-gram.y" + case 71: +#line 545 "src/parse-gram.y" /* yacc.c:1668 */ { - symbol_class_set ((yyvsp[0].symbol), current_class, (yylsp[0]), true); - symbol_type_set ((yyvsp[0].symbol), current_type, (yylsp[0])); - } -/* Line 1678 of yacc.c */ -#line 2704 "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 2516 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 75: -/* Line 1678 of yacc.c */ -#line 553 "src/parse-gram.y" + case 72: +#line 550 "src/parse-gram.y" /* yacc.c:1668 */ { 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 1678 of yacc.c */ -#line 2716 "src/parse-gram.c" +#line 2526 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 76: -/* Line 1678 of yacc.c */ -#line 559 "src/parse-gram.y" + case 73: +#line 556 "src/parse-gram.y" /* yacc.c:1668 */ { 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 1678 of yacc.c */ -#line 2728 "src/parse-gram.c" +#line 2536 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 77: -/* Line 1678 of yacc.c */ -#line 565 "src/parse-gram.y" + case 74: +#line 562 "src/parse-gram.y" /* yacc.c:1668 */ { 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 1678 of yacc.c */ -#line 2741 "src/parse-gram.c" +#line 2547 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 84: -/* Line 1678 of yacc.c */ -#line 595 "src/parse-gram.y" + case 81: +#line 592 "src/parse-gram.y" /* yacc.c:1668 */ { yyerrok; } -/* Line 1678 of yacc.c */ -#line 2751 "src/parse-gram.c" +#line 2555 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 85: -/* Line 1678 of yacc.c */ -#line 601 "src/parse-gram.y" + case 82: +#line 598 "src/parse-gram.y" /* yacc.c:1668 */ { current_lhs ((yyvsp[-1].symbol), (yylsp[-1]), (yyvsp[0].named_ref)); } -/* Line 1678 of yacc.c */ -#line 2759 "src/parse-gram.c" +#line 2561 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 86: -/* Line 1678 of yacc.c */ -#line 602 "src/parse-gram.y" + case 83: +#line 599 "src/parse-gram.y" /* yacc.c:1668 */ { /* Free the current lhs. */ current_lhs (0, (yylsp[-3]), 0); } -/* Line 1678 of yacc.c */ -#line 2770 "src/parse-gram.c" +#line 2570 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 87: -/* Line 1678 of yacc.c */ -#line 609 "src/parse-gram.y" + case 84: +#line 606 "src/parse-gram.y" /* yacc.c:1668 */ { grammar_current_rule_end ((yylsp[0])); } -/* Line 1678 of yacc.c */ -#line 2778 "src/parse-gram.c" +#line 2576 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 88: -/* Line 1678 of yacc.c */ -#line 610 "src/parse-gram.y" + case 85: +#line 607 "src/parse-gram.y" /* yacc.c:1668 */ { grammar_current_rule_end ((yylsp[0])); } -/* Line 1678 of yacc.c */ -#line 2786 "src/parse-gram.c" +#line 2582 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 90: -/* Line 1678 of yacc.c */ -#line 616 "src/parse-gram.y" + case 87: +#line 614 "src/parse-gram.y" /* yacc.c:1668 */ { grammar_current_rule_begin (current_lhs_symbol, current_lhs_location, current_lhs_named_ref); } -/* Line 1678 of yacc.c */ -#line 2795 "src/parse-gram.c" +#line 2589 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 91: -/* Line 1678 of yacc.c */ -#line 619 "src/parse-gram.y" + case 88: +#line 617 "src/parse-gram.y" /* yacc.c:1668 */ { grammar_current_rule_symbol_append ((yyvsp[-1].symbol), (yylsp[-1]), (yyvsp[0].named_ref)); } -/* Line 1678 of yacc.c */ -#line 2803 "src/parse-gram.c" +#line 2595 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 92: -/* Line 1678 of yacc.c */ -#line 621 "src/parse-gram.y" + case 89: +#line 619 "src/parse-gram.y" /* yacc.c:1668 */ { grammar_current_rule_action_append ((yyvsp[-1].code), (yylsp[-1]), (yyvsp[0].named_ref), false); } -/* Line 1678 of yacc.c */ -#line 2811 "src/parse-gram.c" +#line 2601 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 93: -/* Line 1678 of yacc.c */ -#line 623 "src/parse-gram.y" + case 90: +#line 621 "src/parse-gram.y" /* yacc.c:1668 */ { grammar_current_rule_action_append ((yyvsp[0].code), (yylsp[0]), NULL, true); } -/* Line 1678 of yacc.c */ -#line 2819 "src/parse-gram.c" +#line 2607 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 94: -/* Line 1678 of yacc.c */ -#line 625 "src/parse-gram.y" + case 91: +#line 623 "src/parse-gram.y" /* yacc.c:1668 */ + { grammar_current_rule_empty_set ((yylsp[0])); } +#line 2613 "src/parse-gram.c" /* yacc.c:1668 */ + break; + + case 92: +#line 625 "src/parse-gram.y" /* yacc.c:1668 */ { grammar_current_rule_prec_set ((yyvsp[0].symbol), (yylsp[0])); } -/* Line 1678 of yacc.c */ -#line 2827 "src/parse-gram.c" +#line 2619 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 95: -/* Line 1678 of yacc.c */ -#line 627 "src/parse-gram.y" + case 93: +#line 627 "src/parse-gram.y" /* yacc.c:1668 */ { grammar_current_rule_dprec_set ((yyvsp[0].integer), (yylsp[0])); } -/* Line 1678 of yacc.c */ -#line 2835 "src/parse-gram.c" +#line 2625 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 96: -/* Line 1678 of yacc.c */ -#line 629 "src/parse-gram.y" + case 94: +#line 629 "src/parse-gram.y" /* yacc.c:1668 */ { grammar_current_rule_merge_set ((yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1678 of yacc.c */ -#line 2843 "src/parse-gram.c" +#line 2631 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 97: -/* Line 1678 of yacc.c */ -#line 633 "src/parse-gram.y" + case 95: +#line 633 "src/parse-gram.y" /* yacc.c:1668 */ { (yyval.named_ref) = 0; } -/* Line 1678 of yacc.c */ -#line 2851 "src/parse-gram.c" +#line 2637 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 98: -/* Line 1678 of yacc.c */ -#line 635 "src/parse-gram.y" + case 96: +#line 634 "src/parse-gram.y" /* yacc.c:1668 */ { (yyval.named_ref) = named_ref_new((yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1678 of yacc.c */ -#line 2859 "src/parse-gram.c" +#line 2643 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 100: -/* Line 1678 of yacc.c */ -#line 646 "src/parse-gram.y" + case 98: +#line 645 "src/parse-gram.y" /* yacc.c:1668 */ { (yyval.uniqstr) = uniqstr_new ((yyvsp[0].chars)); } -/* Line 1678 of yacc.c */ -#line 2867 "src/parse-gram.c" +#line 2649 "src/parse-gram.c" /* yacc.c:1668 */ + break; + + case 99: +#line 670 "src/parse-gram.y" /* yacc.c:1668 */ + { (yyval.value).kind = muscle_keyword; (yyval.value).chars = ""; } +#line 2655 "src/parse-gram.c" /* yacc.c:1668 */ + break; + + case 100: +#line 671 "src/parse-gram.y" /* yacc.c:1668 */ + { (yyval.value).kind = muscle_keyword; (yyval.value).chars = (yyvsp[0].uniqstr); } +#line 2661 "src/parse-gram.c" /* yacc.c:1668 */ break; case 101: -/* Line 1678 of yacc.c */ -#line 651 "src/parse-gram.y" - { (yyval.chars) = ""; } -/* Line 1678 of yacc.c */ -#line 2875 "src/parse-gram.c" +#line 672 "src/parse-gram.y" /* yacc.c:1668 */ + { (yyval.value).kind = muscle_string; (yyval.value).chars = (yyvsp[0].chars); } +#line 2667 "src/parse-gram.c" /* yacc.c:1668 */ break; case 102: -/* Line 1678 of yacc.c */ -#line 652 "src/parse-gram.y" - { (yyval.chars) = (yyvsp[0].uniqstr); } -/* Line 1678 of yacc.c */ -#line 2883 "src/parse-gram.c" +#line 673 "src/parse-gram.y" /* yacc.c:1668 */ + { (yyval.value).kind = muscle_code; (yyval.value).chars = (yyvsp[0].chars); } +#line 2673 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 104: -/* Line 1678 of yacc.c */ -#line 663 "src/parse-gram.y" + case 103: +#line 683 "src/parse-gram.y" /* yacc.c:1668 */ { code_props plain_code; - (yyvsp[0].code)[strlen ((yyvsp[0].code)) - 1] = '\n'; + (yyvsp[0].code)[strlen ((yyvsp[0].code)) - 1] = '\0'; code_props_plain_init (&plain_code, (yyvsp[0].code)+1, (yylsp[0])); code_props_translate_code (&plain_code); gram_scanner_last_string_free (); (yyval.chars) = plain_code.code; } -/* Line 1678 of yacc.c */ -#line 2898 "src/parse-gram.c" +#line 2686 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 105: -/* Line 1678 of yacc.c */ -#line 683 "src/parse-gram.y" + case 104: +#line 703 "src/parse-gram.y" /* yacc.c:1668 */ { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1678 of yacc.c */ -#line 2906 "src/parse-gram.c" +#line 2692 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 106: -/* Line 1678 of yacc.c */ -#line 685 "src/parse-gram.y" + case 105: +#line 705 "src/parse-gram.y" /* yacc.c:1668 */ { (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 1678 of yacc.c */ -#line 2918 "src/parse-gram.c" +#line 2702 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 107: -/* Line 1678 of yacc.c */ -#line 693 "src/parse-gram.y" + case 106: +#line 713 "src/parse-gram.y" /* yacc.c:1668 */ { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1678 of yacc.c */ -#line 2926 "src/parse-gram.c" +#line 2708 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 110: -/* Line 1678 of yacc.c */ -#line 705 "src/parse-gram.y" + case 109: +#line 725 "src/parse-gram.y" /* yacc.c:1668 */ { (yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[0].chars)), (yylsp[0])); symbol_class_set ((yyval.symbol), token_sym, (yylsp[0]), false); } -/* Line 1678 of yacc.c */ -#line 2937 "src/parse-gram.c" +#line 2717 "src/parse-gram.c" /* yacc.c:1668 */ break; - case 112: -/* Line 1678 of yacc.c */ -#line 714 "src/parse-gram.y" + case 111: +#line 734 "src/parse-gram.y" /* yacc.c:1668 */ { code_props plain_code; code_props_plain_init (&plain_code, (yyvsp[0].chars), (yylsp[0])); @@ -2947,13 +2726,11 @@ yyreduce: muscle_code_grow ("epilogue", plain_code.code, (yylsp[0])); code_scanner_last_string_free (); } -/* Line 1678 of yacc.c */ -#line 2952 "src/parse-gram.c" +#line 2730 "src/parse-gram.c" /* yacc.c:1668 */ break; -/* Line 1678 of yacc.c */ -#line 2957 "src/parse-gram.c" +#line 2734 "src/parse-gram.c" /* yacc.c:1668 */ default: break; } if (yychar_backup != yychar) @@ -2979,7 +2756,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. */ @@ -3007,7 +2784,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, \ @@ -3037,7 +2814,7 @@ yyerrlab: yymsgp = yymsg; } } - yyerror (yymsgp); + yyerror (&yylloc, yymsgp); if (yysyntax_error_status == 2) goto yyexhaustedlab; } @@ -3083,7 +2860,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; @@ -3128,7 +2905,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 @@ -3162,7 +2941,7 @@ yyabortlab: | yyexhaustedlab -- memory exhaustion comes here. | `-------------------------------------------------*/ yyexhaustedlab: - yyerror (YY_("memory exhausted")); + yyerror (&yylloc, YY_("memory exhausted")); yyresult = 2; /* Fall through. */ #endif @@ -3176,7 +2955,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); @@ -3198,9 +2977,7 @@ yyreturn: #endif return yyresult; } -/* Line 1936 of yacc.c */ -#line 724 "src/parse-gram.y" - +#line 744 "src/parse-gram.y" /* yacc.c:1928 */ /* Return the location of the left-hand side of a rule whose @@ -3255,17 +3032,16 @@ add_param (param_type type, char *decl, location loc) /* Strip the surrounding '{' and '}', and any blanks just inside the braces. */ --p; - while (isspace ((unsigned char) *p)) + while (c_isspace ((unsigned char) *p)) --p; p[1] = '\0'; ++decl; - while (isspace ((unsigned char) *decl)) + while (c_isspace ((unsigned char) *decl)) ++decl; } if (! name_start) - complain_at (loc, complaint, - _("missing identifier in parameter declaration")); + complain (&loc, complaint, _("missing identifier in parameter declaration")); else { char *name = xmemdup0 (name_start, strspn (name_start, alphanum)); @@ -3285,8 +3061,8 @@ version_check (location const *loc, char const *version) { if (strverscmp (version, PACKAGE_VERSION) > 0) { - complain_at (*loc, complaint, "require bison %s, but have %s", - version, PACKAGE_VERSION); + complain (loc, complaint, "require bison %s, but have %s", + version, PACKAGE_VERSION); exit (EX_MISMATCH); } } @@ -3294,7 +3070,7 @@ version_check (location const *loc, char const *version) static void gram_error (location const *loc, char const *msg) { - complain_at (*loc, complaint, "%s", msg); + complain (loc, complaint, "%s", msg); } char const *