X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/92f5e991daee2ca21119fbb5f12fa4a75661df40..e342c3beaf9d73616e8ff6fe005b97f3a72c0476:/src/parse-gram.c diff --git a/src/parse-gram.c b/src/parse-gram.c index cba44519..14a70563 100644 --- a/src/parse-gram.c +++ b/src/parse-gram.c @@ -1,7 +1,7 @@ -/* A Bison parser, made by GNU Bison 1.875c. */ +/* A Bison parser, made by GNU Bison 1.875e. */ /* Skeleton parser for Yacc-like parsing with Bison, - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 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 @@ -83,32 +83,34 @@ PERCENT_DEFINES = 275, PERCENT_ERROR_VERBOSE = 276, PERCENT_EXPECT = 277, - PERCENT_FILE_PREFIX = 278, - PERCENT_GLR_PARSER = 279, - PERCENT_INITIAL_ACTION = 280, - PERCENT_LEX_PARAM = 281, - PERCENT_LOCATIONS = 282, - PERCENT_NAME_PREFIX = 283, - PERCENT_NO_LINES = 284, - PERCENT_NONDETERMINISTIC_PARSER = 285, - PERCENT_OUTPUT = 286, - PERCENT_PARSE_PARAM = 287, - PERCENT_PURE_PARSER = 288, - PERCENT_SKELETON = 289, - PERCENT_START = 290, - PERCENT_TOKEN_TABLE = 291, - PERCENT_VERBOSE = 292, - PERCENT_YACC = 293, - TYPE = 294, - EQUAL = 295, - SEMICOLON = 296, - PIPE = 297, - ID = 298, - ID_COLON = 299, - PERCENT_PERCENT = 300, - PROLOGUE = 301, - EPILOGUE = 302, - BRACED_CODE = 303 + PERCENT_EXPECT_RR = 278, + PERCENT_FILE_PREFIX = 279, + PERCENT_GLR_PARSER = 280, + PERCENT_INITIAL_ACTION = 281, + PERCENT_LEX_PARAM = 282, + PERCENT_LOCATIONS = 283, + PERCENT_NAME_PREFIX = 284, + PERCENT_NO_DEFAULT_PREC = 285, + PERCENT_NO_LINES = 286, + PERCENT_NONDETERMINISTIC_PARSER = 287, + PERCENT_OUTPUT = 288, + PERCENT_PARSE_PARAM = 289, + PERCENT_PURE_PARSER = 290, + PERCENT_SKELETON = 291, + PERCENT_START = 292, + PERCENT_TOKEN_TABLE = 293, + PERCENT_VERBOSE = 294, + PERCENT_YACC = 295, + TYPE = 296, + EQUAL = 297, + SEMICOLON = 298, + PIPE = 299, + ID = 300, + ID_COLON = 301, + PERCENT_PERCENT = 302, + PROLOGUE = 303, + EPILOGUE = 304, + BRACED_CODE = 305 }; #endif #define GRAM_EOF 0 @@ -132,38 +134,61 @@ #define PERCENT_DEFINES 275 #define PERCENT_ERROR_VERBOSE 276 #define PERCENT_EXPECT 277 -#define PERCENT_FILE_PREFIX 278 -#define PERCENT_GLR_PARSER 279 -#define PERCENT_INITIAL_ACTION 280 -#define PERCENT_LEX_PARAM 281 -#define PERCENT_LOCATIONS 282 -#define PERCENT_NAME_PREFIX 283 -#define PERCENT_NO_LINES 284 -#define PERCENT_NONDETERMINISTIC_PARSER 285 -#define PERCENT_OUTPUT 286 -#define PERCENT_PARSE_PARAM 287 -#define PERCENT_PURE_PARSER 288 -#define PERCENT_SKELETON 289 -#define PERCENT_START 290 -#define PERCENT_TOKEN_TABLE 291 -#define PERCENT_VERBOSE 292 -#define PERCENT_YACC 293 -#define TYPE 294 -#define EQUAL 295 -#define SEMICOLON 296 -#define PIPE 297 -#define ID 298 -#define ID_COLON 299 -#define PERCENT_PERCENT 300 -#define PROLOGUE 301 -#define EPILOGUE 302 -#define BRACED_CODE 303 +#define PERCENT_EXPECT_RR 278 +#define PERCENT_FILE_PREFIX 279 +#define PERCENT_GLR_PARSER 280 +#define PERCENT_INITIAL_ACTION 281 +#define PERCENT_LEX_PARAM 282 +#define PERCENT_LOCATIONS 283 +#define PERCENT_NAME_PREFIX 284 +#define PERCENT_NO_DEFAULT_PREC 285 +#define PERCENT_NO_LINES 286 +#define PERCENT_NONDETERMINISTIC_PARSER 287 +#define PERCENT_OUTPUT 288 +#define PERCENT_PARSE_PARAM 289 +#define PERCENT_PURE_PARSER 290 +#define PERCENT_SKELETON 291 +#define PERCENT_START 292 +#define PERCENT_TOKEN_TABLE 293 +#define PERCENT_VERBOSE 294 +#define PERCENT_YACC 295 +#define TYPE 296 +#define EQUAL 297 +#define SEMICOLON 298 +#define PIPE 299 +#define ID 300 +#define ID_COLON 301 +#define PERCENT_PERCENT 302 +#define PROLOGUE 303 +#define EPILOGUE 304 +#define BRACED_CODE 305 /* Copy the first part of user declarations. */ -#line 32 "parse-gram.y" +#line 1 "parse-gram.y" +/* Bison Grammar Parser -*- C -*- + + Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. + + This file is part of Bison, the GNU Compiler Compiler. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA +*/ #include "system.h" @@ -180,6 +205,9 @@ #define YYLLOC_DEFAULT(Current, Rhs, N) (Current) = lloc_default (Rhs, N) static YYLTYPE lloc_default (YYLTYPE const *, int); +#define YY_LOCATION_PRINT(File, Loc) \ + location_print (File, Loc) + /* Request detailed syntax error messages, and pass them to GRAM_ERROR. FIXME: depends on the undocumented availability of YYLLOC. */ #undef yyerror @@ -215,7 +243,7 @@ int current_prec = 0; #endif #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) -#line 80 "parse-gram.y" +#line 81 "parse-gram.y" typedef union YYSTYPE { symbol *symbol; symbol_list *list; @@ -225,7 +253,7 @@ typedef union YYSTYPE { uniqstr uniqstr; } YYSTYPE; /* Line 191 of yacc.c. */ -#line 229 "parse-gram.c" +#line 257 "parse-gram.c" # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 # define YYSTYPE_IS_TRIVIAL 1 @@ -249,7 +277,7 @@ typedef struct YYLTYPE /* Line 214 of yacc.c. */ -#line 253 "parse-gram.c" +#line 281 "parse-gram.c" #if ! defined (yyoverflow) || YYERROR_VERBOSE @@ -298,7 +326,7 @@ typedef struct YYLTYPE /* A type that is properly aligned for any stack member. */ union yyalloc { - short yyss; + short int yyss; YYSTYPE yyvs; YYLTYPE yyls; }; @@ -309,7 +337,7 @@ union yyalloc /* The size of an array large to enough to hold all stacks, each with N elements. */ # define YYSTACK_BYTES(N) \ - ((N) * (sizeof (short) + sizeof (YYSTYPE) + sizeof (YYLTYPE)) \ + ((N) * (sizeof (short int) + sizeof (YYSTYPE) + sizeof (YYLTYPE)) \ + 2 * YYSTACK_GAP_MAXIMUM) /* Copy COUNT objects from FROM to TO. The source and destination do @@ -351,26 +379,26 @@ union yyalloc #if defined (__STDC__) || defined (__cplusplus) typedef signed char yysigned_char; #else - typedef short yysigned_char; + typedef short int yysigned_char; #endif /* YYFINAL -- State number of the termination state. */ #define YYFINAL 3 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 153 +#define YYLAST 158 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 49 +#define YYNTOKENS 51 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 25 /* YYNRULES -- Number of rules. */ -#define YYNRULES 77 +#define YYNRULES 79 /* YYNRULES -- Number of states. */ -#define YYNSTATES 106 +#define YYNSTATES 108 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 303 +#define YYMAXUTOK 305 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -408,7 +436,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, 46, 47, 48 + 45, 46, 47, 48, 49, 50 }; #if YYDEBUG @@ -417,51 +445,52 @@ 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, 37, 39, 41, 45, 47, - 49, 53, 55, 57, 60, 62, 64, 66, 68, 70, - 72, 75, 77, 80, 83, 86, 87, 91, 92, 96, - 100, 104, 106, 108, 110, 111, 113, 115, 118, 120, - 122, 125, 128, 132, 134, 137, 139, 142, 144, 147, - 150, 151, 155, 157, 161, 164, 165, 168, 171, 175, - 179, 183, 185, 187, 189, 191, 193, 194 + 24, 26, 29, 32, 36, 38, 40, 42, 44, 48, + 50, 52, 56, 58, 60, 63, 65, 67, 69, 71, + 73, 75, 78, 80, 83, 86, 88, 90, 91, 95, + 96, 100, 104, 108, 110, 112, 114, 115, 117, 119, + 122, 124, 126, 129, 132, 136, 138, 141, 143, 146, + 148, 151, 154, 155, 159, 161, 165, 168, 169, 172, + 175, 179, 183, 187, 189, 191, 193, 195, 197, 198 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yysigned_char yyrhs[] = { - 50, 0, -1, 51, 45, 63, 73, -1, -1, 51, - 52, -1, 53, -1, 46, -1, 17, -1, 19, 72, - 72, -1, 20, -1, 21, -1, 22, 4, -1, 23, - 40, 72, -1, 24, -1, 25, -1, 26, -1, 27, - -1, 28, 40, 72, -1, 29, -1, 30, -1, 31, - 40, 72, -1, 32, -1, 33, -1, 34, 72, -1, - 36, -1, 37, -1, 38, -1, 41, -1, 57, -1, - 54, -1, 35, 69, -1, 10, -1, 8, 60, -1, - 9, 60, -1, 18, 4, -1, -1, 6, 55, 62, - -1, -1, 5, 56, 62, -1, 7, 39, 60, -1, - 58, 59, 60, -1, 11, -1, 12, -1, 13, -1, - -1, 39, -1, 69, -1, 60, 69, -1, 39, -1, - 43, -1, 43, 4, -1, 43, 71, -1, 43, 4, - 71, -1, 61, -1, 62, 61, -1, 64, -1, 63, - 64, -1, 65, -1, 53, 41, -1, 1, 41, -1, - -1, 44, 66, 67, -1, 68, -1, 67, 42, 68, - -1, 67, 41, -1, -1, 68, 69, -1, 68, 70, - -1, 68, 14, 69, -1, 68, 15, 4, -1, 68, - 16, 39, -1, 43, -1, 71, -1, 48, -1, 3, - -1, 3, -1, -1, 45, 47, -1 + 52, 0, -1, 53, 47, 65, 75, -1, -1, 53, + 54, -1, 55, -1, 48, -1, 17, -1, 19, 74, + 74, -1, 20, -1, 21, -1, 22, 4, -1, 23, + 4, -1, 24, 42, 74, -1, 25, -1, 26, -1, + 27, -1, 28, -1, 29, 42, 74, -1, 31, -1, + 32, -1, 33, 42, 74, -1, 34, -1, 35, -1, + 36, 74, -1, 38, -1, 39, -1, 40, -1, 43, + -1, 59, -1, 56, -1, 37, 71, -1, 10, -1, + 8, 62, -1, 9, 62, -1, 18, -1, 30, -1, + -1, 6, 57, 64, -1, -1, 5, 58, 64, -1, + 7, 41, 62, -1, 60, 61, 62, -1, 11, -1, + 12, -1, 13, -1, -1, 41, -1, 71, -1, 62, + 71, -1, 41, -1, 45, -1, 45, 4, -1, 45, + 73, -1, 45, 4, 73, -1, 63, -1, 64, 63, + -1, 66, -1, 65, 66, -1, 67, -1, 55, 43, + -1, 1, 43, -1, -1, 46, 68, 69, -1, 70, + -1, 69, 44, 70, -1, 69, 43, -1, -1, 70, + 71, -1, 70, 72, -1, 70, 14, 71, -1, 70, + 15, 4, -1, 70, 16, 41, -1, 45, -1, 73, + -1, 50, -1, 3, -1, 3, -1, -1, 47, 49, + -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ -static const unsigned short yyrline[] = +static const unsigned short int yyrline[] = { - 0, 171, 171, 179, 181, 185, 186, 187, 188, 189, - 190, 191, 192, 193, 198, 202, 203, 204, 205, 206, - 207, 208, 209, 210, 211, 212, 213, 214, 218, 219, - 220, 224, 230, 237, 244, 254, 254, 259, 259, 264, - 274, 289, 290, 291, 295, 296, 302, 303, 308, 312, - 317, 323, 329, 340, 341, 350, 351, 357, 358, 363, - 370, 370, 374, 375, 376, 381, 382, 384, 386, 388, - 390, 395, 396, 400, 406, 415, 422, 424 + 0, 174, 174, 182, 184, 188, 189, 190, 191, 192, + 193, 194, 195, 196, 197, 202, 206, 207, 208, 209, + 210, 211, 212, 213, 214, 215, 216, 217, 218, 222, + 223, 224, 228, 234, 241, 248, 252, 259, 259, 264, + 264, 269, 279, 294, 295, 296, 300, 301, 307, 308, + 313, 317, 322, 328, 334, 345, 346, 355, 356, 362, + 363, 368, 375, 375, 379, 380, 381, 386, 387, 389, + 391, 393, 395, 400, 401, 405, 411, 420, 427, 429 }; #endif @@ -475,59 +504,60 @@ static const char *const yytname[] = "\"%printer {...}\"", "\"%union {...}\"", "\"%left\"", "\"%right\"", "\"%nonassoc\"", "\"%prec\"", "\"%dprec\"", "\"%merge\"", "\"%debug\"", "\"%default-prec\"", "\"%define\"", "\"%defines\"", "\"%error-verbose\"", - "\"%expect\"", "\"%file-prefix\"", "\"%glr-parser\"", + "\"%expect\"", "\"%expect-rr\"", "\"%file-prefix\"", "\"%glr-parser\"", "\"%initial-action {...}\"", "\"%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 + "\"%name-prefix\"", "\"%no-default-prec\"", "\"%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 # ifdef YYPRINT /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to token YYLEX-NUM. */ -static const unsigned short yytoknum[] = +static const unsigned short int yytoknum[] = { 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, - 295, 296, 297, 298, 299, 300, 301, 302, 303 + 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, + 305 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const unsigned char yyr1[] = { - 0, 49, 50, 51, 51, 52, 52, 52, 52, 52, - 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, - 52, 52, 52, 52, 52, 52, 52, 52, 53, 53, - 53, 53, 53, 53, 53, 55, 54, 56, 54, 54, - 57, 58, 58, 58, 59, 59, 60, 60, 61, 61, - 61, 61, 61, 62, 62, 63, 63, 64, 64, 64, - 66, 65, 67, 67, 67, 68, 68, 68, 68, 68, - 68, 69, 69, 70, 71, 72, 73, 73 + 0, 51, 52, 53, 53, 54, 54, 54, 54, 54, + 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, + 54, 54, 54, 54, 54, 54, 54, 54, 54, 55, + 55, 55, 55, 55, 55, 55, 55, 57, 56, 58, + 56, 56, 59, 60, 60, 60, 61, 61, 62, 62, + 63, 63, 63, 63, 63, 64, 64, 65, 65, 66, + 66, 66, 68, 67, 69, 69, 69, 70, 70, 70, + 70, 70, 70, 71, 71, 72, 73, 74, 75, 75 }; /* 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, 1, 1, 1, 3, 1, 1, - 3, 1, 1, 2, 1, 1, 1, 1, 1, 1, - 2, 1, 2, 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 + 1, 2, 2, 3, 1, 1, 1, 1, 3, 1, + 1, 3, 1, 1, 2, 1, 1, 1, 1, 1, + 1, 2, 1, 2, 2, 1, 1, 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 @@ -535,113 +565,113 @@ static const unsigned char yyr2[] = means the default is an error. */ static const unsigned char yydefact[] = { - 3, 0, 0, 1, 37, 35, 0, 0, 0, 31, - 41, 42, 43, 7, 0, 0, 9, 10, 0, 0, - 13, 14, 15, 16, 0, 18, 19, 0, 21, 22, - 0, 0, 24, 25, 26, 27, 0, 6, 4, 5, - 29, 28, 44, 0, 0, 0, 74, 71, 32, 46, - 72, 33, 34, 75, 0, 11, 0, 0, 0, 23, - 30, 0, 60, 0, 0, 55, 57, 45, 0, 48, - 49, 53, 38, 36, 39, 47, 8, 12, 17, 20, - 59, 65, 58, 0, 56, 2, 40, 50, 51, 54, - 61, 62, 77, 52, 64, 65, 0, 0, 0, 73, - 66, 67, 63, 68, 69, 70 + 3, 0, 0, 1, 39, 37, 0, 0, 0, 32, + 43, 44, 45, 7, 35, 0, 9, 10, 0, 0, + 0, 14, 15, 16, 17, 0, 36, 19, 20, 0, + 22, 23, 0, 0, 25, 26, 27, 28, 0, 6, + 4, 5, 30, 29, 46, 0, 0, 0, 76, 73, + 33, 48, 74, 34, 77, 0, 11, 12, 0, 0, + 0, 24, 31, 0, 62, 0, 0, 57, 59, 47, + 0, 50, 51, 55, 40, 38, 41, 49, 8, 13, + 18, 21, 61, 67, 60, 0, 58, 2, 42, 52, + 53, 56, 63, 64, 79, 54, 66, 67, 0, 0, + 0, 75, 68, 69, 65, 70, 71, 72 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yysigned_char yydefgoto[] = { - -1, 1, 2, 38, 63, 40, 44, 43, 41, 42, - 68, 48, 71, 72, 64, 65, 66, 81, 90, 91, - 49, 101, 50, 54, 85 + -1, 1, 2, 40, 65, 42, 46, 45, 43, 44, + 70, 50, 73, 74, 66, 67, 68, 83, 92, 93, + 51, 103, 52, 55, 87 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -63 +#define YYPACT_NINF -67 static const yysigned_char yypact[] = { - -63, 12, 107, -63, -63, -63, -18, 1, 1, -63, - -63, -63, -63, -63, 28, 31, -63, -63, 33, -5, - -63, -63, -63, -63, 0, -63, -63, 5, -63, -63, - 31, 1, -63, -63, -63, -63, 67, -63, -63, -63, - -63, -63, 13, -36, -36, 1, -63, -63, 1, -63, - -63, 1, -63, -63, 31, -63, 31, 31, 31, -63, - -63, -2, -63, 10, 18, -63, -63, -63, 1, -63, - 2, -63, -36, -36, 1, -63, -63, -63, -63, -63, - -63, -63, -63, -6, -63, -63, 1, 51, -63, -63, - -33, -1, -63, -63, -63, -63, 1, 52, 19, -63, - -63, -63, -1, -63, -63, -63 + -67, 5, 110, -67, -67, -67, -34, 0, 0, -67, + -67, -67, -67, -67, -67, 13, -67, -67, 20, 31, + -17, -67, -67, -67, -67, -6, -67, -67, -67, -5, + -67, -67, 13, 0, -67, -67, -67, -67, 68, -67, + -67, -67, -67, -67, -3, -37, -37, 0, -67, -67, + 0, -67, -67, 0, -67, 13, -67, -67, 13, 13, + 13, -67, -67, -2, -67, 3, 21, -67, -67, -67, + 0, -67, 6, -67, -37, -37, 0, -67, -67, -67, + -67, -67, -67, -67, -67, 1, -67, -67, 0, 39, + -67, -67, -32, -1, -67, -67, -67, -67, 0, 43, + 7, -67, -67, -67, -1, -67, -67, -67 }; /* YYPGOTO[NTERM-NUM]. */ static const yysigned_char yypgoto[] = { - -63, -63, -63, -63, 55, -63, -63, -63, -63, -63, - -63, -7, -62, 15, -63, 3, -63, -63, -63, -29, - -31, -63, -54, -8, -63 + -67, -67, -67, -67, 50, -67, -67, -67, -67, -67, + -67, -7, -56, 8, -67, -13, -67, -67, -67, -41, + -33, -67, -66, 29, -67 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If positive, shift that token. If negative, reduce the rule which number is the opposite. If zero, do what YYDEFACT says. If YYTABLE_NINF, syntax error. */ -#define YYTABLE_NINF -77 +#define YYTABLE_NINF -79 static const yysigned_char yytable[] = { - 60, 51, 46, 69, 46, 46, 87, 70, 94, 95, - 89, 89, 3, 96, 97, 98, 88, 75, -76, 61, - 75, 45, 59, 4, 5, 6, 7, 8, 9, 10, - 11, 12, 52, 93, 53, 56, 14, 55, 74, 80, - 57, 92, 47, 75, 47, 58, 76, 99, 77, 78, - 79, 82, 67, 31, 46, 75, 104, 39, 105, 73, - 100, 86, 62, 83, 0, 103, 102, 84, 61, 0, - 0, 100, 4, 5, 6, 7, 8, 9, 10, 11, - 12, 0, 0, 0, 0, 14, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 31, 0, 0, 0, 0, 0, 0, 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, 32, 33, 34, 0, 0, 35, 0, - 0, 0, 36, 37 + 62, 53, 48, 48, 71, 3, 90, 47, 72, 48, + 89, 96, 97, 98, 99, 100, 54, 77, 91, 91, + 77, -78, 63, 95, 56, 58, 4, 5, 6, 7, + 8, 9, 10, 11, 12, 57, 59, 60, 69, 14, + 76, 82, 48, 77, 49, 49, 84, 106, 107, 101, + 94, 26, 41, 86, 75, 77, 104, 0, 33, 0, + 102, 61, 0, 88, 0, 105, 0, 64, 85, 63, + 0, 102, 0, 4, 5, 6, 7, 8, 9, 10, + 11, 12, 0, 0, 78, 0, 14, 79, 80, 81, + 0, 0, 0, 0, 0, 0, 0, 0, 26, 0, + 0, 0, 0, 0, 0, 33, 0, 0, 0, 0, + 0, 0, 0, 0, 64, 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, 33, 34, 35, + 36, 0, 0, 37, 0, 0, 0, 38, 39 }; static const yysigned_char yycheck[] = { - 31, 8, 3, 39, 3, 3, 4, 43, 41, 42, - 72, 73, 0, 14, 15, 16, 70, 48, 0, 1, - 51, 39, 30, 5, 6, 7, 8, 9, 10, 11, - 12, 13, 4, 87, 3, 40, 18, 4, 45, 41, - 40, 47, 43, 74, 43, 40, 54, 48, 56, 57, - 58, 41, 39, 35, 3, 86, 4, 2, 39, 44, - 91, 68, 44, 45, -1, 96, 95, 64, 1, -1, - -1, 102, 5, 6, 7, 8, 9, 10, 11, 12, - 13, -1, -1, -1, -1, 18, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 35, -1, -1, -1, -1, -1, -1, -1, - -1, 44, 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, 37, 38, -1, -1, 41, -1, - -1, -1, 45, 46 + 33, 8, 3, 3, 41, 0, 72, 41, 45, 3, + 4, 43, 44, 14, 15, 16, 3, 50, 74, 75, + 53, 0, 1, 89, 4, 42, 5, 6, 7, 8, + 9, 10, 11, 12, 13, 4, 42, 42, 41, 18, + 47, 43, 3, 76, 45, 45, 43, 4, 41, 50, + 49, 30, 2, 66, 46, 88, 97, -1, 37, -1, + 93, 32, -1, 70, -1, 98, -1, 46, 47, 1, + -1, 104, -1, 5, 6, 7, 8, 9, 10, 11, + 12, 13, -1, -1, 55, -1, 18, 58, 59, 60, + -1, -1, -1, -1, -1, -1, -1, -1, 30, -1, + -1, -1, -1, -1, -1, 37, -1, -1, -1, -1, + -1, -1, -1, -1, 46, 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, 37, 38, 39, + 40, -1, -1, 43, -1, -1, -1, 47, 48 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const unsigned char yystos[] = { - 0, 50, 51, 0, 5, 6, 7, 8, 9, 10, + 0, 52, 53, 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, - 34, 35, 36, 37, 38, 41, 45, 46, 52, 53, - 54, 57, 58, 56, 55, 39, 3, 43, 60, 69, - 71, 60, 4, 3, 72, 4, 40, 40, 40, 72, - 69, 1, 44, 53, 63, 64, 65, 39, 59, 39, - 43, 61, 62, 62, 60, 69, 72, 72, 72, 72, - 41, 66, 41, 45, 64, 73, 60, 4, 71, 61, - 67, 68, 47, 71, 41, 42, 14, 15, 16, 48, - 69, 70, 68, 69, 4, 39 + 34, 35, 36, 37, 38, 39, 40, 43, 47, 48, + 54, 55, 56, 59, 60, 58, 57, 41, 3, 45, + 62, 71, 73, 62, 3, 74, 4, 4, 42, 42, + 42, 74, 71, 1, 46, 55, 65, 66, 67, 41, + 61, 41, 45, 63, 64, 64, 62, 71, 74, 74, + 74, 74, 43, 68, 43, 47, 66, 75, 62, 4, + 73, 63, 69, 70, 49, 73, 43, 44, 14, 15, + 16, 50, 71, 72, 70, 71, 4, 41 }; #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) @@ -695,20 +725,50 @@ do \ } \ while (0) + #define YYTERROR 1 #define YYERRCODE 256 -/* YYLLOC_DEFAULT -- Compute the default location (before the actions - are run). */ + +/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. + If N is 0, then set CURRENT to the empty location which ends + the previous symbol: RHS[0] (always defined). */ #ifndef YYLLOC_DEFAULT -# define YYLLOC_DEFAULT(Current, Rhs, N) \ - ((Current).first_line = (Rhs)[1].first_line, \ - (Current).first_column = (Rhs)[1].first_column, \ - (Current).last_line = (Rhs)[N].last_line, \ - (Current).last_column = (Rhs)[N].last_column) +# define YYLLOC_DEFAULT(Current, Rhs, N) \ +do { \ + if (N) \ + { \ + (Current).first_line = (Rhs)[1].first_line; \ + (Current).first_column = (Rhs)[1].first_column; \ + (Current).last_line = (Rhs)[N].last_line; \ + (Current).last_column = (Rhs)[N].last_column; \ + } \ + else \ + { \ + (Current).first_line = (Current).last_line = (Rhs)[0].last_line; \ + (Current).first_column = (Current).last_column = (Rhs)[0].last_column; \ + } \ +} while(0) +#endif + + +/* YY_LOCATION_PRINT -- Print the location on the stream. + This macro was not mandated originally: define only if we know + we won't break user code: when these are the locations we know. */ + +#ifndef YY_LOCATION_PRINT +# if YYLTYPE_IS_TRIVIAL +# define YY_LOCATION_PRINT(File, Loc) \ + fprintf (File, "%d.%d-%d.%d", \ + (Loc).first_line, (Loc).first_column, \ + (Loc).last_line, (Loc).last_column) +# else +# define YY_LOCATION_PRINT(File, Loc) ((void) 0) +# endif #endif + /* YYLEX -- calling `yylex' with the right arguments. */ #ifdef YYLEX_PARAM @@ -731,19 +791,13 @@ do { \ YYFPRINTF Args; \ } while (0) -# define YYDSYMPRINT(Args) \ -do { \ - if (yydebug) \ - yysymprint Args; \ -} while (0) - -# define YYDSYMPRINTF(Title, Token, Value, Location) \ +# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ do { \ if (yydebug) \ { \ YYFPRINTF (stderr, "%s ", Title); \ yysymprint (stderr, \ - Token, Value, Location); \ + Type, Value, Location); \ YYFPRINTF (stderr, "\n"); \ } \ } while (0) @@ -755,12 +809,12 @@ do { \ #if defined (__STDC__) || defined (__cplusplus) static void -yy_stack_print (short *bottom, short *top) +yy_stack_print (short int *bottom, short int *top) #else static void yy_stack_print (bottom, top) - short *bottom; - short *top; + short int *bottom; + short int *top; #endif { YYFPRINTF (stderr, "Stack now"); @@ -810,8 +864,7 @@ do { \ int yydebug; #else /* !YYDEBUG */ # define YYDPRINTF(Args) -# define YYDSYMPRINT(Args) -# define YYDSYMPRINTF(Title, Token, Value, Location) +# define YY_SYMBOL_PRINT(Title, Type, Value, Location) # define YY_STACK_PRINT(Bottom, Top) # define YY_REDUCE_PRINT(Rule) #endif /* !YYDEBUG */ @@ -916,15 +969,17 @@ yysymprint (yyoutput, yytype, yyvaluep, yylocationp) (void) yylocationp; if (yytype < YYNTOKENS) - { - YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); -# ifdef YYPRINT - YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); -# endif - } + YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); else YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); + YY_LOCATION_PRINT (yyoutput, *yylocationp); + fprintf (yyoutput, ": "); + +# ifdef YYPRINT + if (yytype < YYNTOKENS) + YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); +# endif switch (yytype) { default: @@ -940,10 +995,11 @@ yysymprint (yyoutput, yytype, yyvaluep, yylocationp) #if defined (__STDC__) || defined (__cplusplus) static void -yydestruct (int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocationp) +yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocationp) #else static void -yydestruct (yytype, yyvaluep, yylocationp) +yydestruct (yymsg, yytype, yyvaluep, yylocationp) + const char *yymsg; int yytype; YYSTYPE *yyvaluep; YYLTYPE *yylocationp; @@ -953,6 +1009,10 @@ yydestruct (yytype, yyvaluep, yylocationp) (void) yyvaluep; (void) yylocationp; + if (!yymsg) + yymsg = "Deleting"; + YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); + switch (yytype) { @@ -1005,15 +1065,15 @@ yyparse () #endif #endif { - /* The lookahead symbol. */ + /* The look-ahead symbol. */ int yychar; -/* The semantic value of the lookahead symbol. */ +/* The semantic value of the look-ahead symbol. */ YYSTYPE yylval; /* Number of syntax errors so far. */ int yynerrs; -/* Location data for the lookahead symbol. */ +/* Location data for the look-ahead symbol. */ YYLTYPE yylloc; register int yystate; @@ -1021,7 +1081,7 @@ YYLTYPE yylloc; int yyresult; /* Number of tokens to shift before error messages enabled. */ int yyerrstatus; - /* Lookahead token as an internal (translated) token number. */ + /* Look-ahead token as an internal (translated) token number. */ int yytoken = 0; /* Three stacks and their tools: @@ -1033,9 +1093,9 @@ YYLTYPE yylloc; to reallocate them elsewhere. */ /* The state stack. */ - short yyssa[YYINITDEPTH]; - short *yyss = yyssa; - register short *yyssp; + short int yyssa[YYINITDEPTH]; + short int *yyss = yyssa; + register short int *yyssp; /* The semantic value stack. */ YYSTYPE yyvsa[YYINITDEPTH]; @@ -1046,7 +1106,8 @@ YYLTYPE yylloc; YYLTYPE yylsa[YYINITDEPTH]; YYLTYPE *yyls = yylsa; YYLTYPE *yylsp; - YYLTYPE *yylerrsp; + /* The locations where the error started and ended. */ + YYLTYPE yyerror_range[2]; #define YYPOPSTACK (yyvsp--, yyssp--, yylsp--) @@ -1076,18 +1137,27 @@ YYLTYPE yylloc; yyssp = yyss; yyvsp = yyvs; yylsp = yyls; +#if YYLTYPE_IS_TRIVIAL + /* Initialize the default location before parsing starts. */ + yylloc.first_line = yylloc.last_line = 1; + yylloc.first_column = yylloc.last_column = 0; +#endif + /* User initialization code. */ - #line 70 "parse-gram.y" + #line 71 "parse-gram.y" { /* Bison's grammar can initial empty locations, hence a default location is needed. */ - (*yylsp).start.file = (*yylsp).end.file = current_file; - (*yylsp).start.line = (*yylsp).end.line = 1; - (*yylsp).start.column = (*yylsp).end.column = 0; + yylloc.start.file = yylloc.end.file = current_file; + yylloc.start.line = yylloc.end.line = 1; + yylloc.start.column = yylloc.end.column = 0; } -/* Line 818 of yacc.c. */ -#line 1091 "parse-gram.c" +/* Line 848 of yacc.c. */ +#line 1158 "parse-gram.c" + yyvsp[0] = yylval; + yylsp[0] = yylloc; + goto yysetstate; /*------------------------------------------------------------. @@ -1113,7 +1183,7 @@ YYLTYPE yylloc; these so that the &'s don't force the real ones into memory. */ YYSTYPE *yyvs1 = yyvs; - short *yyss1 = yyss; + short int *yyss1 = yyss; YYLTYPE *yyls1 = yyls; /* Each stack pointer address is followed by the size of the @@ -1141,7 +1211,7 @@ YYLTYPE yylloc; yystacksize = YYMAXDEPTH; { - short *yyss1 = yyss; + short int *yyss1 = yyss; union yyalloc *yyptr = (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); if (! yyptr) @@ -1177,18 +1247,18 @@ YYLTYPE yylloc; yybackup: /* Do appropriate processing given the current state. */ -/* Read a lookahead token if we need one and don't already have one. */ +/* Read a look-ahead token if we need one and don't already have one. */ /* yyresume: */ - /* First try to decide what to do without reference to lookahead token. */ + /* First try to decide what to do without reference to look-ahead token. */ yyn = yypact[yystate]; if (yyn == YYPACT_NINF) goto yydefault; - /* Not known => get a lookahead token if don't already have one. */ + /* Not known => get a look-ahead token if don't already have one. */ - /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */ + /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */ if (yychar == YYEMPTY) { YYDPRINTF ((stderr, "Reading a token: ")); @@ -1203,7 +1273,7 @@ yybackup: else { yytoken = YYTRANSLATE (yychar); - YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc); + YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc); } /* If the proper action on seeing token YYTOKEN is to reduce or to @@ -1223,8 +1293,8 @@ yybackup: if (yyn == YYFINAL) YYACCEPT; - /* Shift the lookahead token. */ - YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken])); + /* Shift the look-ahead token. */ + YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); /* Discard the token being shifted unless it is eof. */ if (yychar != YYEOF) @@ -1275,124 +1345,129 @@ yyreduce: switch (yyn) { case 6: -#line 186 "parse-gram.y" +#line 189 "parse-gram.y" { prologue_augment (yyvsp[0].chars, yylsp[0]); } break; case 7: -#line 187 "parse-gram.y" +#line 190 "parse-gram.y" { debug_flag = true; } break; case 8: -#line 188 "parse-gram.y" +#line 191 "parse-gram.y" { muscle_insert (yyvsp[-1].chars, yyvsp[0].chars); } break; case 9: -#line 189 "parse-gram.y" +#line 192 "parse-gram.y" { defines_flag = true; } break; case 10: -#line 190 "parse-gram.y" +#line 193 "parse-gram.y" { error_verbose = true; } break; case 11: -#line 191 "parse-gram.y" - { expected_conflicts = yyvsp[0].integer; } +#line 194 "parse-gram.y" + { expected_sr_conflicts = yyvsp[0].integer; } break; case 12: -#line 192 "parse-gram.y" - { spec_file_prefix = yyvsp[0].chars; } +#line 195 "parse-gram.y" + { expected_rr_conflicts = yyvsp[0].integer; } break; case 13: -#line 194 "parse-gram.y" +#line 196 "parse-gram.y" + { spec_file_prefix = yyvsp[0].chars; } + break; + + case 14: +#line 198 "parse-gram.y" { nondeterministic_parser = true; glr_parser = true; } break; - case 14: -#line 199 "parse-gram.y" + case 15: +#line 203 "parse-gram.y" { muscle_code_grow ("initial_action", yyvsp[0].chars, yylsp[0]); } break; - case 15: -#line 202 "parse-gram.y" + case 16: +#line 206 "parse-gram.y" { add_param ("lex_param", yyvsp[0].chars, yylsp[0]); } break; - case 16: -#line 203 "parse-gram.y" + case 17: +#line 207 "parse-gram.y" { locations_flag = true; } break; - case 17: -#line 204 "parse-gram.y" + case 18: +#line 208 "parse-gram.y" { spec_name_prefix = yyvsp[0].chars; } break; - case 18: -#line 205 "parse-gram.y" + case 19: +#line 209 "parse-gram.y" { no_lines_flag = true; } break; - case 19: -#line 206 "parse-gram.y" + case 20: +#line 210 "parse-gram.y" { nondeterministic_parser = true; } break; - case 20: -#line 207 "parse-gram.y" + case 21: +#line 211 "parse-gram.y" { spec_outfile = yyvsp[0].chars; } break; - case 21: -#line 208 "parse-gram.y" + case 22: +#line 212 "parse-gram.y" { add_param ("parse_param", yyvsp[0].chars, yylsp[0]); } break; - case 22: -#line 209 "parse-gram.y" + case 23: +#line 213 "parse-gram.y" { pure_parser = true; } break; - case 23: -#line 210 "parse-gram.y" + case 24: +#line 214 "parse-gram.y" { skeleton = yyvsp[0].chars; } break; - case 24: -#line 211 "parse-gram.y" + case 25: +#line 215 "parse-gram.y" { token_table_flag = true; } break; - case 25: -#line 212 "parse-gram.y" + case 26: +#line 216 "parse-gram.y" { report_flag = report_states; } break; - case 26: -#line 213 "parse-gram.y" + case 27: +#line 217 "parse-gram.y" { yacc_flag = true; } break; - case 30: -#line 221 "parse-gram.y" + case 31: +#line 225 "parse-gram.y" { grammar_start_symbol_set (yyvsp[0].symbol, yylsp[0]); } break; - case 31: -#line 225 "parse-gram.y" + case 32: +#line 229 "parse-gram.y" { typed = true; MUSCLE_INSERT_INT ("stype_line", yylsp[0].start.line); @@ -1400,8 +1475,8 @@ yyreduce: } break; - case 32: -#line 231 "parse-gram.y" + case 33: +#line 235 "parse-gram.y" { symbol_list *list; for (list = yyvsp[0].list; list; list = list->next) @@ -1410,8 +1485,8 @@ yyreduce: } break; - case 33: -#line 238 "parse-gram.y" + case 34: +#line 242 "parse-gram.y" { symbol_list *list; for (list = yyvsp[0].list; list; list = list->next) @@ -1420,32 +1495,23 @@ yyreduce: } break; - case 34: -#line 245 "parse-gram.y" + case 35: +#line 249 "parse-gram.y" { - if (0 <= yyvsp[0].integer && yyvsp[0].integer <= 1) - default_prec = yyvsp[0].integer; - else - complain_at (yylsp[-1], _("invalid value for `%default-prec'")); + default_prec = true; } break; - case 35: -#line 254 "parse-gram.y" - { current_class = nterm_sym; } - break; - case 36: -#line 255 "parse-gram.y" +#line 253 "parse-gram.y" { - current_class = unknown_sym; - current_type = NULL; + default_prec = false; } break; case 37: #line 259 "parse-gram.y" - { current_class = token_sym; } + { current_class = nterm_sym; } break; case 38: @@ -1457,7 +1523,20 @@ yyreduce: break; case 39: +#line 264 "parse-gram.y" + { current_class = token_sym; } + break; + + case 40: #line 265 "parse-gram.y" + { + current_class = unknown_sym; + current_type = NULL; + } + break; + + case 41: +#line 270 "parse-gram.y" { symbol_list *list; for (list = yyvsp[0].list; list; list = list->next) @@ -1466,8 +1545,8 @@ yyreduce: } break; - case 40: -#line 275 "parse-gram.y" + case 42: +#line 280 "parse-gram.y" { symbol_list *list; ++current_prec; @@ -1481,58 +1560,58 @@ yyreduce: } break; - case 41: -#line 289 "parse-gram.y" + case 43: +#line 294 "parse-gram.y" { yyval.assoc = left_assoc; } break; - case 42: -#line 290 "parse-gram.y" + case 44: +#line 295 "parse-gram.y" { yyval.assoc = right_assoc; } break; - case 43: -#line 291 "parse-gram.y" + case 45: +#line 296 "parse-gram.y" { yyval.assoc = non_assoc; } break; - case 44: -#line 295 "parse-gram.y" + case 46: +#line 300 "parse-gram.y" { current_type = NULL; } break; - case 45: -#line 296 "parse-gram.y" + case 47: +#line 301 "parse-gram.y" { current_type = yyvsp[0].uniqstr; } break; - case 46: -#line 302 "parse-gram.y" + case 48: +#line 307 "parse-gram.y" { yyval.list = symbol_list_new (yyvsp[0].symbol, yylsp[0]); } break; - case 47: -#line 303 "parse-gram.y" + case 49: +#line 308 "parse-gram.y" { yyval.list = symbol_list_prepend (yyvsp[-1].list, yyvsp[0].symbol, yylsp[0]); } break; - case 48: -#line 309 "parse-gram.y" + case 50: +#line 314 "parse-gram.y" { current_type = yyvsp[0].uniqstr; } break; - case 49: -#line 313 "parse-gram.y" + case 51: +#line 318 "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 50: -#line 318 "parse-gram.y" + case 52: +#line 323 "parse-gram.y" { symbol_class_set (yyvsp[-1].symbol, current_class, yylsp[-1]); symbol_type_set (yyvsp[-1].symbol, current_type, yylsp[-1]); @@ -1540,8 +1619,8 @@ yyreduce: } break; - case 51: -#line 324 "parse-gram.y" + case 53: +#line 329 "parse-gram.y" { symbol_class_set (yyvsp[-1].symbol, current_class, yylsp[-1]); symbol_type_set (yyvsp[-1].symbol, current_type, yylsp[-1]); @@ -1549,8 +1628,8 @@ yyreduce: } break; - case 52: -#line 330 "parse-gram.y" + case 54: +#line 335 "parse-gram.y" { symbol_class_set (yyvsp[-2].symbol, current_class, yylsp[-2]); symbol_type_set (yyvsp[-2].symbol, current_type, yylsp[-2]); @@ -1559,99 +1638,99 @@ yyreduce: } break; - case 58: -#line 359 "parse-gram.y" + case 60: +#line 364 "parse-gram.y" { if (yacc_flag) complain_at (yyloc, _("POSIX forbids declarations in the grammar")); } break; - case 59: -#line 364 "parse-gram.y" + case 61: +#line 369 "parse-gram.y" { yyerrok; } break; - case 60: -#line 370 "parse-gram.y" + case 62: +#line 375 "parse-gram.y" { current_lhs = yyvsp[0].symbol; current_lhs_location = yylsp[0]; } break; - case 62: -#line 374 "parse-gram.y" + case 64: +#line 379 "parse-gram.y" { grammar_rule_end (yylsp[0]); } break; - case 63: -#line 375 "parse-gram.y" + case 65: +#line 380 "parse-gram.y" { grammar_rule_end (yylsp[0]); } break; - case 65: -#line 381 "parse-gram.y" + case 67: +#line 386 "parse-gram.y" { grammar_rule_begin (current_lhs, current_lhs_location); } break; - case 66: -#line 383 "parse-gram.y" + case 68: +#line 388 "parse-gram.y" { grammar_current_rule_symbol_append (yyvsp[0].symbol, yylsp[0]); } break; - case 67: -#line 385 "parse-gram.y" + case 69: +#line 390 "parse-gram.y" { grammar_current_rule_action_append (yyvsp[0].chars, yylsp[0]); } break; - case 68: -#line 387 "parse-gram.y" + case 70: +#line 392 "parse-gram.y" { grammar_current_rule_prec_set (yyvsp[0].symbol, yylsp[0]); } break; - case 69: -#line 389 "parse-gram.y" + case 71: +#line 394 "parse-gram.y" { grammar_current_rule_dprec_set (yyvsp[0].integer, yylsp[0]); } break; - case 70: -#line 391 "parse-gram.y" + case 72: +#line 396 "parse-gram.y" { grammar_current_rule_merge_set (yyvsp[0].uniqstr, yylsp[0]); } break; - case 71: -#line 395 "parse-gram.y" + case 73: +#line 400 "parse-gram.y" { yyval.symbol = yyvsp[0].symbol; } break; - case 72: -#line 396 "parse-gram.y" + case 74: +#line 401 "parse-gram.y" { yyval.symbol = yyvsp[0].symbol; } break; - case 73: -#line 401 "parse-gram.y" + case 75: +#line 406 "parse-gram.y" { yyval.chars = yyvsp[0].chars; } break; - case 74: -#line 407 "parse-gram.y" + case 76: +#line 412 "parse-gram.y" { yyval.symbol = symbol_get (yyvsp[0].chars, yylsp[0]); symbol_class_set (yyval.symbol, token_sym, yylsp[0]); } break; - case 75: -#line 416 "parse-gram.y" + case 77: +#line 421 "parse-gram.y" { yyval.chars = yyvsp[0].chars + 1; yyval.chars[strlen (yyval.chars) - 1] = '\0'; } break; - case 77: -#line 425 "parse-gram.y" + case 79: +#line 430 "parse-gram.y" { muscle_code_grow ("epilogue", yyvsp[0].chars, yylsp[0]); scanner_last_string_free (); @@ -1661,8 +1740,8 @@ yyreduce: } -/* Line 1010 of yacc.c. */ -#line 1666 "parse-gram.c" +/* Line 1043 of yacc.c. */ +#line 1745 "parse-gram.c" yyvsp -= yylen; yyssp -= yylen; @@ -1758,11 +1837,11 @@ yyerrlab: yyerror ("syntax error"); } - yylerrsp = yylsp; + yyerror_range[0] = yylloc; if (yyerrstatus == 3) { - /* If just tried and failed to reuse lookahead token after an + /* If just tried and failed to reuse look-ahead token after an error, discard it. */ if (yychar <= YYEOF) @@ -1772,23 +1851,22 @@ yyerrlab: if (yychar == YYEOF) for (;;) { + yyerror_range[0] = *yylsp; YYPOPSTACK; if (yyssp == yyss) YYABORT; - YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp); - yydestruct (yystos[*yyssp], yyvsp, yylsp); + yydestruct ("Error: popping", + yystos[*yyssp], yyvsp, yylsp); } } else { - YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc); - yydestruct (yytoken, &yylval, &yylloc); + yydestruct ("Error: discarding", yytoken, &yylval, &yylloc); yychar = YYEMPTY; - *++yylerrsp = yylloc; } } - /* Else will try to reuse lookahead token after shifting the error + /* Else will try to reuse look-ahead token after shifting the error token. */ goto yyerrlab1; @@ -1805,12 +1883,11 @@ yyerrorlab: goto yyerrorlab; #endif + yyerror_range[0] = yylsp[1-yylen]; + yylsp -= yylen; yyvsp -= yylen; yyssp -= yylen; yystate = *yyssp; - yylerrsp = yylsp; - *++yylerrsp = yyloc; - yylsp -= yylen; goto yyerrlab1; @@ -1838,8 +1915,8 @@ yyerrlab1: if (yyssp == yyss) YYABORT; - YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp); - yydestruct (yystos[yystate], yyvsp, yylsp); + yyerror_range[0] = *yylsp; + yydestruct ("Error: popping", yystos[yystate], yyvsp, yylsp); YYPOPSTACK; yystate = *yyssp; YY_STACK_PRINT (yyss, yyssp); @@ -1848,12 +1925,17 @@ yyerrlab1: if (yyn == YYFINAL) YYACCEPT; - YYDPRINTF ((stderr, "Shifting error token, ")); - *++yyvsp = yylval; - YYLLOC_DEFAULT (yyloc, yylsp, yylerrsp - yylsp); + + yyerror_range[1] = yylloc; + /* Using YYLLOC is tempting, but would change the location of + the look-ahead. YYLOC is available though. */ + YYLLOC_DEFAULT (yyloc, yyerror_range - 1, 2); *++yylsp = yyloc; + /* Shift the error token. */ + YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp); + yystate = yyn; goto yynewstate; @@ -1869,6 +1951,9 @@ yyacceptlab: | yyabortlab -- YYABORT comes here. | `-----------------------------------*/ yyabortlab: + yydestruct ("Error: discarding lookahead", + yytoken, &yylval, &yylloc); + yychar = YYEMPTY; yyresult = 1; goto yyreturn; @@ -1891,7 +1976,7 @@ yyreturn: } -#line 431 "parse-gram.y" +#line 436 "parse-gram.y" @@ -1905,7 +1990,11 @@ lloc_default (YYLTYPE const *rhs, int n) { int i; YYLTYPE loc; - loc.start = loc.end = rhs[n].end; + + /* SGI MIPSpro 7.4.1m miscompiles "loc.start = loc.end = rhs[n].end;". + The bug is fixed in 7.4.2m, but play it safe for now. */ + loc.start = rhs[n].end; + 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, @@ -1927,22 +2016,28 @@ lloc_default (YYLTYPE const *rhs, int n) static void add_param (char const *type, char *decl, location loc) { - static char const alphanum[] = - "0123456789" + static char const alphanum[26 + 26 + 1 + 10] = "abcdefghijklmnopqrstuvwxyz" "ABCDEFGHIJKLMNOPQRSTUVWXYZ" - "_"; - char const *alpha = alphanum + 10; + "_" + "0123456789"; char const *name_start = NULL; char *p; - for (p = decl; *p; p++) - if ((p == decl || ! strchr (alphanum, p[-1])) && strchr (alpha, p[0])) + /* Stop on last actual character. */ + for (p = decl; p[1]; p++) + if ((p == decl + || ! memchr (alphanum, p[-1], sizeof alphanum)) + && memchr (alphanum, p[0], sizeof alphanum - 10)) name_start = p; - /* Strip the surrounding '{' and '}'. */ - decl++; - p[-1] = '\0'; + /* Strip the surrounding '{' and '}', and any blanks just inside + the braces. */ + while (*--p == ' ' || *p == '\t') + continue; + p[1] = '\0'; + while (*++decl == ' ' || *decl == '\t') + continue; if (! name_start) complain_at (loc, _("missing identifier in parameter declaration")); @@ -1952,7 +2047,7 @@ add_param (char const *type, char *decl, location loc) size_t name_len; for (name_len = 1; - name_start[name_len] && strchr (alphanum, name_start[name_len]); + memchr (alphanum, name_start[name_len], sizeof alphanum); name_len++) continue;