X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/56c47203421107ee019a20f3b56cfb967ad75bd2..b5480d74b8162a2827c357b62dfacfedf1b93a96:/src/parse-gram.c diff --git a/src/parse-gram.c b/src/parse-gram.c index 6a083107..ed1685b8 100644 --- a/src/parse-gram.c +++ b/src/parse-gram.c @@ -55,10 +55,7 @@ #define yychar gram_char #define yydebug gram_debug #define yynerrs gram_nerrs -#if YYLSP_NEEDED -# define yylloc gram_lloc -#endif - +#define yylloc gram_lloc /* Copy the first part of user declarations. */ #line 31 "parse-gram.y" @@ -103,12 +100,9 @@ do { \ #define yyerror(Msg) \ gram_error (yycontrol, &yylloc, Msg) -/* When debugging our pure parser, we want to see values and locations - of the tokens. */ #define YYPRINT(File, Type, Value) \ - yyprint (File, &yylloc, Type, &Value) -static void yyprint (FILE *file, const location_t *loc, - int type, const yystype *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; @@ -116,6 +110,7 @@ symbol_t *current_lhs; location_t current_lhs_location; associativity current_assoc; int current_prec = 0; +braced_code_t current_braced_code = action_braced_code; /* Tokens. */ @@ -131,37 +126,42 @@ int current_prec = 0; PERCENT_TOKEN = 261, PERCENT_NTERM = 262, PERCENT_TYPE = 263, - PERCENT_UNION = 264, - PERCENT_LEFT = 265, - PERCENT_RIGHT = 266, - PERCENT_NONASSOC = 267, - PERCENT_EXPECT = 268, - PERCENT_START = 269, - PERCENT_PREC = 270, - PERCENT_VERBOSE = 271, - PERCENT_ERROR_VERBOSE = 272, - PERCENT_OUTPUT = 273, - PERCENT_FILE_PREFIX = 274, - PERCENT_NAME_PREFIX = 275, - PERCENT_DEFINE = 276, - PERCENT_PURE_PARSER = 277, - PERCENT_DEFINES = 278, - PERCENT_YACC = 279, - PERCENT_DEBUG = 280, - PERCENT_LOCATIONS = 281, - PERCENT_NO_LINES = 282, - PERCENT_SKELETON = 283, - PERCENT_TOKEN_TABLE = 284, - TYPE = 285, - EQUAL = 286, - SEMICOLON = 287, - COLON = 288, - PIPE = 289, - ID = 290, - PERCENT_PERCENT = 291, - PROLOGUE = 292, - EPILOGUE = 293, - BRACED_CODE = 294 + 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. */ @@ -174,37 +174,42 @@ int current_prec = 0; #define PERCENT_TOKEN 261 #define PERCENT_NTERM 262 #define PERCENT_TYPE 263 -#define PERCENT_UNION 264 -#define PERCENT_LEFT 265 -#define PERCENT_RIGHT 266 -#define PERCENT_NONASSOC 267 -#define PERCENT_EXPECT 268 -#define PERCENT_START 269 -#define PERCENT_PREC 270 -#define PERCENT_VERBOSE 271 -#define PERCENT_ERROR_VERBOSE 272 -#define PERCENT_OUTPUT 273 -#define PERCENT_FILE_PREFIX 274 -#define PERCENT_NAME_PREFIX 275 -#define PERCENT_DEFINE 276 -#define PERCENT_PURE_PARSER 277 -#define PERCENT_DEFINES 278 -#define PERCENT_YACC 279 -#define PERCENT_DEBUG 280 -#define PERCENT_LOCATIONS 281 -#define PERCENT_NO_LINES 282 -#define PERCENT_SKELETON 283 -#define PERCENT_TOKEN_TABLE 284 -#define TYPE 285 -#define EQUAL 286 -#define SEMICOLON 287 -#define COLON 288 -#define PIPE 289 -#define ID 290 -#define PERCENT_PERCENT 291 -#define PROLOGUE 292 -#define EPILOGUE 293 -#define BRACED_CODE 294 +#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 @@ -223,7 +228,7 @@ int current_prec = 0; #endif #ifndef YYSTYPE -#line 90 "parse-gram.y" +#line 88 "parse-gram.y" typedef union { symbol_t *symbol; symbol_list_t *list; @@ -231,8 +236,8 @@ typedef union { char *string; associativity assoc; } yystype; -/* Line 199 of /usr/local/share/bison/bison.simple. */ -#line 236 "parse-gram.c" +/* Line 272 of /home/cs/hilfingr/work/grammars/glr2/install/share/bison/yacc.c. */ +#line 241 "parse-gram.c" # define YYSTYPE yystype # define YYSTYPE_IS_TRIVIAL 1 #endif @@ -252,8 +257,8 @@ typedef struct yyltype /* Copy the second part of user declarations. */ -/* Line 219 of /usr/local/share/bison/bison.simple. */ -#line 257 "parse-gram.c" +/* Line 292 of /home/cs/hilfingr/work/grammars/glr2/install/share/bison/yacc.c. */ +#line 262 "parse-gram.c" #if ! defined (yyoverflow) || YYERROR_VERBOSE @@ -296,9 +301,7 @@ union yyalloc { short yyss; YYSTYPE yyvs; -# if YYLSP_NEEDED - YYLTYPE yyls; -# endif + YYLTYPE yyls; }; /* The size of the maximum gap between one aligned stack and the next. */ @@ -306,15 +309,9 @@ union yyalloc /* The size of an array large to enough to hold all stacks, each with N elements. */ -# if YYLSP_NEEDED -# define YYSTACK_BYTES(N) \ +# define YYSTACK_BYTES(N) \ ((N) * (sizeof (short) + sizeof (YYSTYPE) + sizeof (YYLTYPE)) \ + 2 * YYSTACK_GAP_MAX) -# else -# define YYSTACK_BYTES(N) \ - ((N) * (sizeof (short) + sizeof (YYSTYPE)) \ - + YYSTACK_GAP_MAX) -# endif /* Copy COUNT objects from FROM to TO. The source and destination do not overlap. */ @@ -355,20 +352,20 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 3 #define YYFLAG -32768 -#define YYLAST 111 +#define YYLAST 125 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 40 +#define YYNTOKENS 45 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 26 +#define YYNNTS 28 /* YYNRULES -- Number of rules. */ -#define YYNRULES 67 +#define YYNRULES 74 /* YYNRULES -- Number of states. */ -#define YYNSTATES 93 +#define YYNSTATES 106 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 294 +#define YYMAXUTOK 299 #define YYTRANSLATE(X) \ ((unsigned)(X) <= YYMAXUTOK ? yytranslate[X] : YYUNDEFTOK) @@ -405,7 +402,7 @@ 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 + 35, 36, 37, 38, 39, 40, 41, 42, 43, 44 }; #if YYDEBUG @@ -414,47 +411,51 @@ 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, 51, - 53, 55, 57, 59, 61, 64, 67, 68, 72, 73, - 77, 81, 85, 87, 89, 91, 92, 94, 96, 99, - 101, 103, 106, 109, 113, 115, 118, 120, 123, 125, - 128, 129, 135, 137, 141, 142, 145, 148, 152, 154, - 156, 158, 160, 162, 164, 165, 168, 169 + 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, 143, 149, 151, 155, + 156, 159, 162, 166, 170, 174, 176, 178, 180, 182, + 184, 186, 187, 190, 191 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const signed char yyrhs[] = { - 41, 0, -1, 42, 36, 54, 64, -1, -1, 42, - 43, 65, -1, 44, -1, 37, -1, 25, -1, 21, - 63, 63, -1, 23, -1, 17, -1, 13, 5, -1, - 19, 31, 63, -1, 26, -1, 20, 31, 63, -1, - 27, -1, 18, 31, 63, -1, 22, -1, 28, 63, - -1, 29, -1, 16, -1, 24, -1, 48, -1, 45, - -1, 14, 60, -1, 9, 39, -1, -1, 7, 46, - 53, -1, -1, 6, 47, 53, -1, 8, 30, 51, - -1, 49, 50, 51, -1, 10, -1, 11, -1, 12, - -1, -1, 30, -1, 60, -1, 51, 60, -1, 30, - -1, 35, -1, 35, 5, -1, 35, 62, -1, 35, - 5, 62, -1, 52, -1, 53, 52, -1, 55, -1, - 54, 55, -1, 56, -1, 44, 32, -1, -1, 35, - 33, 57, 58, 32, -1, 59, -1, 58, 34, 59, - -1, -1, 59, 60, -1, 59, 61, -1, 59, 15, - 60, -1, 35, -1, 62, -1, 4, -1, 39, -1, - 3, -1, 3, -1, -1, 36, 38, -1, -1, 32, - -1 + 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, 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 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const unsigned short yyrline[] = { - 0, 152, 152, 165, 167, 170, 172, 173, 174, 175, - 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, - 186, 187, 190, 192, 193, 197, 205, 205, 211, 211, - 216, 225, 240, 242, 243, 246, 248, 253, 255, 259, - 264, 269, 275, 281, 291, 294, 303, 305, 311, 313, - 316, 316, 321, 323, 326, 329, 331, 333, 337, 339, - 340, 343, 349, 358, 366, 371, 377, 379 + 0, 158, 158, 171, 173, 176, 178, 179, 180, 181, + 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, + 192, 193, 194, 197, 199, 200, 204, 211, 210, 221, + 220, 233, 232, 238, 238, 243, 252, 267, 269, 270, + 273, 275, 280, 282, 286, 291, 296, 302, 308, 318, + 321, 330, 332, 338, 340, 344, 343, 348, 350, 353, + 356, 358, 360, 362, 364, 368, 370, 371, 374, 380, + 389, 397, 402, 408, 410 }; #endif @@ -464,20 +465,21 @@ static const unsigned short yyrline[] = static const char *const yytname[] = { "\"end of string\"", "error", "$undefined.", "STRING", "CHARACTER", "INT", - "\"%token\"", "\"%nterm\"", "\"%type\"", "\"%union\"", "\"%left\"", - "\"%right\"", "\"%nonassoc\"", "\"%expect\"", "\"%start\"", "\"%prec\"", - "\"%verbose\"", "\"%error-verbose\"", "\"%output\"", "\"%file-prefix\"", - "\"%name-prefix\"", "\"%define\"", "\"%pure-parser\"", "\"%defines\"", - "\"%yacc\"", "\"%debug\"", "\"%locations\"", "\"%no-lines\"", - "\"%skeleton\"", "\"%token-table\"", "TYPE", "\"=\"", "\";\"", "\":\"", - "\"|\"", "\"identifier\"", "\"%%\"", "PROLOGUE", "EPILOGUE", - "BRACED_CODE", "$axiom", "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", - "semi_colon.opt", 0 + "\"%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", + "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", "epilogue.opt", "semi_colon.opt", 0 }; #endif @@ -489,31 +491,33 @@ static const 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, - -1 + 295, 296, 297, 298, 299, -1 }; /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const unsigned char yyr1[] = { - 0, 40, 41, 42, 42, 43, 43, 43, 43, 43, - 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, - 43, 43, 44, 44, 44, 44, 46, 45, 47, 45, - 45, 48, 49, 49, 49, 50, 50, 51, 51, 52, - 52, 52, 52, 52, 53, 53, 54, 54, 55, 55, - 57, 56, 58, 58, 59, 59, 59, 59, 60, 60, - 60, 61, 62, 63, 64, 64, 65, 65 + 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, 64, 63, 65, 65, 66, + 66, 66, 66, 66, 66, 67, 67, 67, 68, 69, + 70, 71, 71, 72, 72 }; /* 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, 2, 1, - 1, 1, 1, 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, - 0, 5, 1, 3, 0, 2, 2, 3, 1, 1, - 1, 1, 1, 1, 0, 2, 0, 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, 0, 5, 1, 3, 0, + 2, 2, 3, 3, 3, 1, 1, 1, 1, 1, + 1, 0, 2, 0, 1 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -521,48 +525,50 @@ static const unsigned char yyr2[] = means the default is an error. */ static const short yydefact[] = { - 3, 0, 0, 0, 28, 26, 0, 0, 32, 33, - 34, 0, 0, 20, 10, 0, 0, 0, 0, 17, - 9, 21, 7, 13, 15, 0, 19, 0, 6, 66, - 5, 23, 22, 35, 0, 0, 0, 25, 11, 62, - 60, 58, 24, 59, 0, 0, 0, 63, 0, 18, - 0, 0, 64, 46, 48, 67, 4, 36, 0, 39, - 40, 44, 29, 27, 30, 37, 16, 12, 14, 8, - 50, 49, 0, 47, 2, 31, 41, 42, 45, 38, - 54, 65, 43, 0, 52, 51, 54, 0, 61, 55, - 56, 53, 57 + 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, 73, 5, 24, 23, 40, 0, 0, 0, + 0, 0, 26, 11, 69, 67, 65, 25, 66, 0, + 0, 0, 70, 0, 19, 0, 0, 71, 51, 53, + 74, 4, 41, 0, 44, 45, 49, 34, 32, 35, + 42, 0, 0, 16, 12, 14, 8, 55, 54, 0, + 52, 2, 36, 46, 47, 50, 43, 28, 30, 59, + 72, 48, 0, 57, 56, 59, 0, 0, 0, 68, + 60, 61, 58, 62, 63, 64 }; /* YYPGOTO[NTERM-NUM]. */ static const short yydefgoto[] = { - -1, 1, 2, 29, 51, 31, 35, 34, 32, 33, - 58, 64, 61, 62, 52, 53, 54, 80, 83, 84, - 65, 90, 43, 48, 74, 56 + -1, 1, 2, 32, 56, 40, 41, 34, 38, 37, + 35, 36, 63, 69, 66, 67, 57, 58, 59, 89, + 92, 93, 70, 101, 48, 53, 81, 61 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ static const short yypact[] = { - -32768, 23, 74,-32768,-32768,-32768, 1, -31,-32768,-32768, - -32768, 29, 0,-32768,-32768, 7, 10, 14, 39,-32768, - -32768,-32768,-32768,-32768,-32768, 39,-32768, 18,-32768, 15, - -32768,-32768,-32768, 16, -24, -24, 0,-32768,-32768,-32768, - -32768,-32768,-32768,-32768, 39, 39, 39,-32768, 39,-32768, - 17, 19, 8,-32768,-32768,-32768,-32768,-32768, 0,-32768, - 4,-32768, -24, -24, 0,-32768,-32768,-32768,-32768,-32768, - -32768,-32768, 20,-32768,-32768, 0, 45,-32768,-32768,-32768, - -32768,-32768,-32768, -22, -2,-32768,-32768, 0,-32768,-32768, - -32768, -2,-32768 + -32768, 7, 83,-32768,-32768,-32768, -23,-32768,-32768, 3, + -32768,-32768,-32768, 43, 0,-32768,-32768, 13, 14, 15, + 51,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 51,-32768, + 23,-32768, 19,-32768,-32768,-32768, 22, -29, -29, 0, + 17, 18,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 51, + 51, 51,-32768, 51,-32768, 20, 27, 12,-32768,-32768, + -32768,-32768,-32768, 0,-32768, 5,-32768, -29, -29, 0, + -32768, 0, 0,-32768,-32768,-32768,-32768,-32768,-32768, 28, + -32768,-32768, 0, 56,-32768,-32768,-32768, 0, 0,-32768, + -32768,-32768, 4, -2,-32768,-32768, 0, 55, 35,-32768, + -32768,-32768, -2,-32768,-32768,-32768 }; /* YYPGOTO[NTERM-NUM]. */ static const short yypgoto[] = { - -32768,-32768,-32768,-32768, 47,-32768,-32768,-32768,-32768,-32768, - -32768, -4, -23, 25,-32768, 9,-32768,-32768,-32768, -21, - -12,-32768, -55, 11,-32768,-32768 + -32768,-32768,-32768,-32768, 70,-32768,-32768,-32768,-32768,-32768, + -32768,-32768,-32768, -58, -22, 37,-32768, 21,-32768,-32768, + -32768, -19, -14,-32768, -56, 16,-32768,-32768 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -570,53 +576,54 @@ static const short yypgoto[] = number is the opposite. If zero, do what YYDEFACT says. */ static const short yytable[] = { - 42, 39, 40, 39, 40, 77, 59, 39, 37, 76, - 85, 60, 86, 87, 4, 5, 6, 7, 8, 9, - 10, 82, 12, 3, 4, 5, 6, 7, 8, 9, - 10, 36, 12, 41, 38, 41, 49, 88, 44, 78, - 78, 45, 47, 50, 72, 46, 57, 55, 39, 30, - 70, 71, 79, 50, 75, 66, 67, 68, 81, 69, - 63, 73, 0, 79, 0, 91, 0, 0, 0, 0, - 0, 0, 89, 0, 0, 92, 0, 0, 0, 89, - 4, 5, 6, 7, 8, 9, 10, 11, 12, 0, - 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, - 23, 24, 25, 26, 0, 0, 0, 0, 0, 0, - 27, 28 + 47, 44, 45, 44, 45, 82, 64, 3, 44, 84, + 83, 65, 39, 87, 88, 96, 97, 98, 4, 5, + 6, 7, 8, 9, 10, 11, 12, 91, 14, 4, + 5, 6, 7, 8, 9, 10, 11, 12, 46, 14, + 46, 94, 99, 95, 54, 85, 85, 42, 43, 49, + 50, 51, 55, 79, 52, 86, 60, 62, 77, 44, + 104, 71, 72, 55, 78, 73, 74, 75, 86, 76, + 105, 90, 33, 86, 86, 68, 102, 0, 80, 100, + 0, 0, 103, 0, 0, 0, 0, 0, 100, 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 }; static const short yycheck[] = { - 12, 3, 4, 3, 4, 60, 30, 3, 39, 5, - 32, 35, 34, 15, 6, 7, 8, 9, 10, 11, - 12, 76, 14, 0, 6, 7, 8, 9, 10, 11, - 12, 30, 14, 35, 5, 35, 25, 39, 31, 62, - 63, 31, 3, 35, 36, 31, 30, 32, 3, 2, - 33, 32, 64, 35, 58, 44, 45, 46, 38, 48, - 35, 52, -1, 75, -1, 86, -1, -1, -1, -1, - -1, -1, 84, -1, -1, 87, -1, -1, -1, 91, - 6, 7, 8, 9, 10, 11, 12, 13, 14, -1, - 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, - 26, 27, 28, 29, -1, -1, -1, -1, -1, -1, - 36, 37 + 14, 3, 4, 3, 4, 63, 35, 0, 3, 65, + 5, 40, 35, 71, 72, 17, 18, 19, 6, 7, + 8, 9, 10, 11, 12, 13, 14, 83, 16, 6, + 7, 8, 9, 10, 11, 12, 13, 14, 40, 16, + 40, 37, 44, 39, 28, 67, 68, 44, 5, 36, + 36, 36, 40, 41, 3, 69, 37, 35, 38, 3, + 5, 44, 44, 40, 37, 49, 50, 51, 82, 53, + 35, 43, 2, 87, 88, 38, 95, -1, 57, 93, + -1, -1, 96, -1, -1, -1, -1, -1, 102, 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 }; -#if YYDEBUG /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const unsigned char yystos[] = { - 0, 41, 42, 0, 6, 7, 8, 9, 10, 11, - 12, 13, 14, 16, 17, 18, 19, 20, 21, 22, - 23, 24, 25, 26, 27, 28, 29, 36, 37, 43, - 44, 45, 48, 49, 47, 46, 30, 39, 5, 3, - 4, 35, 60, 62, 31, 31, 31, 3, 63, 63, - 35, 44, 54, 55, 56, 32, 65, 30, 50, 30, - 35, 52, 53, 53, 51, 60, 63, 63, 63, 63, - 33, 32, 36, 55, 64, 51, 5, 62, 52, 60, - 57, 38, 62, 58, 59, 32, 34, 15, 39, 60, - 61, 59, 60 + 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, 40, 49, 61, 62, 63, + 37, 72, 35, 57, 35, 40, 59, 60, 60, 58, + 67, 44, 44, 70, 70, 70, 70, 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 }; -#endif #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) # define YYSIZE_T __SIZE_TYPE__ @@ -684,23 +691,11 @@ while (0) /* YYLEX -- calling `yylex' with the right arguments. */ -#if YYPURE -# if YYLSP_NEEDED -# ifdef YYLEX_PARAM -# define YYLEX yylex (&yylval, &yylloc, YYLEX_PARAM) -# else -# define YYLEX yylex (&yylval, &yylloc) -# endif -# else /* !YYLSP_NEEDED */ -# ifdef YYLEX_PARAM -# define YYLEX yylex (&yylval, YYLEX_PARAM) -# else -# define YYLEX yylex (&yylval) -# endif -# endif /* !YYLSP_NEEDED */ -#else /* !YYPURE */ -# define YYLEX yylex () -#endif /* !YYPURE */ +#ifdef YYLEX_PARAM +# define YYLEX yylex (&yylval, &yylloc, YYLEX_PARAM) +#else +# define YYLEX yylex (&yylval, &yylloc) +#endif /* Enable debugging if requested. */ #if YYDEBUG @@ -715,11 +710,17 @@ do { \ if (yydebug) \ YYFPRINTF Args; \ } while (0) +# define YYDSYMPRINT(Args) \ +do { \ + if (yydebug) \ + yysymprint Args; \ +} while (0) /* Nonzero means print parse trace. It is left uninitialized so that multiple parsers can coexist. */ int yydebug; #else /* !YYDEBUG */ # define YYDPRINTF(Args) +# define YYDSYMPRINT(Args) #endif /* !YYDEBUG */ /* YYINITDEPTH -- initial size of the parser's stacks. */ @@ -827,44 +828,32 @@ int yyparse (void); # endif #endif -/* YY_DECL_VARIABLES -- depending whether we use a pure parser, - variables are global, or local to YYPARSE. */ - -#define YY_DECL_NON_LSP_VARIABLES \ -/* The lookahead symbol. */ \ -int yychar; \ - \ -/* The semantic value of the lookahead symbol. */ \ -YYSTYPE yylval; \ - \ -/* Number of parse errors so far. */ \ -int yynerrs; - -#if YYLSP_NEEDED -# define YY_DECL_VARIABLES \ -YY_DECL_NON_LSP_VARIABLES \ - \ -/* Location data for the lookahead symbol. */ \ -YYLTYPE yylloc; -#else -# define YY_DECL_VARIABLES \ -YY_DECL_NON_LSP_VARIABLES +#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 -/* If nonreentrant, generate the variables here. */ -#if !YYPURE -YY_DECL_VARIABLES -#endif /* !YYPURE */ + int yyparse (YYPARSE_PARAM_ARG) YYPARSE_PARAM_DECL { - /* If reentrant, generate the variables here. */ -#if YYPURE - YY_DECL_VARIABLES -#endif /* !YYPURE */ + /* The lookahead symbol. */ +int yychar; + +/* The semantic value of the lookahead symbol. */ +YYSTYPE yylval; + +/* Number of parse errors so far. */ +int yynerrs; +/* Location data for the lookahead symbol. */ +YYLTYPE yylloc; register int yystate; register int yyn; @@ -892,27 +881,19 @@ yyparse (YYPARSE_PARAM_ARG) YYSTYPE *yyvs = yyvsa; register YYSTYPE *yyvsp; -#if YYLSP_NEEDED /* The location stack. */ YYLTYPE yylsa[YYINITDEPTH]; YYLTYPE *yyls = yylsa; YYLTYPE *yylsp; -#endif -#if YYLSP_NEEDED -# define YYPOPSTACK (yyvsp--, yyssp--, yylsp--) -#else -# define YYPOPSTACK (yyvsp--, yyssp--) -#endif +#define YYPOPSTACK (yyvsp--, yyssp--, yylsp--) YYSIZE_T yystacksize = YYINITDEPTH; /* The variables used to return semantic value and location from the action routines. */ YYSTYPE yyval; -#if YYLSP_NEEDED YYLTYPE yyloc; -#endif /* When reducing, the number of symbols on the RHS of the reduced rule. */ @@ -932,9 +913,7 @@ yyparse (YYPARSE_PARAM_ARG) yyssp = yyss; yyvsp = yyvs; -#if YYLSP_NEEDED yylsp = yyls; -#endif goto yysetstate; /*------------------------------------------------------------. @@ -961,25 +940,18 @@ yyparse (YYPARSE_PARAM_ARG) memory. */ YYSTYPE *yyvs1 = yyvs; short *yyss1 = yyss; + YYLTYPE *yyls1 = yyls; /* Each stack pointer address is followed by the size of the - data in use in that stack, in bytes. */ -# if YYLSP_NEEDED - YYLTYPE *yyls1 = yyls; - /* This used to be a conditional around just the two extra args, - but that might be undefined if yyoverflow is a macro. */ + data in use in that stack, in bytes. This used to be a + conditional around just the two extra args, but that might + be undefined if yyoverflow is a macro. */ yyoverflow ("parser stack overflow", &yyss1, yysize * sizeof (*yyssp), &yyvs1, yysize * sizeof (*yyvsp), &yyls1, yysize * sizeof (*yylsp), &yystacksize); yyls = yyls1; -# else - yyoverflow ("parser stack overflow", - &yyss1, yysize * sizeof (*yyssp), - &yyvs1, yysize * sizeof (*yyvsp), - &yystacksize); -# endif yyss = yyss1; yyvs = yyvs1; } @@ -1002,9 +974,7 @@ yyparse (YYPARSE_PARAM_ARG) goto yyoverflowlab; YYSTACK_RELOCATE (yyss); YYSTACK_RELOCATE (yyvs); -# if YYLSP_NEEDED YYSTACK_RELOCATE (yyls); -# endif # undef YYSTACK_RELOCATE if (yyss1 != yyssa) YYSTACK_FREE (yyss1); @@ -1014,9 +984,7 @@ yyparse (YYPARSE_PARAM_ARG) yyssp = yyss + yysize - 1; yyvsp = yyvs + yysize - 1; -#if YYLSP_NEEDED yylsp = yyls + yysize - 1; -#endif YYDPRINTF ((stderr, "Stack size increased to %lu\n", (unsigned long int) yystacksize)); @@ -1068,21 +1036,11 @@ yybackup: { yychar1 = YYTRANSLATE (yychar); -#if YYDEBUG - /* We have to keep this `#if YYDEBUG', since we use variables - which are defined only if `YYDEBUG' is set. */ - if (yydebug) - { - YYFPRINTF (stderr, "Next token is %d (%s", - yychar, yytname[yychar1]); - /* Give the individual parser a way to print the precise - meaning of a token, for further debugging info. */ -# ifdef YYPRINT - YYPRINT (stderr, yychar, yylval); -# endif - YYFPRINTF (stderr, ")\n"); - } -#endif + /* We have to keep this `#if YYDEBUG', since we use variables + which are defined only if `YYDEBUG' is set. */ + YYDPRINTF ((stderr, "Next token is ")); + YYDSYMPRINT ((stderr, yychar1, yylval, yyloc)); + YYDPRINTF ((stderr, "\n")); } yyn += yychar1; @@ -1120,9 +1078,7 @@ yybackup: yychar = YYEMPTY; *++yyvsp = yylval; -#if YYLSP_NEEDED *++yylsp = yylloc; -#endif /* Count tokens shifted since error; after three, turn off error status. */ @@ -1160,10 +1116,8 @@ yyreduce: GCC warning that YYVAL may be used uninitialized. */ yyval = yyvsp[1-yylen]; -#if YYLSP_NEEDED /* Default location. */ YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen); -#endif #if YYDEBUG /* We have to keep this `#if YYDEBUG', since we use variables which @@ -1184,7 +1138,7 @@ yyreduce: switch (yyn) { case 2: -#line 154 "parse-gram.y" +#line 160 "parse-gram.y" { yycontrol->errcode = 0; epilogue_set (yyvsp[0].string, yylsp[0]); @@ -1192,94 +1146,99 @@ yyreduce: break; case 6: -#line 172 "parse-gram.y" +#line 178 "parse-gram.y" { prologue_augment (yyvsp[0].string, yylsp[0]); } break; case 7: -#line 173 "parse-gram.y" +#line 179 "parse-gram.y" { debug_flag = 1; } break; case 8: -#line 174 "parse-gram.y" +#line 180 "parse-gram.y" { muscle_insert (yyvsp[-1].string, yyvsp[0].string); } break; case 9: -#line 175 "parse-gram.y" +#line 181 "parse-gram.y" { defines_flag = 1; } break; case 10: -#line 176 "parse-gram.y" +#line 182 "parse-gram.y" { error_verbose = 1; } break; case 11: -#line 177 "parse-gram.y" +#line 183 "parse-gram.y" { expected_conflicts = yyvsp[0].integer; } break; case 12: -#line 178 "parse-gram.y" +#line 184 "parse-gram.y" { spec_file_prefix = yyvsp[0].string; } break; case 13: -#line 179 "parse-gram.y" +#line 185 "parse-gram.y" { locations_flag = 1; } break; case 14: -#line 180 "parse-gram.y" +#line 186 "parse-gram.y" { spec_name_prefix = yyvsp[0].string; } break; case 15: -#line 181 "parse-gram.y" +#line 187 "parse-gram.y" { no_lines_flag = 1; } break; case 16: -#line 182 "parse-gram.y" +#line 188 "parse-gram.y" { spec_outfile = yyvsp[0].string; } break; case 17: -#line 183 "parse-gram.y" +#line 189 "parse-gram.y" { pure_parser = 1; } break; case 18: -#line 184 "parse-gram.y" - { skeleton = yyvsp[0].string; } +#line 190 "parse-gram.y" + { glr_parser = 1; } break; case 19: -#line 185 "parse-gram.y" - { token_table_flag = 1; } +#line 191 "parse-gram.y" + { skeleton = yyvsp[0].string; } break; case 20: -#line 186 "parse-gram.y" - { report_flag = 1; } +#line 192 "parse-gram.y" + { token_table_flag = 1; } break; case 21: -#line 187 "parse-gram.y" - { yacc_flag = 1; } +#line 193 "parse-gram.y" + { report_flag = 1; } break; - case 24: + case 22: #line 194 "parse-gram.y" + { yacc_flag = 1; } + break; + + case 25: +#line 201 "parse-gram.y" { grammar_start_symbol_set (yyvsp[0].symbol, yylsp[0]); } break; - case 25: -#line 198 "parse-gram.y" + case 26: +#line 205 "parse-gram.y" { typed = 1; MUSCLE_INSERT_INT ("stype_line", yylsp[0].first_line); @@ -1287,230 +1246,272 @@ yyreduce: } break; - case 26: -#line 206 "parse-gram.y" + case 27: +#line 211 "parse-gram.y" + { current_braced_code = destructor_braced_code; } + break; + + case 28: +#line 213 "parse-gram.y" + { + symbol_list_t *list; + for (list = yyvsp[0].list; list; list = list->next) + symbol_destructor_set (list->sym, yyvsp[-1].string, yylsp[-1]); + symbol_list_free (yyvsp[0].list); + current_braced_code = action_braced_code; + } + break; + + case 29: +#line 221 "parse-gram.y" + { current_braced_code = printer_braced_code; } + break; + + case 30: +#line 223 "parse-gram.y" + { + symbol_list_t *list; + for (list = yyvsp[0].list; list; list = list->next) + symbol_printer_set (list->sym, yyvsp[-1].string, list->location); + symbol_list_free (yyvsp[0].list); + current_braced_code = action_braced_code; + } + break; + + case 31: +#line 233 "parse-gram.y" { current_class = nterm_sym; } break; - case 27: -#line 207 "parse-gram.y" + case 32: +#line 234 "parse-gram.y" { current_class = unknown_sym; current_type = NULL; } break; - case 28: -#line 211 "parse-gram.y" + case 33: +#line 238 "parse-gram.y" { current_class = token_sym; } break; - case 29: -#line 212 "parse-gram.y" + case 34: +#line 239 "parse-gram.y" { current_class = unknown_sym; current_type = NULL; } break; - case 30: -#line 217 "parse-gram.y" + case 35: +#line 244 "parse-gram.y" { symbol_list_t *list; for (list = yyvsp[0].list; list; list = list->next) - symbol_type_set (list->sym, list->location, yyvsp[-1].string); - LIST_FREE (symbol_list_t, yyvsp[0].list); + symbol_type_set (list->sym, yyvsp[-1].string, yylsp[-1]); + symbol_list_free (yyvsp[0].list); } break; - case 31: -#line 227 "parse-gram.y" + case 36: +#line 254 "parse-gram.y" { symbol_list_t *list; ++current_prec; for (list = yyvsp[0].list; list; list = list->next) { - symbol_type_set (list->sym, list->location, current_type); - symbol_precedence_set (list->sym, list->location, current_prec, yyvsp[-2].assoc); + symbol_type_set (list->sym, current_type, yylsp[-1]); + symbol_precedence_set (list->sym, current_prec, yyvsp[-2].assoc, yylsp[-2]); } - LIST_FREE (symbol_list_t, yyvsp[0].list); + symbol_list_free (yyvsp[0].list); current_type = NULL; } break; - case 32: -#line 241 "parse-gram.y" + case 37: +#line 268 "parse-gram.y" { yyval.assoc = left_assoc; } break; - case 33: -#line 242 "parse-gram.y" + case 38: +#line 269 "parse-gram.y" { yyval.assoc = right_assoc; } break; - case 34: -#line 243 "parse-gram.y" + case 39: +#line 270 "parse-gram.y" { yyval.assoc = non_assoc; } break; - case 35: -#line 247 "parse-gram.y" + case 40: +#line 274 "parse-gram.y" { current_type = NULL;} break; - case 36: -#line 248 "parse-gram.y" + case 41: +#line 275 "parse-gram.y" { current_type = yyvsp[0].string; } break; - case 37: -#line 254 "parse-gram.y" + case 42: +#line 281 "parse-gram.y" { yyval.list = symbol_list_new (yyvsp[0].symbol, yylsp[0]); } break; - case 38: -#line 255 "parse-gram.y" + case 43: +#line 282 "parse-gram.y" { yyval.list = symbol_list_prepend (yyvsp[-1].list, yyvsp[0].symbol, yylsp[0]); } break; - case 39: -#line 261 "parse-gram.y" + case 44: +#line 288 "parse-gram.y" { current_type = yyvsp[0].string; } break; - case 40: -#line 265 "parse-gram.y" + case 45: +#line 292 "parse-gram.y" { - symbol_class_set (yyvsp[0].symbol, current_class); - symbol_type_set (yyvsp[0].symbol, yylsp[0], current_type); + symbol_class_set (yyvsp[0].symbol, current_class, yylsp[0]); + symbol_type_set (yyvsp[0].symbol, current_type, yylsp[0]); } break; - case 41: -#line 270 "parse-gram.y" + case 46: +#line 297 "parse-gram.y" { - symbol_class_set (yyvsp[-1].symbol, current_class); - symbol_type_set (yyvsp[-1].symbol, yylsp[-1], current_type); - symbol_user_token_number_set (yyvsp[-1].symbol, yyvsp[0].integer); + symbol_class_set (yyvsp[-1].symbol, current_class, yylsp[-1]); + symbol_type_set (yyvsp[-1].symbol, current_type, yylsp[-1]); + symbol_user_token_number_set (yyvsp[-1].symbol, yyvsp[0].integer, yylsp[0]); } break; - case 42: -#line 276 "parse-gram.y" + case 47: +#line 303 "parse-gram.y" { - symbol_class_set (yyvsp[-1].symbol, current_class); - symbol_type_set (yyvsp[-1].symbol, yylsp[-1], current_type); + 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); } break; - case 43: -#line 282 "parse-gram.y" + case 48: +#line 309 "parse-gram.y" { - symbol_class_set (yyvsp[-2].symbol, current_class); - symbol_type_set (yyvsp[-2].symbol, yylsp[-2], current_type); - symbol_user_token_number_set (yyvsp[-2].symbol, yyvsp[-1].integer); + 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); } break; - case 44: -#line 293 "parse-gram.y" + case 49: +#line 320 "parse-gram.y" {;} break; - case 45: -#line 295 "parse-gram.y" + case 50: +#line 322 "parse-gram.y" {;} break; - case 50: -#line 317 "parse-gram.y" + case 55: +#line 344 "parse-gram.y" { current_lhs = yyvsp[-1].symbol; current_lhs_location = yylsp[-1]; } break; - case 51: -#line 318 "parse-gram.y" + case 56: +#line 345 "parse-gram.y" {;} break; - case 52: -#line 322 "parse-gram.y" + case 57: +#line 349 "parse-gram.y" { grammar_rule_end (yylsp[0]); } break; - case 53: -#line 323 "parse-gram.y" + case 58: +#line 350 "parse-gram.y" { grammar_rule_end (yylsp[0]); } break; - case 54: -#line 328 "parse-gram.y" + case 59: +#line 355 "parse-gram.y" { grammar_rule_begin (current_lhs, current_lhs_location); } break; - case 55: -#line 330 "parse-gram.y" + case 60: +#line 357 "parse-gram.y" { grammar_current_rule_symbol_append (yyvsp[0].symbol, yylsp[0]); } break; - case 56: -#line 332 "parse-gram.y" + case 61: +#line 359 "parse-gram.y" { grammar_current_rule_action_append (yyvsp[0].string, yylsp[0]); } break; - case 57: -#line 334 "parse-gram.y" - { grammar_current_rule_prec_set (yyvsp[0].symbol); } + case 62: +#line 361 "parse-gram.y" + { grammar_current_rule_prec_set (yyvsp[0].symbol, yylsp[0]); } break; - case 58: -#line 338 "parse-gram.y" + case 63: +#line 363 "parse-gram.y" + { grammar_current_rule_dprec_set (yyvsp[0].integer, yylsp[0]); } + break; + + case 64: +#line 365 "parse-gram.y" + { grammar_current_rule_merge_set (yyvsp[0].string, yylsp[0]); } + break; + + case 65: +#line 369 "parse-gram.y" { yyval.symbol = yyvsp[0].symbol; } break; - case 59: -#line 339 "parse-gram.y" + case 66: +#line 370 "parse-gram.y" { yyval.symbol = yyvsp[0].symbol; } break; - case 60: -#line 340 "parse-gram.y" + case 67: +#line 371 "parse-gram.y" { yyval.symbol = getsym (yyvsp[0].string, yylsp[0]); } break; - case 61: -#line 345 "parse-gram.y" + case 68: +#line 376 "parse-gram.y" { yyval.string = yyvsp[0].string; } break; - case 62: -#line 351 "parse-gram.y" + case 69: +#line 382 "parse-gram.y" { yyval.symbol = getsym (yyvsp[0].string, yylsp[0]); - symbol_class_set (yyval.symbol, token_sym); + symbol_class_set (yyval.symbol, token_sym, yylsp[0]); } break; - case 63: -#line 360 "parse-gram.y" + case 70: +#line 391 "parse-gram.y" { yyval.string = yyvsp[0].string + 1; yyval.string[strlen (yyval.string) - 1] = '\0'; } break; - case 64: -#line 368 "parse-gram.y" + case 71: +#line 399 "parse-gram.y" { yyval.string = xstrdup (""); } break; - case 65: -#line 372 "parse-gram.y" + case 72: +#line 403 "parse-gram.y" { yyval.string = yyvsp[0].string; } @@ -1519,14 +1520,12 @@ yyreduce: } -/* Line 1012 of /usr/local/share/bison/bison.simple. */ -#line 1524 "parse-gram.c" +/* Line 1040 of /home/cs/hilfingr/work/grammars/glr2/install/share/bison/yacc.c. */ +#line 1525 "parse-gram.c" yyvsp -= yylen; yyssp -= yylen; -#if YYLSP_NEEDED yylsp -= yylen; -#endif #if YYDEBUG if (yydebug) @@ -1540,9 +1539,7 @@ yyreduce: #endif *++yyvsp = yyval; -#if YYLSP_NEEDED *++yylsp = yyloc; -#endif /* Now `shift' the result of the reduction. Determine what state that goes to, based on the state we popped back to and the rule @@ -1630,9 +1627,26 @@ yyerrlab1: /* Return failure if at end of input. */ if (yychar == YYEOF) - YYABORT; + { + /* Pop the error token. */ + YYPOPSTACK; + /* Pop the rest of the stack. */ + while (yyssp > yyss) + { + YYDPRINTF ((stderr, "Error: popping ")); + YYDSYMPRINT ((stderr, + yystos[*yyssp], + *yyvsp, *yylsp)); + YYDPRINTF ((stderr, "\n")); + yydestruct (yystos[*yyssp], *yyvsp, *yylsp); + YYPOPSTACK; + } + YYABORT; + } + YYDPRINTF ((stderr, "Discarding token %d (%s).\n", yychar, yytname[yychar1])); + yydestruct (yychar1, yylval, yylloc); yychar = YYEMPTY; } @@ -1659,31 +1673,15 @@ yyerrlab1: if (yyssp == yyss) YYABORT; -#if YYDEBUG - if (yydebug) - { - if (yystos[yystate] < YYNTOKENS) - { - YYFPRINTF (stderr, "Error: popping token %d (%s", - yytoknum[yystos[yystate]], yytname[yystos[yystate]]); -# ifdef YYPRINT - YYPRINT (stderr, yytoknum[yystos[yystate]], *yyvsp); -# endif - YYFPRINTF (stderr, ")\n"); - } - else - { - YYFPRINTF (stderr, "Error: popping nonterminal (%s)\n", - yytname[yystos[yystate]]); - } - } -#endif + YYDPRINTF ((stderr, "Error: popping ")); + YYDSYMPRINT ((stderr, + yystos[*yyssp], *yyvsp, *yylsp)); + YYDPRINTF ((stderr, "\n")); + yydestruct (yystos[yystate], *yyvsp, *yylsp); yyvsp--; yystate = *--yyssp; -#if YYLSP_NEEDED yylsp--; -#endif #if YYDEBUG if (yydebug) @@ -1703,9 +1701,7 @@ yyerrlab1: YYDPRINTF ((stderr, "Shifting error token, ")); *++yyvsp = yylval; -#if YYLSP_NEEDED *++yylsp = yylloc; -#endif yystate = yyn; goto yynewstate; @@ -1725,13 +1721,15 @@ yyabortlab: yyresult = 1; goto yyreturn; -/*---------------------------------------------. -| yyoverflowab -- parser overflow comes here. | -`---------------------------------------------*/ +#ifndef yyoverflow +/*----------------------------------------------. +| yyoverflowlab -- parser overflow comes here. | +`----------------------------------------------*/ yyoverflowlab: yyerror ("parser stack overflow"); yyresult = 2; /* Fall through. */ +#endif yyreturn: #ifndef yyoverflow @@ -1741,7 +1739,52 @@ yyreturn: return yyresult; } -#line 381 "parse-gram.y" + +/*-----------------------------------------------. +| Release the memory associated to this symbol. | +`-----------------------------------------------*/ + +static void +yydestruct (int yytype, + YYSTYPE yyvalue, YYLTYPE yylocation) +{ + switch (yytype) + { + default: + break; + } +} + + +#if YYDEBUG +/*-----------------------------. +| Print this symbol on YYOUT. | +`-----------------------------*/ + +static void +yysymprint (FILE* yyout, int yytype, + YYSTYPE yyvalue, YYLTYPE 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 412 "parse-gram.y" /*------------------------------------------------------------------. | When debugging the parser, display tokens' locations and values. | @@ -1749,11 +1792,9 @@ yyreturn: static void yyprint (FILE *file, - const location_t *loc, int type, const yystype *value) + int type, const yystype *value) { - fputs (" (", file); - LOCATION_PRINT (file, *loc); - fputs (")", file); + fputc (' ', file); switch (type) { case CHARACTER: