X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/e42906f7904ca7516e9867a3a19ee08d963b1205..332019e19a45611b7ca89619b3700d4a085bf719:/src/parse-gram.c diff --git a/src/parse-gram.c b/src/parse-gram.c index c06a03b4..4cf41afa 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.957-b074-dirty. */ +/* A Bison parser, made by GNU Bison 2.7.1164-a174b-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.957-b074-dirty" +#define YYBISON_VERSION "2.7.1164-a174b-dirty" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" /* Pure parsers. */ -#define YYPURE 1 +#define YYPURE 2 /* Push parsers. */ #define YYPUSH 0 @@ -65,72 +65,13 @@ #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 353 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 "c-ctype.h" -#include "complain.h" -#include "conflicts.h" -#include "files.h" -#include "getargs.h" -#include "gram.h" -#include "muscle-tab.h" -#include "named-ref.h" -#include "quotearg.h" -#include "reader.h" -#include "symlist.h" -#include "symtab.h" -#include "scan-gram.h" -#include "scan-code.h" -#include "xmemdup0.h" - -#define YYLLOC_DEFAULT(Current, Rhs, N) (Current) = lloc_default (Rhs, N) -static YYLTYPE lloc_default (YYLTYPE const *, int); - -#define YY_LOCATION_PRINT(File, Loc) \ - location_print (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 353 of yacc.c */ -#line 134 "src/parse-gram.c" +#line 75 "src/parse-gram.c" /* yacc.c:356 */ # ifndef YY_NULL # if defined __cplusplus && 201103L <= __cplusplus @@ -152,7 +93,7 @@ static char const *char_name (char); by #include "src/parse-gram.h". */ #ifndef YY_GRAM_SRC_PARSE_GRAM_H_INCLUDED # define YY_GRAM_SRC_PARSE_GRAM_H_INCLUDED -/* Enabling traces. */ +/* Debug traces. */ #ifndef GRAM_DEBUG # if defined YYDEBUG #if YYDEBUG @@ -168,11 +109,12 @@ static char const *char_name (char); extern int gram_debug; #endif /* "%code requires" blocks. */ -/* Line 369 of yacc.c */ -#line 223 "src/parse-gram.y" +#line 21 "src/parse-gram.y" /* yacc.c:372 */ + + #include "symlist.h" + #include "symtab.h" +#line 216 "src/parse-gram.y" /* yacc.c:372 */ -# ifndef PARAM_TYPE -# define PARAM_TYPE typedef enum { param_none = 0, @@ -180,189 +122,155 @@ extern int gram_debug; param_parse = 1 << 1, param_both = param_lex | param_parse } param_type; -# endif - +#line 640 "src/parse-gram.y" /* yacc.c:372 */ +#include "muscle-tab.h" -/* Line 369 of yacc.c */ -#line 188 "src/parse-gram.c" +#line 129 "src/parse-gram.c" /* yacc.c:372 */ -/* Tokens. */ +/* Token type. */ #ifndef GRAM_TOKENTYPE # define GRAM_TOKENTYPE - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ 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 +/* Value type. */ #if ! defined GRAM_STYPE && ! defined GRAM_STYPE_IS_DECLARED -typedef union GRAM_STYPE +typedef union GRAM_STYPE GRAM_STYPE; +union GRAM_STYPE { -/* Line 369 of yacc.c */ -#line 109 "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 369 of yacc.c */ -#line 247 "src/parse-gram.y" - - param_type param; - -/* Line 369 of yacc.c */ -#line 423 "src/parse-gram.y" +#line 177 "src/parse-gram.y" /* yacc.c:372 */ +unsigned char character; +#line 181 "src/parse-gram.y" /* yacc.c:372 */ +char *code; +#line 186 "src/parse-gram.y" /* yacc.c:372 */ +uniqstr uniqstr; +#line 194 "src/parse-gram.y" /* yacc.c:372 */ +int integer; +#line 198 "src/parse-gram.y" /* yacc.c:372 */ +symbol *symbol; +#line 203 "src/parse-gram.y" /* yacc.c:372 */ +assoc assoc; +#line 206 "src/parse-gram.y" /* yacc.c:372 */ +symbol_list *list; +#line 209 "src/parse-gram.y" /* yacc.c:372 */ +named_ref *named_ref; +#line 236 "src/parse-gram.y" /* yacc.c:372 */ +param_type param; +#line 404 "src/parse-gram.y" /* yacc.c:372 */ code_props_type code_type; +#line 642 "src/parse-gram.y" /* yacc.c:372 */ -/* Line 369 of yacc.c */ -#line 337 "src/parse-gram.c" -} GRAM_STYPE; + struct + { + char const *chars; + muscle_kind kind; + } value; + +#line 228 "src/parse-gram.c" /* yacc.c:372 */ +}; # define GRAM_STYPE_IS_TRIVIAL 1 # define GRAM_STYPE_IS_DECLARED 1 #endif +/* Location type. */ #if ! defined GRAM_LTYPE && ! defined GRAM_LTYPE_IS_DECLARED -typedef struct GRAM_LTYPE +typedef struct GRAM_LTYPE GRAM_LTYPE; +struct GRAM_LTYPE { int first_line; int first_column; int last_line; int last_column; -} GRAM_LTYPE; +}; # 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 372 of yacc.c */ -#line 363 "src/parse-gram.c" +#line 256 "src/parse-gram.c" /* yacc.c:375 */ /* Unqualified %code blocks. */ -/* Line 373 of yacc.c */ -#line 58 "src/parse-gram.y" +#line 27 "src/parse-gram.y" /* yacc.c:376 */ + + #include + #include "system.h" + + #include "c-ctype.h" + #include "complain.h" + #include "conflicts.h" + #include "files.h" + #include "getargs.h" + #include "gram.h" + #include "named-ref.h" + #include "quotearg.h" + #include "reader.h" + #include "scan-gram.h" + #include "scan-code.h" + #include "xmemdup0.h" static int current_prec = 0; static location current_lhs_location; @@ -374,28 +282,43 @@ int gram_parse (void); /** Set the new current left-hand side symbol, possibly common * to several right-hand side parts of rule. */ - static - void - current_lhs(symbol *sym, location loc, named_ref *ref) - { - current_lhs_symbol = sym; - current_lhs_location = loc; - /* In order to simplify memory management, named references for lhs - are always assigned by deep copy into the current symbol_list - node. This is because a single named-ref in the grammar may - result in several uses when the user factors lhs between several - rules using "|". Therefore free the parser's original copy. */ - free (current_lhs_named_ref); - current_lhs_named_ref = ref; - } + static void current_lhs (symbol *sym, location loc, named_ref *ref); + + #define YYLLOC_DEFAULT(Current, Rhs, N) \ + (Current) = lloc_default (Rhs, N) + static YYLTYPE lloc_default (YYLTYPE const *, int); + + #define YY_LOCATION_PRINT(File, Loc) \ + location_print (Loc, File) + + /* 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 373 of yacc.c */ -#line 236 "src/parse-gram.y" +#line 226 "src/parse-gram.y" /* yacc.c:376 */ /** Add a lex-param and/or a parse-param. * @@ -406,9 +329,7 @@ int gram_parse (void); static void add_param (param_type type, char *decl, location loc); static param_type current_param = param_none; - -/* Line 373 of yacc.c */ -#line 412 "src/parse-gram.c" +#line 333 "src/parse-gram.c" /* yacc.c:376 */ #ifdef short # undef short @@ -465,19 +386,28 @@ typedef short int yytype_int16; # endif #endif +#ifndef __attribute__ +/* This feature is available in gcc versions 2.5 and later. */ +# if (! defined __GNUC__ || __GNUC__ < 2 \ + || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)) +# define __attribute__(Spec) /* empty */ +# endif +#endif + /* Suppress unused-variable warnings by "using" E. */ -#ifdef __GNUC__ +#if ! defined lint || defined __GNUC__ # define YYUSE(E) ((void) (E)) #else # define YYUSE(E) /* empty */ #endif + #if 1 /* The parser invokes alloca or malloc; define the necessary symbols. */ # ifdef YYSTACK_ALLOC - /* Pacify GCC's `empty if-body' warning. */ + /* Pacify GCC's 'empty if-body' warning. */ # define YYSTACK_FREE(Ptr) do { /* empty */; } while (0) # ifndef YYSTACK_ALLOC_MAXIMUM /* The OS might guarantee only one guard page at the bottom of the stack, @@ -582,21 +512,21 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 3 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 157 +#define YYLAST 164 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 57 +#define YYNTOKENS 58 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 38 +#define YYNNTS 37 /* YYNRULES -- Number of rules. */ -#define YYNRULES 109 +#define YYNRULES 110 /* YYNSTATES -- Number of states. */ -#define YYNSTATES 143 +#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) @@ -636,24 +566,25 @@ 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 GRAM_DEBUG - /* YYRLINEYYN -- Source line where rule number YYN was defined. */ + /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 272, 272, 280, 282, 286, 287, 297, 301, 306, - 307, 312, 317, 318, 319, 320, 325, 334, 335, 336, - 337, 338, 339, 339, 340, 341, 365, 366, 367, 368, - 372, 373, 382, 383, 384, 388, 400, 404, 408, 415, - 426, 427, 437, 438, 442, 454, 454, 459, 459, 464, - 475, 490, 491, 492, 493, 497, 498, 503, 505, 510, - 511, 516, 518, 523, 524, 528, 529, 533, 534, 535, - 540, 545, 550, 556, 562, 573, 574, 583, 584, 590, - 591, 592, 599, 599, 607, 608, 609, 614, 616, 618, - 620, 622, 624, 626, 631, 633, 643, 644, 649, 650, - 651, 660, 680, 682, 691, 696, 697, 702, 709, 711 + 0, 259, 259, 268, 269, 273, 274, 280, 284, 289, + 290, 295, 301, 302, 303, 304, 309, 314, 315, 316, + 317, 318, 319, 319, 320, 321, 345, 346, 347, 348, + 352, 353, 362, 363, 364, 368, 380, 384, 388, 396, + 407, 408, 418, 419, 423, 435, 435, 440, 440, 445, + 456, 471, 472, 473, 474, 478, 479, 484, 486, 491, + 496, 506, 508, 513, 514, 518, 519, 523, 524, 525, + 530, 535, 540, 546, 552, 563, 564, 573, 574, 580, + 581, 582, 589, 589, 597, 598, 599, 604, 607, 609, + 611, 613, 615, 617, 619, 624, 625, 635, 636, 661, + 662, 663, 664, 676, 678, 687, 692, 693, 698, 706, + 707 }; #endif @@ -662,10 +593,10 @@ static const yytype_uint16 yyrline[] = First, the terminals, then, starting at YYNTOKENS, nonterminals. */ static const char *const yytname[] = { - "\"end of file\"", "error", "$undefined", "\"string\"", "\"integer\"", - "\"%token\"", "\"%nterm\"", "\"%type\"", "\"%destructor\"", - "\"%printer\"", "\"%left\"", "\"%right\"", "\"%nonassoc\"", - "\"%precedence\"", "\"%prec\"", "\"%dprec\"", "\"%merge\"", "\"%code\"", + "\"end of file\"", "error", "$undefined", "\"string\"", "\"%token\"", + "\"%nterm\"", "\"%type\"", "\"%destructor\"", "\"%printer\"", + "\"%left\"", "\"%right\"", "\"%nonassoc\"", "\"%precedence\"", + "\"%prec\"", "\"%dprec\"", "\"%merge\"", "\"%code\"", "\"%default-prec\"", "\"%define\"", "\"%defines\"", "\"%error-verbose\"", "\"%expect\"", "\"%expect-rr\"", "\"%\"", "\"%file-prefix\"", "\"%glr-parser\"", "\"%initial-action\"", "\"%language\"", @@ -675,15 +606,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", + "id", "id_colon", "symbol", "string_as_id", "epilogue.opt", YY_NULL }; #endif @@ -697,44 +628,44 @@ 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 -74 +#define YYPACT_NINF -113 #define yypact_value_is_default(Yystate) \ - (!!((Yystate) == (-74))) + (!!((Yystate) == (-113))) -#define YYTABLE_NINF -109 +#define YYTABLE_NINF -110 #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[] = { - -74, 40, 101, -74, -74, -74, -48, -74, -74, -74, - -74, -74, -74, 19, -74, 0, 52, -74, 56, 79, - -74, 81, -74, 45, 83, 84, -74, -74, -74, 85, - 86, 87, 31, -74, -74, -74, 15, -74, -74, -74, - 46, -74, -74, 51, -74, -74, 42, 4, 4, 31, - -74, 57, -74, -74, -74, 36, -74, -74, -74, -74, - -74, -74, -74, -74, -74, -74, -74, -74, -74, -74, - -74, -74, 47, -74, 49, 1, -74, -74, 59, 62, - -74, 57, 26, -74, 31, -74, -74, 4, 72, 4, - 31, -74, -74, -74, -74, -74, -74, -74, 60, -74, - -74, -74, -74, -74, 63, -74, -74, -74, -74, 26, - -74, -74, -74, 31, -74, 111, -74, 113, -74, -74, - -74, -74, -74, -74, -74, -74, -74, -13, 27, -74, - -74, 31, 137, 65, 59, -74, 59, 27, -74, -74, - -74, -74, -74 + -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, 47, 45, 0, 40, 41, 51, @@ -742,117 +673,120 @@ static const yytype_uint8 yydefact[] = 7, 0, 15, 0, 0, 0, 37, 19, 20, 0, 0, 0, 0, 26, 27, 28, 0, 6, 29, 22, 42, 4, 5, 0, 33, 32, 55, 0, 0, 0, - 101, 0, 38, 97, 96, 98, 10, 12, 13, 14, - 16, 17, 18, 21, 24, 25, 107, 103, 102, 105, - 34, 106, 0, 104, 0, 0, 77, 79, 94, 0, - 43, 0, 0, 56, 0, 70, 75, 48, 71, 46, - 49, 61, 39, 100, 99, 8, 81, 80, 0, 78, - 2, 95, 82, 31, 23, 44, 67, 68, 69, 35, + 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, - 109, 87, 30, 64, 58, 60, 74, 83, 84, 87, - 86, 0, 0, 0, 94, 90, 94, 85, 91, 92, - 93, 89, 88 + 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[] = { - -74, -74, -74, -74, -74, -74, 140, -74, -74, -74, - -74, -74, -74, -74, -74, -74, 30, -74, -74, 35, - -74, -26, 97, -74, 71, -74, -74, -74, 18, -70, - -74, -74, -46, 6, -74, -32, -73, -74 + -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, 79, 104, 74, 43, 81, 44, - 48, 47, 45, 46, 84, 113, 114, 90, 109, 110, - 111, 86, 87, 75, 76, 77, 121, 127, 128, 102, - 55, 95, 52, 69, 78, 112, 71, 100 + -1, 1, 2, 41, 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[] = { - 70, -108, 72, 53, 49, 92, 4, 5, 6, 7, - 8, 9, 10, 11, 12, 118, 72, 91, 13, 14, - 4, 5, 6, 7, 8, 9, 10, 11, 12, 66, - 66, 26, 13, 14, 66, 105, 129, 32, 130, 93, - 3, 131, 132, 133, 126, 26, 54, 67, 73, 98, - 68, 32, 115, 88, 88, 56, 85, 40, 119, 50, - 57, 116, 73, 116, 141, 51, 142, 134, 135, 67, - 67, 40, 68, 68, 67, 66, 117, 68, 106, 107, - 108, 115, 94, 58, 59, 60, 61, 62, 63, 64, - 65, 82, 80, 88, 83, 88, 136, 50, 96, 138, - 97, 101, 103, 122, 120, 136, 4, 5, 6, 7, - 8, 9, 10, 11, 12, 125, 66, 140, 13, 14, - 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, - 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, - 35, 139, 42, 124, 123, 89, 99, 137, 0, 36, - 0, 37, 38, 0, 0, 0, 39, 40 + 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, 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, 52, 51, 5, 6, 7, 8, - 9, 10, 11, 12, 13, 88, 1, 49, 17, 18, - 5, 6, 7, 8, 9, 10, 11, 12, 13, 3, - 3, 30, 17, 18, 3, 81, 49, 36, 51, 3, - 0, 14, 15, 16, 117, 30, 46, 43, 47, 48, - 46, 36, 84, 47, 48, 3, 52, 56, 90, 40, - 4, 87, 47, 89, 134, 46, 136, 40, 41, 43, - 43, 56, 46, 46, 43, 3, 4, 46, 52, 53, - 54, 113, 46, 4, 3, 40, 3, 3, 3, 3, - 3, 40, 46, 87, 52, 89, 128, 40, 51, 131, - 51, 42, 40, 40, 44, 137, 5, 6, 7, 8, - 9, 10, 11, 12, 13, 4, 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, 113, 109, 48, 75, 129, -1, 48, - -1, 50, 51, -1, -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, 64, 66, 69, 70, 68, 67, 52, - 40, 46, 89, 3, 46, 87, 3, 4, 4, 3, - 40, 3, 3, 3, 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, 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, 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, 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, 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, @@ -864,8 +798,9 @@ static const yytype_uint8 yyr2[] = 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, 2, 3, 3, 3, 0, 1, 1, 1, 0, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, + 2 }; @@ -894,12 +829,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 @@ -930,28 +865,6 @@ 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 GRAM_LTYPE_IS_TRIVIAL && GRAM_LTYPE_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 GRAM_DEBUG @@ -967,6 +880,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) \ @@ -987,7 +945,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; @@ -997,192 +955,156 @@ yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvalue # endif switch (yytype) { - case 3: // "string" -/* Line 727 of yacc.c */ -#line 196 "src/parse-gram.y" - { fputs (quotearg_style (c_quoting_style, ((*yyvaluep).chars)), yyo); } -/* Line 727 of yacc.c */ -#line 1006 "src/parse-gram.c" + case 3: /* "string" */ +#line 183 "src/parse-gram.y" /* yacc.c:701 */ + { fputs (quotearg_style (c_quoting_style, ((*yyvaluep).code)), yyo); } +#line 962 "src/parse-gram.c" /* yacc.c:701 */ break; - case 4: // "integer" -/* Line 727 of yacc.c */ -#line 209 "src/parse-gram.y" - { fprintf (yyo, "%d", ((*yyvaluep).integer)); } -/* Line 727 of yacc.c */ -#line 1014 "src/parse-gram.c" + case 23: /* "%" */ +#line 191 "src/parse-gram.y" /* yacc.c:701 */ + { fprintf (yyo, "%%%s", ((*yyvaluep).uniqstr)); } +#line 968 "src/parse-gram.c" /* yacc.c:701 */ break; - case 24: // "%" -/* Line 727 of yacc.c */ -#line 205 "src/parse-gram.y" - { fprintf (yyo, "%%%s", ((*yyvaluep).uniqstr)); } -/* Line 727 of yacc.c */ -#line 1022 "src/parse-gram.c" + case 39: /* "{...}" */ +#line 184 "src/parse-gram.y" /* yacc.c:701 */ + { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).code)); } +#line 974 "src/parse-gram.c" /* yacc.c:701 */ break; - case 40: // "{...}" -/* Line 727 of yacc.c */ -#line 198 "src/parse-gram.y" - { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).code)); } -/* Line 727 of yacc.c */ -#line 1030 "src/parse-gram.c" + case 40: /* "%?{...}" */ +#line 184 "src/parse-gram.y" /* yacc.c:701 */ + { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).code)); } +#line 980 "src/parse-gram.c" /* yacc.c:701 */ break; - case 42: // "[identifier]" -/* Line 727 of yacc.c */ -#line 203 "src/parse-gram.y" - { fprintf (yyo, "[%s]", ((*yyvaluep).uniqstr)); } -/* Line 727 of yacc.c */ -#line 1038 "src/parse-gram.c" + case 41: /* "[identifier]" */ +#line 189 "src/parse-gram.y" /* yacc.c:701 */ + { fprintf (yyo, "[%s]", ((*yyvaluep).uniqstr)); } +#line 986 "src/parse-gram.c" /* yacc.c:701 */ break; - case 43: // "char" -/* Line 727 of yacc.c */ -#line 190 "src/parse-gram.y" - { fputs (char_name (((*yyvaluep).character)), yyo); } -/* Line 727 of yacc.c */ -#line 1046 "src/parse-gram.c" + case 42: /* "char" */ +#line 179 "src/parse-gram.y" /* yacc.c:701 */ + { fputs (char_name (((*yyvaluep).character)), yyo); } +#line 992 "src/parse-gram.c" /* yacc.c:701 */ break; - case 44: // "epilogue" -/* Line 727 of yacc.c */ -#line 198 "src/parse-gram.y" - { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); } -/* Line 727 of yacc.c */ -#line 1054 "src/parse-gram.c" + case 43: /* "epilogue" */ +#line 184 "src/parse-gram.y" /* yacc.c:701 */ + { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).code)); } +#line 998 "src/parse-gram.c" /* yacc.c:701 */ break; - case 46: // "identifier" -/* Line 727 of yacc.c */ -#line 202 "src/parse-gram.y" - { fputs (((*yyvaluep).uniqstr), yyo); } -/* Line 727 of yacc.c */ -#line 1062 "src/parse-gram.c" + case 45: /* "identifier" */ +#line 188 "src/parse-gram.y" /* yacc.c:701 */ + { fputs (((*yyvaluep).uniqstr), yyo); } +#line 1004 "src/parse-gram.c" /* yacc.c:701 */ break; - case 47: // "identifier:" -/* Line 727 of yacc.c */ -#line 204 "src/parse-gram.y" - { fprintf (yyo, "%s:", ((*yyvaluep).uniqstr)); } -/* Line 727 of yacc.c */ -#line 1070 "src/parse-gram.c" + case 46: /* "identifier:" */ +#line 190 "src/parse-gram.y" /* yacc.c:701 */ + { fprintf (yyo, "%s:", ((*yyvaluep).uniqstr)); } +#line 1010 "src/parse-gram.c" /* yacc.c:701 */ break; - case 50: // "%{...%}" -/* Line 727 of yacc.c */ -#line 198 "src/parse-gram.y" - { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); } -/* Line 727 of yacc.c */ -#line 1078 "src/parse-gram.c" + case 49: /* "%{...%}" */ +#line 184 "src/parse-gram.y" /* yacc.c:701 */ + { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).code)); } +#line 1016 "src/parse-gram.c" /* yacc.c:701 */ break; - case 52: // "" -/* Line 727 of yacc.c */ -#line 206 "src/parse-gram.y" - { fprintf (yyo, "<%s>", ((*yyvaluep).uniqstr)); } -/* Line 727 of yacc.c */ -#line 1086 "src/parse-gram.c" + case 51: /* "" */ +#line 192 "src/parse-gram.y" /* yacc.c:701 */ + { fprintf (yyo, "<%s>", ((*yyvaluep).uniqstr)); } +#line 1022 "src/parse-gram.c" /* yacc.c:701 */ break; - case 55: // "%param" -/* Line 727 of yacc.c */ -#line 252 "src/parse-gram.y" - { + case 54: /* "integer" */ +#line 196 "src/parse-gram.y" /* yacc.c:701 */ + { fprintf (yyo, "%d", ((*yyvaluep).integer)); } +#line 1028 "src/parse-gram.c" /* yacc.c:701 */ + break; + + case 55: /* "%param" */ +#line 239 "src/parse-gram.y" /* yacc.c:701 */ + { 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 727 of yacc.c */ -#line 1105 "src/parse-gram.c" +#line 1045 "src/parse-gram.c" /* yacc.c:701 */ break; - case 64: // code_props_type -/* Line 727 of yacc.c */ -#line 424 "src/parse-gram.y" - { fprintf (yyo, "%s", code_props_type_string (((*yyvaluep).code_type))); } -/* Line 727 of yacc.c */ -#line 1113 "src/parse-gram.c" + case 65: /* code_props_type */ +#line 405 "src/parse-gram.y" /* yacc.c:701 */ + { fprintf (yyo, "%s", code_props_type_string (((*yyvaluep).code_type))); } +#line 1051 "src/parse-gram.c" /* yacc.c:701 */ break; - case 73: // symbol.prec -/* Line 727 of yacc.c */ -#line 212 "src/parse-gram.y" - { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); } -/* Line 727 of yacc.c */ -#line 1121 "src/parse-gram.c" + case 74: /* symbol.prec */ +#line 200 "src/parse-gram.y" /* yacc.c:701 */ + { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); } +#line 1057 "src/parse-gram.c" /* yacc.c:701 */ break; - case 77: // tag -/* Line 727 of yacc.c */ -#line 206 "src/parse-gram.y" - { fprintf (yyo, "<%s>", ((*yyvaluep).uniqstr)); } -/* Line 727 of yacc.c */ -#line 1129 "src/parse-gram.c" + case 78: /* tag */ +#line 192 "src/parse-gram.y" /* yacc.c:701 */ + { fprintf (yyo, "<%s>", ((*yyvaluep).uniqstr)); } +#line 1063 "src/parse-gram.c" /* yacc.c:701 */ break; - case 87: // variable -/* Line 727 of yacc.c */ -#line 202 "src/parse-gram.y" - { fputs (((*yyvaluep).uniqstr), yyo); } -/* Line 727 of yacc.c */ -#line 1137 "src/parse-gram.c" + case 88: /* variable */ +#line 188 "src/parse-gram.y" /* yacc.c:701 */ + { fputs (((*yyvaluep).uniqstr), yyo); } +#line 1069 "src/parse-gram.c" /* yacc.c:701 */ break; - case 88: // content.opt -/* Line 727 of yacc.c */ -#line 198 "src/parse-gram.y" - { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); } -/* Line 727 of yacc.c */ -#line 1145 "src/parse-gram.c" + case 89: /* value */ +#line 651 "src/parse-gram.y" /* yacc.c:701 */ + { + switch (((*yyvaluep).value).kind) + { + case muscle_code: fprintf (yyo, "{%s}", ((*yyvaluep).value).chars); break; + case muscle_keyword: fprintf (yyo, "%s", ((*yyvaluep).value).chars); break; + case muscle_string: fprintf (yyo, "\"%s\"", ((*yyvaluep).value).chars); break; + } +} +#line 1082 "src/parse-gram.c" /* yacc.c:701 */ break; - case 89: // braceless -/* Line 727 of yacc.c */ -#line 198 "src/parse-gram.y" - { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); } -/* Line 727 of yacc.c */ -#line 1153 "src/parse-gram.c" + case 90: /* id */ +#line 200 "src/parse-gram.y" /* yacc.c:701 */ + { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); } +#line 1088 "src/parse-gram.c" /* yacc.c:701 */ break; - case 90: // id -/* Line 727 of yacc.c */ -#line 212 "src/parse-gram.y" - { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); } -/* Line 727 of yacc.c */ -#line 1161 "src/parse-gram.c" + case 91: /* id_colon */ +#line 201 "src/parse-gram.y" /* yacc.c:701 */ + { fprintf (yyo, "%s:", ((*yyvaluep).symbol)->tag); } +#line 1094 "src/parse-gram.c" /* yacc.c:701 */ break; - case 91: // id_colon -/* Line 727 of yacc.c */ -#line 213 "src/parse-gram.y" - { fprintf (yyo, "%s:", ((*yyvaluep).symbol)->tag); } -/* Line 727 of yacc.c */ -#line 1169 "src/parse-gram.c" + case 92: /* symbol */ +#line 200 "src/parse-gram.y" /* yacc.c:701 */ + { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); } +#line 1100 "src/parse-gram.c" /* yacc.c:701 */ break; - case 92: // symbol -/* Line 727 of yacc.c */ -#line 212 "src/parse-gram.y" - { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); } -/* Line 727 of yacc.c */ -#line 1177 "src/parse-gram.c" + case 93: /* string_as_id */ +#line 200 "src/parse-gram.y" /* yacc.c:701 */ + { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); } +#line 1106 "src/parse-gram.c" /* yacc.c:701 */ break; - case 93: // string_as_id -/* Line 727 of yacc.c */ -#line 212 "src/parse-gram.y" - { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); } -/* Line 727 of yacc.c */ -#line 1185 "src/parse-gram.c" - break; default: break; @@ -1197,10 +1119,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, ": "); @@ -1626,7 +1546,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; @@ -1683,11 +1602,13 @@ 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 GRAM_DEBUG @@ -1711,10 +1632,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) { @@ -1754,17 +1677,13 @@ 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"; YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); - switch (yytype) - { - default: - break; - } + YYUSE (yytype); } @@ -1781,10 +1700,11 @@ yyparse (void) int yychar; -#if defined __GNUC__ && (4 < __GNUC__ + (6 <= __GNUC_MINOR__)) +#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") @@ -1792,21 +1712,27 @@ int yychar; /* Default value used for initialization, for pacifying older GCCs or non-GCC compilers. */ static YYSTYPE yyval_default; -# define YYLVAL_INITIALIZE() (yylval = yyval_default) -#endif -#ifndef YYLVAL_INITIALIZE -# define YYLVAL_INITIALIZE() +# 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; @@ -1816,9 +1742,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. */ @@ -1870,9 +1796,9 @@ YYLTYPE yylloc; Keep to zero when no symbol should be popped. */ int yylen = 0; - yyss = yyssa; - yyvs = yyvsa; - yyls = yylsa; + yyssp = yyss = yyssa; + yyvsp = yyvs = yyvsa; + yylsp = yyls = yylsa; yystacksize = YYINITDEPTH; yyes = yyesa; @@ -1887,32 +1813,16 @@ 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; - - YYLVAL_INITIALIZE (); -#if defined GRAM_LTYPE_IS_TRIVIAL && GRAM_LTYPE_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 1483 of yacc.c */ -#line 101 "src/parse-gram.y" +#line 103 "src/parse-gram.y" /* yacc.c:1446 */ { /* Bison's grammar can initial empty locations, hence a default location is needed. */ boundary_set (&yylloc.start, current_file, 1, 1); boundary_set (&yylloc.end, current_file, 1, 1); } -/* Line 1483 of yacc.c */ -#line 1916 "src/parse-gram.c" + +#line 1826 "src/parse-gram.c" /* yacc.c:1446 */ yylsp[0] = yylloc; goto yysetstate; @@ -2019,7 +1929,7 @@ yybackup: if (yychar == YYEMPTY) { YYDPRINTF ((stderr, "Reading a token: ")); - yychar = YYLEX; + yychar = yylex (&yylval, &yylloc); } if (yychar <= YYEOF) @@ -2089,7 +1999,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 @@ -2106,191 +2016,145 @@ yyreduce: switch (yyn) { case 6: -/* Line 1700 of yacc.c */ -#line 288 "src/parse-gram.y" +#line 275 "src/parse-gram.y" /* yacc.c:1663 */ { - 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 1700 of yacc.c */ -#line 2122 "src/parse-gram.c" +#line 2026 "src/parse-gram.c" /* yacc.c:1663 */ break; case 7: -/* Line 1700 of yacc.c */ -#line 298 "src/parse-gram.y" +#line 281 "src/parse-gram.y" /* yacc.c:1663 */ { muscle_percent_define_ensure ((yyvsp[0].uniqstr), (yylsp[0]), true); } -/* Line 1700 of yacc.c */ -#line 2132 "src/parse-gram.c" +#line 2034 "src/parse-gram.c" /* yacc.c:1663 */ break; case 8: -/* Line 1700 of yacc.c */ -#line 302 "src/parse-gram.y" +#line 285 "src/parse-gram.y" /* yacc.c:1663 */ { - muscle_percent_define_insert ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].chars), + muscle_percent_define_insert ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].value).kind, (yyvsp[0].value).chars, MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE); } -/* Line 1700 of yacc.c */ -#line 2143 "src/parse-gram.c" +#line 2043 "src/parse-gram.c" /* yacc.c:1663 */ break; case 9: -/* Line 1700 of yacc.c */ -#line 306 "src/parse-gram.y" +#line 289 "src/parse-gram.y" /* yacc.c:1663 */ { defines_flag = true; } -/* Line 1700 of yacc.c */ -#line 2151 "src/parse-gram.c" +#line 2049 "src/parse-gram.c" /* yacc.c:1663 */ break; case 10: -/* Line 1700 of yacc.c */ -#line 308 "src/parse-gram.y" +#line 291 "src/parse-gram.y" /* yacc.c:1663 */ { defines_flag = true; - spec_defines_file = xstrdup ((yyvsp[0].chars)); + spec_defines_file = xstrdup ((yyvsp[0].code)); } -/* Line 1700 of yacc.c */ -#line 2162 "src/parse-gram.c" +#line 2058 "src/parse-gram.c" /* yacc.c:1663 */ break; case 11: -/* Line 1700 of yacc.c */ -#line 313 "src/parse-gram.y" +#line 296 "src/parse-gram.y" /* yacc.c:1663 */ { - muscle_percent_define_insert ("parse.error", (yylsp[0]), "verbose", + muscle_percent_define_insert ("parse.error", (yylsp[0]), muscle_keyword, + "verbose", MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE); } -/* Line 1700 of yacc.c */ -#line 2173 "src/parse-gram.c" +#line 2068 "src/parse-gram.c" /* yacc.c:1663 */ break; case 12: -/* Line 1700 of yacc.c */ -#line 317 "src/parse-gram.y" +#line 301 "src/parse-gram.y" /* yacc.c:1663 */ { expected_sr_conflicts = (yyvsp[0].integer); } -/* Line 1700 of yacc.c */ -#line 2181 "src/parse-gram.c" +#line 2074 "src/parse-gram.c" /* yacc.c:1663 */ break; case 13: -/* Line 1700 of yacc.c */ -#line 318 "src/parse-gram.y" +#line 302 "src/parse-gram.y" /* yacc.c:1663 */ { expected_rr_conflicts = (yyvsp[0].integer); } -/* Line 1700 of yacc.c */ -#line 2189 "src/parse-gram.c" +#line 2080 "src/parse-gram.c" /* yacc.c:1663 */ break; case 14: -/* Line 1700 of yacc.c */ -#line 319 "src/parse-gram.y" - { spec_file_prefix = (yyvsp[0].chars); } -/* Line 1700 of yacc.c */ -#line 2197 "src/parse-gram.c" +#line 303 "src/parse-gram.y" /* yacc.c:1663 */ + { spec_file_prefix = (yyvsp[0].code); } +#line 2086 "src/parse-gram.c" /* yacc.c:1663 */ break; case 15: -/* Line 1700 of yacc.c */ -#line 321 "src/parse-gram.y" +#line 305 "src/parse-gram.y" /* yacc.c:1663 */ { nondeterministic_parser = true; glr_parser = true; } -/* Line 1700 of yacc.c */ -#line 2208 "src/parse-gram.c" +#line 2095 "src/parse-gram.c" /* yacc.c:1663 */ break; case 16: -/* Line 1700 of yacc.c */ -#line 326 "src/parse-gram.y" +#line 310 "src/parse-gram.y" /* yacc.c:1663 */ { - 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 1700 of yacc.c */ -#line 2223 "src/parse-gram.c" +#line 2104 "src/parse-gram.c" /* yacc.c:1663 */ break; case 17: -/* Line 1700 of yacc.c */ -#line 334 "src/parse-gram.y" - { language_argmatch ((yyvsp[0].chars), grammar_prio, (yylsp[-1])); } -/* Line 1700 of yacc.c */ -#line 2231 "src/parse-gram.c" +#line 314 "src/parse-gram.y" /* yacc.c:1663 */ + { language_argmatch ((yyvsp[0].code), grammar_prio, (yylsp[-1])); } +#line 2110 "src/parse-gram.c" /* yacc.c:1663 */ break; case 18: -/* Line 1700 of yacc.c */ -#line 335 "src/parse-gram.y" - { spec_name_prefix = (yyvsp[0].chars); } -/* Line 1700 of yacc.c */ -#line 2239 "src/parse-gram.c" +#line 315 "src/parse-gram.y" /* yacc.c:1663 */ + { spec_name_prefix = (yyvsp[0].code); } +#line 2116 "src/parse-gram.c" /* yacc.c:1663 */ break; case 19: -/* Line 1700 of yacc.c */ -#line 336 "src/parse-gram.y" +#line 316 "src/parse-gram.y" /* yacc.c:1663 */ { no_lines_flag = true; } -/* Line 1700 of yacc.c */ -#line 2247 "src/parse-gram.c" +#line 2122 "src/parse-gram.c" /* yacc.c:1663 */ break; case 20: -/* Line 1700 of yacc.c */ -#line 337 "src/parse-gram.y" +#line 317 "src/parse-gram.y" /* yacc.c:1663 */ { nondeterministic_parser = true; } -/* Line 1700 of yacc.c */ -#line 2255 "src/parse-gram.c" +#line 2128 "src/parse-gram.c" /* yacc.c:1663 */ break; case 21: -/* Line 1700 of yacc.c */ -#line 338 "src/parse-gram.y" - { spec_outfile = (yyvsp[0].chars); } -/* Line 1700 of yacc.c */ -#line 2263 "src/parse-gram.c" +#line 318 "src/parse-gram.y" /* yacc.c:1663 */ + { spec_outfile = (yyvsp[0].code); } +#line 2134 "src/parse-gram.c" /* yacc.c:1663 */ break; case 22: -/* Line 1700 of yacc.c */ -#line 339 "src/parse-gram.y" +#line 319 "src/parse-gram.y" /* yacc.c:1663 */ { current_param = (yyvsp[0].param); } -/* Line 1700 of yacc.c */ -#line 2271 "src/parse-gram.c" +#line 2140 "src/parse-gram.c" /* yacc.c:1663 */ break; case 23: -/* Line 1700 of yacc.c */ -#line 339 "src/parse-gram.y" +#line 319 "src/parse-gram.y" /* yacc.c:1663 */ { current_param = param_none; } -/* Line 1700 of yacc.c */ -#line 2279 "src/parse-gram.c" +#line 2146 "src/parse-gram.c" /* yacc.c:1663 */ break; case 24: -/* Line 1700 of yacc.c */ -#line 340 "src/parse-gram.y" - { version_check (&(yylsp[0]), (yyvsp[0].chars)); } -/* Line 1700 of yacc.c */ -#line 2287 "src/parse-gram.c" +#line 320 "src/parse-gram.y" /* yacc.c:1663 */ + { version_check (&(yylsp[0]), (yyvsp[0].code)); } +#line 2152 "src/parse-gram.c" /* yacc.c:1663 */ break; case 25: -/* Line 1700 of yacc.c */ -#line 342 "src/parse-gram.y" +#line 322 "src/parse-gram.y" /* yacc.c:1663 */ { - 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); @@ -2312,63 +2176,49 @@ yyreduce: } skeleton_arg (skeleton_user, grammar_prio, (yylsp[-1])); } -/* Line 1700 of yacc.c */ -#line 2317 "src/parse-gram.c" +#line 2180 "src/parse-gram.c" /* yacc.c:1663 */ break; case 26: -/* Line 1700 of yacc.c */ -#line 365 "src/parse-gram.y" +#line 345 "src/parse-gram.y" /* yacc.c:1663 */ { token_table_flag = true; } -/* Line 1700 of yacc.c */ -#line 2325 "src/parse-gram.c" +#line 2186 "src/parse-gram.c" /* yacc.c:1663 */ break; case 27: -/* Line 1700 of yacc.c */ -#line 366 "src/parse-gram.y" +#line 346 "src/parse-gram.y" /* yacc.c:1663 */ { report_flag |= report_states; } -/* Line 1700 of yacc.c */ -#line 2333 "src/parse-gram.c" +#line 2192 "src/parse-gram.c" /* yacc.c:1663 */ break; case 28: -/* Line 1700 of yacc.c */ -#line 367 "src/parse-gram.y" +#line 347 "src/parse-gram.y" /* yacc.c:1663 */ { yacc_flag = true; } -/* Line 1700 of yacc.c */ -#line 2341 "src/parse-gram.c" +#line 2198 "src/parse-gram.c" /* yacc.c:1663 */ break; case 30: -/* Line 1700 of yacc.c */ -#line 372 "src/parse-gram.y" +#line 352 "src/parse-gram.y" /* yacc.c:1663 */ { add_param (current_param, (yyvsp[0].code), (yylsp[0])); } -/* Line 1700 of yacc.c */ -#line 2349 "src/parse-gram.c" +#line 2204 "src/parse-gram.c" /* yacc.c:1663 */ break; case 31: -/* Line 1700 of yacc.c */ -#line 373 "src/parse-gram.y" +#line 353 "src/parse-gram.y" /* yacc.c:1663 */ { add_param (current_param, (yyvsp[0].code), (yylsp[0])); } -/* Line 1700 of yacc.c */ -#line 2357 "src/parse-gram.c" +#line 2210 "src/parse-gram.c" /* yacc.c:1663 */ break; case 34: -/* Line 1700 of yacc.c */ -#line 385 "src/parse-gram.y" +#line 365 "src/parse-gram.y" /* yacc.c:1663 */ { grammar_start_symbol_set ((yyvsp[0].symbol), (yylsp[0])); } -/* Line 1700 of yacc.c */ -#line 2367 "src/parse-gram.c" +#line 2218 "src/parse-gram.c" /* yacc.c:1663 */ break; case 35: -/* Line 1700 of yacc.c */ -#line 389 "src/parse-gram.y" +#line 369 "src/parse-gram.y" /* yacc.c:1663 */ { code_props code; code_props_symbol_action_init (&code, (yyvsp[-1].code), (yylsp[-1])); @@ -2380,139 +2230,112 @@ yyreduce: symbol_list_free ((yyvsp[0].list)); } } -/* Line 1700 of yacc.c */ -#line 2385 "src/parse-gram.c" +#line 2234 "src/parse-gram.c" /* yacc.c:1663 */ break; case 36: -/* Line 1700 of yacc.c */ -#line 401 "src/parse-gram.y" +#line 381 "src/parse-gram.y" /* yacc.c:1663 */ { default_prec = true; } -/* Line 1700 of yacc.c */ -#line 2395 "src/parse-gram.c" +#line 2242 "src/parse-gram.c" /* yacc.c:1663 */ break; case 37: -/* Line 1700 of yacc.c */ -#line 405 "src/parse-gram.y" +#line 385 "src/parse-gram.y" /* yacc.c:1663 */ { default_prec = false; } -/* Line 1700 of yacc.c */ -#line 2405 "src/parse-gram.c" +#line 2250 "src/parse-gram.c" /* yacc.c:1663 */ break; case 38: -/* Line 1700 of yacc.c */ -#line 409 "src/parse-gram.y" +#line 389 "src/parse-gram.y" /* yacc.c:1663 */ { /* Do not invoke muscle_percent_code_grow here since it invokes muscle_user_name_list_grow. */ - muscle_code_grow ("percent_code()", (yyvsp[0].chars), (yylsp[0])); + muscle_code_grow ("percent_code()", + translate_code_braceless ((yyvsp[0].code), (yylsp[0])), (yylsp[0])); code_scanner_last_string_free (); } -/* Line 1700 of yacc.c */ -#line 2418 "src/parse-gram.c" +#line 2262 "src/parse-gram.c" /* yacc.c:1663 */ break; case 39: -/* Line 1700 of yacc.c */ -#line 416 "src/parse-gram.y" +#line 397 "src/parse-gram.y" /* yacc.c:1663 */ { - 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 1700 of yacc.c */ -#line 2429 "src/parse-gram.c" +#line 2271 "src/parse-gram.c" /* yacc.c:1663 */ break; case 40: -/* Line 1700 of yacc.c */ -#line 426 "src/parse-gram.y" +#line 407 "src/parse-gram.y" /* yacc.c:1663 */ { (yyval.code_type) = destructor; } -/* Line 1700 of yacc.c */ -#line 2437 "src/parse-gram.c" +#line 2277 "src/parse-gram.c" /* yacc.c:1663 */ break; case 41: -/* Line 1700 of yacc.c */ -#line 427 "src/parse-gram.y" +#line 408 "src/parse-gram.y" /* yacc.c:1663 */ { (yyval.code_type) = printer; } -/* Line 1700 of yacc.c */ -#line 2445 "src/parse-gram.c" +#line 2283 "src/parse-gram.c" /* yacc.c:1663 */ break; case 42: -/* Line 1700 of yacc.c */ -#line 437 "src/parse-gram.y" +#line 418 "src/parse-gram.y" /* yacc.c:1663 */ {} -/* Line 1700 of yacc.c */ -#line 2453 "src/parse-gram.c" +#line 2289 "src/parse-gram.c" /* yacc.c:1663 */ break; case 43: -/* Line 1700 of yacc.c */ -#line 438 "src/parse-gram.y" +#line 419 "src/parse-gram.y" /* yacc.c:1663 */ { muscle_code_grow ("union_name", (yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1700 of yacc.c */ -#line 2461 "src/parse-gram.c" +#line 2295 "src/parse-gram.c" /* yacc.c:1663 */ break; case 44: -/* Line 1700 of yacc.c */ -#line 443 "src/parse-gram.y" +#line 424 "src/parse-gram.y" /* yacc.c:1663 */ { 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 1700 of yacc.c */ -#line 2473 "src/parse-gram.c" +#line 2305 "src/parse-gram.c" /* yacc.c:1663 */ break; case 45: -/* Line 1700 of yacc.c */ -#line 454 "src/parse-gram.y" +#line 435 "src/parse-gram.y" /* yacc.c:1663 */ { current_class = nterm_sym; } -/* Line 1700 of yacc.c */ -#line 2481 "src/parse-gram.c" +#line 2311 "src/parse-gram.c" /* yacc.c:1663 */ break; case 46: -/* Line 1700 of yacc.c */ -#line 455 "src/parse-gram.y" +#line 436 "src/parse-gram.y" /* yacc.c:1663 */ { current_class = unknown_sym; current_type = NULL; } -/* Line 1700 of yacc.c */ -#line 2492 "src/parse-gram.c" +#line 2320 "src/parse-gram.c" /* yacc.c:1663 */ break; case 47: -/* Line 1700 of yacc.c */ -#line 459 "src/parse-gram.y" +#line 440 "src/parse-gram.y" /* yacc.c:1663 */ { current_class = token_sym; } -/* Line 1700 of yacc.c */ -#line 2500 "src/parse-gram.c" +#line 2326 "src/parse-gram.c" /* yacc.c:1663 */ break; case 48: -/* Line 1700 of yacc.c */ -#line 460 "src/parse-gram.y" +#line 441 "src/parse-gram.y" /* yacc.c:1663 */ { current_class = unknown_sym; current_type = NULL; } -/* Line 1700 of yacc.c */ -#line 2511 "src/parse-gram.c" +#line 2335 "src/parse-gram.c" /* yacc.c:1663 */ break; case 49: -/* Line 1700 of yacc.c */ -#line 465 "src/parse-gram.y" +#line 446 "src/parse-gram.y" /* yacc.c:1663 */ { symbol_list *list; tag_seen = true; @@ -2520,13 +2343,11 @@ yyreduce: symbol_type_set (list->content.sym, (yyvsp[-1].uniqstr), (yylsp[-1])); symbol_list_free ((yyvsp[0].list)); } -/* Line 1700 of yacc.c */ -#line 2525 "src/parse-gram.c" +#line 2347 "src/parse-gram.c" /* yacc.c:1663 */ break; case 50: -/* Line 1700 of yacc.c */ -#line 476 "src/parse-gram.y" +#line 457 "src/parse-gram.y" /* yacc.c:1663 */ { symbol_list *list; ++current_prec; @@ -2538,427 +2359,341 @@ yyreduce: symbol_list_free ((yyvsp[0].list)); current_type = NULL; } -/* Line 1700 of yacc.c */ -#line 2543 "src/parse-gram.c" +#line 2363 "src/parse-gram.c" /* yacc.c:1663 */ break; case 51: -/* Line 1700 of yacc.c */ -#line 490 "src/parse-gram.y" +#line 471 "src/parse-gram.y" /* yacc.c:1663 */ { (yyval.assoc) = left_assoc; } -/* Line 1700 of yacc.c */ -#line 2551 "src/parse-gram.c" +#line 2369 "src/parse-gram.c" /* yacc.c:1663 */ break; case 52: -/* Line 1700 of yacc.c */ -#line 491 "src/parse-gram.y" +#line 472 "src/parse-gram.y" /* yacc.c:1663 */ { (yyval.assoc) = right_assoc; } -/* Line 1700 of yacc.c */ -#line 2559 "src/parse-gram.c" +#line 2375 "src/parse-gram.c" /* yacc.c:1663 */ break; case 53: -/* Line 1700 of yacc.c */ -#line 492 "src/parse-gram.y" +#line 473 "src/parse-gram.y" /* yacc.c:1663 */ { (yyval.assoc) = non_assoc; } -/* Line 1700 of yacc.c */ -#line 2567 "src/parse-gram.c" +#line 2381 "src/parse-gram.c" /* yacc.c:1663 */ break; case 54: -/* Line 1700 of yacc.c */ -#line 493 "src/parse-gram.y" +#line 474 "src/parse-gram.y" /* yacc.c:1663 */ { (yyval.assoc) = precedence_assoc; } -/* Line 1700 of yacc.c */ -#line 2575 "src/parse-gram.c" +#line 2387 "src/parse-gram.c" /* yacc.c:1663 */ break; case 55: -/* Line 1700 of yacc.c */ -#line 497 "src/parse-gram.y" +#line 478 "src/parse-gram.y" /* yacc.c:1663 */ { current_type = NULL; } -/* Line 1700 of yacc.c */ -#line 2583 "src/parse-gram.c" +#line 2393 "src/parse-gram.c" /* yacc.c:1663 */ break; case 56: -/* Line 1700 of yacc.c */ -#line 498 "src/parse-gram.y" +#line 479 "src/parse-gram.y" /* yacc.c:1663 */ { current_type = (yyvsp[0].uniqstr); tag_seen = true; } -/* Line 1700 of yacc.c */ -#line 2591 "src/parse-gram.c" +#line 2399 "src/parse-gram.c" /* yacc.c:1663 */ break; case 57: -/* Line 1700 of yacc.c */ -#line 504 "src/parse-gram.y" +#line 485 "src/parse-gram.y" /* yacc.c:1663 */ { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); } -/* Line 1700 of yacc.c */ -#line 2599 "src/parse-gram.c" +#line 2405 "src/parse-gram.c" /* yacc.c:1663 */ break; case 58: -/* Line 1700 of yacc.c */ -#line 506 "src/parse-gram.y" - { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); } -/* Line 1700 of yacc.c */ -#line 2607 "src/parse-gram.c" +#line 487 "src/parse-gram.y" /* yacc.c:1663 */ + { (yyval.list) = symbol_list_append ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); } +#line 2411 "src/parse-gram.c" /* yacc.c:1663 */ break; case 59: -/* Line 1700 of yacc.c */ -#line 510 "src/parse-gram.y" - { (yyval.symbol) = (yyvsp[0].symbol); } -/* Line 1700 of yacc.c */ -#line 2615 "src/parse-gram.c" +#line 492 "src/parse-gram.y" /* yacc.c:1663 */ + { + (yyval.symbol) = (yyvsp[0].symbol); + symbol_class_set ((yyvsp[0].symbol), token_sym, (yylsp[0]), false); + } +#line 2420 "src/parse-gram.c" /* yacc.c:1663 */ break; case 60: -/* Line 1700 of yacc.c */ -#line 511 "src/parse-gram.y" - { (yyval.symbol) = (yyvsp[-1].symbol); symbol_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer), (yylsp[0])); } -/* Line 1700 of yacc.c */ -#line 2623 "src/parse-gram.c" +#line 497 "src/parse-gram.y" /* yacc.c:1663 */ + { + (yyval.symbol) = (yyvsp[-1].symbol); + symbol_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer), (yylsp[0])); + symbol_class_set ((yyvsp[-1].symbol), token_sym, (yylsp[-1]), false); + } +#line 2430 "src/parse-gram.c" /* yacc.c:1663 */ break; case 61: -/* Line 1700 of yacc.c */ -#line 517 "src/parse-gram.y" +#line 507 "src/parse-gram.y" /* yacc.c:1663 */ { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); } -/* Line 1700 of yacc.c */ -#line 2631 "src/parse-gram.c" +#line 2436 "src/parse-gram.c" /* yacc.c:1663 */ break; case 62: -/* Line 1700 of yacc.c */ -#line 519 "src/parse-gram.y" - { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); } -/* Line 1700 of yacc.c */ -#line 2639 "src/parse-gram.c" +#line 509 "src/parse-gram.y" /* yacc.c:1663 */ + { (yyval.list) = symbol_list_append ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); } +#line 2442 "src/parse-gram.c" /* yacc.c:1663 */ break; case 63: -/* Line 1700 of yacc.c */ -#line 523 "src/parse-gram.y" +#line 513 "src/parse-gram.y" /* yacc.c:1663 */ { (yyval.list) = (yyvsp[0].list); } -/* Line 1700 of yacc.c */ -#line 2647 "src/parse-gram.c" +#line 2448 "src/parse-gram.c" /* yacc.c:1663 */ break; case 64: -/* Line 1700 of yacc.c */ -#line 524 "src/parse-gram.y" - { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), (yyvsp[0].list)); } -/* Line 1700 of yacc.c */ -#line 2655 "src/parse-gram.c" +#line 514 "src/parse-gram.y" /* yacc.c:1663 */ + { (yyval.list) = symbol_list_append ((yyvsp[-1].list), (yyvsp[0].list)); } +#line 2454 "src/parse-gram.c" /* yacc.c:1663 */ break; case 65: -/* Line 1700 of yacc.c */ -#line 528 "src/parse-gram.y" +#line 518 "src/parse-gram.y" /* yacc.c:1663 */ { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); } -/* Line 1700 of yacc.c */ -#line 2663 "src/parse-gram.c" +#line 2460 "src/parse-gram.c" /* yacc.c:1663 */ break; case 66: -/* Line 1700 of yacc.c */ -#line 529 "src/parse-gram.y" +#line 519 "src/parse-gram.y" /* yacc.c:1663 */ { (yyval.list) = symbol_list_type_new ((yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1700 of yacc.c */ -#line 2671 "src/parse-gram.c" +#line 2466 "src/parse-gram.c" /* yacc.c:1663 */ break; case 68: -/* Line 1700 of yacc.c */ -#line 534 "src/parse-gram.y" +#line 524 "src/parse-gram.y" /* yacc.c:1663 */ { (yyval.uniqstr) = uniqstr_new ("*"); } -/* Line 1700 of yacc.c */ -#line 2679 "src/parse-gram.c" +#line 2472 "src/parse-gram.c" /* yacc.c:1663 */ break; case 69: -/* Line 1700 of yacc.c */ -#line 535 "src/parse-gram.y" +#line 525 "src/parse-gram.y" /* yacc.c:1663 */ { (yyval.uniqstr) = uniqstr_new (""); } -/* Line 1700 of yacc.c */ -#line 2687 "src/parse-gram.c" +#line 2478 "src/parse-gram.c" /* yacc.c:1663 */ break; case 70: -/* Line 1700 of yacc.c */ -#line 541 "src/parse-gram.y" +#line 531 "src/parse-gram.y" /* yacc.c:1663 */ { - current_type = (yyvsp[0].uniqstr); - tag_seen = true; - } -/* Line 1700 of yacc.c */ -#line 2698 "src/parse-gram.c" + current_type = (yyvsp[0].uniqstr); + tag_seen = true; + } +#line 2487 "src/parse-gram.c" /* yacc.c:1663 */ break; case 71: -/* Line 1700 of yacc.c */ -#line 546 "src/parse-gram.y" +#line 536 "src/parse-gram.y" /* yacc.c:1663 */ { - symbol_class_set ((yyvsp[0].symbol), current_class, (yylsp[0]), true); - symbol_type_set ((yyvsp[0].symbol), current_type, (yylsp[0])); - } -/* Line 1700 of yacc.c */ -#line 2709 "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 2496 "src/parse-gram.c" /* yacc.c:1663 */ break; case 72: -/* Line 1700 of yacc.c */ -#line 551 "src/parse-gram.y" +#line 541 "src/parse-gram.y" /* yacc.c:1663 */ { symbol_class_set ((yyvsp[-1].symbol), current_class, (yylsp[-1]), true); symbol_type_set ((yyvsp[-1].symbol), current_type, (yylsp[-1])); symbol_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer), (yylsp[0])); } -/* Line 1700 of yacc.c */ -#line 2721 "src/parse-gram.c" +#line 2506 "src/parse-gram.c" /* yacc.c:1663 */ break; case 73: -/* Line 1700 of yacc.c */ -#line 557 "src/parse-gram.y" +#line 547 "src/parse-gram.y" /* yacc.c:1663 */ { symbol_class_set ((yyvsp[-1].symbol), current_class, (yylsp[-1]), true); symbol_type_set ((yyvsp[-1].symbol), current_type, (yylsp[-1])); symbol_make_alias ((yyvsp[-1].symbol), (yyvsp[0].symbol), (yyloc)); } -/* Line 1700 of yacc.c */ -#line 2733 "src/parse-gram.c" +#line 2516 "src/parse-gram.c" /* yacc.c:1663 */ break; case 74: -/* Line 1700 of yacc.c */ -#line 563 "src/parse-gram.y" +#line 553 "src/parse-gram.y" /* yacc.c:1663 */ { symbol_class_set ((yyvsp[-2].symbol), current_class, (yylsp[-2]), true); symbol_type_set ((yyvsp[-2].symbol), current_type, (yylsp[-2])); symbol_user_token_number_set ((yyvsp[-2].symbol), (yyvsp[-1].integer), (yylsp[-1])); symbol_make_alias ((yyvsp[-2].symbol), (yyvsp[0].symbol), (yyloc)); } -/* Line 1700 of yacc.c */ -#line 2746 "src/parse-gram.c" +#line 2527 "src/parse-gram.c" /* yacc.c:1663 */ break; case 81: -/* Line 1700 of yacc.c */ -#line 593 "src/parse-gram.y" +#line 583 "src/parse-gram.y" /* yacc.c:1663 */ { yyerrok; } -/* Line 1700 of yacc.c */ -#line 2756 "src/parse-gram.c" +#line 2535 "src/parse-gram.c" /* yacc.c:1663 */ break; case 82: -/* Line 1700 of yacc.c */ -#line 599 "src/parse-gram.y" +#line 589 "src/parse-gram.y" /* yacc.c:1663 */ { current_lhs ((yyvsp[-1].symbol), (yylsp[-1]), (yyvsp[0].named_ref)); } -/* Line 1700 of yacc.c */ -#line 2764 "src/parse-gram.c" +#line 2541 "src/parse-gram.c" /* yacc.c:1663 */ break; case 83: -/* Line 1700 of yacc.c */ -#line 600 "src/parse-gram.y" +#line 590 "src/parse-gram.y" /* yacc.c:1663 */ { /* Free the current lhs. */ current_lhs (0, (yylsp[-3]), 0); } -/* Line 1700 of yacc.c */ -#line 2775 "src/parse-gram.c" +#line 2550 "src/parse-gram.c" /* yacc.c:1663 */ break; case 84: -/* Line 1700 of yacc.c */ -#line 607 "src/parse-gram.y" +#line 597 "src/parse-gram.y" /* yacc.c:1663 */ { grammar_current_rule_end ((yylsp[0])); } -/* Line 1700 of yacc.c */ -#line 2783 "src/parse-gram.c" +#line 2556 "src/parse-gram.c" /* yacc.c:1663 */ break; case 85: -/* Line 1700 of yacc.c */ -#line 608 "src/parse-gram.y" +#line 598 "src/parse-gram.y" /* yacc.c:1663 */ { grammar_current_rule_end ((yylsp[0])); } -/* Line 1700 of yacc.c */ -#line 2791 "src/parse-gram.c" +#line 2562 "src/parse-gram.c" /* yacc.c:1663 */ break; case 87: -/* Line 1700 of yacc.c */ -#line 614 "src/parse-gram.y" +#line 605 "src/parse-gram.y" /* yacc.c:1663 */ { grammar_current_rule_begin (current_lhs_symbol, current_lhs_location, current_lhs_named_ref); } -/* Line 1700 of yacc.c */ -#line 2800 "src/parse-gram.c" +#line 2569 "src/parse-gram.c" /* yacc.c:1663 */ break; case 88: -/* Line 1700 of yacc.c */ -#line 617 "src/parse-gram.y" +#line 608 "src/parse-gram.y" /* yacc.c:1663 */ { grammar_current_rule_symbol_append ((yyvsp[-1].symbol), (yylsp[-1]), (yyvsp[0].named_ref)); } -/* Line 1700 of yacc.c */ -#line 2808 "src/parse-gram.c" +#line 2575 "src/parse-gram.c" /* yacc.c:1663 */ break; case 89: -/* Line 1700 of yacc.c */ -#line 619 "src/parse-gram.y" +#line 610 "src/parse-gram.y" /* yacc.c:1663 */ { grammar_current_rule_action_append ((yyvsp[-1].code), (yylsp[-1]), (yyvsp[0].named_ref), false); } -/* Line 1700 of yacc.c */ -#line 2816 "src/parse-gram.c" +#line 2581 "src/parse-gram.c" /* yacc.c:1663 */ break; case 90: -/* Line 1700 of yacc.c */ -#line 621 "src/parse-gram.y" +#line 612 "src/parse-gram.y" /* yacc.c:1663 */ { grammar_current_rule_action_append ((yyvsp[0].code), (yylsp[0]), NULL, true); } -/* Line 1700 of yacc.c */ -#line 2824 "src/parse-gram.c" +#line 2587 "src/parse-gram.c" /* yacc.c:1663 */ break; case 91: -/* Line 1700 of yacc.c */ -#line 623 "src/parse-gram.y" - { grammar_current_rule_prec_set ((yyvsp[0].symbol), (yylsp[0])); } -/* Line 1700 of yacc.c */ -#line 2832 "src/parse-gram.c" +#line 614 "src/parse-gram.y" /* yacc.c:1663 */ + { grammar_current_rule_empty_set ((yylsp[0])); } +#line 2593 "src/parse-gram.c" /* yacc.c:1663 */ break; case 92: -/* Line 1700 of yacc.c */ -#line 625 "src/parse-gram.y" - { grammar_current_rule_dprec_set ((yyvsp[0].integer), (yylsp[0])); } -/* Line 1700 of yacc.c */ -#line 2840 "src/parse-gram.c" +#line 616 "src/parse-gram.y" /* yacc.c:1663 */ + { grammar_current_rule_prec_set ((yyvsp[0].symbol), (yylsp[0])); } +#line 2599 "src/parse-gram.c" /* yacc.c:1663 */ break; case 93: -/* Line 1700 of yacc.c */ -#line 627 "src/parse-gram.y" - { grammar_current_rule_merge_set ((yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1700 of yacc.c */ -#line 2848 "src/parse-gram.c" +#line 618 "src/parse-gram.y" /* yacc.c:1663 */ + { grammar_current_rule_dprec_set ((yyvsp[0].integer), (yylsp[0])); } +#line 2605 "src/parse-gram.c" /* yacc.c:1663 */ break; case 94: -/* Line 1700 of yacc.c */ -#line 631 "src/parse-gram.y" - { (yyval.named_ref) = 0; } -/* Line 1700 of yacc.c */ -#line 2856 "src/parse-gram.c" +#line 620 "src/parse-gram.y" /* yacc.c:1663 */ + { grammar_current_rule_merge_set ((yyvsp[0].uniqstr), (yylsp[0])); } +#line 2611 "src/parse-gram.c" /* yacc.c:1663 */ break; case 95: -/* Line 1700 of yacc.c */ -#line 633 "src/parse-gram.y" - { (yyval.named_ref) = named_ref_new((yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1700 of yacc.c */ -#line 2864 "src/parse-gram.c" +#line 624 "src/parse-gram.y" /* yacc.c:1663 */ + { (yyval.named_ref) = 0; } +#line 2617 "src/parse-gram.c" /* yacc.c:1663 */ break; - case 97: -/* Line 1700 of yacc.c */ -#line 644 "src/parse-gram.y" - { (yyval.uniqstr) = uniqstr_new ((yyvsp[0].chars)); } -/* Line 1700 of yacc.c */ -#line 2872 "src/parse-gram.c" + case 96: +#line 625 "src/parse-gram.y" /* yacc.c:1663 */ + { (yyval.named_ref) = named_ref_new((yyvsp[0].uniqstr), (yylsp[0])); } +#line 2623 "src/parse-gram.c" /* yacc.c:1663 */ break; case 98: -/* Line 1700 of yacc.c */ -#line 649 "src/parse-gram.y" - { (yyval.chars) = ""; } -/* Line 1700 of yacc.c */ -#line 2880 "src/parse-gram.c" +#line 636 "src/parse-gram.y" /* yacc.c:1663 */ + { (yyval.uniqstr) = uniqstr_new ((yyvsp[0].code)); } +#line 2629 "src/parse-gram.c" /* yacc.c:1663 */ break; case 99: -/* Line 1700 of yacc.c */ -#line 650 "src/parse-gram.y" - { (yyval.chars) = (yyvsp[0].uniqstr); } -/* Line 1700 of yacc.c */ -#line 2888 "src/parse-gram.c" +#line 661 "src/parse-gram.y" /* yacc.c:1663 */ + { (yyval.value).kind = muscle_keyword; (yyval.value).chars = ""; } +#line 2635 "src/parse-gram.c" /* yacc.c:1663 */ + break; + + case 100: +#line 662 "src/parse-gram.y" /* yacc.c:1663 */ + { (yyval.value).kind = muscle_keyword; (yyval.value).chars = (yyvsp[0].uniqstr); } +#line 2641 "src/parse-gram.c" /* yacc.c:1663 */ break; case 101: -/* Line 1700 of yacc.c */ -#line 661 "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 1700 of yacc.c */ -#line 2903 "src/parse-gram.c" +#line 663 "src/parse-gram.y" /* yacc.c:1663 */ + { (yyval.value).kind = muscle_string; (yyval.value).chars = (yyvsp[0].code); } +#line 2647 "src/parse-gram.c" /* yacc.c:1663 */ break; case 102: -/* Line 1700 of yacc.c */ -#line 681 "src/parse-gram.y" - { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1700 of yacc.c */ -#line 2911 "src/parse-gram.c" +#line 664 "src/parse-gram.y" /* yacc.c:1663 */ + { (yyval.value).kind = muscle_code; (yyval.value).chars = strip_braces ((yyvsp[0].code)); } +#line 2653 "src/parse-gram.c" /* yacc.c:1663 */ break; case 103: -/* Line 1700 of yacc.c */ -#line 683 "src/parse-gram.y" +#line 677 "src/parse-gram.y" /* yacc.c:1663 */ + { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); } +#line 2659 "src/parse-gram.c" /* yacc.c:1663 */ + break; + + case 104: +#line 679 "src/parse-gram.y" /* yacc.c:1663 */ { (yyval.symbol) = symbol_get (char_name ((yyvsp[0].character)), (yylsp[0])); symbol_class_set ((yyval.symbol), token_sym, (yylsp[0]), false); symbol_user_token_number_set ((yyval.symbol), (yyvsp[0].character), (yylsp[0])); } -/* Line 1700 of yacc.c */ -#line 2923 "src/parse-gram.c" +#line 2669 "src/parse-gram.c" /* yacc.c:1663 */ break; - case 104: -/* Line 1700 of yacc.c */ -#line 691 "src/parse-gram.y" + case 105: +#line 687 "src/parse-gram.y" /* yacc.c:1663 */ { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1700 of yacc.c */ -#line 2931 "src/parse-gram.c" +#line 2675 "src/parse-gram.c" /* yacc.c:1663 */ break; - case 107: -/* Line 1700 of yacc.c */ -#line 703 "src/parse-gram.y" + case 108: +#line 699 "src/parse-gram.y" /* yacc.c:1663 */ { - (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 1700 of yacc.c */ -#line 2942 "src/parse-gram.c" +#line 2684 "src/parse-gram.c" /* yacc.c:1663 */ break; - case 109: -/* Line 1700 of yacc.c */ -#line 712 "src/parse-gram.y" + case 110: +#line 708 "src/parse-gram.y" /* yacc.c:1663 */ { - 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 1700 of yacc.c */ -#line 2957 "src/parse-gram.c" +#line 2693 "src/parse-gram.c" /* yacc.c:1663 */ break; -/* Line 1700 of yacc.c */ -#line 2962 "src/parse-gram.c" +#line 2697 "src/parse-gram.c" /* yacc.c:1663 */ default: break; } if (yychar_backup != yychar) @@ -2984,7 +2719,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. */ @@ -3012,7 +2747,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, \ @@ -3042,7 +2777,7 @@ yyerrlab: yymsgp = yymsg; } } - yyerror (yymsgp); + yyerror (&yylloc, yymsgp); if (yysyntax_error_status == 2) goto yyexhaustedlab; } @@ -3088,7 +2823,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; @@ -3169,7 +2904,7 @@ yyabortlab: | yyexhaustedlab -- memory exhaustion comes here. | `-------------------------------------------------*/ yyexhaustedlab: - yyerror (YY_("memory exhausted")); + yyerror (&yylloc, YY_("memory exhausted")); yyresult = 2; /* Fall through. */ #endif @@ -3183,7 +2918,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); @@ -3205,8 +2940,7 @@ yyreturn: #endif return yyresult; } -/* Line 1960 of yacc.c */ -#line 722 "src/parse-gram.y" +#line 714 "src/parse-gram.y" /* yacc.c:1923 */ /* Return the location of the left-hand side of a rule whose @@ -3238,6 +2972,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) @@ -3320,3 +3081,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; +}