X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/b275314e2dbe2eb5d4706f728aefe132fa93b9c5..3df374151b36bb8693842c09a1904aeffc358b93:/src/parse-gram.c?ds=sidebyside diff --git a/src/parse-gram.c b/src/parse-gram.c index 5c7a8f1f..841054cf 100644 --- a/src/parse-gram.c +++ b/src/parse-gram.c @@ -1,4 +1,4 @@ -/* A Bison parser, made from parse-gram.y, by GNU bison 1.49b. */ +/* A Bison parser, made from parse-gram.y, by GNU bison 1.75b. */ /* Skeleton parser for Yacc-like parsing with Bison, Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc. @@ -34,10 +34,13 @@ USER NAME SPACE" below. */ /* Identify Bison output. */ -#define YYBISON 1 +#define YYBISON 1 + +/* Skeleton name. */ +#define YYSKELETON_NAME "yacc.c" /* Pure parsers. */ -#define YYPURE 1 +#define YYPURE 1 /* Using locations. */ #define YYLSP_NEEDED 1 @@ -53,6 +56,108 @@ #define yynerrs gram_nerrs #define yylloc gram_lloc +/* Tokens. */ +#ifndef YYTOKENTYPE +# define YYTOKENTYPE + /* Put the tokens into the symbol table, so that GDB and other debuggers + know about them. */ + enum yytokentype { + GRAM_EOF = 0, + STRING = 258, + INT = 259, + PERCENT_TOKEN = 260, + PERCENT_NTERM = 261, + PERCENT_TYPE = 262, + PERCENT_DESTRUCTOR = 263, + PERCENT_PRINTER = 264, + PERCENT_UNION = 265, + PERCENT_LEFT = 266, + PERCENT_RIGHT = 267, + PERCENT_NONASSOC = 268, + PERCENT_PREC = 269, + PERCENT_DPREC = 270, + PERCENT_MERGE = 271, + PERCENT_DEBUG = 272, + PERCENT_DEFINE = 273, + PERCENT_DEFINES = 274, + PERCENT_ERROR_VERBOSE = 275, + PERCENT_EXPECT = 276, + PERCENT_FILE_PREFIX = 277, + PERCENT_GLR_PARSER = 278, + PERCENT_LEX_PARAM = 279, + PERCENT_LOCATIONS = 280, + PERCENT_NAME_PREFIX = 281, + PERCENT_NO_LINES = 282, + PERCENT_OUTPUT = 283, + PERCENT_PARSE_PARAM = 284, + PERCENT_PURE_PARSER = 285, + PERCENT_SKELETON = 286, + PERCENT_START = 287, + PERCENT_TOKEN_TABLE = 288, + PERCENT_VERBOSE = 289, + PERCENT_YACC = 290, + TYPE = 291, + EQUAL = 292, + SEMICOLON = 293, + COLON = 294, + COMMA = 295, + PIPE = 296, + ID = 297, + PERCENT_PERCENT = 298, + PROLOGUE = 299, + EPILOGUE = 300, + BRACED_CODE = 301 + }; +#endif +#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_UNION 265 +#define PERCENT_LEFT 266 +#define PERCENT_RIGHT 267 +#define PERCENT_NONASSOC 268 +#define PERCENT_PREC 269 +#define PERCENT_DPREC 270 +#define PERCENT_MERGE 271 +#define PERCENT_DEBUG 272 +#define PERCENT_DEFINE 273 +#define PERCENT_DEFINES 274 +#define PERCENT_ERROR_VERBOSE 275 +#define PERCENT_EXPECT 276 +#define PERCENT_FILE_PREFIX 277 +#define PERCENT_GLR_PARSER 278 +#define PERCENT_LEX_PARAM 279 +#define PERCENT_LOCATIONS 280 +#define PERCENT_NAME_PREFIX 281 +#define PERCENT_NO_LINES 282 +#define PERCENT_OUTPUT 283 +#define PERCENT_PARSE_PARAM 284 +#define PERCENT_PURE_PARSER 285 +#define PERCENT_SKELETON 286 +#define PERCENT_START 287 +#define PERCENT_TOKEN_TABLE 288 +#define PERCENT_VERBOSE 289 +#define PERCENT_YACC 290 +#define TYPE 291 +#define EQUAL 292 +#define SEMICOLON 293 +#define COLON 294 +#define COMMA 295 +#define PIPE 296 +#define ID 297 +#define PERCENT_PERCENT 298 +#define PROLOGUE 299 +#define EPILOGUE 300 +#define BRACED_CODE 301 + + + + /* Copy the first part of user declarations. */ #line 31 "parse-gram.y" @@ -91,126 +196,25 @@ do { \ correctly typed access to it. */ #define yycontrol ((gram_control_t *) gram_control) -/* Request detailed parse error messages, and pass them to - GRAM_ERROR. */ +/* Request detailed parse error messages, and pass them to GRAM_ERROR. + FIXME: depends on the undocumented availability of YYLLOC.t */ #undef yyerror #define yyerror(Msg) \ - gram_error (yycontrol, &yylloc, Msg) + gram_error (&yylloc, Msg) #define YYPRINT(File, Type, Value) \ yyprint (File, Type, &Value) static void yyprint (FILE *file, int type, const yystype *value); symbol_class current_class = unknown_sym; -char *current_type = 0; +struniq_t current_type = 0; symbol_t *current_lhs; location_t current_lhs_location; -associativity current_assoc; +assoc_t current_assoc; int current_prec = 0; braced_code_t current_braced_code = action_braced_code; -/* Tokens. */ -#ifndef YYTOKENTYPE -# if defined (__STDC__) || defined (__cplusplus) - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ - enum yytokentype { - GRAM_EOF = 0, - STRING = 258, - CHARACTER = 259, - INT = 260, - PERCENT_TOKEN = 261, - PERCENT_NTERM = 262, - PERCENT_TYPE = 263, - PERCENT_DESTRUCTOR = 264, - PERCENT_PRINTER = 265, - PERCENT_UNION = 266, - PERCENT_LEFT = 267, - PERCENT_RIGHT = 268, - PERCENT_NONASSOC = 269, - PERCENT_EXPECT = 270, - PERCENT_START = 271, - PERCENT_PREC = 272, - PERCENT_DPREC = 273, - PERCENT_MERGE = 274, - PERCENT_VERBOSE = 275, - PERCENT_ERROR_VERBOSE = 276, - PERCENT_OUTPUT = 277, - PERCENT_FILE_PREFIX = 278, - PERCENT_NAME_PREFIX = 279, - PERCENT_DEFINE = 280, - PERCENT_PURE_PARSER = 281, - PERCENT_GLR_PARSER = 282, - PERCENT_DEFINES = 283, - PERCENT_YACC = 284, - PERCENT_DEBUG = 285, - PERCENT_LOCATIONS = 286, - PERCENT_NO_LINES = 287, - PERCENT_SKELETON = 288, - PERCENT_TOKEN_TABLE = 289, - TYPE = 290, - EQUAL = 291, - SEMICOLON = 292, - COLON = 293, - PIPE = 294, - ID = 295, - PERCENT_PERCENT = 296, - PROLOGUE = 297, - EPILOGUE = 298, - BRACED_CODE = 299 - }; -# endif - /* POSIX requires `int' for tokens in interfaces. */ -# define YYTOKENTYPE int -#endif /* !YYTOKENTYPE */ -#define GRAM_EOF 0 -#define STRING 258 -#define CHARACTER 259 -#define INT 260 -#define PERCENT_TOKEN 261 -#define PERCENT_NTERM 262 -#define PERCENT_TYPE 263 -#define PERCENT_DESTRUCTOR 264 -#define PERCENT_PRINTER 265 -#define PERCENT_UNION 266 -#define PERCENT_LEFT 267 -#define PERCENT_RIGHT 268 -#define PERCENT_NONASSOC 269 -#define PERCENT_EXPECT 270 -#define PERCENT_START 271 -#define PERCENT_PREC 272 -#define PERCENT_DPREC 273 -#define PERCENT_MERGE 274 -#define PERCENT_VERBOSE 275 -#define PERCENT_ERROR_VERBOSE 276 -#define PERCENT_OUTPUT 277 -#define PERCENT_FILE_PREFIX 278 -#define PERCENT_NAME_PREFIX 279 -#define PERCENT_DEFINE 280 -#define PERCENT_PURE_PARSER 281 -#define PERCENT_GLR_PARSER 282 -#define PERCENT_DEFINES 283 -#define PERCENT_YACC 284 -#define PERCENT_DEBUG 285 -#define PERCENT_LOCATIONS 286 -#define PERCENT_NO_LINES 287 -#define PERCENT_SKELETON 288 -#define PERCENT_TOKEN_TABLE 289 -#define TYPE 290 -#define EQUAL 291 -#define SEMICOLON 292 -#define COLON 293 -#define PIPE 294 -#define ID 295 -#define PERCENT_PERCENT 296 -#define PROLOGUE 297 -#define EPILOGUE 298 -#define BRACED_CODE 299 - - - - /* Enabling traces. */ #ifndef YYDEBUG # define YYDEBUG 1 @@ -231,10 +235,11 @@ typedef union { symbol_list_t *list; int integer; char *string; - associativity assoc; + assoc_t assoc; + struniq_t struniq; } yystype; -/* Line 187 of /usr/local/share/bison/yacc.c. */ -#line 238 "parse-gram.c" +/* Line 237 of /usr/local/share/bison/yacc.c. */ +#line 243 "parse-gram.c" # define YYSTYPE yystype # define YYSTYPE_IS_TRIVIAL 1 #endif @@ -254,8 +259,8 @@ typedef struct yyltype /* Copy the second part of user declarations. */ -/* Line 207 of /usr/local/share/bison/yacc.c. */ -#line 259 "parse-gram.c" +/* Line 257 of /usr/local/share/bison/yacc.c. */ +#line 264 "parse-gram.c" #if ! defined (yyoverflow) || YYERROR_VERBOSE @@ -346,23 +351,29 @@ union yyalloc #endif +#if defined (__STDC__) || defined (__cplusplus) + typedef signed char yysigned_char; +#else + typedef short yysigned_char; +#endif + /* YYFINAL -- State number of the termination state. */ #define YYFINAL 3 -#define YYFLAG -32768 -#define YYLAST 127 +/* YYLAST -- Last index in YYTABLE. */ +#define YYLAST 125 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 45 +#define YYNTOKENS 47 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 28 /* YYNRULES -- Number of rules. */ -#define YYNRULES 75 +#define YYNRULES 76 /* YYNRULES -- Number of states. */ -#define YYNSTATES 108 +#define YYNSTATES 115 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 299 +#define YYMAXUTOK 301 #define YYTRANSLATE(X) \ ((unsigned)(X) <= YYMAXUTOK ? yytranslate[X] : YYUNDEFTOK) @@ -399,7 +410,8 @@ static const unsigned char yytranslate[] = 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, - 35, 36, 37, 38, 39, 40, 41, 42, 43, 44 + 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, + 45, 46 }; #if YYDEBUG @@ -408,51 +420,52 @@ static const unsigned char yytranslate[] = static const unsigned char yyprhs[] = { 0, 0, 3, 8, 9, 13, 15, 17, 19, 23, - 25, 27, 30, 34, 36, 40, 42, 46, 48, 50, - 53, 55, 57, 59, 61, 63, 66, 69, 70, 75, - 76, 81, 82, 86, 87, 91, 95, 99, 101, 103, - 105, 106, 108, 110, 113, 115, 117, 120, 123, 127, - 129, 132, 134, 137, 139, 142, 145, 146, 152, 154, - 158, 159, 162, 165, 169, 173, 177, 179, 181, 183, - 185, 187, 189, 190, 193, 194 + 25, 27, 30, 34, 36, 41, 43, 47, 49, 53, + 58, 60, 63, 65, 67, 69, 71, 73, 76, 79, + 80, 85, 86, 91, 92, 96, 97, 101, 105, 109, + 111, 113, 115, 116, 118, 120, 123, 125, 127, 130, + 133, 137, 139, 142, 144, 147, 149, 152, 155, 156, + 162, 164, 168, 169, 172, 175, 179, 183, 187, 189, + 191, 193, 195, 197, 198, 201, 202 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ -static const signed char yyrhs[] = +static const yysigned_char yyrhs[] = { - 46, 0, -1, 47, 41, 61, 71, -1, -1, 47, - 48, 72, -1, 49, -1, 42, -1, 30, -1, 25, - 70, 70, -1, 28, -1, 21, -1, 15, 5, -1, - 23, 36, 70, -1, 31, -1, 24, 36, 70, -1, - 32, -1, 22, 36, 70, -1, 26, -1, 27, -1, - 33, 70, -1, 34, -1, 20, -1, 29, -1, 55, - -1, 52, -1, 16, 67, -1, 11, 44, -1, -1, - 9, 50, 44, 58, -1, -1, 10, 51, 44, 58, - -1, -1, 7, 53, 60, -1, -1, 6, 54, 60, - -1, 8, 35, 58, -1, 56, 57, 58, -1, 12, - -1, 13, -1, 14, -1, -1, 35, -1, 67, -1, - 58, 67, -1, 35, -1, 40, -1, 40, 5, -1, - 40, 69, -1, 40, 5, 69, -1, 59, -1, 60, - 59, -1, 62, -1, 61, 62, -1, 63, -1, 49, - 37, -1, 1, 37, -1, -1, 40, 38, 64, 65, - 37, -1, 66, -1, 65, 39, 66, -1, -1, 66, - 67, -1, 66, 68, -1, 66, 17, 67, -1, 66, - 18, 5, -1, 66, 19, 35, -1, 40, -1, 69, - -1, 4, -1, 44, -1, 3, -1, 3, -1, -1, - 41, 43, -1, -1, 37, -1 + 48, 0, -1, 49, 43, 63, 73, -1, -1, 49, + 50, 74, -1, 51, -1, 44, -1, 17, -1, 18, + 72, 72, -1, 19, -1, 20, -1, 21, 4, -1, + 22, 37, 72, -1, 23, -1, 24, 72, 40, 72, + -1, 25, -1, 26, 37, 72, -1, 27, -1, 28, + 37, 72, -1, 29, 72, 40, 72, -1, 30, -1, + 31, 72, -1, 33, -1, 34, -1, 35, -1, 57, + -1, 54, -1, 32, 69, -1, 10, 46, -1, -1, + 8, 52, 46, 60, -1, -1, 9, 53, 46, 60, + -1, -1, 6, 55, 62, -1, -1, 5, 56, 62, + -1, 7, 36, 60, -1, 58, 59, 60, -1, 11, + -1, 12, -1, 13, -1, -1, 36, -1, 69, -1, + 60, 69, -1, 36, -1, 42, -1, 42, 4, -1, + 42, 71, -1, 42, 4, 71, -1, 61, -1, 62, + 61, -1, 64, -1, 63, 64, -1, 65, -1, 51, + 38, -1, 1, 38, -1, -1, 42, 39, 66, 67, + 38, -1, 68, -1, 67, 41, 68, -1, -1, 68, + 69, -1, 68, 70, -1, 68, 14, 69, -1, 68, + 15, 4, -1, 68, 16, 36, -1, 42, -1, 71, + -1, 46, -1, 3, -1, 3, -1, -1, 43, 45, + -1, -1, 38, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const unsigned short yyrline[] = { - 0, 159, 159, 172, 174, 177, 179, 180, 181, 182, - 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, - 193, 194, 195, 198, 200, 201, 205, 212, 211, 222, - 221, 234, 233, 239, 239, 244, 253, 268, 270, 271, - 274, 276, 281, 283, 287, 292, 297, 303, 309, 319, - 322, 331, 333, 339, 341, 346, 353, 352, 357, 359, - 362, 365, 367, 369, 371, 373, 377, 379, 380, 383, - 389, 398, 406, 411, 417, 419 + 0, 170, 170, 182, 184, 187, 189, 190, 191, 192, + 193, 194, 195, 196, 197, 199, 200, 201, 202, 203, + 205, 206, 207, 208, 209, 212, 214, 215, 219, 226, + 225, 236, 235, 248, 247, 253, 253, 258, 267, 282, + 284, 285, 288, 290, 295, 297, 301, 306, 311, 317, + 323, 333, 336, 345, 347, 353, 355, 360, 367, 366, + 371, 373, 376, 379, 381, 383, 385, 387, 391, 393, + 396, 402, 411, 419, 421, 428, 430 }; #endif @@ -461,18 +474,19 @@ static const unsigned short yyrline[] = First, the terminals, then, starting at YYNTOKENS, nonterminals. */ static const char *const yytname[] = { - "\"end of string\"", "error", "$undefined.", "STRING", "CHARACTER", "INT", + "\"end of file\"", "error", "$undefined", "\"string\"", "\"integer\"", "\"%token\"", "\"%nterm\"", "\"%type\"", "\"%destructor\"", "\"%printer\"", "\"%union\"", "\"%left\"", "\"%right\"", - "\"%nonassoc\"", "\"%expect\"", "\"%start\"", "\"%prec\"", "\"%dprec\"", - "\"%merge\"", "\"%verbose\"", "\"%error-verbose\"", "\"%output\"", - "\"%file-prefix\"", "\"%name-prefix\"", "\"%define\"", - "\"%pure-parser\"", "\"%glr-parser\"", "\"%defines\"", "\"%yacc\"", - "\"%debug\"", "\"%locations\"", "\"%no-lines\"", "\"%skeleton\"", - "\"%token-table\"", "TYPE", "\"=\"", "\";\"", "\":\"", "\"|\"", - "\"identifier\"", "\"%%\"", "PROLOGUE", "EPILOGUE", "BRACED_CODE", - "$axiom", "input", "declarations", "declaration", "grammar_declaration", - "@1", "@2", "symbol_declaration", "@3", "@4", "precedence_declaration", + "\"%nonassoc\"", "\"%prec\"", "\"%dprec\"", "\"%merge\"", "\"%debug\"", + "\"%define\"", "\"%defines\"", "\"%error-verbose\"", "\"%expect\"", + "\"%file-prefix\"", "\"%glr-parser\"", "\"%lex-param\"", + "\"%locations\"", "\"%name-prefix\"", "\"%no-lines\"", "\"%output\"", + "\"%parse-param\"", "\"%pure-parser\"", "\"%skeleton\"", "\"%start\"", + "\"%token-table\"", "\"%verbose\"", "\"%yacc\"", "\"type\"", "\"=\"", + "\";\"", "\":\"", "\",\"", "\"|\"", "\"identifier\"", "\"%%\"", + "\"%{...%}\"", "\"epilogue\"", "\"{...}\"", "$accept", "input", + "declarations", "declaration", "grammar_declaration", "@1", "@2", + "symbol_declaration", "@3", "@4", "precedence_declaration", "precedence_declarator", "type.opt", "symbols.1", "symbol_def", "symbol_defs.1", "grammar", "rules_or_grammar_declaration", "rules", "@5", "rhses.1", "rhs", "symbol", "action", "string_as_id", @@ -480,146 +494,154 @@ static const char *const yytname[] = }; #endif +# ifdef YYPRINT /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to token YYLEX-NUM. */ -static const short yytoknum[] = +static const unsigned short yytoknum[] = { 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 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, -1 + 295, 296, 297, 298, 299, 300, 301 }; +# endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const unsigned char yyr1[] = { - 0, 45, 46, 47, 47, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 49, 49, 49, 49, 50, 49, 51, - 49, 53, 52, 54, 52, 52, 55, 56, 56, 56, - 57, 57, 58, 58, 59, 59, 59, 59, 59, 60, - 60, 61, 61, 62, 62, 62, 64, 63, 65, 65, - 66, 66, 66, 66, 66, 66, 67, 67, 67, 68, - 69, 70, 71, 71, 72, 72 + 0, 47, 48, 49, 49, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 51, 51, 51, 51, 52, + 51, 53, 51, 55, 54, 56, 54, 54, 57, 58, + 58, 58, 59, 59, 60, 60, 61, 61, 61, 61, + 61, 62, 62, 63, 63, 64, 64, 64, 66, 65, + 67, 67, 68, 68, 68, 68, 68, 68, 69, 69, + 70, 71, 72, 73, 73, 74, 74 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ static const unsigned char yyr2[] = { 0, 2, 4, 0, 3, 1, 1, 1, 3, 1, - 1, 2, 3, 1, 3, 1, 3, 1, 1, 2, - 1, 1, 1, 1, 1, 2, 2, 0, 4, 0, - 4, 0, 3, 0, 3, 3, 3, 1, 1, 1, - 0, 1, 1, 2, 1, 1, 2, 2, 3, 1, - 2, 1, 2, 1, 2, 2, 0, 5, 1, 3, - 0, 2, 2, 3, 3, 3, 1, 1, 1, 1, - 1, 1, 0, 2, 0, 1 + 1, 2, 3, 1, 4, 1, 3, 1, 3, 4, + 1, 2, 1, 1, 1, 1, 1, 2, 2, 0, + 4, 0, 4, 0, 3, 0, 3, 3, 3, 1, + 1, 1, 0, 1, 1, 2, 1, 1, 2, 2, + 3, 1, 2, 1, 2, 1, 2, 2, 0, 5, + 1, 3, 0, 2, 2, 3, 3, 3, 1, 1, + 1, 1, 1, 0, 2, 0, 1 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state STATE-NUM when YYTABLE doesn't specify something else to do. Zero means the default is an error. */ -static const short yydefact[] = +static const unsigned char yydefact[] = { - 3, 0, 0, 0, 33, 31, 0, 27, 29, 0, - 37, 38, 39, 0, 0, 21, 10, 0, 0, 0, - 0, 17, 18, 9, 22, 7, 13, 15, 0, 20, - 0, 6, 74, 5, 24, 23, 40, 0, 0, 0, - 0, 0, 26, 11, 70, 68, 66, 25, 67, 0, - 0, 0, 71, 0, 19, 0, 0, 0, 0, 51, - 53, 75, 4, 41, 0, 44, 45, 49, 34, 32, - 35, 42, 0, 0, 16, 12, 14, 8, 55, 56, - 54, 0, 52, 2, 36, 46, 47, 50, 43, 28, - 30, 60, 73, 48, 0, 58, 57, 60, 0, 0, - 0, 69, 61, 62, 59, 63, 64, 65 + 3, 0, 0, 1, 35, 33, 0, 29, 31, 0, + 39, 40, 41, 7, 0, 9, 10, 0, 0, 13, + 0, 15, 0, 17, 0, 0, 20, 0, 0, 22, + 23, 24, 0, 6, 75, 5, 26, 25, 42, 0, + 0, 0, 0, 0, 28, 72, 0, 11, 0, 0, + 0, 0, 0, 21, 71, 68, 27, 69, 0, 0, + 0, 0, 53, 55, 76, 4, 43, 0, 46, 47, + 51, 36, 34, 37, 44, 0, 0, 8, 12, 0, + 16, 18, 0, 57, 58, 56, 0, 54, 2, 38, + 48, 49, 52, 45, 30, 32, 14, 19, 62, 74, + 50, 0, 60, 59, 62, 0, 0, 0, 70, 63, + 64, 61, 65, 66, 67 }; -/* YYPGOTO[NTERM-NUM]. */ -static const short yydefgoto[] = +/* YYDEFGOTO[NTERM-NUM]. */ +static const yysigned_char yydefgoto[] = { - -1, 1, 2, 32, 57, 40, 41, 34, 38, 37, - 35, 36, 64, 70, 67, 68, 58, 59, 60, 91, - 94, 95, 71, 103, 48, 53, 83, 62 + -1, 1, 2, 34, 60, 42, 43, 36, 40, 39, + 37, 38, 67, 73, 70, 71, 61, 62, 63, 98, + 101, 102, 74, 110, 57, 46, 88, 65 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -static const short yypact[] = +#define YYPACT_NINF -67 +static const yysigned_char yypact[] = { - -32768, 35, 85,-32768,-32768,-32768, 2,-32768,-32768, -5, - -32768,-32768,-32768, 31, 0,-32768,-32768, 18, 21, 22, - 59,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 59,-32768, - 37,-32768, 26,-32768,-32768,-32768, 29, -19, -19, 0, - 23, 24,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 59, - 59, 59,-32768, 59,-32768, 28, 33, 32, 1,-32768, - -32768,-32768,-32768,-32768, 0,-32768, 17,-32768, -19, -19, - 0,-32768, 0, 0,-32768,-32768,-32768,-32768,-32768,-32768, - -32768, 30,-32768,-32768, 0, 63,-32768,-32768,-32768, 0, - 0,-32768,-32768,-32768, -8, 15,-32768,-32768, 0, 67, - 39,-32768,-32768,-32768, 15,-32768,-32768,-32768 + -67, 7, 81, -67, -67, -67, -13, -67, -67, -16, + -67, -67, -67, -67, 32, -67, -67, 36, 20, -67, + 32, -67, 21, -67, 22, 32, -67, 32, -1, -67, + -67, -67, 43, -67, 24, -67, -67, -67, 28, -14, + -14, -1, 25, 26, -67, -67, 32, -67, 32, 30, + 32, 32, 33, -67, -67, -67, -67, -67, 38, 29, + 40, 4, -67, -67, -67, -67, -67, -1, -67, 16, + -67, -14, -14, -1, -67, -1, -1, -67, -67, 32, + -67, -67, 32, -67, -67, -67, 34, -67, -67, -1, + 77, -67, -67, -67, -1, -1, -67, -67, -67, -67, + -67, -20, 23, -67, -67, -1, 78, 45, -67, -67, + -67, 23, -67, -67, -67 }; /* YYPGOTO[NTERM-NUM]. */ -static const short yypgoto[] = +static const yysigned_char yypgoto[] = { - -32768,-32768,-32768,-32768, 76,-32768,-32768,-32768,-32768,-32768, - -32768,-32768,-32768, -12, -45, 41,-32768, 25,-32768,-32768, - -32768, -17, -14,-32768, -60, -23,-32768,-32768 + -67, -67, -67, -67, 82, -67, -67, -67, -67, -67, + -67, -67, -67, -42, -29, 55, -67, 35, -67, -67, + -67, -7, -28, -67, -66, -19, -67, -67 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If positive, shift that token. If negative, reduce the rule which - number is the opposite. If zero, do what YYDEFACT says. */ -static const short yytable[] = + number is the opposite. If zero, do what YYDEFACT says. + If YYTABLE_NINF, parse error. */ +#define YYTABLE_NINF -74 +static const yysigned_char yytable[] = { - 47, -72, 55, 44, 45, 54, 86, 4, 5, 6, - 7, 8, 9, 10, 11, 12, 65, 14, 44, 45, - 44, 66, 85, 87, 87, 93, 74, 75, 76, 96, - 77, 97, 98, 99, 100, 3, 43, 39, 55, 42, - 46, 56, 81, 4, 5, 6, 7, 8, 9, 10, - 11, 12, 84, 14, 49, 46, 88, 50, 51, 101, - 89, 90, 52, 61, 63, 78, 44, 72, 73, 80, - 88, 79, 106, 92, 107, 88, 88, 56, 33, 69, - 104, 102, 0, 82, 105, 0, 0, 0, 0, 0, - 102, 4, 5, 6, 7, 8, 9, 10, 11, 12, - 13, 14, 0, 0, 0, 15, 16, 17, 18, 19, - 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, - 0, 0, 0, 0, 0, 0, 30, 31 + 56, 49, 54, 91, -73, 58, 52, 3, 53, 4, + 5, 6, 7, 8, 9, 10, 11, 12, 103, 54, + 90, 104, 68, 41, 100, 89, 54, 77, 69, 78, + 44, 80, 81, 94, 95, 45, 28, 105, 106, 107, + 47, 55, 92, 92, 58, 93, 59, 86, 4, 5, + 6, 7, 8, 9, 10, 11, 12, 48, 50, 51, + 96, 93, 64, 97, 66, 55, 93, 93, 84, 108, + 79, 75, 76, 82, 109, 28, 83, 112, 85, 99, + 54, 114, 113, 109, 35, 59, 4, 5, 6, 7, + 8, 9, 10, 11, 12, 72, 87, 111, 13, 14, + 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, + 25, 26, 27, 28, 29, 30, 31, 0, 0, 0, + 0, 0, 0, 0, 32, 33 }; -static const short yycheck[] = +static const yysigned_char yycheck[] = { - 14, 0, 1, 3, 4, 28, 66, 6, 7, 8, - 9, 10, 11, 12, 13, 14, 35, 16, 3, 4, - 3, 40, 5, 68, 69, 85, 49, 50, 51, 37, - 53, 39, 17, 18, 19, 0, 5, 35, 1, 44, - 40, 40, 41, 6, 7, 8, 9, 10, 11, 12, - 13, 14, 64, 16, 36, 40, 70, 36, 36, 44, - 72, 73, 3, 37, 35, 37, 3, 44, 44, 37, - 84, 38, 5, 43, 35, 89, 90, 40, 2, 38, - 97, 95, -1, 58, 98, -1, -1, -1, -1, -1, - 104, 6, 7, 8, 9, 10, 11, 12, 13, 14, - 15, 16, -1, -1, -1, 20, 21, 22, 23, 24, - 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, - -1, -1, -1, -1, -1, -1, 41, 42 + 28, 20, 3, 69, 0, 1, 25, 0, 27, 5, + 6, 7, 8, 9, 10, 11, 12, 13, 38, 3, + 4, 41, 36, 36, 90, 67, 3, 46, 42, 48, + 46, 50, 51, 75, 76, 3, 32, 14, 15, 16, + 4, 42, 71, 72, 1, 73, 42, 43, 5, 6, + 7, 8, 9, 10, 11, 12, 13, 37, 37, 37, + 79, 89, 38, 82, 36, 42, 94, 95, 39, 46, + 40, 46, 46, 40, 102, 32, 38, 105, 38, 45, + 3, 36, 4, 111, 2, 42, 5, 6, 7, 8, + 9, 10, 11, 12, 13, 40, 61, 104, 17, 18, + 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, + 29, 30, 31, 32, 33, 34, 35, -1, -1, -1, + -1, -1, -1, -1, 43, 44 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const unsigned char yystos[] = { - 0, 46, 47, 0, 6, 7, 8, 9, 10, 11, - 12, 13, 14, 15, 16, 20, 21, 22, 23, 24, - 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, - 41, 42, 48, 49, 52, 55, 56, 54, 53, 35, - 50, 51, 44, 5, 3, 4, 40, 67, 69, 36, - 36, 36, 3, 70, 70, 1, 40, 49, 61, 62, - 63, 37, 72, 35, 57, 35, 40, 59, 60, 60, - 58, 67, 44, 44, 70, 70, 70, 70, 37, 38, - 37, 41, 62, 71, 58, 5, 69, 59, 67, 58, - 58, 64, 43, 69, 65, 66, 37, 39, 17, 18, - 19, 44, 67, 68, 66, 67, 5, 35 + 0, 48, 49, 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, 43, 44, 50, 51, 54, 57, 58, 56, + 55, 36, 52, 53, 46, 3, 72, 4, 37, 72, + 37, 37, 72, 72, 3, 42, 69, 71, 1, 42, + 51, 63, 64, 65, 38, 74, 36, 59, 36, 42, + 61, 62, 62, 60, 69, 46, 46, 72, 72, 40, + 72, 72, 40, 38, 39, 38, 43, 64, 73, 60, + 4, 71, 61, 69, 60, 60, 72, 72, 66, 45, + 71, 67, 68, 38, 41, 14, 15, 16, 46, 69, + 70, 68, 69, 4, 36 }; #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) @@ -667,7 +689,7 @@ do \ } \ else \ { \ - yyerror ("syntax error: cannot back up"); \ + yyerror ("syntax error: cannot back up"); \ YYERROR; \ } \ while (0) @@ -689,9 +711,9 @@ while (0) /* YYLEX -- calling `yylex' with the right arguments. */ #ifdef YYLEX_PARAM -# define YYLEX yylex (&yylval, &yylloc, YYLEX_PARAM) +# define YYLEX yylex (&yylval, &yylloc, YYLEX_PARAM) #else -# define YYLEX yylex (&yylval, &yylloc) +# define YYLEX yylex (&yylval, &yylloc) #endif /* Enable debugging if requested. */ @@ -797,49 +819,117 @@ yystpcpy (yydest, yysrc) -/* The user can define YYPARSE_PARAM as the name of an argument to be passed - into yyparse. The argument should have type void *. - It should actually point to an object. - Grammar actions can access the variable by casting it - to the proper pointer type. */ +#if YYDEBUG +/*-----------------------------. +| Print this symbol on YYOUT. | +`-----------------------------*/ + +#if defined (__STDC__) || defined (__cplusplus) +static void +yysymprint (FILE *yyout, int yytype, YYSTYPE yyvalue, YYLTYPE yylocation) +#else +static void +yysymprint (yyout, yytype, yyvalue, yylocation) + FILE *yyout; + int yytype; + YYSTYPE yyvalue; + YYLTYPE yylocation; +#endif +{ + /* Pacify ``unused variable'' warnings. */ + (void) yyvalue; + (void) yylocation; + + if (yytype < YYNTOKENS) + { + YYFPRINTF (yyout, "token %s (", yytname[yytype]); +# ifdef YYPRINT + YYPRINT (yyout, yytoknum[yytype], yyvalue); +# endif + } + else + YYFPRINTF (yyout, "nterm %s (", yytname[yytype]); + + switch (yytype) + { + default: + break; + } + YYFPRINTF (yyout, ")"); +} +#endif /* YYDEBUG. */ + + +/*-----------------------------------------------. +| Release the memory associated to this symbol. | +`-----------------------------------------------*/ + +#if defined (__STDC__) || defined (__cplusplus) +static void +yydestruct (int yytype, YYSTYPE yyvalue, YYLTYPE yylocation) +#else +static void +yydestruct (yytype, yyvalue, yylocation) + int yytype; + YYSTYPE yyvalue; + YYLTYPE yylocation; +#endif +{ + /* Pacify ``unused variable'' warnings. */ + (void) yyvalue; + (void) yylocation; + + switch (yytype) + { + default: + break; + } +} + + + +/* Prevent warnings from -Wmissing-prototypes. */ #ifdef YYPARSE_PARAM # if defined (__STDC__) || defined (__cplusplus) -# define YYPARSE_PARAM_ARG void *YYPARSE_PARAM -# define YYPARSE_PARAM_DECL +int yyparse (void *YYPARSE_PARAM); # else -# define YYPARSE_PARAM_ARG YYPARSE_PARAM -# define YYPARSE_PARAM_DECL void *YYPARSE_PARAM; +int yyparse (); # endif -#else /* !YYPARSE_PARAM */ -# define YYPARSE_PARAM_ARG -# define YYPARSE_PARAM_DECL -#endif /* !YYPARSE_PARAM */ - -/* Prevent warning if -Wstrict-prototypes. */ -#ifdef __GNUC__ -# ifdef YYPARSE_PARAM -int yyparse (void *); -# else +#else /* ! YYPARSE_PARAM */ +#if defined (__STDC__) || defined (__cplusplus) int yyparse (void); -# endif +#else +int yyparse (); #endif - -#if defined (__STDC__) || defined (__cplusplus) -static void yydestruct (int yytype, - YYSTYPE yyvalue, YYLTYPE yylocation); -# if YYDEBUG -static void yysymprint (FILE* out, int yytype, - YYSTYPE yyvalue, YYLTYPE yylocation); -# endif #endif + + +/*----------. +| yyparse. | +`----------*/ + +#ifdef YYPARSE_PARAM +# if defined (__STDC__) || defined (__cplusplus) +int yyparse (void *YYPARSE_PARAM) +# else +int yyparse (YYPARSE_PARAM) + void *YYPARSE_PARAM; +# endif +#else /* ! YYPARSE_PARAM */ +#if defined (__STDC__) || defined (__cplusplus) +int +yyparse (void) +#else int -yyparse (YYPARSE_PARAM_ARG) - YYPARSE_PARAM_DECL +yyparse () + +#endif +#endif { /* The lookahead symbol. */ int yychar; @@ -925,7 +1015,7 @@ YYLTYPE yylloc; yysetstate: *yyssp = yystate; - if (yyssp >= yyss + yystacksize - 1) + if (yyss + yystacksize - 1 <= yyssp) { /* Get the current used size of the three stacks, in elements. */ YYSIZE_T yysize = yyssp - yyss + 1; @@ -957,10 +1047,10 @@ YYLTYPE yylloc; goto yyoverflowlab; # else /* Extend the stack our own way. */ - if (yystacksize >= YYMAXDEPTH) + if (YYMAXDEPTH <= yystacksize) goto yyoverflowlab; yystacksize *= 2; - if (yystacksize > YYMAXDEPTH) + if (YYMAXDEPTH < yystacksize) yystacksize = YYMAXDEPTH; { @@ -986,7 +1076,7 @@ YYLTYPE yylloc; YYDPRINTF ((stderr, "Stack size increased to %lu\n", (unsigned long int) yystacksize)); - if (yyssp >= yyss + yystacksize - 1) + if (yyss + yystacksize - 1 <= yyssp) YYABORT; } @@ -1006,7 +1096,7 @@ yybackup: /* First try to decide what to do without reference to lookahead token. */ yyn = yypact[yystate]; - if (yyn == YYFLAG) + if (yyn == YYPACT_NINF) goto yydefault; /* Not known => get a lookahead token if don't already have one. */ @@ -1040,28 +1130,19 @@ yybackup: YYDPRINTF ((stderr, "\n")); } + /* If the proper action on seeing token YYCHAR1 is to reduce or to + detect an error, take that action. */ yyn += yychar1; - if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1) + if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yychar1) goto yydefault; - yyn = yytable[yyn]; - - /* yyn is what to do for this token type in this state. - Negative => reduce, -yyn is rule number. - Positive => shift, yyn is new state. - New state is final state => don't bother to shift, - just return success. - 0, or most negative number => error. */ - - if (yyn < 0) + if (yyn <= 0) { - if (yyn == YYFLAG) + if (yyn == 0 || yyn == YYTABLE_NINF) goto yyerrlab; yyn = -yyn; goto yyreduce; } - else if (yyn == 0) - goto yyerrlab; if (yyn == YYFINAL) YYACCEPT; @@ -1106,8 +1187,8 @@ yyreduce: /* If YYLEN is nonzero, implement the default value of the action: `$$ = $1'. - Otherwise, the following line sets YYVAL to the semantic value of - the lookahead token. This behavior is undocumented and Bison + Otherwise, the following line sets YYVAL to garbage. + This behavior is undocumented and Bison users should not rely upon it. Assigning to YYVAL unconditionally makes the parser a bit smaller, and it avoids a GCC warning that YYVAL may be used uninitialized. */ @@ -1127,7 +1208,7 @@ yyreduce: yyn - 1, yyrline[yyn]); /* Print the symbols being reduced, and their result. */ - for (yyi = yyprhs[yyn]; yyrhs[yyi] >= 0; yyi++) + for (yyi = yyprhs[yyn]; 0 <= yyrhs[yyi]; yyi++) YYFPRINTF (stderr, "%s ", yytname[yyrhs[yyi]]); YYFPRINTF (stderr, " -> %s\n", yytname[yyr1[yyn]]); } @@ -1135,107 +1216,116 @@ yyreduce: switch (yyn) { case 2: -#line 161 "parse-gram.y" +#line 172 "parse-gram.y" { yycontrol->errcode = 0; - epilogue_set (yyvsp[0].string, yylsp[0]); } break; case 6: -#line 179 "parse-gram.y" +#line 189 "parse-gram.y" { prologue_augment (yyvsp[0].string, yylsp[0]); } break; case 7: -#line 180 "parse-gram.y" +#line 190 "parse-gram.y" { debug_flag = 1; } break; case 8: -#line 181 "parse-gram.y" +#line 191 "parse-gram.y" { muscle_insert (yyvsp[-1].string, yyvsp[0].string); } break; case 9: -#line 182 "parse-gram.y" +#line 192 "parse-gram.y" { defines_flag = 1; } break; case 10: -#line 183 "parse-gram.y" +#line 193 "parse-gram.y" { error_verbose = 1; } break; case 11: -#line 184 "parse-gram.y" +#line 194 "parse-gram.y" { expected_conflicts = yyvsp[0].integer; } break; case 12: -#line 185 "parse-gram.y" +#line 195 "parse-gram.y" { spec_file_prefix = yyvsp[0].string; } break; case 13: -#line 186 "parse-gram.y" - { locations_flag = 1; } +#line 196 "parse-gram.y" + { glr_parser = 1; } break; case 14: -#line 187 "parse-gram.y" - { spec_name_prefix = yyvsp[0].string; } +#line 198 "parse-gram.y" + { muscle_pair_list_grow ("lex_param", yyvsp[-2].string, yyvsp[0].string); } break; case 15: -#line 188 "parse-gram.y" - { no_lines_flag = 1; } +#line 199 "parse-gram.y" + { locations_flag = 1; } break; case 16: -#line 189 "parse-gram.y" - { spec_outfile = yyvsp[0].string; } +#line 200 "parse-gram.y" + { spec_name_prefix = yyvsp[0].string; } break; case 17: -#line 190 "parse-gram.y" - { pure_parser = 1; } +#line 201 "parse-gram.y" + { no_lines_flag = 1; } break; case 18: -#line 191 "parse-gram.y" - { glr_parser = 1; } +#line 202 "parse-gram.y" + { spec_outfile = yyvsp[0].string; } break; case 19: -#line 192 "parse-gram.y" - { skeleton = yyvsp[0].string; } +#line 204 "parse-gram.y" + { muscle_pair_list_grow ("parse_param", yyvsp[-2].string, yyvsp[0].string); } break; case 20: -#line 193 "parse-gram.y" - { token_table_flag = 1; } +#line 205 "parse-gram.y" + { pure_parser = 1; } break; case 21: -#line 194 "parse-gram.y" - { report_flag = 1; } +#line 206 "parse-gram.y" + { skeleton = yyvsp[0].string; } break; case 22: -#line 195 "parse-gram.y" +#line 207 "parse-gram.y" + { token_table_flag = 1; } + break; + + case 23: +#line 208 "parse-gram.y" + { report_flag = 1; } + break; + + case 24: +#line 209 "parse-gram.y" { yacc_flag = 1; } break; - case 25: -#line 202 "parse-gram.y" + case 27: +#line 216 "parse-gram.y" { grammar_start_symbol_set (yyvsp[0].symbol, yylsp[0]); } break; - case 26: -#line 206 "parse-gram.y" + case 28: +#line 220 "parse-gram.y" { typed = 1; MUSCLE_INSERT_INT ("stype_line", yylsp[0].first_line); @@ -1243,13 +1333,13 @@ yyreduce: } break; - case 27: -#line 212 "parse-gram.y" + case 29: +#line 226 "parse-gram.y" { current_braced_code = destructor_braced_code; } break; - case 28: -#line 214 "parse-gram.y" + case 30: +#line 228 "parse-gram.y" { symbol_list_t *list; for (list = yyvsp[0].list; list; list = list->next) @@ -1259,13 +1349,13 @@ yyreduce: } break; - case 29: -#line 222 "parse-gram.y" + case 31: +#line 236 "parse-gram.y" { current_braced_code = printer_braced_code; } break; - case 30: -#line 224 "parse-gram.y" + case 32: +#line 238 "parse-gram.y" { symbol_list_t *list; for (list = yyvsp[0].list; list; list = list->next) @@ -1275,44 +1365,44 @@ yyreduce: } break; - case 31: -#line 234 "parse-gram.y" + case 33: +#line 248 "parse-gram.y" { current_class = nterm_sym; } break; - case 32: -#line 235 "parse-gram.y" + case 34: +#line 249 "parse-gram.y" { current_class = unknown_sym; current_type = NULL; } break; - case 33: -#line 239 "parse-gram.y" + case 35: +#line 253 "parse-gram.y" { current_class = token_sym; } break; - case 34: -#line 240 "parse-gram.y" + case 36: +#line 254 "parse-gram.y" { current_class = unknown_sym; current_type = NULL; } break; - case 35: -#line 245 "parse-gram.y" + case 37: +#line 259 "parse-gram.y" { symbol_list_t *list; for (list = yyvsp[0].list; list; list = list->next) - symbol_type_set (list->sym, yyvsp[-1].string, yylsp[-1]); + symbol_type_set (list->sym, yyvsp[-1].struniq, yylsp[-1]); symbol_list_free (yyvsp[0].list); } break; - case 36: -#line 255 "parse-gram.y" + case 38: +#line 269 "parse-gram.y" { symbol_list_t *list; ++current_prec; @@ -1326,58 +1416,58 @@ yyreduce: } break; - case 37: -#line 269 "parse-gram.y" + case 39: +#line 283 "parse-gram.y" { yyval.assoc = left_assoc; } break; - case 38: -#line 270 "parse-gram.y" + case 40: +#line 284 "parse-gram.y" { yyval.assoc = right_assoc; } break; - case 39: -#line 271 "parse-gram.y" + case 41: +#line 285 "parse-gram.y" { yyval.assoc = non_assoc; } break; - case 40: -#line 275 "parse-gram.y" - { current_type = NULL;} + case 42: +#line 289 "parse-gram.y" + { current_type = NULL; } break; - case 41: -#line 276 "parse-gram.y" - { current_type = yyvsp[0].string; } + case 43: +#line 290 "parse-gram.y" + { current_type = yyvsp[0].struniq; } break; - case 42: -#line 282 "parse-gram.y" + case 44: +#line 296 "parse-gram.y" { yyval.list = symbol_list_new (yyvsp[0].symbol, yylsp[0]); } break; - case 43: -#line 283 "parse-gram.y" + case 45: +#line 297 "parse-gram.y" { yyval.list = symbol_list_prepend (yyvsp[-1].list, yyvsp[0].symbol, yylsp[0]); } break; - case 44: -#line 289 "parse-gram.y" + case 46: +#line 303 "parse-gram.y" { - current_type = yyvsp[0].string; + current_type = yyvsp[0].struniq; } break; - case 45: -#line 293 "parse-gram.y" + case 47: +#line 307 "parse-gram.y" { symbol_class_set (yyvsp[0].symbol, current_class, yylsp[0]); symbol_type_set (yyvsp[0].symbol, current_type, yylsp[0]); } break; - case 46: -#line 298 "parse-gram.y" + case 48: +#line 312 "parse-gram.y" { symbol_class_set (yyvsp[-1].symbol, current_class, yylsp[-1]); symbol_type_set (yyvsp[-1].symbol, current_type, yylsp[-1]); @@ -1385,155 +1475,144 @@ yyreduce: } break; - case 47: -#line 304 "parse-gram.y" + case 49: +#line 318 "parse-gram.y" { symbol_class_set (yyvsp[-1].symbol, current_class, yylsp[-1]); symbol_type_set (yyvsp[-1].symbol, current_type, yylsp[-1]); - symbol_make_alias (yyvsp[-1].symbol, yyvsp[0].symbol); + symbol_make_alias (yyvsp[-1].symbol, yyvsp[0].symbol, yyloc); } break; - case 48: -#line 310 "parse-gram.y" + case 50: +#line 324 "parse-gram.y" { symbol_class_set (yyvsp[-2].symbol, current_class, yylsp[-2]); 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); + symbol_make_alias (yyvsp[-2].symbol, yyvsp[0].symbol, yyloc); } break; - case 49: -#line 321 "parse-gram.y" + case 51: +#line 335 "parse-gram.y" {;} break; - case 50: -#line 323 "parse-gram.y" + case 52: +#line 337 "parse-gram.y" {;} break; - case 54: -#line 342 "parse-gram.y" + case 56: +#line 356 "parse-gram.y" { if (yacc_flag) complain_at (yyloc, _("POSIX forbids declarations in the grammar")); } break; - case 55: -#line 347 "parse-gram.y" + case 57: +#line 361 "parse-gram.y" { yyerrok; } break; - case 56: -#line 353 "parse-gram.y" + case 58: +#line 367 "parse-gram.y" { current_lhs = yyvsp[-1].symbol; current_lhs_location = yylsp[-1]; } break; - case 57: -#line 354 "parse-gram.y" + case 59: +#line 368 "parse-gram.y" {;} break; - case 58: -#line 358 "parse-gram.y" + case 60: +#line 372 "parse-gram.y" { grammar_rule_end (yylsp[0]); } break; - case 59: -#line 359 "parse-gram.y" + case 61: +#line 373 "parse-gram.y" { grammar_rule_end (yylsp[0]); } break; - case 60: -#line 364 "parse-gram.y" + case 62: +#line 378 "parse-gram.y" { grammar_rule_begin (current_lhs, current_lhs_location); } break; - case 61: -#line 366 "parse-gram.y" + case 63: +#line 380 "parse-gram.y" { grammar_current_rule_symbol_append (yyvsp[0].symbol, yylsp[0]); } break; - case 62: -#line 368 "parse-gram.y" + case 64: +#line 382 "parse-gram.y" { grammar_current_rule_action_append (yyvsp[0].string, yylsp[0]); } break; - case 63: -#line 370 "parse-gram.y" + case 65: +#line 384 "parse-gram.y" { grammar_current_rule_prec_set (yyvsp[0].symbol, yylsp[0]); } break; - case 64: -#line 372 "parse-gram.y" + case 66: +#line 386 "parse-gram.y" { grammar_current_rule_dprec_set (yyvsp[0].integer, yylsp[0]); } break; - case 65: -#line 374 "parse-gram.y" - { grammar_current_rule_merge_set (yyvsp[0].string, yylsp[0]); } + case 67: +#line 388 "parse-gram.y" + { grammar_current_rule_merge_set (yyvsp[0].struniq, yylsp[0]); } break; - case 66: -#line 378 "parse-gram.y" + case 68: +#line 392 "parse-gram.y" { yyval.symbol = yyvsp[0].symbol; } break; - case 67: -#line 379 "parse-gram.y" + case 69: +#line 393 "parse-gram.y" { yyval.symbol = yyvsp[0].symbol; } break; - case 68: -#line 380 "parse-gram.y" - { yyval.symbol = symbol_get (yyvsp[0].string, yylsp[0]); } - break; - - case 69: -#line 385 "parse-gram.y" + case 70: +#line 398 "parse-gram.y" { yyval.string = yyvsp[0].string; } break; - case 70: -#line 391 "parse-gram.y" + case 71: +#line 404 "parse-gram.y" { yyval.symbol = symbol_get (yyvsp[0].string, yylsp[0]); symbol_class_set (yyval.symbol, token_sym, yylsp[0]); } break; - case 71: -#line 400 "parse-gram.y" + case 72: +#line 413 "parse-gram.y" { yyval.string = yyvsp[0].string + 1; yyval.string[strlen (yyval.string) - 1] = '\0'; } break; - case 72: -#line 408 "parse-gram.y" - { - yyval.string = xstrdup (""); - } - break; - - case 73: -#line 412 "parse-gram.y" + case 74: +#line 422 "parse-gram.y" { - yyval.string = yyvsp[0].string; + epilogue_augment (yyvsp[0].string, yylsp[0]); + scanner_last_string_free (); } break; } -/* Line 955 of /usr/local/share/bison/yacc.c. */ -#line 1537 "parse-gram.c" +/* Line 1056 of /usr/local/share/bison/yacc.c. */ +#line 1616 "parse-gram.c" yyvsp -= yylen; yyssp -= yylen; @@ -1560,7 +1639,7 @@ yyreduce: yyn = yyr1[yyn]; yystate = yypgoto[yyn - YYNTOKENS] + *yyssp; - if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp) + if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp) yystate = yytable[yystate]; else yystate = yydefgoto[yyn - YYNTOKENS]; @@ -1576,13 +1655,13 @@ yyerrlab: if (!yyerrstatus) { ++yynerrs; - #if YYERROR_VERBOSE yyn = yypact[yystate]; - if (yyn > YYFLAG && yyn < YYLAST) + if (YYPACT_NINF < yyn && yyn < YYLAST) { YYSIZE_T yysize = 0; + int yytype = YYTRANSLATE (yychar); char *yymsg; int yyx, yycount; @@ -1591,15 +1670,15 @@ yyerrlab: YYCHECK. */ for (yyx = yyn < 0 ? -yyn : 0; yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++) - if (yycheck[yyx + yyn] == yyx) + if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) yysize += yystrlen (yytname[yyx]) + 15, yycount++; yysize += yystrlen ("parse error, unexpected ") + 1; - yysize += yystrlen (yytname[YYTRANSLATE (yychar)]); + yysize += yystrlen (yytname[yytype]); yymsg = (char *) YYSTACK_ALLOC (yysize); if (yymsg != 0) { char *yyp = yystpcpy (yymsg, "parse error, unexpected "); - yyp = yystpcpy (yyp, yytname[YYTRANSLATE (yychar)]); + yyp = yystpcpy (yyp, yytname[yytype]); if (yycount < 5) { @@ -1607,7 +1686,7 @@ yyerrlab: for (yyx = yyn < 0 ? -yyn : 0; yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++) - if (yycheck[yyx + yyn] == yyx) + if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) { const char *yyq = ! yycount ? ", expecting " : " or "; yyp = yystpcpy (yyp, yyq); @@ -1617,13 +1696,13 @@ yyerrlab: } yyerror (yymsg); YYSTACK_FREE (yymsg); - } - else - yyerror ("parse error; also virtual memory exhausted"); - } + } + else + yyerror ("parse error; also virtual memory exhausted"); + } else #endif /* YYERROR_VERBOSE */ - yyerror ("parse error"); + yyerror ("parse error"); } goto yyerrlab1; @@ -1643,7 +1722,7 @@ yyerrlab1: /* Pop the error token. */ YYPOPSTACK; /* Pop the rest of the stack. */ - while (yyssp > yyss) + while (yyss < yyssp) { YYDPRINTF ((stderr, "Error: popping ")); YYDSYMPRINT ((stderr, @@ -1670,7 +1749,7 @@ yyerrlab1: for (;;) { yyn = yypact[yystate]; - if (yyn != YYFLAG) + if (yyn != YYPACT_NINF) { yyn += YYTERROR; if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) @@ -1752,59 +1831,7 @@ yyreturn: } -/*-----------------------------------------------. -| Release the memory associated to this symbol. | -`-----------------------------------------------*/ - -static void -yydestruct (int yytype, - YYSTYPE yyvalue, YYLTYPE yylocation) -{ - /* Pacify ``unused variable'' warnings. */ - (void) yyvalue; - (void) yylocation; - - switch (yytype) - { - default: - break; - } -} - - -#if YYDEBUG -/*-----------------------------. -| Print this symbol on YYOUT. | -`-----------------------------*/ - -static void -yysymprint (FILE* yyout, int yytype, - YYSTYPE yyvalue, YYLTYPE yylocation) -{ - /* Pacify ``unused variable'' warnings. */ - (void) yyvalue; - (void) yylocation; - - if (yytype < YYNTOKENS) - { - YYFPRINTF (yyout, "token %s (", yytname[yytype]); -# ifdef YYPRINT - YYPRINT (yyout, yytoknum[yytype], yyvalue); -# endif - } - else - YYFPRINTF (yyout, "nterm %s (", yytname[yytype]); - - switch (yytype) - { - default: - break; - } - YYFPRINTF (yyout, ")"); -} -#endif /* YYDEBUG. */ - -#line 421 "parse-gram.y" +#line 432 "parse-gram.y" /*------------------------------------------------------------------. | When debugging the parser, display tokens' locations and values. | @@ -1817,10 +1844,6 @@ yyprint (FILE *file, fputc (' ', file); switch (type) { - case CHARACTER: - fprintf (file, " = '%s'", value->string); - break; - case ID: fprintf (file, " = %s", value->symbol->tag); break; @@ -1834,7 +1857,7 @@ yyprint (FILE *file, break; case TYPE: - fprintf (file, " = <%s>", value->string); + fprintf (file, " = <%s>", value->struniq); break; case BRACED_CODE: @@ -1842,12 +1865,15 @@ yyprint (FILE *file, case EPILOGUE: fprintf (file, " = {{ %s }}", value->string); break; + + default: + fprintf (file, "unknown token type"); + break; } } void -gram_error (gram_control_t *control ATTRIBUTE_UNUSED, - location_t *yylloc, const char *msg) +gram_error (location_t *yylloc, const char *msg) { complain_at (*yylloc, "%s", msg); }