X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/9280d3ef893b90b36c89fa7737512f2d640e41d9..b63473552d7014a4868eb32bf90e4f4814b9be39:/src/parse-gram.c diff --git a/src/parse-gram.c b/src/parse-gram.c index d2f1e84a..11b6e22e 100644 --- a/src/parse-gram.c +++ b/src/parse-gram.c @@ -1,9 +1,7 @@ -/* 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.49b. */ -/* Skeleton output parser for Bison, - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software - Foundation, Inc. +/* Skeleton parser for Yacc-like parsing with Bison, + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 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 @@ -25,10 +23,8 @@ This special exception was added by the Free Software Foundation in version 1.24 of Bison. */ -/* This is the parser code that is written into each bison parser when - the %semantic_parser declaration is not specified in the grammar. - It was written by Richard Stallman by simplifying the original so - called ``semantic'' parser. */ +/* Written by Richard Stallman by simplifying the original so called + ``semantic'' parser. */ /* All symbols defined below should begin with yy or YY, to avoid infringing on user name space. This should be done even for local @@ -55,15 +51,13 @@ #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" #include "system.h" +#include "complain.h" #include "muscle_tab.h" #include "files.h" #include "getargs.h" @@ -97,24 +91,21 @@ 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) -/* 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; 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; @@ -133,37 +124,41 @@ braced_code_t current_braced_code = action_braced_code; PERCENT_NTERM = 262, PERCENT_TYPE = 263, PERCENT_DESTRUCTOR = 264, - PERCENT_UNION = 265, - PERCENT_LEFT = 266, - PERCENT_RIGHT = 267, - PERCENT_NONASSOC = 268, - PERCENT_EXPECT = 269, - PERCENT_START = 270, - PERCENT_PREC = 271, - PERCENT_VERBOSE = 272, - PERCENT_ERROR_VERBOSE = 273, - PERCENT_OUTPUT = 274, - PERCENT_FILE_PREFIX = 275, - PERCENT_NAME_PREFIX = 276, - PERCENT_DEFINE = 277, - PERCENT_PURE_PARSER = 278, - PERCENT_DEFINES = 279, - PERCENT_YACC = 280, - PERCENT_DEBUG = 281, - PERCENT_LOCATIONS = 282, - PERCENT_NO_LINES = 283, - PERCENT_SKELETON = 284, - PERCENT_TOKEN_TABLE = 285, - TYPE = 286, - EQUAL = 287, - SEMICOLON = 288, - COLON = 289, - PIPE = 290, - ID = 291, - PERCENT_PERCENT = 292, - PROLOGUE = 293, - EPILOGUE = 294, - BRACED_CODE = 295 + 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. */ @@ -177,37 +172,41 @@ braced_code_t current_braced_code = action_braced_code; #define PERCENT_NTERM 262 #define PERCENT_TYPE 263 #define PERCENT_DESTRUCTOR 264 -#define PERCENT_UNION 265 -#define PERCENT_LEFT 266 -#define PERCENT_RIGHT 267 -#define PERCENT_NONASSOC 268 -#define PERCENT_EXPECT 269 -#define PERCENT_START 270 -#define PERCENT_PREC 271 -#define PERCENT_VERBOSE 272 -#define PERCENT_ERROR_VERBOSE 273 -#define PERCENT_OUTPUT 274 -#define PERCENT_FILE_PREFIX 275 -#define PERCENT_NAME_PREFIX 276 -#define PERCENT_DEFINE 277 -#define PERCENT_PURE_PARSER 278 -#define PERCENT_DEFINES 279 -#define PERCENT_YACC 280 -#define PERCENT_DEBUG 281 -#define PERCENT_LOCATIONS 282 -#define PERCENT_NO_LINES 283 -#define PERCENT_SKELETON 284 -#define PERCENT_TOKEN_TABLE 285 -#define TYPE 286 -#define EQUAL 287 -#define SEMICOLON 288 -#define COLON 289 -#define PIPE 290 -#define ID 291 -#define PERCENT_PERCENT 292 -#define PROLOGUE 293 -#define EPILOGUE 294 -#define BRACED_CODE 295 +#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 @@ -226,16 +225,16 @@ braced_code_t current_braced_code = action_braced_code; #endif #ifndef YYSTYPE -#line 91 "parse-gram.y" +#line 89 "parse-gram.y" typedef union { symbol_t *symbol; symbol_list_t *list; int integer; char *string; - associativity assoc; + assoc_t assoc; } yystype; -/* Line 199 of /usr/local/share/bison/bison.simple. */ -#line 239 "parse-gram.c" +/* Line 188 of /tmp/prefix/share/bison/yacc.c. */ +#line 238 "parse-gram.c" # define YYSTYPE yystype # define YYSTYPE_IS_TRIVIAL 1 #endif @@ -255,8 +254,8 @@ typedef struct yyltype /* Copy the second part of user declarations. */ -/* Line 219 of /usr/local/share/bison/bison.simple. */ -#line 260 "parse-gram.c" +/* Line 208 of /tmp/prefix/share/bison/yacc.c. */ +#line 259 "parse-gram.c" #if ! defined (yyoverflow) || YYERROR_VERBOSE @@ -299,9 +298,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. */ @@ -309,15 +306,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. */ @@ -357,21 +348,20 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 3 -#define YYFLAG -32768 -#define YYLAST 115 +#define YYLAST 127 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 41 +#define YYNTOKENS 45 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 27 +#define YYNNTS 28 /* YYNRULES -- Number of rules. */ -#define YYNRULES 69 +#define YYNRULES 75 /* YYNRULES -- Number of states. */ -#define YYNSTATES 97 +#define YYNSTATES 108 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 295 +#define YYMAXUTOK 299 #define YYTRANSLATE(X) \ ((unsigned)(X) <= YYMAXUTOK ? yytranslate[X] : YYUNDEFTOK) @@ -408,7 +398,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, 40 + 35, 36, 37, 38, 39, 40, 41, 42, 43, 44 }; #if YYDEBUG @@ -417,47 +407,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, 73, 74, - 78, 79, 83, 87, 91, 93, 95, 97, 98, 100, - 102, 105, 107, 109, 112, 115, 119, 121, 124, 126, - 129, 131, 134, 135, 141, 143, 147, 148, 151, 154, - 158, 160, 162, 164, 166, 168, 170, 171, 174, 175 + 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 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const signed char yyrhs[] = { - 42, 0, -1, 43, 37, 56, 66, -1, -1, 43, - 44, 67, -1, 45, -1, 38, -1, 26, -1, 22, - 65, 65, -1, 24, -1, 18, -1, 14, 5, -1, - 20, 32, 65, -1, 27, -1, 21, 32, 65, -1, - 28, -1, 19, 32, 65, -1, 23, -1, 29, 65, - -1, 30, -1, 17, -1, 25, -1, 50, -1, 47, - -1, 15, 62, -1, 10, 40, -1, -1, 9, 46, - 40, 53, -1, -1, 7, 48, 55, -1, -1, 6, - 49, 55, -1, 8, 31, 53, -1, 51, 52, 53, - -1, 11, -1, 12, -1, 13, -1, -1, 31, -1, - 62, -1, 53, 62, -1, 31, -1, 36, -1, 36, - 5, -1, 36, 64, -1, 36, 5, 64, -1, 54, - -1, 55, 54, -1, 57, -1, 56, 57, -1, 58, - -1, 45, 33, -1, -1, 36, 34, 59, 60, 33, - -1, 61, -1, 60, 35, 61, -1, -1, 61, 62, - -1, 61, 63, -1, 61, 16, 62, -1, 36, -1, - 64, -1, 4, -1, 40, -1, 3, -1, 3, -1, - -1, 37, 39, -1, -1, 33, -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, 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, 154, 154, 167, 169, 172, 174, 175, 176, 177, - 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, - 188, 189, 192, 194, 195, 199, 205, 205, 217, 217, - 223, 223, 228, 237, 252, 254, 255, 258, 260, 265, - 267, 271, 276, 281, 287, 293, 303, 306, 315, 317, - 323, 325, 328, 328, 333, 335, 338, 341, 343, 345, - 349, 351, 352, 355, 361, 370, 378, 383, 389, 391 + 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 }; #endif @@ -466,160 +460,169 @@ 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 string\"", "error", "$undefined", "STRING", "CHARACTER", "INT", "\"%token\"", "\"%nterm\"", "\"%type\"", "\"%destructor\"", - "\"%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", "@1", - "symbol_declaration", "@2", "@3", "precedence_declaration", - "precedence_declarator", "type.opt", "symbols.1", "symbol_def", - "symbol_defs.1", "grammar", "rules_or_grammar_declaration", "rules", - "@4", "rhses.1", "rhs", "symbol", "action", "string_as_id", - "string_content", "epilogue.opt", "semi_colon.opt", 0 + "\"%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", + "$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", "epilogue.opt", + "semi_colon.opt", 0 }; #endif /* 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, -1 + 295, 296, 297, 298, 299 }; /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const unsigned char yyr1[] = { - 0, 41, 42, 43, 43, 44, 44, 44, 44, 44, - 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, - 44, 44, 45, 45, 45, 45, 46, 45, 48, 47, - 49, 47, 47, 50, 51, 51, 51, 52, 52, 53, - 53, 54, 54, 54, 54, 54, 55, 55, 56, 56, - 57, 57, 59, 58, 60, 60, 61, 61, 61, 61, - 62, 62, 62, 63, 64, 65, 66, 66, 67, 67 + 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 }; /* 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, 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, - 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, 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 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, 30, 28, 0, 26, 0, 34, - 35, 36, 0, 0, 20, 10, 0, 0, 0, 0, - 17, 9, 21, 7, 13, 15, 0, 19, 0, 6, - 68, 5, 23, 22, 37, 0, 0, 0, 0, 25, - 11, 64, 62, 60, 24, 61, 0, 0, 0, 65, - 0, 18, 0, 0, 66, 48, 50, 69, 4, 38, - 0, 41, 42, 46, 31, 29, 32, 39, 0, 16, - 12, 14, 8, 52, 51, 0, 49, 2, 33, 43, - 44, 47, 40, 27, 56, 67, 45, 0, 54, 53, - 56, 0, 63, 57, 58, 55, 59 + 3, 0, 0, 1, 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 }; -/* YYPGOTO[NTERM-NUM]. */ -static const short yydefgoto[] = +/* YYDEFGOTO[NTERM-NUM]. */ +static const signed char yydefgoto[] = { - -1, 1, 2, 30, 53, 38, 32, 36, 35, 33, - 34, 60, 66, 63, 64, 54, 55, 56, 84, 87, - 88, 67, 94, 45, 50, 77, 58 + -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 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -static const short yypact[] = +#define YYPACT_NINF -61 +static const signed char yypact[] = { - -32768, 25, 77,-32768,-32768,-32768, -20,-32768, -31,-32768, - -32768,-32768, 35, 0,-32768,-32768, 12, 15, 16, 46, - -32768,-32768,-32768,-32768,-32768,-32768, 46,-32768, 20,-32768, - 17,-32768,-32768,-32768, 21, -24, -24, 0, 14,-32768, - -32768,-32768,-32768,-32768,-32768,-32768, 46, 46, 46,-32768, - 46,-32768, 26, 18, 9,-32768,-32768,-32768,-32768,-32768, - 0,-32768, 5,-32768, -24, -24, 0,-32768, 0,-32768, - -32768,-32768,-32768,-32768,-32768, 23,-32768,-32768, 0, 52, - -32768,-32768,-32768, 0,-32768,-32768,-32768, 6, -2,-32768, - -32768, 0,-32768,-32768,-32768, -2,-32768 + -61, 35, 85, -61, -61, -61, 2, -61, -61, -5, + -61, -61, -61, 31, 0, -61, -61, 18, 21, 22, + 59, -61, -61, -61, -61, -61, -61, -61, 59, -61, + 37, -61, 26, -61, -61, -61, 29, -19, -19, 0, + 23, 24, -61, -61, -61, -61, -61, -61, -61, 59, + 59, 59, -61, 59, -61, 28, 33, 32, 1, -61, + -61, -61, -61, -61, 0, -61, 17, -61, -19, -19, + 0, -61, 0, 0, -61, -61, -61, -61, -61, -61, + -61, 30, -61, -61, 0, 63, -61, -61, -61, 0, + 0, -61, -61, -61, -8, 15, -61, -61, 0, 67, + 39, -61, -61, -61, 15, -61, -61, -61 }; /* YYPGOTO[NTERM-NUM]. */ -static const short yypgoto[] = +static const signed char yypgoto[] = { - -32768,-32768,-32768,-32768, 61,-32768,-32768,-32768,-32768,-32768, - -32768,-32768, -55, -22, 28,-32768, 13,-32768,-32768,-32768, - -21, -13,-32768, -56, 11,-32768,-32768 + -61, -61, -61, -61, 76, -61, -61, -61, -61, -61, + -61, -61, -61, -12, -45, 41, -61, 25, -61, -61, + -61, -17, -14, -61, -60, -23, -61, -61 }; /* 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[] = +#define YYTABLE_NINF -62 +static const signed char yytable[] = { - 44, 41, 42, 41, 42, 78, 80, 61, 41, 39, - 79, 37, 62, 83, 91, 4, 5, 6, 7, 8, - 9, 10, 11, 86, 13, 3, 4, 5, 6, 7, - 8, 9, 10, 11, 43, 13, 43, 51, 92, 89, - 40, 90, 81, 81, 46, 52, 75, 47, 48, 49, - 57, 74, 59, 82, 68, 41, 52, 69, 70, 71, - 73, 72, 85, 31, 65, 82, 0, 76, 0, 95, - 82, 0, 0, 0, 0, 93, 0, 0, 96, 0, - 0, 0, 93, 4, 5, 6, 7, 8, 9, 10, - 11, 12, 13, 0, 14, 15, 16, 17, 18, 19, - 20, 21, 22, 23, 24, 25, 26, 27, 0, 0, - 0, 0, 0, 0, 28, 29 + 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 }; -static const short yycheck[] = +static const signed char yycheck[] = { - 13, 3, 4, 3, 4, 60, 62, 31, 3, 40, - 5, 31, 36, 68, 16, 6, 7, 8, 9, 10, - 11, 12, 13, 79, 15, 0, 6, 7, 8, 9, - 10, 11, 12, 13, 36, 15, 36, 26, 40, 33, - 5, 35, 64, 65, 32, 36, 37, 32, 32, 3, - 33, 33, 31, 66, 40, 3, 36, 46, 47, 48, - 34, 50, 39, 2, 36, 78, -1, 54, -1, 90, - 83, -1, -1, -1, -1, 88, -1, -1, 91, -1, - -1, -1, 95, 6, 7, 8, 9, 10, 11, 12, - 13, 14, 15, -1, 17, 18, 19, 20, 21, 22, - 23, 24, 25, 26, 27, 28, 29, 30, -1, -1, - -1, -1, -1, -1, 37, 38 + 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 }; -#if YYDEBUG /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const unsigned char yystos[] = { - 0, 42, 43, 0, 6, 7, 8, 9, 10, 11, - 12, 13, 14, 15, 17, 18, 19, 20, 21, 22, - 23, 24, 25, 26, 27, 28, 29, 30, 37, 38, - 44, 45, 47, 50, 51, 49, 48, 31, 46, 40, - 5, 3, 4, 36, 62, 64, 32, 32, 32, 3, - 65, 65, 36, 45, 56, 57, 58, 33, 67, 31, - 52, 31, 36, 54, 55, 55, 53, 62, 40, 65, - 65, 65, 65, 34, 33, 37, 57, 66, 53, 5, - 64, 54, 62, 53, 59, 39, 64, 60, 61, 33, - 35, 16, 40, 62, 63, 61, 62 + 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 }; -#endif #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) # define YYSIZE_T __SIZE_TYPE__ @@ -687,23 +690,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 @@ -718,11 +709,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. */ @@ -802,6 +799,145 @@ yystpcpy (yydest, yysrc) +#if YYDEBUG +/*-----------------------------. +| Print this symbol on YYOUT. | +`-----------------------------*/ + +static void +#if defined (__STDC__) || defined (__cplusplus) +yysymprint (FILE* yyout, int yytype, YYSTYPE yyvalue, YYLTYPE yylocation) +#else +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. */ + + +/*----------------------------------------------------------. +| yyreport_parse_error -- report a parse error in YYSTATE. | +`----------------------------------------------------------*/ + +static void +#if defined (__STDC__) || defined (__cplusplus) +yyreport_parse_error (int yystate, int yychar, YYSTYPE yyvalue, YYLTYPE yylloc) +#else +yyreport_parse_error (yystate, yychar, yyvalue, yylloc) + int yystate; + int yychar; + YYSTYPE yyvalue; + YYLTYPE yylloc; +#endif +{ +#if YYERROR_VERBOSE + int yyn = yypact[yystate]; + + if (YYPACT_NINF < yyn && yyn < YYLAST) + { + YYSIZE_T yysize = 0; + int yytype = YYTRANSLATE (yychar); + char *yymsg; + int yyx, yycount; + + 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++) + if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) + yysize += yystrlen (yytname[yyx]) + 15, yycount++; + yysize += yystrlen ("parse error, unexpected ") + 1; + yysize += yystrlen (yytname[yytype]); + yymsg = (char *) YYSTACK_ALLOC (yysize); + if (yymsg != 0) + { + char *yyp = yystpcpy (yymsg, "parse error, unexpected "); + yyp = yystpcpy (yyp, yytname[yytype]); + + if (yycount < 5) + { + yycount = 0; + for (yyx = yyn < 0 ? -yyn : 0; + yyx < (int) (sizeof (yytname) / sizeof (char *)); + yyx++) + if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) + { + const char *yyq = ! yycount ? ", expecting " : " or "; + yyp = yystpcpy (yyp, yyq); + yyp = yystpcpy (yyp, yytname[yyx]); + yycount++; + } + } + yyerror (yymsg); + YYSTACK_FREE (yymsg); + } + else + yyerror ("parse error; also virtual memory exhausted"); + } + else +#endif /* YYERROR_VERBOSE */ + yyerror ("parse error"); + + /* Pacify ``unused variable'' warnings. */ + (void) yystate; + (void) yychar; + (void) yyvalue; + (void) yylloc; +} + + +/*-----------------------------------------------. +| Release the memory associated to this symbol. | +`-----------------------------------------------*/ + +static void +#if defined (__STDC__) || defined (__cplusplus) +yydestruct (int yytype, YYSTYPE yyvalue, YYLTYPE yylocation) +#else +yydestruct (yytype, yyvalue, yylocation) + int yytype; + YYSTYPE yyvalue; + YYLTYPE yylocation; +#endif +{ + /* Pacify ``unused variable'' warnings. */ + (void) yyvalue; + (void) yylocation; + + switch (yytype) + { + default: + break; + } +} + + + /* 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. @@ -830,44 +966,23 @@ 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 -#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; @@ -895,27 +1010,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. */ @@ -935,9 +1042,7 @@ yyparse (YYPARSE_PARAM_ARG) yyssp = yyss; yyvsp = yyvs; -#if YYLSP_NEEDED yylsp = yyls; -#endif goto yysetstate; /*------------------------------------------------------------. @@ -964,25 +1069,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; } @@ -1005,9 +1103,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); @@ -1017,9 +1113,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)); @@ -1044,7 +1138,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. */ @@ -1071,25 +1165,15 @@ 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; - if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1) + if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yychar1) goto yydefault; yyn = yytable[yyn]; @@ -1103,7 +1187,7 @@ yybackup: if (yyn < 0) { - if (yyn == YYFLAG) + if (yyn == YYTABLE_NINF) goto yyerrlab; yyn = -yyn; goto yyreduce; @@ -1123,9 +1207,7 @@ yybackup: yychar = YYEMPTY; *++yyvsp = yylval; -#if YYLSP_NEEDED *++yylsp = yylloc; -#endif /* Count tokens shifted since error; after three, turn off error status. */ @@ -1156,17 +1238,15 @@ 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. */ 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 @@ -1187,7 +1267,7 @@ yyreduce: switch (yyn) { case 2: -#line 156 "parse-gram.y" +#line 161 "parse-gram.y" { yycontrol->errcode = 0; epilogue_set (yyvsp[0].string, yylsp[0]); @@ -1195,94 +1275,99 @@ yyreduce: break; case 6: -#line 174 "parse-gram.y" +#line 179 "parse-gram.y" { prologue_augment (yyvsp[0].string, yylsp[0]); } break; case 7: -#line 175 "parse-gram.y" +#line 180 "parse-gram.y" { debug_flag = 1; } break; case 8: -#line 176 "parse-gram.y" +#line 181 "parse-gram.y" { muscle_insert (yyvsp[-1].string, yyvsp[0].string); } break; case 9: -#line 177 "parse-gram.y" +#line 182 "parse-gram.y" { defines_flag = 1; } break; case 10: -#line 178 "parse-gram.y" +#line 183 "parse-gram.y" { error_verbose = 1; } break; case 11: -#line 179 "parse-gram.y" +#line 184 "parse-gram.y" { expected_conflicts = yyvsp[0].integer; } break; case 12: -#line 180 "parse-gram.y" +#line 185 "parse-gram.y" { spec_file_prefix = yyvsp[0].string; } break; case 13: -#line 181 "parse-gram.y" +#line 186 "parse-gram.y" { locations_flag = 1; } break; case 14: -#line 182 "parse-gram.y" +#line 187 "parse-gram.y" { spec_name_prefix = yyvsp[0].string; } break; case 15: -#line 183 "parse-gram.y" +#line 188 "parse-gram.y" { no_lines_flag = 1; } break; case 16: -#line 184 "parse-gram.y" +#line 189 "parse-gram.y" { spec_outfile = yyvsp[0].string; } break; case 17: -#line 185 "parse-gram.y" +#line 190 "parse-gram.y" { pure_parser = 1; } break; case 18: -#line 186 "parse-gram.y" - { skeleton = yyvsp[0].string; } +#line 191 "parse-gram.y" + { glr_parser = 1; } break; case 19: -#line 187 "parse-gram.y" - { token_table_flag = 1; } +#line 192 "parse-gram.y" + { skeleton = yyvsp[0].string; } break; case 20: -#line 188 "parse-gram.y" - { report_flag = 1; } +#line 193 "parse-gram.y" + { token_table_flag = 1; } break; case 21: -#line 189 "parse-gram.y" +#line 194 "parse-gram.y" + { report_flag = 1; } + break; + + case 22: +#line 195 "parse-gram.y" { yacc_flag = 1; } break; - case 24: -#line 196 "parse-gram.y" + case 25: +#line 202 "parse-gram.y" { grammar_start_symbol_set (yyvsp[0].symbol, yylsp[0]); } break; - case 25: -#line 200 "parse-gram.y" + case 26: +#line 206 "parse-gram.y" { typed = 1; MUSCLE_INSERT_INT ("stype_line", yylsp[0].first_line); @@ -1290,246 +1375,287 @@ yyreduce: } break; - case 26: -#line 206 "parse-gram.y" + case 27: +#line 212 "parse-gram.y" { current_braced_code = destructor_braced_code; } break; - case 27: -#line 208 "parse-gram.y" + case 28: +#line 214 "parse-gram.y" { symbol_list_t *list; for (list = yyvsp[0].list; list; list = list->next) - symbol_destructor_set (list->sym, list->location, yyvsp[-1].string); + symbol_destructor_set (list->sym, yyvsp[-1].string, yylsp[-1]); symbol_list_free (yyvsp[0].list); current_braced_code = action_braced_code; } break; - case 28: -#line 218 "parse-gram.y" + case 29: +#line 222 "parse-gram.y" + { current_braced_code = printer_braced_code; } + break; + + case 30: +#line 224 "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 234 "parse-gram.y" { current_class = nterm_sym; } break; - case 29: -#line 219 "parse-gram.y" + case 32: +#line 235 "parse-gram.y" { current_class = unknown_sym; current_type = NULL; } break; - case 30: -#line 223 "parse-gram.y" + case 33: +#line 239 "parse-gram.y" { current_class = token_sym; } break; - case 31: -#line 224 "parse-gram.y" + case 34: +#line 240 "parse-gram.y" { current_class = unknown_sym; current_type = NULL; } break; - case 32: -#line 229 "parse-gram.y" + case 35: +#line 245 "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); + symbol_type_set (list->sym, yyvsp[-1].string, yylsp[-1]); symbol_list_free (yyvsp[0].list); } break; - case 33: -#line 239 "parse-gram.y" + case 36: +#line 255 "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]); } symbol_list_free (yyvsp[0].list); current_type = NULL; } break; - case 34: -#line 253 "parse-gram.y" + case 37: +#line 269 "parse-gram.y" { yyval.assoc = left_assoc; } break; - case 35: -#line 254 "parse-gram.y" + case 38: +#line 270 "parse-gram.y" { yyval.assoc = right_assoc; } break; - case 36: -#line 255 "parse-gram.y" + case 39: +#line 271 "parse-gram.y" { yyval.assoc = non_assoc; } break; - case 37: -#line 259 "parse-gram.y" + case 40: +#line 275 "parse-gram.y" { current_type = NULL;} break; - case 38: -#line 260 "parse-gram.y" + case 41: +#line 276 "parse-gram.y" { current_type = yyvsp[0].string; } break; - case 39: -#line 266 "parse-gram.y" + case 42: +#line 282 "parse-gram.y" { yyval.list = symbol_list_new (yyvsp[0].symbol, yylsp[0]); } break; - case 40: -#line 267 "parse-gram.y" + case 43: +#line 283 "parse-gram.y" { yyval.list = symbol_list_prepend (yyvsp[-1].list, yyvsp[0].symbol, yylsp[0]); } break; - case 41: -#line 273 "parse-gram.y" + case 44: +#line 289 "parse-gram.y" { current_type = yyvsp[0].string; } break; - case 42: -#line 277 "parse-gram.y" + case 45: +#line 293 "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 43: -#line 282 "parse-gram.y" + case 46: +#line 298 "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 44: -#line 288 "parse-gram.y" + case 47: +#line 304 "parse-gram.y" { - symbol_class_set (yyvsp[-1].symbol, current_class); - symbol_type_set (yyvsp[-1].symbol, yylsp[-1], current_type); - symbol_make_alias (yyvsp[-1].symbol, yyvsp[0].symbol); + 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, yyloc); } break; - case 45: -#line 294 "parse-gram.y" + case 48: +#line 310 "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_make_alias (yyvsp[-2].symbol, yyvsp[0].symbol); + 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, yyloc); } break; - case 46: -#line 305 "parse-gram.y" + case 49: +#line 321 "parse-gram.y" {;} break; - case 47: -#line 307 "parse-gram.y" + case 50: +#line 323 "parse-gram.y" {;} break; - case 52: -#line 329 "parse-gram.y" + case 54: +#line 342 "parse-gram.y" + { + if (yacc_flag) + complain_at (yyloc, _("POSIX forbids declarations in the grammar")); + } + break; + + case 55: +#line 347 "parse-gram.y" + { + yyerrok; + } + break; + + case 56: +#line 353 "parse-gram.y" { current_lhs = yyvsp[-1].symbol; current_lhs_location = yylsp[-1]; } break; - case 53: -#line 330 "parse-gram.y" + case 57: +#line 354 "parse-gram.y" {;} break; - case 54: -#line 334 "parse-gram.y" + case 58: +#line 358 "parse-gram.y" { grammar_rule_end (yylsp[0]); } break; - case 55: -#line 335 "parse-gram.y" + case 59: +#line 359 "parse-gram.y" { grammar_rule_end (yylsp[0]); } break; - case 56: -#line 340 "parse-gram.y" + case 60: +#line 364 "parse-gram.y" { grammar_rule_begin (current_lhs, current_lhs_location); } break; - case 57: -#line 342 "parse-gram.y" + case 61: +#line 366 "parse-gram.y" { grammar_current_rule_symbol_append (yyvsp[0].symbol, yylsp[0]); } break; - case 58: -#line 344 "parse-gram.y" + case 62: +#line 368 "parse-gram.y" { grammar_current_rule_action_append (yyvsp[0].string, yylsp[0]); } break; - case 59: -#line 346 "parse-gram.y" - { grammar_current_rule_prec_set (yyvsp[0].symbol); } + case 63: +#line 370 "parse-gram.y" + { grammar_current_rule_prec_set (yyvsp[0].symbol, yylsp[0]); } break; - case 60: -#line 350 "parse-gram.y" + case 64: +#line 372 "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]); } + break; + + case 66: +#line 378 "parse-gram.y" { yyval.symbol = yyvsp[0].symbol; } break; - case 61: -#line 351 "parse-gram.y" + case 67: +#line 379 "parse-gram.y" { yyval.symbol = yyvsp[0].symbol; } break; - case 62: -#line 352 "parse-gram.y" - { yyval.symbol = getsym (yyvsp[0].string, yylsp[0]); } + case 68: +#line 380 "parse-gram.y" + { yyval.symbol = symbol_get (yyvsp[0].string, yylsp[0]); } break; - case 63: -#line 357 "parse-gram.y" + case 69: +#line 385 "parse-gram.y" { yyval.string = yyvsp[0].string; } break; - case 64: -#line 363 "parse-gram.y" + case 70: +#line 391 "parse-gram.y" { - yyval.symbol = getsym (yyvsp[0].string, yylsp[0]); - symbol_class_set (yyval.symbol, token_sym); + yyval.symbol = symbol_get (yyvsp[0].string, yylsp[0]); + symbol_class_set (yyval.symbol, token_sym, yylsp[0]); } break; - case 65: -#line 372 "parse-gram.y" + case 71: +#line 400 "parse-gram.y" { yyval.string = yyvsp[0].string + 1; yyval.string[strlen (yyval.string) - 1] = '\0'; } break; - case 66: -#line 380 "parse-gram.y" + case 72: +#line 408 "parse-gram.y" { yyval.string = xstrdup (""); } break; - case 67: -#line 384 "parse-gram.y" + case 73: +#line 412 "parse-gram.y" { yyval.string = yyvsp[0].string; } @@ -1538,14 +1664,12 @@ yyreduce: } -/* Line 1012 of /usr/local/share/bison/bison.simple. */ -#line 1543 "parse-gram.c" +/* Line 1079 of /tmp/prefix/share/bison/yacc.c. */ +#line 1669 "parse-gram.c" yyvsp -= yylen; yyssp -= yylen; -#if YYLSP_NEEDED yylsp -= yylen; -#endif #if YYDEBUG if (yydebug) @@ -1559,9 +1683,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 @@ -1570,7 +1692,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]; @@ -1586,54 +1708,7 @@ yyerrlab: if (!yyerrstatus) { ++yynerrs; - -#if YYERROR_VERBOSE - yyn = yypact[yystate]; - - if (yyn > YYFLAG && yyn < YYLAST) - { - YYSIZE_T yysize = 0; - char *yymsg; - int yyx, yycount; - - 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++) - if (yycheck[yyx + yyn] == yyx) - yysize += yystrlen (yytname[yyx]) + 15, yycount++; - yysize += yystrlen ("parse error, unexpected ") + 1; - yysize += yystrlen (yytname[YYTRANSLATE (yychar)]); - yymsg = (char *) YYSTACK_ALLOC (yysize); - if (yymsg != 0) - { - char *yyp = yystpcpy (yymsg, "parse error, unexpected "); - yyp = yystpcpy (yyp, yytname[YYTRANSLATE (yychar)]); - - if (yycount < 5) - { - yycount = 0; - for (yyx = yyn < 0 ? -yyn : 0; - yyx < (int) (sizeof (yytname) / sizeof (char *)); - yyx++) - if (yycheck[yyx + yyn] == yyx) - { - const char *yyq = ! yycount ? ", expecting " : " or "; - yyp = yystpcpy (yyp, yyq); - yyp = yystpcpy (yyp, yytname[yyx]); - yycount++; - } - } - yyerror (yymsg); - YYSTACK_FREE (yymsg); - } - else - yyerror ("parse error; also virtual memory exhausted"); - } - else -#endif /* YYERROR_VERBOSE */ - yyerror ("parse error"); + yyreport_parse_error (yystate, yychar, yylval, yylloc); } goto yyerrlab1; @@ -1649,9 +1724,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; } @@ -1663,7 +1755,7 @@ yyerrlab1: for (;;) { yyn = yypact[yystate]; - if (yyn != YYFLAG) + if (yyn != YYPACT_NINF) { yyn += YYTERROR; if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) @@ -1678,31 +1770,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) @@ -1722,9 +1798,7 @@ yyerrlab1: YYDPRINTF ((stderr, "Shifting error token, ")); *++yyvsp = yylval; -#if YYLSP_NEEDED *++yylsp = yylloc; -#endif yystate = yyn; goto yynewstate; @@ -1744,13 +1818,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 @@ -1760,7 +1836,8 @@ yyreturn: return yyresult; } -#line 393 "parse-gram.y" + +#line 421 "parse-gram.y" /*------------------------------------------------------------------. | When debugging the parser, display tokens' locations and values. | @@ -1768,11 +1845,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: @@ -1804,10 +1879,8 @@ yyprint (FILE *file, } void -gram_error (gram_control_t *control ATTRIBUTE_UNUSED, - location_t *yylloc, const char *msg) +gram_error (location_t *yylloc, const char *msg) { - LOCATION_PRINT (stderr, *yylloc); - fprintf (stderr, ": %s\n", msg); + complain_at (*yylloc, "%s", msg); }