X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/66c209cf435b5bfc5cf982d8df9cc3ef05b4546b..58b465ae5f7fb39e025540d02455f580749ccbdb:/src/parse-gram.c?ds=inline diff --git a/src/parse-gram.c b/src/parse-gram.c index 8215a943..17d04181 100644 --- a/src/parse-gram.c +++ b/src/parse-gram.c @@ -1,4 +1,4 @@ -/* A Bison parser, made by GNU Bison 2.7.1081-93af. */ +/* A Bison parser, made by GNU Bison 2.7.90. */ /* Bison implementation for Yacc-like parsers in C @@ -44,7 +44,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.7.1081-93af" +#define YYBISON_VERSION "2.7.90" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -58,6 +58,13 @@ /* Pull parsers. */ #define YYPULL 1 +/* "%code top" blocks. */ +#line 27 "src/parse-gram.y" /* yacc.c:333 */ + + /* On column 0 to please syntax-check. */ +#include + +#line 68 "src/parse-gram.c" /* yacc.c:333 */ /* Substitute the type names. */ #define YYSTYPE GRAM_STYPE #define YYLTYPE GRAM_LTYPE @@ -70,59 +77,8 @@ /* Copy the first part of user declarations. */ -#line 1 "src/parse-gram.y" /* yacc.c:357 */ -/* Bison Grammar Parser -*- C -*- - - Copyright (C) 2002-2013 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 (Loc, File) - -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); - -#line 126 "src/parse-gram.c" /* yacc.c:357 */ +#line 82 "src/parse-gram.c" /* yacc.c:356 */ # ifndef YY_NULL # if defined __cplusplus && 201103L <= __cplusplus @@ -160,10 +116,12 @@ static char const *char_name (char); extern int gram_debug; #endif /* "%code requires" blocks. */ -#line 219 "src/parse-gram.y" /* yacc.c:373 */ +#line 21 "src/parse-gram.y" /* yacc.c:372 */ + + #include "symlist.h" + #include "symtab.h" +#line 221 "src/parse-gram.y" /* yacc.c:372 */ -# ifndef PARAM_TYPE -# define PARAM_TYPE typedef enum { param_none = 0, @@ -171,10 +129,10 @@ extern int gram_debug; param_parse = 1 << 1, param_both = param_lex | param_parse } param_type; -# endif - +#line 645 "src/parse-gram.y" /* yacc.c:372 */ +#include "muscle-tab.h" -#line 178 "src/parse-gram.c" /* yacc.c:373 */ +#line 136 "src/parse-gram.c" /* yacc.c:372 */ /* Token type. */ #ifndef GRAM_TOKENTYPE @@ -183,143 +141,97 @@ extern int gram_debug; { 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 GRAM_STYPE; union GRAM_STYPE { -#line 105 "src/parse-gram.y" /* yacc.c:373 */ - - assoc assoc; - char *code; - char const *chars; - int integer; - named_ref *named_ref; - symbol *symbol; - symbol_list *list; - uniqstr uniqstr; - unsigned char character; - -#line 243 "src/parse-gram.y" /* yacc.c:373 */ - - param_type param; - -#line 419 "src/parse-gram.y" /* yacc.c:373 */ +#line 182 "src/parse-gram.y" /* yacc.c:372 */ +unsigned char character; +#line 186 "src/parse-gram.y" /* yacc.c:372 */ +char *code; +#line 191 "src/parse-gram.y" /* yacc.c:372 */ +uniqstr uniqstr; +#line 199 "src/parse-gram.y" /* yacc.c:372 */ +int integer; +#line 203 "src/parse-gram.y" /* yacc.c:372 */ +symbol *symbol; +#line 208 "src/parse-gram.y" /* yacc.c:372 */ +assoc assoc; +#line 211 "src/parse-gram.y" /* yacc.c:372 */ +symbol_list *list; +#line 214 "src/parse-gram.y" /* yacc.c:372 */ +named_ref *named_ref; +#line 241 "src/parse-gram.y" /* yacc.c:372 */ +param_type param; +#line 409 "src/parse-gram.y" /* yacc.c:372 */ code_props_type code_type; +#line 647 "src/parse-gram.y" /* yacc.c:372 */ -#line 323 "src/parse-gram.c" /* yacc.c:373 */ + struct + { + char const *chars; + muscle_kind kind; + } value; + +#line 235 "src/parse-gram.c" /* yacc.c:372 */ }; # define GRAM_STYPE_IS_TRIVIAL 1 # define GRAM_STYPE_IS_DECLARED 1 @@ -347,9 +259,24 @@ int gram_parse (void); /* Copy the second part of user declarations. */ -#line 351 "src/parse-gram.c" /* yacc.c:376 */ +#line 263 "src/parse-gram.c" /* yacc.c:375 */ /* Unqualified %code blocks. */ -#line 54 "src/parse-gram.y" /* yacc.c:377 */ +#line 33 "src/parse-gram.y" /* yacc.c:376 */ + + #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; @@ -361,27 +288,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 232 "src/parse-gram.y" /* yacc.c:377 */ +#line 231 "src/parse-gram.y" /* yacc.c:376 */ /** Add a lex-param and/or a parse-param. * @@ -392,8 +335,7 @@ int gram_parse (void); static void add_param (param_type type, char *decl, location loc); static param_type current_param = param_none; - -#line 397 "src/parse-gram.c" /* yacc.c:377 */ +#line 339 "src/parse-gram.c" /* yacc.c:376 */ #ifdef short # undef short @@ -450,19 +392,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, @@ -567,21 +518,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) @@ -621,24 +572,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 /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 268, 268, 276, 278, 282, 283, 293, 297, 302, - 303, 308, 313, 314, 315, 316, 321, 330, 331, 332, - 333, 334, 335, 335, 336, 337, 361, 362, 363, 364, - 368, 369, 378, 379, 380, 384, 396, 400, 404, 411, - 422, 423, 433, 434, 438, 450, 450, 455, 455, 460, - 471, 486, 487, 488, 489, 493, 494, 499, 501, 506, - 507, 512, 514, 519, 520, 524, 525, 529, 530, 531, - 536, 541, 546, 552, 558, 569, 570, 579, 580, 586, - 587, 588, 595, 595, 603, 604, 605, 610, 612, 614, - 616, 618, 620, 622, 627, 629, 639, 640, 645, 646, - 647, 656, 676, 678, 687, 692, 693, 698, 705, 707 + 0, 264, 264, 273, 274, 278, 279, 285, 289, 294, + 295, 300, 306, 307, 308, 309, 314, 319, 320, 321, + 322, 323, 324, 324, 325, 326, 350, 351, 352, 353, + 357, 358, 367, 368, 369, 373, 385, 389, 393, 401, + 412, 413, 423, 424, 428, 440, 440, 445, 445, 450, + 461, 476, 477, 478, 479, 483, 484, 489, 491, 496, + 501, 511, 513, 518, 519, 523, 524, 528, 529, 530, + 535, 540, 545, 551, 557, 568, 569, 578, 579, 585, + 586, 587, 594, 594, 602, 603, 604, 609, 612, 614, + 616, 618, 620, 622, 624, 629, 630, 640, 641, 666, + 667, 668, 669, 681, 683, 692, 697, 698, 703, 711, + 712 }; #endif @@ -647,10 +599,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\"", @@ -660,15 +612,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 @@ -682,39 +634,39 @@ 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[] = +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[STATE-NUM] -- Default reduction number in state STATE-NUM. @@ -727,34 +679,34 @@ 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[] = +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]. */ 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 @@ -762,79 +714,82 @@ static const yytype_int16 yydefgoto[] = 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 }; /* 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. */ 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 on the right hand side of rule YYN. */ @@ -849,8 +804,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 }; @@ -1005,79 +961,85 @@ yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvalue # endif switch (yytype) { - case 3: /* "string" */ -#line 192 "src/parse-gram.y" /* yacc.c:707 */ - { fputs (quotearg_style (c_quoting_style, ((*yyvaluep).chars)), yyo); } -#line 1012 "src/parse-gram.c" /* yacc.c:707 */ + case 3: /* "string" */ +#line 188 "src/parse-gram.y" /* yacc.c:701 */ + { fputs (quotearg_style (c_quoting_style, ((*yyvaluep).code)), yyo); } +#line 968 "src/parse-gram.c" /* yacc.c:701 */ break; - case 4: /* "integer" */ -#line 205 "src/parse-gram.y" /* yacc.c:707 */ - { fprintf (yyo, "%d", ((*yyvaluep).integer)); } -#line 1018 "src/parse-gram.c" /* yacc.c:707 */ + case 23: /* "%" */ +#line 196 "src/parse-gram.y" /* yacc.c:701 */ + { fprintf (yyo, "%%%s", ((*yyvaluep).uniqstr)); } +#line 974 "src/parse-gram.c" /* yacc.c:701 */ break; - case 24: /* "%" */ -#line 201 "src/parse-gram.y" /* yacc.c:707 */ - { fprintf (yyo, "%%%s", ((*yyvaluep).uniqstr)); } -#line 1024 "src/parse-gram.c" /* yacc.c:707 */ + case 39: /* "{...}" */ +#line 189 "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 40: /* "{...}" */ -#line 194 "src/parse-gram.y" /* yacc.c:707 */ + case 40: /* "%?{...}" */ +#line 189 "src/parse-gram.y" /* yacc.c:701 */ { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).code)); } -#line 1030 "src/parse-gram.c" /* yacc.c:707 */ +#line 986 "src/parse-gram.c" /* yacc.c:701 */ break; - case 42: /* "[identifier]" */ -#line 199 "src/parse-gram.y" /* yacc.c:707 */ + case 41: /* "[identifier]" */ +#line 194 "src/parse-gram.y" /* yacc.c:701 */ { fprintf (yyo, "[%s]", ((*yyvaluep).uniqstr)); } -#line 1036 "src/parse-gram.c" /* yacc.c:707 */ +#line 992 "src/parse-gram.c" /* yacc.c:701 */ break; - case 43: /* "char" */ -#line 186 "src/parse-gram.y" /* yacc.c:707 */ + case 42: /* "char" */ +#line 184 "src/parse-gram.y" /* yacc.c:701 */ { fputs (char_name (((*yyvaluep).character)), yyo); } -#line 1042 "src/parse-gram.c" /* yacc.c:707 */ +#line 998 "src/parse-gram.c" /* yacc.c:701 */ break; - case 44: /* "epilogue" */ -#line 194 "src/parse-gram.y" /* yacc.c:707 */ - { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); } -#line 1048 "src/parse-gram.c" /* yacc.c:707 */ + case 43: /* "epilogue" */ +#line 189 "src/parse-gram.y" /* yacc.c:701 */ + { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).code)); } +#line 1004 "src/parse-gram.c" /* yacc.c:701 */ break; - case 46: /* "identifier" */ -#line 198 "src/parse-gram.y" /* yacc.c:707 */ + case 45: /* "identifier" */ +#line 193 "src/parse-gram.y" /* yacc.c:701 */ { fputs (((*yyvaluep).uniqstr), yyo); } -#line 1054 "src/parse-gram.c" /* yacc.c:707 */ +#line 1010 "src/parse-gram.c" /* yacc.c:701 */ break; - case 47: /* "identifier:" */ -#line 200 "src/parse-gram.y" /* yacc.c:707 */ + case 46: /* "identifier:" */ +#line 195 "src/parse-gram.y" /* yacc.c:701 */ { fprintf (yyo, "%s:", ((*yyvaluep).uniqstr)); } -#line 1060 "src/parse-gram.c" /* yacc.c:707 */ +#line 1016 "src/parse-gram.c" /* yacc.c:701 */ break; - case 50: /* "%{...%}" */ -#line 194 "src/parse-gram.y" /* yacc.c:707 */ - { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); } -#line 1066 "src/parse-gram.c" /* yacc.c:707 */ + case 49: /* "%{...%}" */ +#line 189 "src/parse-gram.y" /* yacc.c:701 */ + { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).code)); } +#line 1022 "src/parse-gram.c" /* yacc.c:701 */ break; - case 52: /* "" */ -#line 202 "src/parse-gram.y" /* yacc.c:707 */ + case 51: /* "" */ +#line 197 "src/parse-gram.y" /* yacc.c:701 */ { fprintf (yyo, "<%s>", ((*yyvaluep).uniqstr)); } -#line 1072 "src/parse-gram.c" /* yacc.c:707 */ +#line 1028 "src/parse-gram.c" /* yacc.c:701 */ + break; + + case 54: /* "integer" */ +#line 201 "src/parse-gram.y" /* yacc.c:701 */ + { fprintf (yyo, "%d", ((*yyvaluep).integer)); } +#line 1034 "src/parse-gram.c" /* yacc.c:701 */ break; case 55: /* "%param" */ -#line 248 "src/parse-gram.y" /* yacc.c:707 */ +#line 244 "src/parse-gram.y" /* yacc.c:701 */ { switch (((*yyvaluep).param)) { #define CASE(In, Out) \ - case param_ ## In: fputs ("%" #Out, stderr); break + case param_ ## In: fputs ("%" #Out, yyo); break CASE (lex, lex-param); CASE (parse, parse-param); CASE (both, param); @@ -1085,69 +1047,71 @@ yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvalue case param_none: aver (false); break; } } -#line 1089 "src/parse-gram.c" /* yacc.c:707 */ +#line 1051 "src/parse-gram.c" /* yacc.c:701 */ break; - case 64: /* code_props_type */ -#line 420 "src/parse-gram.y" /* yacc.c:707 */ + case 65: /* code_props_type */ +#line 410 "src/parse-gram.y" /* yacc.c:701 */ { fprintf (yyo, "%s", code_props_type_string (((*yyvaluep).code_type))); } -#line 1095 "src/parse-gram.c" /* yacc.c:707 */ +#line 1057 "src/parse-gram.c" /* yacc.c:701 */ break; - case 73: /* symbol.prec */ -#line 208 "src/parse-gram.y" /* yacc.c:707 */ + case 74: /* symbol.prec */ +#line 205 "src/parse-gram.y" /* yacc.c:701 */ { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); } -#line 1101 "src/parse-gram.c" /* yacc.c:707 */ +#line 1063 "src/parse-gram.c" /* yacc.c:701 */ break; - case 77: /* tag */ -#line 202 "src/parse-gram.y" /* yacc.c:707 */ + case 78: /* tag */ +#line 197 "src/parse-gram.y" /* yacc.c:701 */ { fprintf (yyo, "<%s>", ((*yyvaluep).uniqstr)); } -#line 1107 "src/parse-gram.c" /* yacc.c:707 */ +#line 1069 "src/parse-gram.c" /* yacc.c:701 */ break; - case 87: /* variable */ -#line 198 "src/parse-gram.y" /* yacc.c:707 */ + case 88: /* variable */ +#line 193 "src/parse-gram.y" /* yacc.c:701 */ { fputs (((*yyvaluep).uniqstr), yyo); } -#line 1113 "src/parse-gram.c" /* yacc.c:707 */ - break; - - case 88: /* content.opt */ -#line 194 "src/parse-gram.y" /* yacc.c:707 */ - { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); } -#line 1119 "src/parse-gram.c" /* yacc.c:707 */ +#line 1075 "src/parse-gram.c" /* yacc.c:701 */ break; - case 89: /* braceless */ -#line 194 "src/parse-gram.y" /* yacc.c:707 */ - { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); } -#line 1125 "src/parse-gram.c" /* yacc.c:707 */ + case 89: /* value */ +#line 656 "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 1088 "src/parse-gram.c" /* yacc.c:701 */ break; case 90: /* id */ -#line 208 "src/parse-gram.y" /* yacc.c:707 */ +#line 205 "src/parse-gram.y" /* yacc.c:701 */ { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); } -#line 1131 "src/parse-gram.c" /* yacc.c:707 */ +#line 1094 "src/parse-gram.c" /* yacc.c:701 */ break; case 91: /* id_colon */ -#line 209 "src/parse-gram.y" /* yacc.c:707 */ +#line 206 "src/parse-gram.y" /* yacc.c:701 */ { fprintf (yyo, "%s:", ((*yyvaluep).symbol)->tag); } -#line 1137 "src/parse-gram.c" /* yacc.c:707 */ +#line 1100 "src/parse-gram.c" /* yacc.c:701 */ break; case 92: /* symbol */ -#line 208 "src/parse-gram.y" /* yacc.c:707 */ +#line 205 "src/parse-gram.y" /* yacc.c:701 */ { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); } -#line 1143 "src/parse-gram.c" /* yacc.c:707 */ +#line 1106 "src/parse-gram.c" /* yacc.c:701 */ break; case 93: /* string_as_id */ -#line 208 "src/parse-gram.y" /* yacc.c:707 */ +#line 205 "src/parse-gram.y" /* yacc.c:701 */ { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); } -#line 1149 "src/parse-gram.c" /* yacc.c:707 */ +#line 1112 "src/parse-gram.c" /* yacc.c:701 */ break; + default: break; } @@ -1725,11 +1689,7 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocatio yymsg = "Deleting"; YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); - switch (yytype) - { - default: - break; - } + YYUSE (yytype); } @@ -1774,7 +1734,7 @@ static YYLTYPE yyloc_default #endif /* The semantic value of the lookahead symbol. */ -YYSTYPE yylval YY_INITIAL_VALUE(yyval_default); +YYSTYPE yylval YY_INITIAL_VALUE (yyval_default); /* Location data for the lookahead symbol. */ YYLTYPE yylloc = yyloc_default; @@ -1788,9 +1748,9 @@ YYLTYPE yylloc = yyloc_default; 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. */ @@ -1860,14 +1820,15 @@ YYLTYPE yylloc = yyloc_default; yychar = YYEMPTY; /* Cause a token to be read. */ /* User initialization code. */ -#line 97 "src/parse-gram.y" /* yacc.c:1452 */ +#line 108 "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 1871 "src/parse-gram.c" /* yacc.c:1452 */ + +#line 1832 "src/parse-gram.c" /* yacc.c:1446 */ yylsp[0] = yylloc; goto yysetstate; @@ -2044,7 +2005,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 @@ -2061,152 +2022,145 @@ yyreduce: switch (yyn) { case 6: -#line 284 "src/parse-gram.y" /* yacc.c:1669 */ +#line 280 "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 2075 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2032 "src/parse-gram.c" /* yacc.c:1663 */ break; case 7: -#line 294 "src/parse-gram.y" /* yacc.c:1669 */ +#line 286 "src/parse-gram.y" /* yacc.c:1663 */ { muscle_percent_define_ensure ((yyvsp[0].uniqstr), (yylsp[0]), true); } -#line 2083 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2040 "src/parse-gram.c" /* yacc.c:1663 */ break; case 8: -#line 298 "src/parse-gram.y" /* yacc.c:1669 */ +#line 290 "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 2092 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2049 "src/parse-gram.c" /* yacc.c:1663 */ break; case 9: -#line 302 "src/parse-gram.y" /* yacc.c:1669 */ +#line 294 "src/parse-gram.y" /* yacc.c:1663 */ { defines_flag = true; } -#line 2098 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2055 "src/parse-gram.c" /* yacc.c:1663 */ break; case 10: -#line 304 "src/parse-gram.y" /* yacc.c:1669 */ +#line 296 "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 2107 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2064 "src/parse-gram.c" /* yacc.c:1663 */ break; case 11: -#line 309 "src/parse-gram.y" /* yacc.c:1669 */ +#line 301 "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 2116 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2074 "src/parse-gram.c" /* yacc.c:1663 */ break; case 12: -#line 313 "src/parse-gram.y" /* yacc.c:1669 */ +#line 306 "src/parse-gram.y" /* yacc.c:1663 */ { expected_sr_conflicts = (yyvsp[0].integer); } -#line 2122 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2080 "src/parse-gram.c" /* yacc.c:1663 */ break; case 13: -#line 314 "src/parse-gram.y" /* yacc.c:1669 */ +#line 307 "src/parse-gram.y" /* yacc.c:1663 */ { expected_rr_conflicts = (yyvsp[0].integer); } -#line 2128 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2086 "src/parse-gram.c" /* yacc.c:1663 */ break; case 14: -#line 315 "src/parse-gram.y" /* yacc.c:1669 */ - { spec_file_prefix = (yyvsp[0].chars); } -#line 2134 "src/parse-gram.c" /* yacc.c:1669 */ +#line 308 "src/parse-gram.y" /* yacc.c:1663 */ + { spec_file_prefix = (yyvsp[0].code); } +#line 2092 "src/parse-gram.c" /* yacc.c:1663 */ break; case 15: -#line 317 "src/parse-gram.y" /* yacc.c:1669 */ +#line 310 "src/parse-gram.y" /* yacc.c:1663 */ { nondeterministic_parser = true; glr_parser = true; } -#line 2143 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2101 "src/parse-gram.c" /* yacc.c:1663 */ break; case 16: -#line 322 "src/parse-gram.y" /* yacc.c:1669 */ +#line 315 "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 2156 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2110 "src/parse-gram.c" /* yacc.c:1663 */ break; case 17: -#line 330 "src/parse-gram.y" /* yacc.c:1669 */ - { language_argmatch ((yyvsp[0].chars), grammar_prio, (yylsp[-1])); } -#line 2162 "src/parse-gram.c" /* yacc.c:1669 */ +#line 319 "src/parse-gram.y" /* yacc.c:1663 */ + { language_argmatch ((yyvsp[0].code), grammar_prio, (yylsp[-1])); } +#line 2116 "src/parse-gram.c" /* yacc.c:1663 */ break; case 18: -#line 331 "src/parse-gram.y" /* yacc.c:1669 */ - { spec_name_prefix = (yyvsp[0].chars); } -#line 2168 "src/parse-gram.c" /* yacc.c:1669 */ +#line 320 "src/parse-gram.y" /* yacc.c:1663 */ + { spec_name_prefix = (yyvsp[0].code); } +#line 2122 "src/parse-gram.c" /* yacc.c:1663 */ break; case 19: -#line 332 "src/parse-gram.y" /* yacc.c:1669 */ +#line 321 "src/parse-gram.y" /* yacc.c:1663 */ { no_lines_flag = true; } -#line 2174 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2128 "src/parse-gram.c" /* yacc.c:1663 */ break; case 20: -#line 333 "src/parse-gram.y" /* yacc.c:1669 */ +#line 322 "src/parse-gram.y" /* yacc.c:1663 */ { nondeterministic_parser = true; } -#line 2180 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2134 "src/parse-gram.c" /* yacc.c:1663 */ break; case 21: -#line 334 "src/parse-gram.y" /* yacc.c:1669 */ - { spec_outfile = (yyvsp[0].chars); } -#line 2186 "src/parse-gram.c" /* yacc.c:1669 */ +#line 323 "src/parse-gram.y" /* yacc.c:1663 */ + { spec_outfile = (yyvsp[0].code); } +#line 2140 "src/parse-gram.c" /* yacc.c:1663 */ break; case 22: -#line 335 "src/parse-gram.y" /* yacc.c:1669 */ +#line 324 "src/parse-gram.y" /* yacc.c:1663 */ { current_param = (yyvsp[0].param); } -#line 2192 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2146 "src/parse-gram.c" /* yacc.c:1663 */ break; case 23: -#line 335 "src/parse-gram.y" /* yacc.c:1669 */ +#line 324 "src/parse-gram.y" /* yacc.c:1663 */ { current_param = param_none; } -#line 2198 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2152 "src/parse-gram.c" /* yacc.c:1663 */ break; case 24: -#line 336 "src/parse-gram.y" /* yacc.c:1669 */ - { version_check (&(yylsp[0]), (yyvsp[0].chars)); } -#line 2204 "src/parse-gram.c" /* yacc.c:1669 */ +#line 325 "src/parse-gram.y" /* yacc.c:1663 */ + { version_check (&(yylsp[0]), (yyvsp[0].code)); } +#line 2158 "src/parse-gram.c" /* yacc.c:1663 */ break; case 25: -#line 338 "src/parse-gram.y" /* yacc.c:1669 */ +#line 327 "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); @@ -2228,49 +2182,49 @@ yyreduce: } skeleton_arg (skeleton_user, grammar_prio, (yylsp[-1])); } -#line 2232 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2186 "src/parse-gram.c" /* yacc.c:1663 */ break; case 26: -#line 361 "src/parse-gram.y" /* yacc.c:1669 */ +#line 350 "src/parse-gram.y" /* yacc.c:1663 */ { token_table_flag = true; } -#line 2238 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2192 "src/parse-gram.c" /* yacc.c:1663 */ break; case 27: -#line 362 "src/parse-gram.y" /* yacc.c:1669 */ +#line 351 "src/parse-gram.y" /* yacc.c:1663 */ { report_flag |= report_states; } -#line 2244 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2198 "src/parse-gram.c" /* yacc.c:1663 */ break; case 28: -#line 363 "src/parse-gram.y" /* yacc.c:1669 */ +#line 352 "src/parse-gram.y" /* yacc.c:1663 */ { yacc_flag = true; } -#line 2250 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2204 "src/parse-gram.c" /* yacc.c:1663 */ break; case 30: -#line 368 "src/parse-gram.y" /* yacc.c:1669 */ +#line 357 "src/parse-gram.y" /* yacc.c:1663 */ { add_param (current_param, (yyvsp[0].code), (yylsp[0])); } -#line 2256 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2210 "src/parse-gram.c" /* yacc.c:1663 */ break; case 31: -#line 369 "src/parse-gram.y" /* yacc.c:1669 */ +#line 358 "src/parse-gram.y" /* yacc.c:1663 */ { add_param (current_param, (yyvsp[0].code), (yylsp[0])); } -#line 2262 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2216 "src/parse-gram.c" /* yacc.c:1663 */ break; case 34: -#line 381 "src/parse-gram.y" /* yacc.c:1669 */ +#line 370 "src/parse-gram.y" /* yacc.c:1663 */ { grammar_start_symbol_set ((yyvsp[0].symbol), (yylsp[0])); } -#line 2270 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2224 "src/parse-gram.c" /* yacc.c:1663 */ break; case 35: -#line 385 "src/parse-gram.y" /* yacc.c:1669 */ +#line 374 "src/parse-gram.y" /* yacc.c:1663 */ { code_props code; code_props_symbol_action_init (&code, (yyvsp[-1].code), (yylsp[-1])); @@ -2282,111 +2236,112 @@ yyreduce: symbol_list_free ((yyvsp[0].list)); } } -#line 2286 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2240 "src/parse-gram.c" /* yacc.c:1663 */ break; case 36: -#line 397 "src/parse-gram.y" /* yacc.c:1669 */ +#line 386 "src/parse-gram.y" /* yacc.c:1663 */ { default_prec = true; } -#line 2294 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2248 "src/parse-gram.c" /* yacc.c:1663 */ break; case 37: -#line 401 "src/parse-gram.y" /* yacc.c:1669 */ +#line 390 "src/parse-gram.y" /* yacc.c:1663 */ { default_prec = false; } -#line 2302 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2256 "src/parse-gram.c" /* yacc.c:1663 */ break; case 38: -#line 405 "src/parse-gram.y" /* yacc.c:1669 */ +#line 394 "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 2313 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2268 "src/parse-gram.c" /* yacc.c:1663 */ break; case 39: -#line 412 "src/parse-gram.y" /* yacc.c:1669 */ +#line 402 "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 2322 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2277 "src/parse-gram.c" /* yacc.c:1663 */ break; case 40: -#line 422 "src/parse-gram.y" /* yacc.c:1669 */ +#line 412 "src/parse-gram.y" /* yacc.c:1663 */ { (yyval.code_type) = destructor; } -#line 2328 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2283 "src/parse-gram.c" /* yacc.c:1663 */ break; case 41: -#line 423 "src/parse-gram.y" /* yacc.c:1669 */ +#line 413 "src/parse-gram.y" /* yacc.c:1663 */ { (yyval.code_type) = printer; } -#line 2334 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2289 "src/parse-gram.c" /* yacc.c:1663 */ break; case 42: -#line 433 "src/parse-gram.y" /* yacc.c:1669 */ +#line 423 "src/parse-gram.y" /* yacc.c:1663 */ {} -#line 2340 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2295 "src/parse-gram.c" /* yacc.c:1663 */ break; case 43: -#line 434 "src/parse-gram.y" /* yacc.c:1669 */ +#line 424 "src/parse-gram.y" /* yacc.c:1663 */ { muscle_code_grow ("union_name", (yyvsp[0].uniqstr), (yylsp[0])); } -#line 2346 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2301 "src/parse-gram.c" /* yacc.c:1663 */ break; case 44: -#line 439 "src/parse-gram.y" /* yacc.c:1669 */ +#line 429 "src/parse-gram.y" /* yacc.c:1663 */ { union_seen = true; - muscle_code_grow ("union_members", (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 2356 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2311 "src/parse-gram.c" /* yacc.c:1663 */ break; case 45: -#line 450 "src/parse-gram.y" /* yacc.c:1669 */ +#line 440 "src/parse-gram.y" /* yacc.c:1663 */ { current_class = nterm_sym; } -#line 2362 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2317 "src/parse-gram.c" /* yacc.c:1663 */ break; case 46: -#line 451 "src/parse-gram.y" /* yacc.c:1669 */ +#line 441 "src/parse-gram.y" /* yacc.c:1663 */ { current_class = unknown_sym; current_type = NULL; } -#line 2371 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2326 "src/parse-gram.c" /* yacc.c:1663 */ break; case 47: -#line 455 "src/parse-gram.y" /* yacc.c:1669 */ +#line 445 "src/parse-gram.y" /* yacc.c:1663 */ { current_class = token_sym; } -#line 2377 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2332 "src/parse-gram.c" /* yacc.c:1663 */ break; case 48: -#line 456 "src/parse-gram.y" /* yacc.c:1669 */ +#line 446 "src/parse-gram.y" /* yacc.c:1663 */ { current_class = unknown_sym; current_type = NULL; } -#line 2386 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2341 "src/parse-gram.c" /* yacc.c:1663 */ break; case 49: -#line 461 "src/parse-gram.y" /* yacc.c:1669 */ +#line 451 "src/parse-gram.y" /* yacc.c:1663 */ { symbol_list *list; tag_seen = true; @@ -2394,11 +2349,11 @@ yyreduce: symbol_type_set (list->content.sym, (yyvsp[-1].uniqstr), (yylsp[-1])); symbol_list_free ((yyvsp[0].list)); } -#line 2398 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2353 "src/parse-gram.c" /* yacc.c:1663 */ break; case 50: -#line 472 "src/parse-gram.y" /* yacc.c:1669 */ +#line 462 "src/parse-gram.y" /* yacc.c:1663 */ { symbol_list *list; ++current_prec; @@ -2410,333 +2365,341 @@ yyreduce: symbol_list_free ((yyvsp[0].list)); current_type = NULL; } -#line 2414 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2369 "src/parse-gram.c" /* yacc.c:1663 */ break; case 51: -#line 486 "src/parse-gram.y" /* yacc.c:1669 */ +#line 476 "src/parse-gram.y" /* yacc.c:1663 */ { (yyval.assoc) = left_assoc; } -#line 2420 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2375 "src/parse-gram.c" /* yacc.c:1663 */ break; case 52: -#line 487 "src/parse-gram.y" /* yacc.c:1669 */ +#line 477 "src/parse-gram.y" /* yacc.c:1663 */ { (yyval.assoc) = right_assoc; } -#line 2426 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2381 "src/parse-gram.c" /* yacc.c:1663 */ break; case 53: -#line 488 "src/parse-gram.y" /* yacc.c:1669 */ +#line 478 "src/parse-gram.y" /* yacc.c:1663 */ { (yyval.assoc) = non_assoc; } -#line 2432 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2387 "src/parse-gram.c" /* yacc.c:1663 */ break; case 54: -#line 489 "src/parse-gram.y" /* yacc.c:1669 */ +#line 479 "src/parse-gram.y" /* yacc.c:1663 */ { (yyval.assoc) = precedence_assoc; } -#line 2438 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2393 "src/parse-gram.c" /* yacc.c:1663 */ break; case 55: -#line 493 "src/parse-gram.y" /* yacc.c:1669 */ +#line 483 "src/parse-gram.y" /* yacc.c:1663 */ { current_type = NULL; } -#line 2444 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2399 "src/parse-gram.c" /* yacc.c:1663 */ break; case 56: -#line 494 "src/parse-gram.y" /* yacc.c:1669 */ +#line 484 "src/parse-gram.y" /* yacc.c:1663 */ { current_type = (yyvsp[0].uniqstr); tag_seen = true; } -#line 2450 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2405 "src/parse-gram.c" /* yacc.c:1663 */ break; case 57: -#line 500 "src/parse-gram.y" /* yacc.c:1669 */ +#line 490 "src/parse-gram.y" /* yacc.c:1663 */ { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); } -#line 2456 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2411 "src/parse-gram.c" /* yacc.c:1663 */ break; case 58: -#line 502 "src/parse-gram.y" /* yacc.c:1669 */ +#line 492 "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 2462 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2417 "src/parse-gram.c" /* yacc.c:1663 */ break; case 59: -#line 506 "src/parse-gram.y" /* yacc.c:1669 */ - { (yyval.symbol) = (yyvsp[0].symbol); } -#line 2468 "src/parse-gram.c" /* yacc.c:1669 */ +#line 497 "src/parse-gram.y" /* yacc.c:1663 */ + { + (yyval.symbol) = (yyvsp[0].symbol); + symbol_class_set ((yyvsp[0].symbol), token_sym, (yylsp[0]), false); + } +#line 2426 "src/parse-gram.c" /* yacc.c:1663 */ break; case 60: -#line 507 "src/parse-gram.y" /* yacc.c:1669 */ - { (yyval.symbol) = (yyvsp[-1].symbol); symbol_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer), (yylsp[0])); } -#line 2474 "src/parse-gram.c" /* yacc.c:1669 */ +#line 502 "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 2436 "src/parse-gram.c" /* yacc.c:1663 */ break; case 61: -#line 513 "src/parse-gram.y" /* yacc.c:1669 */ +#line 512 "src/parse-gram.y" /* yacc.c:1663 */ { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); } -#line 2480 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2442 "src/parse-gram.c" /* yacc.c:1663 */ break; case 62: -#line 515 "src/parse-gram.y" /* yacc.c:1669 */ +#line 514 "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 2486 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2448 "src/parse-gram.c" /* yacc.c:1663 */ break; case 63: -#line 519 "src/parse-gram.y" /* yacc.c:1669 */ +#line 518 "src/parse-gram.y" /* yacc.c:1663 */ { (yyval.list) = (yyvsp[0].list); } -#line 2492 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2454 "src/parse-gram.c" /* yacc.c:1663 */ break; case 64: -#line 520 "src/parse-gram.y" /* yacc.c:1669 */ +#line 519 "src/parse-gram.y" /* yacc.c:1663 */ { (yyval.list) = symbol_list_append ((yyvsp[-1].list), (yyvsp[0].list)); } -#line 2498 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2460 "src/parse-gram.c" /* yacc.c:1663 */ break; case 65: -#line 524 "src/parse-gram.y" /* yacc.c:1669 */ +#line 523 "src/parse-gram.y" /* yacc.c:1663 */ { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); } -#line 2504 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2466 "src/parse-gram.c" /* yacc.c:1663 */ break; case 66: -#line 525 "src/parse-gram.y" /* yacc.c:1669 */ +#line 524 "src/parse-gram.y" /* yacc.c:1663 */ { (yyval.list) = symbol_list_type_new ((yyvsp[0].uniqstr), (yylsp[0])); } -#line 2510 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2472 "src/parse-gram.c" /* yacc.c:1663 */ break; case 68: -#line 530 "src/parse-gram.y" /* yacc.c:1669 */ +#line 529 "src/parse-gram.y" /* yacc.c:1663 */ { (yyval.uniqstr) = uniqstr_new ("*"); } -#line 2516 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2478 "src/parse-gram.c" /* yacc.c:1663 */ break; case 69: -#line 531 "src/parse-gram.y" /* yacc.c:1669 */ +#line 530 "src/parse-gram.y" /* yacc.c:1663 */ { (yyval.uniqstr) = uniqstr_new (""); } -#line 2522 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2484 "src/parse-gram.c" /* yacc.c:1663 */ break; case 70: -#line 537 "src/parse-gram.y" /* yacc.c:1669 */ +#line 536 "src/parse-gram.y" /* yacc.c:1663 */ { current_type = (yyvsp[0].uniqstr); tag_seen = true; } -#line 2531 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2493 "src/parse-gram.c" /* yacc.c:1663 */ break; case 71: -#line 542 "src/parse-gram.y" /* yacc.c:1669 */ +#line 541 "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 2540 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2502 "src/parse-gram.c" /* yacc.c:1663 */ break; case 72: -#line 547 "src/parse-gram.y" /* yacc.c:1669 */ +#line 546 "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 2550 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2512 "src/parse-gram.c" /* yacc.c:1663 */ break; case 73: -#line 553 "src/parse-gram.y" /* yacc.c:1669 */ +#line 552 "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 2560 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2522 "src/parse-gram.c" /* yacc.c:1663 */ break; case 74: -#line 559 "src/parse-gram.y" /* yacc.c:1669 */ +#line 558 "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 2571 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2533 "src/parse-gram.c" /* yacc.c:1663 */ break; case 81: -#line 589 "src/parse-gram.y" /* yacc.c:1669 */ +#line 588 "src/parse-gram.y" /* yacc.c:1663 */ { yyerrok; } -#line 2579 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2541 "src/parse-gram.c" /* yacc.c:1663 */ break; case 82: -#line 595 "src/parse-gram.y" /* yacc.c:1669 */ +#line 594 "src/parse-gram.y" /* yacc.c:1663 */ { current_lhs ((yyvsp[-1].symbol), (yylsp[-1]), (yyvsp[0].named_ref)); } -#line 2585 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2547 "src/parse-gram.c" /* yacc.c:1663 */ break; case 83: -#line 596 "src/parse-gram.y" /* yacc.c:1669 */ +#line 595 "src/parse-gram.y" /* yacc.c:1663 */ { /* Free the current lhs. */ current_lhs (0, (yylsp[-3]), 0); } -#line 2594 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2556 "src/parse-gram.c" /* yacc.c:1663 */ break; case 84: -#line 603 "src/parse-gram.y" /* yacc.c:1669 */ +#line 602 "src/parse-gram.y" /* yacc.c:1663 */ { grammar_current_rule_end ((yylsp[0])); } -#line 2600 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2562 "src/parse-gram.c" /* yacc.c:1663 */ break; case 85: -#line 604 "src/parse-gram.y" /* yacc.c:1669 */ +#line 603 "src/parse-gram.y" /* yacc.c:1663 */ { grammar_current_rule_end ((yylsp[0])); } -#line 2606 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2568 "src/parse-gram.c" /* yacc.c:1663 */ break; case 87: -#line 610 "src/parse-gram.y" /* yacc.c:1669 */ +#line 610 "src/parse-gram.y" /* yacc.c:1663 */ { grammar_current_rule_begin (current_lhs_symbol, current_lhs_location, current_lhs_named_ref); } -#line 2613 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2575 "src/parse-gram.c" /* yacc.c:1663 */ break; case 88: -#line 613 "src/parse-gram.y" /* yacc.c:1669 */ +#line 613 "src/parse-gram.y" /* yacc.c:1663 */ { grammar_current_rule_symbol_append ((yyvsp[-1].symbol), (yylsp[-1]), (yyvsp[0].named_ref)); } -#line 2619 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2581 "src/parse-gram.c" /* yacc.c:1663 */ break; case 89: -#line 615 "src/parse-gram.y" /* yacc.c:1669 */ +#line 615 "src/parse-gram.y" /* yacc.c:1663 */ { grammar_current_rule_action_append ((yyvsp[-1].code), (yylsp[-1]), (yyvsp[0].named_ref), false); } -#line 2625 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2587 "src/parse-gram.c" /* yacc.c:1663 */ break; case 90: -#line 617 "src/parse-gram.y" /* yacc.c:1669 */ +#line 617 "src/parse-gram.y" /* yacc.c:1663 */ { grammar_current_rule_action_append ((yyvsp[0].code), (yylsp[0]), NULL, true); } -#line 2631 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2593 "src/parse-gram.c" /* yacc.c:1663 */ break; case 91: -#line 619 "src/parse-gram.y" /* yacc.c:1669 */ - { grammar_current_rule_prec_set ((yyvsp[0].symbol), (yylsp[0])); } -#line 2637 "src/parse-gram.c" /* yacc.c:1669 */ +#line 619 "src/parse-gram.y" /* yacc.c:1663 */ + { grammar_current_rule_empty_set ((yylsp[0])); } +#line 2599 "src/parse-gram.c" /* yacc.c:1663 */ break; case 92: -#line 621 "src/parse-gram.y" /* yacc.c:1669 */ - { grammar_current_rule_dprec_set ((yyvsp[0].integer), (yylsp[0])); } -#line 2643 "src/parse-gram.c" /* yacc.c:1669 */ +#line 621 "src/parse-gram.y" /* yacc.c:1663 */ + { grammar_current_rule_prec_set ((yyvsp[0].symbol), (yylsp[0])); } +#line 2605 "src/parse-gram.c" /* yacc.c:1663 */ break; case 93: -#line 623 "src/parse-gram.y" /* yacc.c:1669 */ - { grammar_current_rule_merge_set ((yyvsp[0].uniqstr), (yylsp[0])); } -#line 2649 "src/parse-gram.c" /* yacc.c:1669 */ +#line 623 "src/parse-gram.y" /* yacc.c:1663 */ + { grammar_current_rule_dprec_set ((yyvsp[0].integer), (yylsp[0])); } +#line 2611 "src/parse-gram.c" /* yacc.c:1663 */ break; case 94: -#line 627 "src/parse-gram.y" /* yacc.c:1669 */ - { (yyval.named_ref) = 0; } -#line 2655 "src/parse-gram.c" /* yacc.c:1669 */ +#line 625 "src/parse-gram.y" /* yacc.c:1663 */ + { grammar_current_rule_merge_set ((yyvsp[0].uniqstr), (yylsp[0])); } +#line 2617 "src/parse-gram.c" /* yacc.c:1663 */ break; case 95: -#line 629 "src/parse-gram.y" /* yacc.c:1669 */ - { (yyval.named_ref) = named_ref_new ((yyvsp[0].uniqstr), (yylsp[0])); } -#line 2661 "src/parse-gram.c" /* yacc.c:1669 */ +#line 629 "src/parse-gram.y" /* yacc.c:1663 */ + { (yyval.named_ref) = 0; } +#line 2623 "src/parse-gram.c" /* yacc.c:1663 */ break; - case 97: -#line 640 "src/parse-gram.y" /* yacc.c:1669 */ - { (yyval.uniqstr) = uniqstr_new ((yyvsp[0].chars)); } -#line 2667 "src/parse-gram.c" /* yacc.c:1669 */ + case 96: +#line 630 "src/parse-gram.y" /* yacc.c:1663 */ + { (yyval.named_ref) = named_ref_new ((yyvsp[0].uniqstr), (yylsp[0])); } +#line 2629 "src/parse-gram.c" /* yacc.c:1663 */ break; case 98: -#line 645 "src/parse-gram.y" /* yacc.c:1669 */ - { (yyval.chars) = ""; } -#line 2673 "src/parse-gram.c" /* yacc.c:1669 */ +#line 641 "src/parse-gram.y" /* yacc.c:1663 */ + { (yyval.uniqstr) = uniqstr_new ((yyvsp[0].code)); } +#line 2635 "src/parse-gram.c" /* yacc.c:1663 */ break; case 99: -#line 646 "src/parse-gram.y" /* yacc.c:1669 */ - { (yyval.chars) = (yyvsp[0].uniqstr); } -#line 2679 "src/parse-gram.c" /* yacc.c:1669 */ +#line 666 "src/parse-gram.y" /* yacc.c:1663 */ + { (yyval.value).kind = muscle_keyword; (yyval.value).chars = ""; } +#line 2641 "src/parse-gram.c" /* yacc.c:1663 */ + break; + + case 100: +#line 667 "src/parse-gram.y" /* yacc.c:1663 */ + { (yyval.value).kind = muscle_keyword; (yyval.value).chars = (yyvsp[0].uniqstr); } +#line 2647 "src/parse-gram.c" /* yacc.c:1663 */ break; case 101: -#line 657 "src/parse-gram.y" /* yacc.c:1669 */ - { - 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 2692 "src/parse-gram.c" /* yacc.c:1669 */ +#line 668 "src/parse-gram.y" /* yacc.c:1663 */ + { (yyval.value).kind = muscle_string; (yyval.value).chars = (yyvsp[0].code); } +#line 2653 "src/parse-gram.c" /* yacc.c:1663 */ break; case 102: -#line 677 "src/parse-gram.y" /* yacc.c:1669 */ - { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); } -#line 2698 "src/parse-gram.c" /* yacc.c:1669 */ +#line 669 "src/parse-gram.y" /* yacc.c:1663 */ + { (yyval.value).kind = muscle_code; (yyval.value).chars = strip_braces ((yyvsp[0].code)); } +#line 2659 "src/parse-gram.c" /* yacc.c:1663 */ break; case 103: -#line 679 "src/parse-gram.y" /* yacc.c:1669 */ +#line 682 "src/parse-gram.y" /* yacc.c:1663 */ + { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); } +#line 2665 "src/parse-gram.c" /* yacc.c:1663 */ + break; + + case 104: +#line 684 "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 2708 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2675 "src/parse-gram.c" /* yacc.c:1663 */ break; - case 104: -#line 687 "src/parse-gram.y" /* yacc.c:1669 */ + case 105: +#line 692 "src/parse-gram.y" /* yacc.c:1663 */ { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); } -#line 2714 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2681 "src/parse-gram.c" /* yacc.c:1663 */ break; - case 107: -#line 699 "src/parse-gram.y" /* yacc.c:1669 */ + case 108: +#line 704 "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 2723 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2690 "src/parse-gram.c" /* yacc.c:1663 */ break; - case 109: -#line 708 "src/parse-gram.y" /* yacc.c:1669 */ + case 110: +#line 713 "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 2736 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2699 "src/parse-gram.c" /* yacc.c:1663 */ break; -#line 2740 "src/parse-gram.c" /* yacc.c:1669 */ +#line 2703 "src/parse-gram.c" /* yacc.c:1663 */ default: break; } if (yychar_backup != yychar) @@ -2762,7 +2725,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. */ @@ -2983,7 +2946,7 @@ yyreturn: #endif return yyresult; } -#line 718 "src/parse-gram.y" /* yacc.c:1929 */ +#line 719 "src/parse-gram.y" /* yacc.c:1923 */ /* Return the location of the left-hand side of a rule whose @@ -3015,6 +2978,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) @@ -3097,3 +3087,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; +}