X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/05d18c249342b25135c505907eb992707f5e0d65..98bb5428c8396f5925eaf910452761aeb172bbde:/src/parse-gram.c diff --git a/src/parse-gram.c b/src/parse-gram.c index 8e6e2c84..c0f28974 100644 --- a/src/parse-gram.c +++ b/src/parse-gram.c @@ -1,7 +1,7 @@ -/* A Bison parser, made by GNU Bison 1.75d. */ +/* A Bison parser, made by GNU Bison 1.875b. */ /* Skeleton parser for Yacc-like parsing with Bison, - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -88,24 +88,25 @@ 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, - PIPE = 294, - ID = 295, - ID_COLON = 296, - PERCENT_PERCENT = 297, - PROLOGUE = 298, - EPILOGUE = 299, - BRACED_CODE = 300 + PERCENT_NONDETERMINISTIC_PARSER = 283, + PERCENT_OUTPUT = 284, + PERCENT_PARSE_PARAM = 285, + PERCENT_PURE_PARSER = 286, + PERCENT_SKELETON = 287, + PERCENT_START = 288, + PERCENT_TOKEN_TABLE = 289, + PERCENT_VERBOSE = 290, + PERCENT_YACC = 291, + TYPE = 292, + EQUAL = 293, + SEMICOLON = 294, + PIPE = 295, + ID = 296, + ID_COLON = 297, + PERCENT_PERCENT = 298, + PROLOGUE = 299, + EPILOGUE = 300, + BRACED_CODE = 301 }; #endif #define GRAM_EOF 0 @@ -134,30 +135,31 @@ #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 PIPE 294 -#define ID 295 -#define ID_COLON 296 -#define PERCENT_PERCENT 297 -#define PROLOGUE 298 -#define EPILOGUE 299 -#define BRACED_CODE 300 +#define PERCENT_NONDETERMINISTIC_PARSER 283 +#define PERCENT_OUTPUT 284 +#define PERCENT_PARSE_PARAM 285 +#define PERCENT_PURE_PARSER 286 +#define PERCENT_SKELETON 287 +#define PERCENT_START 288 +#define PERCENT_TOKEN_TABLE 289 +#define PERCENT_VERBOSE 290 +#define PERCENT_YACC 291 +#define TYPE 292 +#define EQUAL 293 +#define SEMICOLON 294 +#define PIPE 295 +#define ID 296 +#define ID_COLON 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" +#line 32 "parse-gram.y" #include "system.h" @@ -188,7 +190,7 @@ static void gram_error (location const *, char const *); print_token_value (File, Type, &Value) static void print_token_value (FILE *, int, YYSTYPE const *); -static void add_param (char const *, char const *, location); +static void add_param (char const *, char *, location); symbol_class current_class = unknown_sym; uniqstr current_type = 0; @@ -196,7 +198,6 @@ symbol *current_lhs; location current_lhs_location; assoc current_assoc; int current_prec = 0; -braced_code current_braced_code = action_braced_code; /* Enabling traces. */ @@ -212,54 +213,57 @@ braced_code current_braced_code = action_braced_code; # define YYERROR_VERBOSE 0 #endif -#ifndef YYSTYPE +#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) #line 75 "parse-gram.y" -typedef union { +typedef union YYSTYPE { symbol *symbol; symbol_list *list; int integer; char *chars; assoc assoc; uniqstr uniqstr; -} yystype; -/* Line 195 of yacc.c. */ -#line 226 "parse-gram.c" -# define YYSTYPE yystype +} YYSTYPE; +/* Line 191 of yacc.c. */ +#line 228 "parse-gram.c" +# define yystype YYSTYPE /* obsolescent; will be withdrawn */ +# define YYSTYPE_IS_DECLARED 1 # define YYSTYPE_IS_TRIVIAL 1 #endif -#ifndef YYLTYPE -typedef struct yyltype +#if ! defined (YYLTYPE) && ! defined (YYLTYPE_IS_DECLARED) +typedef struct YYLTYPE { int first_line; int first_column; int last_line; int last_column; -} yyltype; -# define YYLTYPE yyltype +} YYLTYPE; +# define yyltype YYLTYPE /* obsolescent; will be withdrawn */ +# define YYLTYPE_IS_DECLARED 1 # define YYLTYPE_IS_TRIVIAL 1 #endif + /* Copy the second part of user declarations. */ -/* Line 215 of yacc.c. */ -#line 247 "parse-gram.c" +/* Line 214 of yacc.c. */ +#line 252 "parse-gram.c" #if ! defined (yyoverflow) || YYERROR_VERBOSE /* The parser invokes alloca or malloc; define the necessary symbols. */ -# if YYSTACK_USE_ALLOCA -# define YYSTACK_ALLOC alloca +# ifdef YYSTACK_USE_ALLOCA +# if YYSTACK_USE_ALLOCA +# define YYSTACK_ALLOC alloca +# endif # else -# ifndef YYSTACK_USE_ALLOCA -# if defined (alloca) || defined (_ALLOCA_H) -# define YYSTACK_ALLOC alloca -# else -# ifdef __GNUC__ -# define YYSTACK_ALLOC __builtin_alloca -# endif +# if defined (alloca) || defined (_ALLOCA_H) +# define YYSTACK_ALLOC alloca +# else +# ifdef __GNUC__ +# define YYSTACK_ALLOC __builtin_alloca # endif # endif # endif @@ -344,24 +348,23 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 3 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 153 +#define YYLAST 148 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 46 +#define YYNTOKENS 47 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 28 +#define YYNNTS 25 /* YYNRULES -- Number of rules. */ -#define YYNRULES 77 +#define YYNRULES 75 /* YYNRULES -- Number of states. */ -#define YYNSTATES 109 +#define YYNSTATES 103 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 300 +#define YYMAXUTOK 301 #define YYTRANSLATE(YYX) \ - ((YYX <= 0) ? YYEOF : \ - (unsigned)(YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) + ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) /* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */ static const unsigned char yytranslate[] = @@ -396,7 +399,7 @@ static const unsigned char yytranslate[] = 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, - 45 + 45, 46 }; #if YYDEBUG @@ -405,51 +408,51 @@ static const unsigned char yytranslate[] = static const unsigned char yyprhs[] = { 0, 0, 3, 8, 9, 12, 14, 16, 18, 22, - 24, 26, 29, 33, 35, 38, 40, 44, 46, 50, - 53, 55, 58, 60, 62, 64, 66, 68, 70, 73, - 76, 77, 82, 83, 88, 89, 93, 94, 98, 102, - 106, 108, 110, 112, 113, 115, 117, 120, 122, 124, - 127, 130, 134, 136, 139, 141, 144, 146, 148, 151, - 153, 154, 158, 160, 164, 165, 168, 171, 175, 179, - 183, 185, 187, 189, 191, 193, 195, 196 + 24, 26, 29, 33, 35, 37, 39, 43, 45, 47, + 51, 53, 55, 58, 60, 62, 64, 66, 68, 70, + 73, 75, 78, 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, + 150, 152, 156, 159, 160, 163, 166, 170, 174, 178, + 180, 182, 184, 186, 188, 189 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yysigned_char yyrhs[] = { - 47, 0, -1, 48, 42, 62, 73, -1, -1, 48, - 49, -1, 50, -1, 43, -1, 17, -1, 18, 71, - 71, -1, 19, -1, 20, -1, 21, 4, -1, 22, - 37, 71, -1, 23, -1, 24, 72, -1, 25, -1, - 26, 37, 71, -1, 27, -1, 28, 37, 71, -1, - 29, 72, -1, 30, -1, 31, 71, -1, 33, -1, - 34, -1, 35, -1, 38, -1, 56, -1, 53, -1, - 32, 68, -1, 10, 45, -1, -1, 8, 51, 45, - 59, -1, -1, 9, 52, 45, 59, -1, -1, 6, - 54, 61, -1, -1, 5, 55, 61, -1, 7, 36, - 59, -1, 57, 58, 59, -1, 11, -1, 12, -1, - 13, -1, -1, 36, -1, 68, -1, 59, 68, -1, - 36, -1, 40, -1, 40, 4, -1, 40, 70, -1, - 40, 4, 70, -1, 60, -1, 61, 60, -1, 63, - -1, 62, 63, -1, 64, -1, 50, -1, 1, 38, - -1, 38, -1, -1, 41, 65, 66, -1, 67, -1, - 66, 39, 67, -1, -1, 67, 68, -1, 67, 69, - -1, 67, 14, 68, -1, 67, 15, 4, -1, 67, - 16, 36, -1, 40, -1, 70, -1, 45, -1, 3, - -1, 3, -1, 45, -1, -1, 42, 44, -1 + 48, 0, -1, 49, 43, 61, 71, -1, -1, 49, + 50, -1, 51, -1, 44, -1, 17, -1, 18, 70, + 70, -1, 19, -1, 20, -1, 21, 4, -1, 22, + 38, 70, -1, 23, -1, 24, -1, 25, -1, 26, + 38, 70, -1, 27, -1, 28, -1, 29, 38, 70, + -1, 30, -1, 31, -1, 32, 70, -1, 34, -1, + 35, -1, 36, -1, 39, -1, 55, -1, 52, -1, + 33, 67, -1, 10, -1, 8, 58, -1, 9, 58, + -1, -1, 6, 53, 60, -1, -1, 5, 54, 60, + -1, 7, 37, 58, -1, 56, 57, 58, -1, 11, + -1, 12, -1, 13, -1, -1, 37, -1, 67, -1, + 58, 67, -1, 37, -1, 41, -1, 41, 4, -1, + 41, 69, -1, 41, 4, 69, -1, 59, -1, 60, + 59, -1, 62, -1, 61, 62, -1, 63, -1, 51, + 39, -1, 1, 39, -1, -1, 42, 64, 65, -1, + 66, -1, 65, 40, 66, -1, 65, 39, -1, -1, + 66, 67, -1, 66, 68, -1, 66, 14, 67, -1, + 66, 15, 4, -1, 66, 16, 37, -1, 41, -1, + 69, -1, 46, -1, 3, -1, 3, -1, -1, 43, + 45, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const unsigned short yyrline[] = { - 0, 156, 156, 164, 166, 170, 171, 172, 173, 174, - 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, - 185, 186, 187, 188, 189, 190, 194, 195, 196, 200, - 207, 206, 217, 216, 229, 229, 234, 234, 239, 249, - 264, 265, 266, 270, 271, 277, 278, 283, 287, 292, - 298, 304, 315, 316, 325, 326, 332, 333, 338, 342, - 346, 346, 350, 351, 356, 357, 359, 361, 363, 365, - 370, 371, 375, 381, 390, 399, 406, 408 + 0, 162, 162, 170, 172, 176, 177, 178, 179, 180, + 181, 182, 183, 184, 186, 187, 188, 189, 190, 191, + 192, 193, 194, 195, 196, 197, 198, 202, 203, 204, + 208, 214, 221, 231, 231, 236, 236, 241, 251, 266, + 267, 268, 272, 273, 279, 280, 285, 289, 294, 300, + 306, 317, 318, 327, 328, 334, 335, 340, 347, 347, + 351, 352, 353, 358, 359, 361, 363, 365, 367, 372, + 373, 377, 383, 392, 399, 401 }; #endif @@ -458,23 +461,23 @@ static const unsigned short 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\"", "\"%union\"", "\"%left\"", "\"%right\"", - "\"%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\"", "\"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", - "string_content", "code_content", "epilogue.opt", 0 + "\"end of file\"", "error", "$undefined", "\"string\"", "\"integer\"", + "\"%token\"", "\"%nterm\"", "\"%type\"", "\"%destructor {...}\"", + "\"%printer {...}\"", "\"%union {...}\"", "\"%left\"", "\"%right\"", + "\"%nonassoc\"", "\"%prec\"", "\"%dprec\"", "\"%merge\"", "\"%debug\"", + "\"%define\"", "\"%defines\"", "\"%error-verbose\"", "\"%expect\"", + "\"%file-prefix\"", "\"%glr-parser\"", "\"%lex-param {...}\"", + "\"%locations\"", "\"%name-prefix\"", "\"%no-lines\"", + "\"%nondeterministic-parser\"", "\"%output\"", "\"%parse-param {...}\"", + "\"%pure-parser\"", "\"%skeleton\"", "\"%start\"", "\"%token-table\"", + "\"%verbose\"", "\"%yacc\"", "\"type\"", "\"=\"", "\";\"", "\"|\"", + "\"identifier\"", "\"identifier:\"", "\"%%\"", "\"%{...%}\"", + "\"epilogue\"", "\"{...}\"", "$accept", "input", "declarations", + "declaration", "grammar_declaration", "symbol_declaration", "@1", "@2", + "precedence_declaration", "precedence_declarator", "type.opt", + "symbols.1", "symbol_def", "symbol_defs.1", "grammar", + "rules_or_grammar_declaration", "rules", "@3", "rhses.1", "rhs", + "symbol", "action", "string_as_id", "string_content", "epilogue.opt", 0 }; #endif @@ -487,34 +490,34 @@ static const unsigned short yytoknum[] = 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, 300 + 295, 296, 297, 298, 299, 300, 301 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const unsigned char yyr1[] = { - 0, 46, 47, 48, 48, 49, 49, 49, 49, 49, - 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, - 49, 49, 49, 49, 49, 49, 50, 50, 50, 50, - 51, 50, 52, 50, 54, 53, 55, 53, 53, 56, - 57, 57, 57, 58, 58, 59, 59, 60, 60, 60, - 60, 60, 61, 61, 62, 62, 63, 63, 63, 63, - 65, 64, 66, 66, 67, 67, 67, 67, 67, 67, - 68, 68, 69, 70, 71, 72, 73, 73 + 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, 50, 50, 51, 51, 51, + 51, 51, 51, 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, 65, 66, 66, 66, 66, 66, 66, 67, + 67, 68, 69, 70, 71, 71 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ static const unsigned char yyr2[] = { 0, 2, 4, 0, 2, 1, 1, 1, 3, 1, - 1, 2, 3, 1, 2, 1, 3, 1, 3, 2, - 1, 2, 1, 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, 1, 2, 1, - 0, 3, 1, 3, 0, 2, 2, 3, 3, 3, - 1, 1, 1, 1, 1, 1, 0, 2 + 1, 2, 3, 1, 1, 1, 3, 1, 1, 3, + 1, 1, 2, 1, 1, 1, 1, 1, 1, 2, + 1, 2, 2, 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, 3, + 1, 3, 2, 0, 2, 2, 3, 3, 3, 1, + 1, 1, 1, 1, 0, 2 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -522,113 +525,111 @@ static const unsigned char yyr2[] = means the default is an error. */ static const unsigned char yydefact[] = { - 3, 0, 0, 1, 36, 34, 0, 30, 32, 0, - 40, 41, 42, 7, 0, 9, 10, 0, 0, 13, - 0, 15, 0, 17, 0, 0, 20, 0, 0, 22, - 23, 24, 25, 0, 6, 4, 5, 27, 26, 43, - 0, 0, 0, 0, 0, 29, 74, 0, 11, 0, - 75, 14, 0, 0, 19, 21, 73, 70, 28, 71, - 0, 59, 60, 57, 0, 54, 56, 44, 0, 47, - 48, 52, 37, 35, 38, 45, 0, 0, 8, 12, - 16, 18, 58, 64, 0, 55, 2, 39, 49, 50, - 53, 46, 31, 33, 61, 62, 77, 51, 64, 0, - 0, 0, 72, 65, 66, 63, 67, 68, 69 + 3, 0, 0, 1, 35, 33, 0, 0, 0, 30, + 39, 40, 41, 7, 0, 9, 10, 0, 0, 13, + 14, 15, 0, 17, 18, 0, 20, 21, 0, 0, + 23, 24, 25, 26, 0, 6, 4, 5, 28, 27, + 42, 0, 0, 0, 72, 69, 31, 44, 70, 32, + 73, 0, 11, 0, 0, 0, 22, 29, 0, 58, + 0, 0, 53, 55, 43, 0, 46, 47, 51, 36, + 34, 37, 45, 8, 12, 16, 19, 57, 63, 56, + 0, 54, 2, 38, 48, 49, 52, 59, 60, 75, + 50, 62, 63, 0, 0, 0, 71, 64, 65, 61, + 66, 67, 68 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yysigned_char yydefgoto[] = { - -1, 1, 2, 35, 63, 43, 44, 37, 41, 40, - 38, 39, 68, 74, 71, 72, 64, 65, 66, 83, - 94, 95, 75, 104, 59, 47, 51, 86 + -1, 1, 2, 36, 60, 38, 42, 41, 39, 40, + 65, 46, 68, 69, 61, 62, 63, 78, 87, 88, + 47, 98, 48, 51, 82 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -67 +#define YYPACT_NINF -64 static const yysigned_char yypact[] = { - -67, 5, 110, -67, -67, -67, -17, -67, -67, -14, - -67, -67, -67, -67, 29, -67, -67, 30, -1, -67, - -10, -67, 4, -67, 7, -10, -67, 29, 0, -67, - -67, -67, -67, 73, -67, -67, -67, -67, -67, 2, - -20, -20, 0, -8, 3, -67, -67, 29, -67, 29, - -67, -67, 29, 29, -67, -67, -67, -67, -67, -67, - 11, -67, -67, -67, 1, -67, -67, -67, 0, -67, - 14, -67, -20, -20, 0, -67, 0, 0, -67, -67, - -67, -67, -67, -67, 9, -67, -67, 0, 51, -67, - -67, -67, 0, 0, 16, 12, -67, -67, -67, 0, - 52, 22, -67, -67, -67, 12, -67, -67, -67 + -64, 32, 104, -64, -64, -64, -21, 16, 16, -64, + -64, -64, -64, -64, 30, -64, -64, 33, -4, -64, + -64, -64, 0, -64, -64, 1, -64, -64, 30, 16, + -64, -64, -64, -64, 66, -64, -64, -64, -64, -64, + 3, -15, -15, 16, -64, -64, 16, -64, -64, 16, + -64, 30, -64, 30, 30, 30, -64, -64, 4, -64, + 8, 2, -64, -64, -64, 16, -64, 21, -64, -15, + -15, 16, -64, -64, -64, -64, -64, -64, -64, -64, + 6, -64, -64, 16, 38, -64, -64, -34, 15, -64, + -64, -64, -64, 16, 48, 18, -64, -64, -64, 15, + -64, -64, -64 }; /* YYPGOTO[NTERM-NUM]. */ static const yysigned_char yypgoto[] = { - -67, -67, -67, -67, 58, -67, -67, -67, -67, -67, - -67, -67, -67, -47, -49, 20, -67, 6, -67, -67, - -67, -36, -28, -67, -66, -2, 38, -67 + -64, -64, -64, -64, 51, -64, -64, -64, -64, -64, + -64, -7, -42, 20, -64, -1, -64, -64, -64, -27, + -29, -64, -63, -5, -64 }; /* 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. If YYTABLE_NINF, syntax error. */ -#define YYTABLE_NINF -77 +#define YYTABLE_NINF -75 static const yysigned_char yytable[] = { - 58, -76, 60, 56, 89, 3, 4, 5, 6, 7, - 8, 9, 10, 11, 12, 56, 69, 56, 88, 42, - 70, 87, 97, 90, 90, 55, 99, 100, 101, 92, - 93, 45, 46, 28, 48, 50, 49, 76, 67, 61, - 57, 52, 62, 84, 53, 78, 91, 79, 77, 82, - 80, 81, 57, 96, 56, 98, 107, 102, 108, 91, - 36, 73, 105, 54, 91, 91, 0, 103, 0, 0, - 85, 106, 0, 0, 60, 0, 0, 103, 4, 5, - 6, 7, 8, 9, 10, 11, 12, 0, 0, 0, + 57, 49, -74, 58, 85, 91, 92, 4, 5, 6, + 7, 8, 9, 10, 11, 12, 43, 72, 44, 44, + 72, 90, 66, 56, 44, 84, 67, 86, 86, 93, + 94, 95, 3, 50, 53, 29, 71, 52, 54, 55, + 64, 44, 72, 77, 59, 80, 73, 79, 74, 75, + 76, 89, 101, 37, 72, 102, 45, 45, 83, 97, + 81, 96, 70, 0, 100, 99, 0, 58, 0, 0, + 97, 4, 5, 6, 7, 8, 9, 10, 11, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 28, 0, 0, 0, 0, - 0, 61, 0, 0, 62, 4, 5, 6, 7, 8, - 9, 10, 11, 12, 0, 0, 0, 13, 14, 15, - 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, - 26, 27, 28, 29, 30, 31, 0, 0, 32, 0, - 0, 0, 33, 34 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 29, + 0, 0, 0, 0, 0, 0, 0, 0, 59, 4, + 5, 6, 7, 8, 9, 10, 11, 12, 0, 0, + 0, 13, 14, 15, 16, 17, 18, 19, 20, 21, + 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, + 32, 0, 0, 33, 0, 0, 0, 34, 35 }; static const yysigned_char yycheck[] = { - 28, 0, 1, 3, 70, 0, 5, 6, 7, 8, - 9, 10, 11, 12, 13, 3, 36, 3, 4, 36, - 40, 68, 88, 72, 73, 27, 14, 15, 16, 76, - 77, 45, 3, 32, 4, 45, 37, 45, 36, 38, - 40, 37, 41, 42, 37, 47, 74, 49, 45, 38, - 52, 53, 40, 44, 3, 39, 4, 45, 36, 87, - 2, 41, 98, 25, 92, 93, -1, 95, -1, -1, - 64, 99, -1, -1, 1, -1, -1, 105, 5, 6, - 7, 8, 9, 10, 11, 12, 13, -1, -1, -1, + 29, 8, 0, 1, 67, 39, 40, 5, 6, 7, + 8, 9, 10, 11, 12, 13, 37, 46, 3, 3, + 49, 84, 37, 28, 3, 4, 41, 69, 70, 14, + 15, 16, 0, 3, 38, 33, 43, 4, 38, 38, + 37, 3, 71, 39, 42, 43, 51, 39, 53, 54, + 55, 45, 4, 2, 83, 37, 41, 41, 65, 88, + 61, 46, 42, -1, 93, 92, -1, 1, -1, -1, + 99, 5, 6, 7, 8, 9, 10, 11, 12, 13, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 32, -1, -1, -1, -1, - -1, 38, -1, -1, 41, 5, 6, 7, 8, 9, - 10, 11, 12, 13, -1, -1, -1, 17, 18, 19, - 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, - 30, 31, 32, 33, 34, 35, -1, -1, 38, -1, - -1, -1, 42, 43 + -1, -1, -1, -1, -1, -1, -1, -1, -1, 33, + -1, -1, -1, -1, -1, -1, -1, -1, 42, 5, + 6, 7, 8, 9, 10, 11, 12, 13, -1, -1, + -1, 17, 18, 19, 20, 21, 22, 23, 24, 25, + 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, + 36, -1, -1, 39, -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, 47, 48, 0, 5, 6, 7, 8, 9, 10, + 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, 38, 42, 43, 49, 50, 53, 56, 57, - 55, 54, 36, 51, 52, 45, 3, 71, 4, 37, - 45, 72, 37, 37, 72, 71, 3, 40, 68, 70, - 1, 38, 41, 50, 62, 63, 64, 36, 58, 36, - 40, 60, 61, 61, 59, 68, 45, 45, 71, 71, - 71, 71, 38, 65, 42, 63, 73, 59, 4, 70, - 60, 68, 59, 59, 66, 67, 44, 70, 39, 14, - 15, 16, 45, 68, 69, 67, 68, 4, 36 + 34, 35, 36, 39, 43, 44, 50, 51, 52, 55, + 56, 54, 53, 37, 3, 41, 58, 67, 69, 58, + 3, 70, 4, 38, 38, 38, 70, 67, 1, 42, + 51, 61, 62, 63, 37, 57, 37, 41, 59, 60, + 60, 58, 67, 70, 70, 70, 70, 39, 64, 39, + 43, 62, 71, 58, 4, 69, 59, 65, 66, 45, + 69, 39, 40, 14, 15, 16, 46, 67, 68, 66, + 67, 4, 37 }; #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) @@ -648,13 +649,20 @@ static const unsigned char yystos[] = #endif #define yyerrok (yyerrstatus = 0) -#define yyclearin (yytoken = YYEMPTY) -#define YYEMPTY -2 +#define yyclearin (yychar = YYEMPTY) +#define YYEMPTY (-2) #define YYEOF 0 #define YYACCEPT goto yyacceptlab #define YYABORT goto yyabortlab -#define YYERROR goto yyerrlab1 +#define YYERROR do \ + { \ + yylerrsp = yylsp; \ + *++yylerrsp = yyloc; \ + goto yyerrlab1; \ + } \ + while (0) + /* Like YYERROR except do call yyerror. This remains here temporarily to ease the transition to the new meaning of YYERROR, for GCC. @@ -666,7 +674,7 @@ static const unsigned char yystos[] = #define YYBACKUP(Token, Value) \ do \ - if (yytoken == YYEMPTY && yylen == 1) \ + if (yychar == YYEMPTY && yylen == 1) \ { \ yychar = (Token); \ yylval = (Value); \ @@ -776,9 +784,9 @@ yy_reduce_print (yyrule) #endif { int yyi; - unsigned int yylineno = yyrline[yyrule]; + unsigned int yylno = yyrline[yyrule]; YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ", - yyrule - 1, yylineno); + yyrule - 1, yylno); /* Print the symbols being reduced, and their result. */ for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++) YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]); @@ -815,7 +823,7 @@ int yydebug; SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH) evaluated with infinite-precision integer arithmetic. */ -#if YYMAXDEPTH == 0 +#if defined (YYMAXDEPTH) && YYMAXDEPTH == 0 # undef YYMAXDEPTH #endif @@ -1032,6 +1040,7 @@ YYLTYPE yylloc; YYLTYPE yylsa[YYINITDEPTH]; YYLTYPE *yyls = yylsa; YYLTYPE *yylsp; + YYLTYPE *yylerrsp; #define YYPOPSTACK (yyvsp--, yyssp--, yylsp--) @@ -1051,7 +1060,7 @@ YYLTYPE yylloc; yystate = 0; yyerrstatus = 0; yynerrs = 0; - yychar = yytoken = YYEMPTY; /* Cause a token to be read. */ + yychar = YYEMPTY; /* Cause a token to be read. */ /* Initialize stack pointers. Waste one element of value and location stack @@ -1161,20 +1170,21 @@ yybackup: /* Not known => get a lookahead token if don't already have one. */ - /* YYTOKEN is either YYEMPTY or YYEOF or a valid token. */ - if (yytoken == YYEMPTY) + /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */ + if (yychar == YYEMPTY) { YYDPRINTF ((stderr, "Reading a token: ")); yychar = YYLEX; - yytoken = YYTRANSLATE (yychar); } - if (yytoken == YYEOF) + if (yychar <= YYEOF) { + yychar = yytoken = YYEOF; YYDPRINTF ((stderr, "Now at end of input.\n")); } else { + yytoken = YYTRANSLATE (yychar); YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc); } @@ -1199,8 +1209,8 @@ yybackup: YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken])); /* Discard the token being shifted unless it is eof. */ - if (yytoken != YYEOF) - yytoken = YYEMPTY; + if (yychar != YYEOF) + yychar = YYEMPTY; *++yyvsp = yylval; *++yylsp = yylloc; @@ -1247,176 +1257,170 @@ yyreduce: switch (yyn) { case 6: -#line 171 "parse-gram.y" +#line 177 "parse-gram.y" { prologue_augment (yyvsp[0].chars, yylsp[0]); } break; case 7: -#line 172 "parse-gram.y" - { debug_flag = 1; } +#line 178 "parse-gram.y" + { debug_flag = true; } break; case 8: -#line 173 "parse-gram.y" +#line 179 "parse-gram.y" { muscle_insert (yyvsp[-1].chars, yyvsp[0].chars); } break; case 9: -#line 174 "parse-gram.y" - { defines_flag = 1; } +#line 180 "parse-gram.y" + { defines_flag = true; } break; case 10: -#line 175 "parse-gram.y" - { error_verbose = 1; } +#line 181 "parse-gram.y" + { error_verbose = true; } break; case 11: -#line 176 "parse-gram.y" +#line 182 "parse-gram.y" { expected_conflicts = yyvsp[0].integer; } break; case 12: -#line 177 "parse-gram.y" +#line 183 "parse-gram.y" { spec_file_prefix = yyvsp[0].chars; } break; case 13: -#line 178 "parse-gram.y" - { glr_parser = 1; } +#line 184 "parse-gram.y" + { nondeterministic_parser = true; + glr_parser = true; } break; case 14: -#line 179 "parse-gram.y" +#line 186 "parse-gram.y" { add_param ("lex_param", yyvsp[0].chars, yylsp[0]); } break; case 15: -#line 180 "parse-gram.y" - { locations_flag = 1; } +#line 187 "parse-gram.y" + { locations_flag = true; } break; case 16: -#line 181 "parse-gram.y" +#line 188 "parse-gram.y" { spec_name_prefix = yyvsp[0].chars; } break; case 17: -#line 182 "parse-gram.y" - { no_lines_flag = 1; } +#line 189 "parse-gram.y" + { no_lines_flag = true; } break; case 18: -#line 183 "parse-gram.y" - { spec_outfile = yyvsp[0].chars; } +#line 190 "parse-gram.y" + { nondeterministic_parser = true; } break; case 19: -#line 184 "parse-gram.y" - { add_param ("parse_param", yyvsp[0].chars, yylsp[0]); } +#line 191 "parse-gram.y" + { spec_outfile = yyvsp[0].chars; } break; case 20: -#line 185 "parse-gram.y" - { pure_parser = 1; } +#line 192 "parse-gram.y" + { add_param ("parse_param", yyvsp[0].chars, yylsp[0]); } break; case 21: -#line 186 "parse-gram.y" - { skeleton = yyvsp[0].chars; } +#line 193 "parse-gram.y" + { pure_parser = true; } break; case 22: -#line 187 "parse-gram.y" - { token_table_flag = 1; } +#line 194 "parse-gram.y" + { skeleton = yyvsp[0].chars; } break; case 23: -#line 188 "parse-gram.y" - { report_flag = 1; } +#line 195 "parse-gram.y" + { token_table_flag = true; } break; case 24: -#line 189 "parse-gram.y" - { yacc_flag = 1; } +#line 196 "parse-gram.y" + { report_flag = report_states; } break; - case 28: + case 25: #line 197 "parse-gram.y" + { yacc_flag = true; } + break; + + case 29: +#line 205 "parse-gram.y" { grammar_start_symbol_set (yyvsp[0].symbol, yylsp[0]); } break; - case 29: -#line 201 "parse-gram.y" + case 30: +#line 209 "parse-gram.y" { - typed = 1; + typed = true; MUSCLE_INSERT_INT ("stype_line", yylsp[0].start.line); muscle_insert ("stype", yyvsp[0].chars); } break; - case 30: -#line 207 "parse-gram.y" - { current_braced_code = destructor_braced_code; } - break; - case 31: -#line 209 "parse-gram.y" +#line 215 "parse-gram.y" { symbol_list *list; for (list = yyvsp[0].list; list; list = list->next) symbol_destructor_set (list->sym, yyvsp[-1].chars, yylsp[-1]); symbol_list_free (yyvsp[0].list); - current_braced_code = action_braced_code; } break; case 32: -#line 217 "parse-gram.y" - { current_braced_code = printer_braced_code; } - break; - - case 33: -#line 219 "parse-gram.y" +#line 222 "parse-gram.y" { symbol_list *list; for (list = yyvsp[0].list; list; list = list->next) symbol_printer_set (list->sym, yyvsp[-1].chars, list->location); symbol_list_free (yyvsp[0].list); - current_braced_code = action_braced_code; } break; - case 34: -#line 229 "parse-gram.y" + case 33: +#line 231 "parse-gram.y" { current_class = nterm_sym; } break; - case 35: -#line 230 "parse-gram.y" + case 34: +#line 232 "parse-gram.y" { current_class = unknown_sym; current_type = NULL; } break; - case 36: -#line 234 "parse-gram.y" + case 35: +#line 236 "parse-gram.y" { current_class = token_sym; } break; - case 37: -#line 235 "parse-gram.y" + case 36: +#line 237 "parse-gram.y" { current_class = unknown_sym; current_type = NULL; } break; - case 38: -#line 240 "parse-gram.y" + case 37: +#line 242 "parse-gram.y" { symbol_list *list; for (list = yyvsp[0].list; list; list = list->next) @@ -1425,8 +1429,8 @@ yyreduce: } break; - case 39: -#line 250 "parse-gram.y" + case 38: +#line 252 "parse-gram.y" { symbol_list *list; ++current_prec; @@ -1440,58 +1444,58 @@ yyreduce: } break; - case 40: -#line 264 "parse-gram.y" + case 39: +#line 266 "parse-gram.y" { yyval.assoc = left_assoc; } break; - case 41: -#line 265 "parse-gram.y" + case 40: +#line 267 "parse-gram.y" { yyval.assoc = right_assoc; } break; - case 42: -#line 266 "parse-gram.y" + case 41: +#line 268 "parse-gram.y" { yyval.assoc = non_assoc; } break; - case 43: -#line 270 "parse-gram.y" + case 42: +#line 272 "parse-gram.y" { current_type = NULL; } break; - case 44: -#line 271 "parse-gram.y" + case 43: +#line 273 "parse-gram.y" { current_type = yyvsp[0].uniqstr; } break; - case 45: -#line 277 "parse-gram.y" + case 44: +#line 279 "parse-gram.y" { yyval.list = symbol_list_new (yyvsp[0].symbol, yylsp[0]); } break; - case 46: -#line 278 "parse-gram.y" + case 45: +#line 280 "parse-gram.y" { yyval.list = symbol_list_prepend (yyvsp[-1].list, yyvsp[0].symbol, yylsp[0]); } break; - case 47: -#line 284 "parse-gram.y" + case 46: +#line 286 "parse-gram.y" { current_type = yyvsp[0].uniqstr; } break; - case 48: -#line 288 "parse-gram.y" + case 47: +#line 290 "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 49: -#line 293 "parse-gram.y" + case 48: +#line 295 "parse-gram.y" { symbol_class_set (yyvsp[-1].symbol, current_class, yylsp[-1]); symbol_type_set (yyvsp[-1].symbol, current_type, yylsp[-1]); @@ -1499,8 +1503,8 @@ yyreduce: } break; - case 50: -#line 299 "parse-gram.y" + case 49: +#line 301 "parse-gram.y" { symbol_class_set (yyvsp[-1].symbol, current_class, yylsp[-1]); symbol_type_set (yyvsp[-1].symbol, current_type, yylsp[-1]); @@ -1508,8 +1512,8 @@ yyreduce: } break; - case 51: -#line 305 "parse-gram.y" + case 50: +#line 307 "parse-gram.y" { symbol_class_set (yyvsp[-2].symbol, current_class, yylsp[-2]); symbol_type_set (yyvsp[-2].symbol, current_type, yylsp[-2]); @@ -1518,91 +1522,91 @@ yyreduce: } break; - case 57: -#line 334 "parse-gram.y" + case 56: +#line 336 "parse-gram.y" { if (yacc_flag) complain_at (yyloc, _("POSIX forbids declarations in the grammar")); } break; - case 58: -#line 339 "parse-gram.y" + case 57: +#line 341 "parse-gram.y" { yyerrok; } break; - case 60: -#line 346 "parse-gram.y" + case 58: +#line 347 "parse-gram.y" { current_lhs = yyvsp[0].symbol; current_lhs_location = yylsp[0]; } break; - case 62: -#line 350 "parse-gram.y" + case 60: +#line 351 "parse-gram.y" { grammar_rule_end (yylsp[0]); } break; - case 63: -#line 351 "parse-gram.y" + case 61: +#line 352 "parse-gram.y" { grammar_rule_end (yylsp[0]); } break; - case 64: -#line 356 "parse-gram.y" + case 63: +#line 358 "parse-gram.y" { grammar_rule_begin (current_lhs, current_lhs_location); } break; - case 65: -#line 358 "parse-gram.y" + case 64: +#line 360 "parse-gram.y" { grammar_current_rule_symbol_append (yyvsp[0].symbol, yylsp[0]); } break; - case 66: -#line 360 "parse-gram.y" + case 65: +#line 362 "parse-gram.y" { grammar_current_rule_action_append (yyvsp[0].chars, yylsp[0]); } break; - case 67: -#line 362 "parse-gram.y" + case 66: +#line 364 "parse-gram.y" { grammar_current_rule_prec_set (yyvsp[0].symbol, yylsp[0]); } break; - case 68: -#line 364 "parse-gram.y" + case 67: +#line 366 "parse-gram.y" { grammar_current_rule_dprec_set (yyvsp[0].integer, yylsp[0]); } break; - case 69: -#line 366 "parse-gram.y" + case 68: +#line 368 "parse-gram.y" { grammar_current_rule_merge_set (yyvsp[0].uniqstr, yylsp[0]); } break; - case 70: -#line 370 "parse-gram.y" + case 69: +#line 372 "parse-gram.y" { yyval.symbol = yyvsp[0].symbol; } break; - case 71: -#line 371 "parse-gram.y" + case 70: +#line 373 "parse-gram.y" { yyval.symbol = yyvsp[0].symbol; } break; - case 72: -#line 376 "parse-gram.y" + case 71: +#line 378 "parse-gram.y" { yyval.chars = yyvsp[0].chars; } break; - case 73: -#line 382 "parse-gram.y" + case 72: +#line 384 "parse-gram.y" { yyval.symbol = symbol_get (yyvsp[0].chars, yylsp[0]); symbol_class_set (yyval.symbol, token_sym, yylsp[0]); } break; - case 74: -#line 391 "parse-gram.y" + case 73: +#line 393 "parse-gram.y" { yyval.chars = yyvsp[0].chars + 1; yyval.chars[strlen (yyval.chars) - 1] = '\0'; @@ -1610,15 +1614,7 @@ yyreduce: break; case 75: -#line 400 "parse-gram.y" - { - yyval.chars = yyvsp[0].chars + 1; - yyval.chars[strlen (yyval.chars) - 1] = '\0'; - } - break; - - case 77: -#line 409 "parse-gram.y" +#line 402 "parse-gram.y" { epilogue_augment (yyvsp[0].chars, yylsp[0]); scanner_last_string_free (); @@ -1628,8 +1624,8 @@ yyreduce: } -/* Line 991 of yacc.c. */ -#line 1632 "parse-gram.c" +/* Line 999 of yacc.c. */ +#line 1629 "parse-gram.c" yyvsp -= yylen; yyssp -= yylen; @@ -1670,18 +1666,33 @@ yyerrlab: { YYSIZE_T yysize = 0; int yytype = YYTRANSLATE (yychar); + const char* yyprefix; char *yymsg; - int yyx, yycount; + int yyx; - yycount = 0; /* Start YYX at -YYN if negative to avoid negative indexes in YYCHECK. */ - for (yyx = yyn < 0 ? -yyn : 0; - yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++) + int yyxbegin = yyn < 0 ? -yyn : 0; + + /* Stay within bounds of both yycheck and yytname. */ + int yychecklim = YYLAST - yyn; + int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; + int yycount = 0; + + yyprefix = ", expecting "; + for (yyx = yyxbegin; yyx < yyxend; ++yyx) if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) - yysize += yystrlen (yytname[yyx]) + 15, yycount++; - yysize += yystrlen ("syntax error, unexpected ") + 1; - yysize += yystrlen (yytname[yytype]); + { + yysize += yystrlen (yyprefix) + yystrlen (yytname [yyx]); + yycount += 1; + if (yycount == 5) + { + yysize = 0; + break; + } + } + yysize += (sizeof ("syntax error, unexpected ") + + yystrlen (yytname[yytype])); yymsg = (char *) YYSTACK_ALLOC (yysize); if (yymsg != 0) { @@ -1690,16 +1701,13 @@ yyerrlab: if (yycount < 5) { - yycount = 0; - for (yyx = yyn < 0 ? -yyn : 0; - yyx < (int) (sizeof (yytname) / sizeof (char *)); - yyx++) + yyprefix = ", expecting "; + for (yyx = yyxbegin; yyx < yyxend; ++yyx) if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) { - const char *yyq = ! yycount ? ", expecting " : " or "; - yyp = yystpcpy (yyp, yyq); + yyp = yystpcpy (yyp, yyprefix); yyp = yystpcpy (yyp, yytname[yyx]); - yycount++; + yyprefix = " or "; } } yyerror (yymsg); @@ -1713,13 +1721,15 @@ yyerrlab: yyerror ("syntax error"); } + yylerrsp = yylsp; + if (yyerrstatus == 3) { /* If just tried and failed to reuse lookahead token after an error, discard it. */ /* Return failure if at end of input. */ - if (yytoken == YYEOF) + if (yychar == YYEOF) { /* Pop the error token. */ YYPOPSTACK; @@ -1735,7 +1745,8 @@ yyerrlab: YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc); yydestruct (yytoken, &yylval, &yylloc); - yytoken = YYEMPTY; + yychar = YYEMPTY; + *++yylerrsp = yylloc; } /* Else will try to reuse lookahead token after shifting the error @@ -1781,7 +1792,8 @@ yyerrlab1: YYDPRINTF ((stderr, "Shifting error token, ")); *++yyvsp = yylval; - *++yylsp = yylloc; + YYLLOC_DEFAULT (yyloc, yylsp, (yylerrsp - yylsp)); + *++yylsp = yyloc; yystate = yyn; goto yynewstate; @@ -1820,7 +1832,7 @@ yyreturn: } -#line 415 "parse-gram.y" +#line 408 "parse-gram.y" @@ -1833,24 +1845,20 @@ static YYLTYPE lloc_default (YYLTYPE const *rhs, int n) { int i; - int j; - YYLTYPE r; - r.start = r.end = rhs[n].end; + YYLTYPE loc; + loc.start = loc.end = rhs[n].end; + /* Ignore empty nonterminals the start of the the right-hand side. + Do not bother to ignore them at the end of the right-hand side, + since empty nonterminals have the same end as their predecessors. */ for (i = 1; i <= n; i++) if (! equal_boundaries (rhs[i].start, rhs[i].end)) { - r.start = rhs[i].start; - - for (j = n; i < j; j--) - if (! equal_boundaries (rhs[j].start, rhs[j].end)) - break; - r.end = rhs[j].end; - + loc.start = rhs[i].start; break; } - return r; + return loc; } @@ -1858,7 +1866,7 @@ lloc_default (YYLTYPE const *rhs, int n) declaration DECL and location LOC. */ static void -add_param (char const *type, char const *decl, location loc) +add_param (char const *type, char *decl, location loc) { static char const alphanum[] = "0123456789" @@ -1867,12 +1875,16 @@ add_param (char const *type, char const *decl, location loc) "_"; char const *alpha = alphanum + 10; char const *name_start = NULL; - char const *p; + char *p; for (p = decl; *p; p++) if ((p == decl || ! strchr (alphanum, p[-1])) && strchr (alpha, p[0])) name_start = p; + /* Strip the surrounding '{' and '}'. */ + decl++; + p[-1] = '\0'; + if (! name_start) complain_at (loc, _("missing identifier in parameter declaration")); else @@ -1895,9 +1907,9 @@ add_param (char const *type, char const *decl, location loc) scanner_last_string_free (); } -/*------------------------------------------------------------------. -| When debugging the parser, display tokens' locations and values. | -`------------------------------------------------------------------*/ +/*----------------------------------------------------. +| When debugging the parser, display tokens' values. | +`----------------------------------------------------*/ static void print_token_value (FILE *file, int type, YYSTYPE const *value) @@ -1922,6 +1934,11 @@ print_token_value (FILE *file, int type, YYSTYPE const *value) break; case BRACED_CODE: + case PERCENT_DESTRUCTOR: + case PERCENT_LEX_PARAM: + case PERCENT_PARSE_PARAM: + case PERCENT_PRINTER: + case PERCENT_UNION: case PROLOGUE: case EPILOGUE: fprintf (file, " = {{ %s }}", value->chars); @@ -1939,3 +1956,9 @@ gram_error (location const *loc, char const *msg) complain_at (*loc, "%s", msg); } +char const * +token_name (int type) +{ + return yytname[type]; +} +