X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/0210a4bf5eaa64a761d1bb45f1a3e84b115a31c6..6e30ede87a1c39c53842a6a747ecd9f7484d92a5:/src/parse-gram.c diff --git a/src/parse-gram.c b/src/parse-gram.c index 9d454d58..4d4e1722 100644 --- a/src/parse-gram.c +++ b/src/parse-gram.c @@ -1,9 +1,8 @@ -/* A Bison parser, made by GNU Bison 2.4.1.82-67f8. */ +/* A Bison parser, made by GNU Bison 2.4.1.206-8a8b-dirty. */ /* Skeleton implementation for Bison's Yacc-like parsers in C - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006, - 2007, 2008, 2009 Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2010 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 @@ -45,7 +44,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.4.1.82-67f8" +#define YYBISON_VERSION "2.4.1.206-8a8b-dirty" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -74,12 +73,11 @@ /* Copy the first part of user declarations. */ -/* Line 190 of yacc.c */ +/* Line 251 of yacc.c */ #line 1 "parse-gram.y" /* Bison Grammar Parser -*- C -*- - Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free - Software Foundation, Inc. + Copyright (C) 2002-2010 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -104,11 +102,11 @@ #include "files.h" #include "getargs.h" #include "gram.h" -#include "muscle_tab.h" +#include "muscle-tab.h" +#include "named-ref.h" #include "quotearg.h" #include "reader.h" #include "symlist.h" -#include "named-ref.h" #include "scan-gram.h" #include "scan-code.h" @@ -151,8 +149,8 @@ static int current_prec = 0; #define YYTYPE_UINT8 uint_fast8_t -/* Line 190 of yacc.c */ -#line 156 "../../bison-2.5/src/parse-gram.c" +/* Line 251 of yacc.c */ +#line 154 "parse-gram.c" /* Enabling traces. */ #ifndef YYDEBUG @@ -221,19 +219,19 @@ static int current_prec = 0; PERCENT_VERBOSE = 296, PERCENT_YACC = 297, BRACED_CODE = 298, - CHAR = 299, - EPILOGUE = 300, - EQUAL = 301, - ID = 302, - ID_COLON = 303, - PERCENT_PERCENT = 304, - PIPE = 305, - PROLOGUE = 306, - SEMICOLON = 307, - TYPE = 308, - TYPE_TAG_ANY = 309, - TYPE_TAG_NONE = 310, - BRACKETED_ID = 311, + BRACKETED_ID = 299, + CHAR = 300, + EPILOGUE = 301, + EQUAL = 302, + ID = 303, + ID_COLON = 304, + PERCENT_PERCENT = 305, + PIPE = 306, + PROLOGUE = 307, + SEMICOLON = 308, + TYPE = 309, + TYPE_TAG_ANY = 310, + TYPE_TAG_NONE = 311, PERCENT_UNION = 312 }; #endif @@ -280,19 +278,19 @@ static int current_prec = 0; #define PERCENT_VERBOSE 296 #define PERCENT_YACC 297 #define BRACED_CODE 298 -#define CHAR 299 -#define EPILOGUE 300 -#define EQUAL 301 -#define ID 302 -#define ID_COLON 303 -#define PERCENT_PERCENT 304 -#define PIPE 305 -#define PROLOGUE 306 -#define SEMICOLON 307 -#define TYPE 308 -#define TYPE_TAG_ANY 309 -#define TYPE_TAG_NONE 310 -#define BRACKETED_ID 311 +#define BRACKETED_ID 299 +#define CHAR 300 +#define EPILOGUE 301 +#define EQUAL 302 +#define ID 303 +#define ID_COLON 304 +#define PERCENT_PERCENT 305 +#define PIPE 306 +#define PROLOGUE 307 +#define SEMICOLON 308 +#define TYPE 309 +#define TYPE_TAG_ANY 310 +#define TYPE_TAG_NONE 311 #define PERCENT_UNION 312 @@ -302,8 +300,8 @@ static int current_prec = 0; typedef union YYSTYPE { -/* Line 215 of yacc.c */ -#line 94 "parse-gram.y" +/* Line 276 of yacc.c */ +#line 93 "parse-gram.y" symbol *symbol; symbol_list *list; @@ -317,8 +315,8 @@ typedef union YYSTYPE -/* Line 215 of yacc.c */ -#line 322 "../../bison-2.5/src/parse-gram.c" +/* Line 276 of yacc.c */ +#line 320 "parse-gram.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -342,8 +340,8 @@ typedef struct YYLTYPE /* Copy the second part of user declarations. */ -/* Line 265 of yacc.c */ -#line 347 "../../bison-2.5/src/parse-gram.c" +/* Line 326 of yacc.c */ +#line 345 "parse-gram.c" #ifdef short # undef short @@ -393,7 +391,7 @@ typedef short int yytype_int16; #define YYSIZE_MAXIMUM ((YYSIZE_T) -1) #ifndef YY_ -# if YYENABLE_NLS +# if defined YYENABLE_NLS && YYENABLE_NLS # if ENABLE_NLS # include /* INFRINGES ON USER NAME SPACE */ # define YY_(msgid) dgettext ("bison-runtime", msgid) @@ -560,16 +558,16 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 3 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 159 +#define YYLAST 160 /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 58 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 34 /* YYNRULES -- Number of rules. */ -#define YYNRULES 107 +#define YYNRULES 108 /* YYNRULES -- Number of states. */ -#define YYNSTATES 147 +#define YYNSTATES 148 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 @@ -630,56 +628,56 @@ static const yytype_uint16 yyprhs[] = 180, 182, 184, 187, 190, 194, 196, 199, 201, 204, 206, 209, 212, 213, 218, 220, 224, 227, 228, 232, 236, 240, 244, 248, 249, 251, 253, 255, 256, 258, - 260, 262, 264, 266, 268, 270, 272, 273 + 260, 262, 264, 266, 268, 270, 272, 274, 275 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int8 yyrhs[] = { - 59, 0, -1, 60, 49, 77, 91, -1, -1, 60, - 61, -1, 62, -1, 51, -1, 17, -1, 19, 84, + 59, 0, -1, 60, 50, 77, 91, -1, -1, 60, + 61, -1, 62, -1, 52, -1, 17, -1, 19, 84, 85, -1, 20, -1, 20, 3, -1, 21, -1, 22, - 4, -1, 23, 4, -1, 24, 3, -1, 24, 46, + 4, -1, 23, 4, -1, 24, 3, -1, 24, 47, 3, -1, 25, -1, 26, 43, -1, 27, 3, -1, - 28, 43, -1, 29, -1, 30, 3, -1, 30, 46, + 28, 43, -1, 29, -1, 30, 3, -1, 30, 47, 3, -1, 32, -1, 33, -1, 34, 3, -1, 34, - 46, 3, -1, 35, 43, -1, 36, -1, 37, 3, + 47, 3, -1, 35, 43, -1, 36, -1, 37, 3, -1, 38, 3, -1, 40, -1, 41, -1, 42, -1, - 52, -1, 67, -1, 64, -1, 39, 89, -1, 8, + 53, -1, 67, -1, 64, -1, 39, 89, -1, 8, 43, 73, -1, 9, 43, 73, -1, 18, -1, 31, - -1, 16, 86, -1, 16, 47, 86, -1, -1, 47, + -1, 16, 86, -1, 16, 48, 86, -1, -1, 48, -1, 57, 63, 86, -1, -1, 6, 65, 76, -1, - -1, 5, 66, 76, -1, 7, 53, 72, -1, 68, + -1, 5, 66, 76, -1, 7, 54, 72, -1, 68, 69, 70, -1, 10, -1, 11, -1, 12, -1, -1, - 53, -1, 71, -1, 70, 71, -1, 89, -1, 89, + 54, -1, 71, -1, 70, 71, -1, 89, -1, 89, 4, -1, 89, -1, 72, 89, -1, 74, -1, 73, - 74, -1, 89, -1, 53, -1, 54, -1, 55, -1, - 53, -1, 87, -1, 87, 4, -1, 87, 90, -1, + 74, -1, 89, -1, 54, -1, 55, -1, 56, -1, + 54, -1, 87, -1, 87, 4, -1, 87, 90, -1, 87, 4, 90, -1, 75, -1, 76, 75, -1, 78, - -1, 77, 78, -1, 79, -1, 62, 52, -1, 1, - 52, -1, -1, 88, 83, 80, 81, -1, 82, -1, - 81, 50, 82, -1, 81, 52, -1, -1, 82, 89, + -1, 77, 78, -1, 79, -1, 62, 53, -1, 1, + 53, -1, -1, 88, 83, 80, 81, -1, 82, -1, + 81, 51, 82, -1, 81, 53, -1, -1, 82, 89, 83, -1, 82, 43, 83, -1, 82, 13, 89, -1, - 82, 14, 4, -1, 82, 15, 53, -1, -1, 56, - -1, 47, -1, 3, -1, -1, 3, -1, 43, -1, - 47, -1, 44, -1, 48, -1, 87, -1, 90, -1, - 3, -1, -1, 49, 45, -1 + 82, 14, 4, -1, 82, 15, 54, -1, -1, 44, + -1, 48, -1, 3, -1, -1, 48, -1, 3, -1, + 43, -1, 48, -1, 45, -1, 49, -1, 87, -1, + 90, -1, 3, -1, -1, 50, 46, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 207, 207, 215, 217, 221, 222, 232, 233, 238, - 239, 244, 245, 246, 247, 248, 249, 254, 263, 264, - 265, 266, 267, 268, 269, 270, 271, 272, 273, 288, - 289, 313, 314, 315, 316, 320, 321, 322, 326, 333, - 340, 344, 348, 355, 370, 371, 375, 387, 387, 392, - 392, 397, 408, 423, 424, 425, 429, 430, 435, 437, - 442, 443, 448, 450, 455, 456, 460, 461, 462, 463, - 468, 473, 478, 484, 490, 501, 502, 511, 512, 518, - 519, 520, 527, 527, 532, 533, 534, 539, 541, 543, - 545, 547, 549, 555, 557, 569, 570, 575, 576, 585, - 605, 607, 616, 621, 622, 627, 634, 636 + 0, 208, 208, 216, 218, 222, 223, 233, 234, 239, + 240, 245, 246, 247, 248, 249, 250, 255, 264, 265, + 266, 267, 268, 269, 270, 271, 272, 273, 274, 289, + 290, 314, 315, 316, 317, 321, 322, 323, 327, 334, + 341, 345, 349, 356, 371, 372, 376, 388, 388, 393, + 393, 398, 409, 424, 425, 426, 430, 431, 436, 438, + 443, 444, 449, 451, 456, 457, 461, 462, 463, 464, + 469, 474, 479, 485, 491, 502, 503, 512, 513, 519, + 520, 521, 528, 528, 533, 534, 535, 540, 542, 544, + 546, 548, 550, 555, 557, 568, 569, 574, 575, 576, + 585, 605, 607, 616, 621, 622, 627, 634, 636 }; #endif @@ -699,11 +697,11 @@ static const char *const yytname[] = "\"%no-lines\"", "\"%nondeterministic-parser\"", "\"%output\"", "\"%parse-param\"", "\"%pure-parser\"", "\"%require\"", "\"%skeleton\"", "\"%start\"", "\"%token-table\"", "\"%verbose\"", "\"%yacc\"", - "\"{...}\"", "\"char\"", "\"epilogue\"", "\"=\"", "\"identifier\"", - "\"identifier:\"", "\"%%\"", "\"|\"", "\"%{...%}\"", "\";\"", "\"type\"", - "\"<*>\"", "\"<>\"", "\"[id]\"", "\"%union\"", "$accept", "input", - "prologue_declarations", "prologue_declaration", "grammar_declaration", - "union_name", "symbol_declaration", "$@1", "$@2", + "\"{...}\"", "\"[identifier]\"", "\"char\"", "\"epilogue\"", "\"=\"", + "\"identifier\"", "\"identifier:\"", "\"%%\"", "\"|\"", "\"%{...%}\"", + "\";\"", "\"type\"", "\"<*>\"", "\"<>\"", "\"%union\"", "$accept", + "input", "prologue_declarations", "prologue_declaration", + "grammar_declaration", "union_name", "symbol_declaration", "$@1", "$@2", "precedence_declaration", "precedence_declarator", "type.opt", "symbols.prec", "symbol.prec", "symbols.1", "generic_symlist", "generic_symlist_item", "symbol_def", "symbol_defs.1", "grammar", @@ -739,8 +737,8 @@ static const yytype_uint8 yyr1[] = 71, 71, 72, 72, 73, 73, 74, 74, 74, 74, 75, 75, 75, 75, 75, 76, 76, 77, 77, 78, 78, 78, 80, 79, 81, 81, 81, 82, 82, 82, - 82, 82, 82, 83, 83, 84, 84, 85, 85, 86, - 87, 87, 88, 89, 89, 90, 91, 91 + 82, 82, 82, 83, 83, 84, 84, 85, 85, 85, + 86, 87, 87, 88, 89, 89, 90, 91, 91 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -756,7 +754,7 @@ static const yytype_uint8 yyr2[] = 1, 1, 2, 2, 3, 1, 2, 1, 2, 1, 2, 2, 0, 4, 1, 3, 2, 0, 3, 3, 3, 3, 3, 0, 1, 1, 1, 0, 1, 1, - 1, 1, 1, 1, 1, 1, 0, 2 + 1, 1, 1, 1, 1, 1, 1, 0, 2 }; /* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM. @@ -769,101 +767,108 @@ static const yytype_uint8 yydefact[] = 0, 16, 0, 0, 0, 20, 0, 41, 23, 24, 0, 0, 28, 0, 0, 0, 31, 32, 33, 0, 6, 34, 44, 4, 5, 36, 35, 56, 0, 0, - 0, 0, 0, 99, 0, 42, 96, 95, 97, 10, + 0, 0, 0, 100, 0, 42, 96, 95, 97, 10, 12, 13, 14, 0, 17, 18, 19, 21, 0, 25, - 0, 27, 29, 30, 105, 101, 100, 103, 37, 104, - 0, 102, 0, 0, 77, 79, 93, 45, 0, 57, + 0, 27, 29, 30, 106, 102, 101, 104, 37, 105, + 0, 103, 0, 0, 77, 79, 93, 45, 0, 57, 0, 70, 75, 50, 71, 48, 51, 62, 67, 68, - 69, 38, 64, 66, 39, 43, 98, 8, 15, 22, - 26, 81, 80, 0, 78, 2, 94, 82, 46, 52, - 58, 60, 76, 72, 73, 63, 65, 107, 87, 59, - 61, 74, 83, 84, 87, 86, 0, 0, 0, 93, - 93, 85, 90, 91, 92, 89, 88 + 69, 38, 64, 66, 39, 43, 99, 98, 8, 15, + 22, 26, 81, 80, 0, 78, 2, 94, 82, 46, + 52, 58, 60, 76, 72, 73, 63, 65, 108, 87, + 59, 61, 74, 83, 84, 87, 86, 0, 0, 0, + 93, 93, 85, 90, 91, 92, 89, 88 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { -1, 1, 2, 43, 82, 88, 45, 49, 48, 46, - 47, 90, 119, 120, 96, 101, 102, 92, 93, 83, - 84, 85, 128, 132, 133, 117, 58, 107, 55, 77, - 86, 103, 79, 115 + 47, 90, 120, 121, 96, 101, 102, 92, 93, 83, + 84, 85, 129, 133, 134, 118, 58, 108, 55, 77, + 86, 103, 79, 116 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -60 +#define YYPACT_NINF -91 static const yytype_int16 yypact[] = { - -60, 4, 102, -60, -60, -60, 7, 10, 22, -60, - -60, -60, -6, -60, -60, 27, 40, -60, 65, 72, - 2, -60, 35, 79, 47, -60, 11, -60, -60, -60, - 25, 48, -60, 89, 90, 0, -60, -60, -60, 15, - -60, -60, 52, -60, -60, -60, -60, 41, -2, -2, - 0, 26, 26, -60, 59, -60, -60, -60, 92, -60, - -60, -60, -60, 100, -60, -60, -60, -60, 101, -60, - 112, -60, -60, -60, -60, -60, -60, -60, -60, -60, - 64, -60, 93, 1, -60, -60, 49, -60, 59, -60, - 0, -60, -60, -2, 83, -2, 0, -60, -60, -60, - -60, 26, -60, -60, 26, -60, -60, -60, -60, -60, - -60, -60, -60, 103, -60, -60, -60, -60, -60, 0, - -60, 113, -60, 143, -60, -60, -60, -60, -60, -60, - -60, -60, -16, 53, -60, -60, 0, 145, 94, 49, - 49, 53, -60, -60, -60, -60, -60 + -91, 3, 103, -91, -91, -91, -36, 2, 10, -91, + -91, -91, 9, -91, -91, 32, 60, -91, 65, 67, + 27, -91, 41, 73, 51, -91, 39, -91, -91, -91, + 40, 52, -91, 93, 95, 33, -91, -91, -91, 15, + -91, -91, 53, -91, -91, -91, -91, 46, 43, 43, + 33, 11, 11, -91, 61, -91, -91, -91, 35, -91, + -91, -91, -91, 100, -91, -91, -91, -91, 102, -91, + 113, -91, -91, -91, -91, -91, -91, -91, -91, -91, + 64, -91, 94, 1, -91, -91, 62, -91, 61, -91, + 33, -91, -91, 43, 86, 43, 33, -91, -91, -91, + -91, 11, -91, -91, 11, -91, -91, -91, -91, -91, + -91, -91, -91, -91, 72, -91, -91, -91, -91, -91, + 33, -91, 142, -91, 145, -91, -91, -91, -91, -91, + -91, -91, -91, 17, 34, -91, -91, 33, 146, 97, + 62, 62, 34, -91, -91, -91, -91, -91 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -60, -60, -60, -60, 148, -60, -60, -60, -60, -60, - -60, -60, -60, 33, -60, 104, -42, -18, 106, -60, - 74, -60, -60, -60, 24, -51, -60, -60, -36, -10, - -60, -35, -59, -60 + -91, -91, -91, -91, 147, -91, -91, -91, -91, -91, + -91, -91, -91, 37, -91, 106, -60, -33, 105, -91, + 69, -91, -91, -91, 24, -48, -91, -91, -49, -20, + -91, -35, -90, -91 }; /* 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 -107 + number is the opposite. If YYTABLE_NINF, syntax error. */ +#define YYTABLE_NINF -108 static const yytype_int16 yytable[] = { - 78, -106, 80, 74, 3, 62, 4, 5, 6, 7, - 8, 9, 10, 11, 67, 97, 80, 12, 105, 14, - 4, 5, 6, 7, 8, 9, 10, 11, 69, 74, - 56, 12, 27, 14, 134, 124, 135, 53, 94, 94, - 35, 54, 75, 59, 75, 76, 27, 76, 63, 81, - 113, 91, 118, 51, 35, 121, 74, 68, 42, 126, - 50, 125, 126, 81, 131, 52, 136, 137, 138, 60, - 75, 70, 42, 76, 57, 122, 61, 122, 64, 98, - 99, 100, 65, 94, 121, 94, 74, 123, 145, 146, - 66, 71, 72, 73, 89, 106, 139, 75, 140, 87, - 76, 142, 53, 108, 109, 116, 140, 4, 5, 6, - 7, 8, 9, 10, 11, 110, 111, 130, 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, 112, 74, 144, 127, 143, - 44, 39, 129, 40, 41, 95, 104, 114, 141, 42 + 78, -107, 80, 3, 125, 105, 4, 5, 6, 7, + 8, 9, 10, 11, 74, 97, 80, 12, 50, 14, + 4, 5, 6, 7, 8, 9, 10, 11, 94, 94, + 62, 12, 27, 14, 132, 56, 74, 74, 106, 119, + 35, 127, 67, 69, 127, 51, 27, 137, 138, 139, + 81, 114, 53, 52, 35, 122, 75, 54, 42, 76, + 123, 126, 123, 59, 81, 98, 99, 100, 135, 60, + 136, 61, 42, 94, 63, 94, 65, 140, 75, 75, + 57, 76, 76, 107, 64, 122, 68, 70, 75, 74, + 124, 76, 146, 147, 66, 71, 72, 91, 73, 141, + 89, 87, 143, 109, 53, 110, 117, 141, 4, 5, + 6, 7, 8, 9, 10, 11, 111, 112, 128, 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, 131, 113, 74, 44, + 144, 145, 115, 39, 95, 40, 41, 130, 104, 142, + 42 }; +#define yypact_value_is_default(yystate) \ + ((yystate) == (-91)) + +#define yytable_value_is_error(yytable_value) \ + YYID (0) + static const yytype_uint8 yycheck[] = { - 35, 0, 1, 3, 0, 3, 5, 6, 7, 8, + 35, 0, 1, 0, 94, 54, 5, 6, 7, 8, 9, 10, 11, 12, 3, 50, 1, 16, 54, 18, - 5, 6, 7, 8, 9, 10, 11, 12, 3, 3, - 3, 16, 31, 18, 50, 94, 52, 43, 48, 49, - 39, 47, 44, 3, 44, 47, 31, 47, 46, 48, - 49, 53, 88, 43, 39, 90, 3, 46, 57, 101, - 53, 96, 104, 48, 123, 43, 13, 14, 15, 4, - 44, 46, 57, 47, 47, 93, 4, 95, 43, 53, - 54, 55, 3, 93, 119, 95, 3, 4, 139, 140, - 43, 43, 3, 3, 53, 3, 43, 44, 133, 47, - 47, 136, 43, 3, 3, 56, 141, 5, 6, 7, - 8, 9, 10, 11, 12, 3, 52, 4, 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, 52, 3, 53, 45, 4, - 2, 49, 119, 51, 52, 49, 52, 83, 134, 57 + 5, 6, 7, 8, 9, 10, 11, 12, 48, 49, + 3, 16, 31, 18, 124, 3, 3, 3, 3, 88, + 39, 101, 3, 3, 104, 43, 31, 13, 14, 15, + 49, 50, 43, 43, 39, 90, 45, 48, 57, 48, + 93, 96, 95, 3, 49, 54, 55, 56, 51, 4, + 53, 4, 57, 93, 47, 95, 3, 43, 45, 45, + 48, 48, 48, 48, 43, 120, 47, 47, 45, 3, + 4, 48, 140, 141, 43, 43, 3, 54, 3, 134, + 54, 48, 137, 3, 43, 3, 44, 142, 5, 6, + 7, 8, 9, 10, 11, 12, 3, 53, 46, 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, 4, 53, 3, 2, + 4, 54, 83, 50, 49, 52, 53, 120, 52, 135, + 57 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -873,18 +878,18 @@ static const yytype_uint8 yystos[] = 0, 59, 60, 0, 5, 6, 7, 8, 9, 10, 11, 12, 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, 49, - 51, 52, 57, 61, 62, 64, 67, 68, 66, 65, - 53, 43, 43, 43, 47, 86, 3, 47, 84, 3, - 4, 4, 3, 46, 43, 3, 43, 3, 46, 3, - 46, 43, 3, 3, 3, 44, 47, 87, 89, 90, - 1, 48, 62, 77, 78, 79, 88, 47, 63, 53, - 69, 53, 75, 76, 87, 76, 72, 89, 53, 54, - 55, 73, 74, 89, 73, 86, 3, 85, 3, 3, - 3, 52, 52, 49, 78, 91, 56, 83, 86, 70, - 71, 89, 75, 4, 90, 89, 74, 45, 80, 71, - 4, 90, 81, 82, 50, 52, 13, 14, 15, 43, - 89, 82, 89, 4, 53, 83, 83 + 34, 35, 36, 37, 38, 39, 40, 41, 42, 50, + 52, 53, 57, 61, 62, 64, 67, 68, 66, 65, + 54, 43, 43, 43, 48, 86, 3, 48, 84, 3, + 4, 4, 3, 47, 43, 3, 43, 3, 47, 3, + 47, 43, 3, 3, 3, 45, 48, 87, 89, 90, + 1, 49, 62, 77, 78, 79, 88, 48, 63, 54, + 69, 54, 75, 76, 87, 76, 72, 89, 54, 55, + 56, 73, 74, 89, 73, 86, 3, 48, 85, 3, + 3, 3, 53, 53, 50, 78, 91, 44, 83, 86, + 70, 71, 89, 75, 4, 90, 89, 74, 46, 80, + 71, 4, 90, 81, 82, 51, 53, 13, 14, 15, + 43, 89, 82, 89, 4, 54, 83, 83 }; #define yyerrok (yyerrstatus = 0) @@ -899,9 +904,18 @@ static const yytype_uint8 yystos[] = /* Like YYERROR except do call yyerror. This remains here temporarily to ease the transition to the new meaning of YYERROR, for GCC. - Once GCC version 2 has supplanted version 1, this can go. */ + Once GCC version 2 has supplanted version 1, this can go. However, + YYFAIL appears to be in use. Nevertheless, it is formally deprecated + in Bison 2.4.2's NEWS entry, where a plan to phase it out is + discussed. */ #define YYFAIL goto yyerrlab +#if defined YYFAIL + /* This is here to suppress warnings from the GCC cpp's + -Wunused-macros. Normally we don't worry about that warning, but + some users do, and we want to make it easy for users to remove + YYFAIL uses, which will produce warnings from Bison 2.5. */ +#endif #define YYRECOVERING() (!!yyerrstatus) @@ -911,7 +925,6 @@ do \ { \ yychar = (Token); \ yylval = (Value); \ - yytoken = YYTRANSLATE (yychar); \ YYPOPSTACK (1); \ goto yybackup; \ } \ @@ -958,7 +971,7 @@ while (YYID (0)) we won't break user code: when these are the locations we know. */ #ifndef YY_LOCATION_PRINT -# if YYLTYPE_IS_TRIVIAL +# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL # define YY_LOCATION_PRINT(File, Loc) \ fprintf (File, "%d.%d-%d.%d", \ (Loc).first_line, (Loc).first_column, \ @@ -1034,147 +1047,165 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp) { case 3: /* "\"string\"" */ -/* Line 716 of yacc.c */ -#line 184 "parse-gram.y" +/* Line 797 of yacc.c */ +#line 183 "parse-gram.y" { fputs (quotearg_style (c_quoting_style, (yyvaluep->chars)), stderr); }; -/* Line 716 of yacc.c */ -#line 1043 "../../bison-2.5/src/parse-gram.c" +/* Line 797 of yacc.c */ +#line 1056 "parse-gram.c" break; case 4: /* "\"integer\"" */ -/* Line 716 of yacc.c */ -#line 196 "parse-gram.y" +/* Line 797 of yacc.c */ +#line 195 "parse-gram.y" { fprintf (stderr, "%d", (yyvaluep->integer)); }; -/* Line 716 of yacc.c */ -#line 1052 "../../bison-2.5/src/parse-gram.c" +/* Line 797 of yacc.c */ +#line 1065 "parse-gram.c" break; case 43: /* "\"{...}\"" */ -/* Line 716 of yacc.c */ -#line 186 "parse-gram.y" +/* Line 797 of yacc.c */ +#line 185 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->code)); }; -/* Line 716 of yacc.c */ -#line 1061 "../../bison-2.5/src/parse-gram.c" +/* Line 797 of yacc.c */ +#line 1074 "parse-gram.c" + break; + case 44: /* "\"[identifier]\"" */ + +/* Line 797 of yacc.c */ +#line 190 "parse-gram.y" + { fprintf (stderr, "[%s]", (yyvaluep->uniqstr)); }; + +/* Line 797 of yacc.c */ +#line 1083 "parse-gram.c" break; - case 44: /* "\"char\"" */ + case 45: /* "\"char\"" */ -/* Line 716 of yacc.c */ -#line 178 "parse-gram.y" +/* Line 797 of yacc.c */ +#line 177 "parse-gram.y" { fputs (char_name ((yyvaluep->character)), stderr); }; -/* Line 716 of yacc.c */ -#line 1070 "../../bison-2.5/src/parse-gram.c" +/* Line 797 of yacc.c */ +#line 1092 "parse-gram.c" break; - case 45: /* "\"epilogue\"" */ + case 46: /* "\"epilogue\"" */ -/* Line 716 of yacc.c */ -#line 186 "parse-gram.y" +/* Line 797 of yacc.c */ +#line 185 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -/* Line 716 of yacc.c */ -#line 1079 "../../bison-2.5/src/parse-gram.c" +/* Line 797 of yacc.c */ +#line 1101 "parse-gram.c" break; - case 47: /* "\"identifier\"" */ + case 48: /* "\"identifier\"" */ -/* Line 716 of yacc.c */ -#line 192 "parse-gram.y" +/* Line 797 of yacc.c */ +#line 189 "parse-gram.y" { fputs ((yyvaluep->uniqstr), stderr); }; -/* Line 716 of yacc.c */ -#line 1088 "../../bison-2.5/src/parse-gram.c" +/* Line 797 of yacc.c */ +#line 1110 "parse-gram.c" break; - case 48: /* "\"identifier:\"" */ + case 49: /* "\"identifier:\"" */ -/* Line 716 of yacc.c */ -#line 193 "parse-gram.y" +/* Line 797 of yacc.c */ +#line 191 "parse-gram.y" { fprintf (stderr, "%s:", (yyvaluep->uniqstr)); }; -/* Line 716 of yacc.c */ -#line 1097 "../../bison-2.5/src/parse-gram.c" +/* Line 797 of yacc.c */ +#line 1119 "parse-gram.c" break; - case 51: /* "\"%{...%}\"" */ + case 52: /* "\"%{...%}\"" */ -/* Line 716 of yacc.c */ -#line 186 "parse-gram.y" +/* Line 797 of yacc.c */ +#line 185 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -/* Line 716 of yacc.c */ -#line 1106 "../../bison-2.5/src/parse-gram.c" +/* Line 797 of yacc.c */ +#line 1128 "parse-gram.c" break; - case 53: /* "\"type\"" */ + case 54: /* "\"type\"" */ -/* Line 716 of yacc.c */ -#line 191 "parse-gram.y" +/* Line 797 of yacc.c */ +#line 192 "parse-gram.y" { fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); }; -/* Line 716 of yacc.c */ -#line 1115 "../../bison-2.5/src/parse-gram.c" +/* Line 797 of yacc.c */ +#line 1137 "parse-gram.c" + break; + case 71: /* "symbol.prec" */ + +/* Line 797 of yacc.c */ +#line 198 "parse-gram.y" + { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; + +/* Line 797 of yacc.c */ +#line 1146 "parse-gram.c" break; case 84: /* "variable" */ -/* Line 716 of yacc.c */ -#line 192 "parse-gram.y" +/* Line 797 of yacc.c */ +#line 189 "parse-gram.y" { fputs ((yyvaluep->uniqstr), stderr); }; -/* Line 716 of yacc.c */ -#line 1124 "../../bison-2.5/src/parse-gram.c" +/* Line 797 of yacc.c */ +#line 1155 "parse-gram.c" break; case 85: /* "content.opt" */ -/* Line 716 of yacc.c */ -#line 186 "parse-gram.y" +/* Line 797 of yacc.c */ +#line 185 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -/* Line 716 of yacc.c */ -#line 1133 "../../bison-2.5/src/parse-gram.c" +/* Line 797 of yacc.c */ +#line 1164 "parse-gram.c" break; case 86: /* "braceless" */ -/* Line 716 of yacc.c */ -#line 186 "parse-gram.y" +/* Line 797 of yacc.c */ +#line 185 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -/* Line 716 of yacc.c */ -#line 1142 "../../bison-2.5/src/parse-gram.c" +/* Line 797 of yacc.c */ +#line 1173 "parse-gram.c" break; case 87: /* "id" */ -/* Line 716 of yacc.c */ -#line 199 "parse-gram.y" +/* Line 797 of yacc.c */ +#line 198 "parse-gram.y" { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; -/* Line 716 of yacc.c */ -#line 1151 "../../bison-2.5/src/parse-gram.c" +/* Line 797 of yacc.c */ +#line 1182 "parse-gram.c" break; case 88: /* "id_colon" */ -/* Line 716 of yacc.c */ -#line 200 "parse-gram.y" +/* Line 797 of yacc.c */ +#line 199 "parse-gram.y" { fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); }; -/* Line 716 of yacc.c */ -#line 1160 "../../bison-2.5/src/parse-gram.c" +/* Line 797 of yacc.c */ +#line 1191 "parse-gram.c" break; case 89: /* "symbol" */ -/* Line 716 of yacc.c */ -#line 199 "parse-gram.y" +/* Line 797 of yacc.c */ +#line 198 "parse-gram.y" { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; -/* Line 716 of yacc.c */ -#line 1169 "../../bison-2.5/src/parse-gram.c" +/* Line 797 of yacc.c */ +#line 1200 "parse-gram.c" break; case 90: /* "string_as_id" */ -/* Line 716 of yacc.c */ -#line 199 "parse-gram.y" +/* Line 797 of yacc.c */ +#line 198 "parse-gram.y" { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; -/* Line 716 of yacc.c */ -#line 1178 "../../bison-2.5/src/parse-gram.c" +/* Line 797 of yacc.c */ +#line 1209 "parse-gram.c" break; default: break; @@ -1410,111 +1441,121 @@ yytnamerr (char *yyres, const char *yystr) } # endif -/* Copy into YYRESULT an error message about the unexpected token - YYCHAR while in state YYSTATE. Return the number of bytes copied, - including the terminating null byte. If YYRESULT is null, do not - copy anything; just return the number of bytes that would be - copied. As a special case, return 0 if an ordinary "syntax error" - message will do. Return YYSIZE_MAXIMUM if overflow occurs during - size calculation. */ -static YYSIZE_T -yysyntax_error (char *yyresult, int yystate, int yychar) +/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message + about the unexpected token YYTOKEN while in state YYSTATE. + + Return 0 if *YYMSG was successfully written. Return 1 if an ordinary + "syntax error" message will suffice instead. Return 2 if *YYMSG is + not large enough to hold the message. In the last case, also set + *YYMSG_ALLOC to either (a) the required number of bytes or (b) zero + if the required number of bytes is too large to store. */ +static int +yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, + int yystate, int yytoken) { int yyn = yypact[yystate]; if (! (YYPACT_NINF < yyn && yyn <= YYLAST)) - return 0; + return 1; else { - int yytype = YYTRANSLATE (yychar); - YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]); + YYSIZE_T yysize0 = yytnamerr (0, yytname[yytoken]); YYSIZE_T yysize = yysize0; YYSIZE_T yysize1; - int yysize_overflow = 0; enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; + /* Internationalized format string. */ + const char *yyformat = 0; + /* Arguments of yyformat. */ char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; - int yyx; - -# if 0 - /* This is so xgettext sees the translatable formats that are - constructed on the fly. */ - YY_("syntax error, unexpected %s"); - YY_("syntax error, unexpected %s, expecting %s"); - YY_("syntax error, unexpected %s, expecting %s or %s"); - YY_("syntax error, unexpected %s, expecting %s or %s or %s"); - YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"); -# endif - char *yyfmt; - char const *yyf; - static char const yyunexpected[] = "syntax error, unexpected %s"; - static char const yyexpecting[] = ", expecting %s"; - static char const yyor[] = " or %s"; - char yyformat[sizeof yyunexpected - + sizeof yyexpecting - 1 - + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2) - * (sizeof yyor - 1))]; - char const *yyprefix = yyexpecting; /* Start YYX at -YYN if negative to avoid negative indexes in - YYCHECK. */ + YYCHECK. In other words, skip the first -YYN actions for this + state because they are default actions. */ int yyxbegin = yyn < 0 ? -yyn : 0; /* Stay within bounds of both yycheck and yytname. */ int yychecklim = YYLAST - yyn + 1; int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; - int yycount = 1; + /* Number of reported tokens (one for the "unexpected", one per + "expected"). */ + int yycount = 0; + int yyx; - yyarg[0] = yytname[yytype]; - yyfmt = yystpcpy (yyformat, yyunexpected); + yyarg[yycount++] = yytname[yytoken]; for (yyx = yyxbegin; yyx < yyxend; ++yyx) - if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) + if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR + && !yytable_value_is_error (yytable[yyx + yyn])) { if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) { yycount = 1; yysize = yysize0; - yyformat[sizeof yyunexpected - 1] = '\0'; break; } yyarg[yycount++] = yytname[yyx]; yysize1 = yysize + yytnamerr (0, yytname[yyx]); - yysize_overflow |= (yysize1 < yysize); + if (! (yysize <= yysize1 + && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + { + /* Overflow. */ + *yymsg_alloc = 0; + return 2; + } yysize = yysize1; - yyfmt = yystpcpy (yyfmt, yyprefix); - yyprefix = yyor; } - yyf = YY_(yyformat); - yysize1 = yysize + yystrlen (yyf); - yysize_overflow |= (yysize1 < yysize); + switch (yycount) + { +#define YYCASE_(N, S) \ + case N: \ + yyformat = S; \ + break + YYCASE_(1, YY_("syntax error, unexpected %s")); + YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s")); + YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s")); + YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s")); + YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s")); +#undef YYCASE_ + } + + yysize1 = yysize + yystrlen (yyformat); + if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + { + /* Overflow. */ + *yymsg_alloc = 0; + return 2; + } yysize = yysize1; - if (yysize_overflow) - return YYSIZE_MAXIMUM; + if (*yymsg_alloc < yysize) + { + *yymsg_alloc = 2 * yysize; + if (! (yysize <= *yymsg_alloc + && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM)) + *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM; + return 2; + } - if (yyresult) - { - /* Avoid sprintf, as that infringes on the user's name space. - Don't have undefined behavior even if the translation - produced a string with the wrong number of "%s"s. */ - char *yyp = yyresult; - int yyi = 0; - while ((*yyp = *yyf) != '\0') - { - if (*yyp == '%' && yyf[1] == 's' && yyi < yycount) - { - yyp += yytnamerr (yyp, yyarg[yyi++]); - yyf += 2; - } - else - { - yyp++; - yyf++; - } - } - } - return yysize; + /* Avoid sprintf, as that infringes on the user's name space. + Don't have undefined behavior even if the translation + produced a string with the wrong number of "%s"s. */ + { + char *yyp = *yymsg; + int yyi = 0; + while ((*yyp = *yyformat) != '\0') + if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount) + { + yyp += yytnamerr (yyp, yyarg[yyi++]); + yyformat += 2; + } + else + { + yyp++; + yyformat++; + } + } + return 0; } } #endif /* YYERROR_VERBOSE */ @@ -1553,6 +1594,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp) } } + /* Prevent warnings from -Wmissing-prototypes. */ #ifdef YYPARSE_PARAM #if defined __STDC__ || defined __cplusplus @@ -1569,12 +1611,9 @@ int yyparse (); #endif /* ! YYPARSE_PARAM */ - - - -/*-------------------------. -| yyparse or yypush_parse. | -`-------------------------*/ +/*----------. +| yyparse. | +`----------*/ #ifdef YYPARSE_PARAM #if (defined __STDC__ || defined __C99__FUNC__ \ @@ -1638,7 +1677,7 @@ YYLTYPE yylloc; YYLTYPE *yylsp; /* The locations where the error started and ended. */ - YYLTYPE yyerror_range[2]; + YYLTYPE yyerror_range[3]; YYSIZE_T yystacksize; @@ -1685,7 +1724,7 @@ YYLTYPE yylloc; yyvsp = yyvs; yylsp = yyls; -#if YYLTYPE_IS_TRIVIAL +#if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL /* Initialize the default location before parsing starts. */ yylloc.first_line = yylloc.last_line = 1; yylloc.first_column = yylloc.last_column = 1; @@ -1693,8 +1732,8 @@ YYLTYPE yylloc; /* User initialization code. */ -/* Line 1243 of yacc.c */ -#line 86 "parse-gram.y" +/* Line 1280 of yacc.c */ +#line 85 "parse-gram.y" { /* Bison's grammar can initial empty locations, hence a default location is needed. */ @@ -1702,8 +1741,8 @@ YYLTYPE yylloc; boundary_set (&yylloc.end, current_file, 1, 1); } -/* Line 1243 of yacc.c */ -#line 1707 "../../bison-2.5/src/parse-gram.c" +/* Line 1280 of yacc.c */ +#line 1746 "parse-gram.c" yylsp[0] = yylloc; goto yysetstate; @@ -1802,7 +1841,7 @@ yybackup: /* First try to decide what to do without reference to lookahead token. */ yyn = yypact[yystate]; - if (yyn == YYPACT_NINF) + if (yypact_value_is_default (yyn)) goto yydefault; /* Not known => get a lookahead token if don't already have one. */ @@ -1833,7 +1872,7 @@ yybackup: yyn = yytable[yyn]; if (yyn <= 0) { - if (yyn == 0 || yyn == YYTABLE_NINF) + if (yytable_value_is_error (yyn)) goto yyerrlab; yyn = -yyn; goto yyreduce; @@ -1890,8 +1929,8 @@ yyreduce: { case 6: -/* Line 1456 of yacc.c */ -#line 223 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 224 "parse-gram.y" { code_props plain_code; code_props_plain_init (&plain_code, (yyvsp[(1) - (1)].chars), (yylsp[(1) - (1)])); @@ -1905,15 +1944,15 @@ yyreduce: case 7: -/* Line 1456 of yacc.c */ -#line 232 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 233 "parse-gram.y" { debug_flag = true; } break; case 8: -/* Line 1456 of yacc.c */ -#line 234 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 235 "parse-gram.y" { muscle_percent_define_insert ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars), MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE); @@ -1922,15 +1961,15 @@ yyreduce: case 9: -/* Line 1456 of yacc.c */ -#line 238 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 239 "parse-gram.y" { defines_flag = true; } break; case 10: -/* Line 1456 of yacc.c */ -#line 240 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 241 "parse-gram.y" { defines_flag = true; spec_defines_file = xstrdup ((yyvsp[(2) - (2)].chars)); @@ -1939,43 +1978,43 @@ yyreduce: case 11: -/* Line 1456 of yacc.c */ -#line 244 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 245 "parse-gram.y" { error_verbose = true; } break; case 12: -/* Line 1456 of yacc.c */ -#line 245 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 246 "parse-gram.y" { expected_sr_conflicts = (yyvsp[(2) - (2)].integer); } break; case 13: -/* Line 1456 of yacc.c */ -#line 246 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 247 "parse-gram.y" { expected_rr_conflicts = (yyvsp[(2) - (2)].integer); } break; case 14: -/* Line 1456 of yacc.c */ -#line 247 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 248 "parse-gram.y" { spec_file_prefix = (yyvsp[(2) - (2)].chars); } break; case 15: -/* Line 1456 of yacc.c */ -#line 248 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 249 "parse-gram.y" { spec_file_prefix = (yyvsp[(3) - (3)].chars); } break; case 16: -/* Line 1456 of yacc.c */ -#line 250 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 251 "parse-gram.y" { nondeterministic_parser = true; glr_parser = true; @@ -1984,8 +2023,8 @@ yyreduce: case 17: -/* Line 1456 of yacc.c */ -#line 255 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 256 "parse-gram.y" { code_props action; code_props_symbol_action_init (&action, (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); @@ -1998,78 +2037,78 @@ yyreduce: case 18: -/* Line 1456 of yacc.c */ -#line 263 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 264 "parse-gram.y" { language_argmatch ((yyvsp[(2) - (2)].chars), grammar_prio, (yylsp[(1) - (2)])); } break; case 19: -/* Line 1456 of yacc.c */ -#line 264 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 265 "parse-gram.y" { add_param ("lex_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); } break; case 20: -/* Line 1456 of yacc.c */ -#line 265 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 266 "parse-gram.y" { locations_flag = true; } break; case 21: -/* Line 1456 of yacc.c */ -#line 266 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 267 "parse-gram.y" { spec_name_prefix = (yyvsp[(2) - (2)].chars); } break; case 22: -/* Line 1456 of yacc.c */ -#line 267 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 268 "parse-gram.y" { spec_name_prefix = (yyvsp[(3) - (3)].chars); } break; case 23: -/* Line 1456 of yacc.c */ -#line 268 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 269 "parse-gram.y" { no_lines_flag = true; } break; case 24: -/* Line 1456 of yacc.c */ -#line 269 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 270 "parse-gram.y" { nondeterministic_parser = true; } break; case 25: -/* Line 1456 of yacc.c */ -#line 270 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 271 "parse-gram.y" { spec_outfile = (yyvsp[(2) - (2)].chars); } break; case 26: -/* Line 1456 of yacc.c */ -#line 271 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 272 "parse-gram.y" { spec_outfile = (yyvsp[(3) - (3)].chars); } break; case 27: -/* Line 1456 of yacc.c */ -#line 272 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 273 "parse-gram.y" { add_param ("parse_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); } break; case 28: -/* Line 1456 of yacc.c */ -#line 274 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 275 "parse-gram.y" { /* %pure-parser is deprecated in favor of `%define api.pure', so use `%define api.pure' in a backward-compatible manner here. First, don't @@ -2088,15 +2127,15 @@ yyreduce: case 29: -/* Line 1456 of yacc.c */ -#line 288 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 289 "parse-gram.y" { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); } break; case 30: -/* Line 1456 of yacc.c */ -#line 290 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 291 "parse-gram.y" { char const *skeleton_user = (yyvsp[(2) - (2)].chars); if (strchr (skeleton_user, '/')) @@ -2124,29 +2163,29 @@ yyreduce: case 31: -/* Line 1456 of yacc.c */ -#line 313 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 314 "parse-gram.y" { token_table_flag = true; } break; case 32: -/* Line 1456 of yacc.c */ -#line 314 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 315 "parse-gram.y" { report_flag |= report_states; } break; case 33: -/* Line 1456 of yacc.c */ -#line 315 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 316 "parse-gram.y" { yacc_flag = true; } break; case 37: -/* Line 1456 of yacc.c */ -#line 323 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 324 "parse-gram.y" { grammar_start_symbol_set ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); } @@ -2154,8 +2193,8 @@ yyreduce: case 38: -/* Line 1456 of yacc.c */ -#line 327 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 328 "parse-gram.y" { symbol_list *list; for (list = (yyvsp[(3) - (3)].list); list; list = list->next) @@ -2166,8 +2205,8 @@ yyreduce: case 39: -/* Line 1456 of yacc.c */ -#line 334 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 335 "parse-gram.y" { symbol_list *list; for (list = (yyvsp[(3) - (3)].list); list; list = list->next) @@ -2178,8 +2217,8 @@ yyreduce: case 40: -/* Line 1456 of yacc.c */ -#line 341 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 342 "parse-gram.y" { default_prec = true; } @@ -2187,8 +2226,8 @@ yyreduce: case 41: -/* Line 1456 of yacc.c */ -#line 345 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 346 "parse-gram.y" { default_prec = false; } @@ -2196,8 +2235,8 @@ yyreduce: case 42: -/* Line 1456 of yacc.c */ -#line 349 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 350 "parse-gram.y" { /* Do not invoke muscle_percent_code_grow here since it invokes muscle_user_name_list_grow. */ @@ -2208,8 +2247,8 @@ yyreduce: case 43: -/* Line 1456 of yacc.c */ -#line 356 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 357 "parse-gram.y" { muscle_percent_code_grow ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)])); code_scanner_last_string_free (); @@ -2218,22 +2257,22 @@ yyreduce: case 44: -/* Line 1456 of yacc.c */ -#line 370 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 371 "parse-gram.y" {} break; case 45: -/* Line 1456 of yacc.c */ -#line 371 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 372 "parse-gram.y" { muscle_code_grow ("union_name", (yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; case 46: -/* Line 1456 of yacc.c */ -#line 376 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 377 "parse-gram.y" { union_seen = true; muscle_code_grow ("stype", (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)])); @@ -2243,15 +2282,15 @@ yyreduce: case 47: -/* Line 1456 of yacc.c */ -#line 387 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 388 "parse-gram.y" { current_class = nterm_sym; } break; case 48: -/* Line 1456 of yacc.c */ -#line 388 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 389 "parse-gram.y" { current_class = unknown_sym; current_type = NULL; @@ -2260,15 +2299,15 @@ yyreduce: case 49: -/* Line 1456 of yacc.c */ -#line 392 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 393 "parse-gram.y" { current_class = token_sym; } break; case 50: -/* Line 1456 of yacc.c */ -#line 393 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 394 "parse-gram.y" { current_class = unknown_sym; current_type = NULL; @@ -2277,8 +2316,8 @@ yyreduce: case 51: -/* Line 1456 of yacc.c */ -#line 398 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 399 "parse-gram.y" { symbol_list *list; tag_seen = true; @@ -2290,8 +2329,8 @@ yyreduce: case 52: -/* Line 1456 of yacc.c */ -#line 409 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 410 "parse-gram.y" { symbol_list *list; ++current_prec; @@ -2307,127 +2346,127 @@ yyreduce: case 53: -/* Line 1456 of yacc.c */ -#line 423 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 424 "parse-gram.y" { (yyval.assoc) = left_assoc; } break; case 54: -/* Line 1456 of yacc.c */ -#line 424 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 425 "parse-gram.y" { (yyval.assoc) = right_assoc; } break; case 55: -/* Line 1456 of yacc.c */ -#line 425 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 426 "parse-gram.y" { (yyval.assoc) = non_assoc; } break; case 56: -/* Line 1456 of yacc.c */ -#line 429 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 430 "parse-gram.y" { current_type = NULL; } break; case 57: -/* Line 1456 of yacc.c */ -#line 430 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 431 "parse-gram.y" { current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; } break; case 58: -/* Line 1456 of yacc.c */ -#line 436 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 437 "parse-gram.y" { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); } break; case 59: -/* Line 1456 of yacc.c */ -#line 438 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 439 "parse-gram.y" { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); } break; case 60: -/* Line 1456 of yacc.c */ -#line 442 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 443 "parse-gram.y" { (yyval.symbol) = (yyvsp[(1) - (1)].symbol); } break; case 61: -/* Line 1456 of yacc.c */ -#line 443 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 444 "parse-gram.y" { (yyval.symbol) = (yyvsp[(1) - (2)].symbol); symbol_user_token_number_set ((yyvsp[(1) - (2)].symbol), (yyvsp[(2) - (2)].integer), (yylsp[(2) - (2)])); } break; case 62: -/* Line 1456 of yacc.c */ -#line 449 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 450 "parse-gram.y" { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); } break; case 63: -/* Line 1456 of yacc.c */ -#line 451 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 452 "parse-gram.y" { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); } break; case 64: -/* Line 1456 of yacc.c */ -#line 455 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 456 "parse-gram.y" { (yyval.list) = (yyvsp[(1) - (1)].list); } break; case 65: -/* Line 1456 of yacc.c */ -#line 456 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 457 "parse-gram.y" { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); } break; case 66: -/* Line 1456 of yacc.c */ -#line 460 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 461 "parse-gram.y" { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); } break; case 67: -/* Line 1456 of yacc.c */ -#line 461 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 462 "parse-gram.y" { (yyval.list) = symbol_list_type_new ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; case 68: -/* Line 1456 of yacc.c */ -#line 462 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 463 "parse-gram.y" { (yyval.list) = symbol_list_default_tagged_new ((yylsp[(1) - (1)])); } break; case 69: -/* Line 1456 of yacc.c */ -#line 463 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 464 "parse-gram.y" { (yyval.list) = symbol_list_default_tagless_new ((yylsp[(1) - (1)])); } break; case 70: -/* Line 1456 of yacc.c */ -#line 469 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 470 "parse-gram.y" { current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; @@ -2436,8 +2475,8 @@ yyreduce: case 71: -/* Line 1456 of yacc.c */ -#line 474 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 475 "parse-gram.y" { symbol_class_set ((yyvsp[(1) - (1)].symbol), current_class, (yylsp[(1) - (1)]), true); symbol_type_set ((yyvsp[(1) - (1)].symbol), current_type, (yylsp[(1) - (1)])); @@ -2446,8 +2485,8 @@ yyreduce: case 72: -/* Line 1456 of yacc.c */ -#line 479 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 480 "parse-gram.y" { symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true); symbol_type_set ((yyvsp[(1) - (2)].symbol), current_type, (yylsp[(1) - (2)])); @@ -2457,8 +2496,8 @@ yyreduce: case 73: -/* Line 1456 of yacc.c */ -#line 485 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 486 "parse-gram.y" { symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true); symbol_type_set ((yyvsp[(1) - (2)].symbol), current_type, (yylsp[(1) - (2)])); @@ -2468,8 +2507,8 @@ yyreduce: case 74: -/* Line 1456 of yacc.c */ -#line 491 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 492 "parse-gram.y" { symbol_class_set ((yyvsp[(1) - (3)].symbol), current_class, (yylsp[(1) - (3)]), true); symbol_type_set ((yyvsp[(1) - (3)].symbol), current_type, (yylsp[(1) - (3)])); @@ -2480,8 +2519,8 @@ yyreduce: case 81: -/* Line 1456 of yacc.c */ -#line 521 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 522 "parse-gram.y" { yyerrok; } @@ -2489,100 +2528,107 @@ yyreduce: case 82: -/* Line 1456 of yacc.c */ -#line 527 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 528 "parse-gram.y" { current_lhs = (yyvsp[(1) - (2)].symbol); current_lhs_location = (yylsp[(1) - (2)]); current_lhs_named_ref = (yyvsp[(2) - (2)].named_ref); } break; case 84: -/* Line 1456 of yacc.c */ -#line 532 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 533 "parse-gram.y" { grammar_current_rule_end ((yylsp[(1) - (1)])); } break; case 85: -/* Line 1456 of yacc.c */ -#line 533 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 534 "parse-gram.y" { grammar_current_rule_end ((yylsp[(3) - (3)])); } break; case 87: -/* Line 1456 of yacc.c */ -#line 539 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 540 "parse-gram.y" { grammar_current_rule_begin (current_lhs, current_lhs_location, current_lhs_named_ref); } break; case 88: -/* Line 1456 of yacc.c */ -#line 542 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 543 "parse-gram.y" { grammar_current_rule_symbol_append ((yyvsp[(2) - (3)].symbol), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].named_ref)); } break; case 89: -/* Line 1456 of yacc.c */ -#line 544 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 545 "parse-gram.y" { grammar_current_rule_action_append ((yyvsp[(2) - (3)].code), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].named_ref)); } break; case 90: -/* Line 1456 of yacc.c */ -#line 546 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 547 "parse-gram.y" { grammar_current_rule_prec_set ((yyvsp[(3) - (3)].symbol), (yylsp[(3) - (3)])); } break; case 91: -/* Line 1456 of yacc.c */ -#line 548 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 549 "parse-gram.y" { grammar_current_rule_dprec_set ((yyvsp[(3) - (3)].integer), (yylsp[(3) - (3)])); } break; case 92: -/* Line 1456 of yacc.c */ -#line 550 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 551 "parse-gram.y" { grammar_current_rule_merge_set ((yyvsp[(3) - (3)].uniqstr), (yylsp[(3) - (3)])); } break; case 93: -/* Line 1456 of yacc.c */ +/* Line 1493 of yacc.c */ #line 555 "parse-gram.y" { (yyval.named_ref) = 0; } break; case 94: -/* Line 1456 of yacc.c */ -#line 558 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 557 "parse-gram.y" { (yyval.named_ref) = named_ref_new((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; case 96: -/* Line 1456 of yacc.c */ -#line 570 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 569 "parse-gram.y" { (yyval.uniqstr) = uniqstr_new ((yyvsp[(1) - (1)].chars)); } break; case 97: -/* Line 1456 of yacc.c */ -#line 575 "parse-gram.y" +/* Line 1493 of yacc.c */ +#line 574 "parse-gram.y" { (yyval.chars) = ""; } break; - case 99: + case 98: -/* Line 1456 of yacc.c */ +/* Line 1493 of yacc.c */ +#line 575 "parse-gram.y" + { (yyval.chars) = (yyvsp[(1) - (1)].uniqstr); } + break; + + case 100: + +/* Line 1493 of yacc.c */ #line 586 "parse-gram.y" { code_props plain_code; @@ -2594,16 +2640,16 @@ yyreduce: } break; - case 100: + case 101: -/* Line 1456 of yacc.c */ +/* Line 1493 of yacc.c */ #line 606 "parse-gram.y" { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; - case 101: + case 102: -/* Line 1456 of yacc.c */ +/* Line 1493 of yacc.c */ #line 608 "parse-gram.y" { (yyval.symbol) = symbol_get (char_name ((yyvsp[(1) - (1)].character)), (yylsp[(1) - (1)])); @@ -2612,16 +2658,16 @@ yyreduce: } break; - case 102: + case 103: -/* Line 1456 of yacc.c */ +/* Line 1493 of yacc.c */ #line 616 "parse-gram.y" { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; - case 105: + case 106: -/* Line 1456 of yacc.c */ +/* Line 1493 of yacc.c */ #line 628 "parse-gram.y" { (yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[(1) - (1)].chars)), (yylsp[(1) - (1)])); @@ -2629,9 +2675,9 @@ yyreduce: } break; - case 107: + case 108: -/* Line 1456 of yacc.c */ +/* Line 1493 of yacc.c */ #line 637 "parse-gram.y" { code_props plain_code; @@ -2645,10 +2691,21 @@ yyreduce: -/* Line 1456 of yacc.c */ -#line 2650 "../../bison-2.5/src/parse-gram.c" +/* Line 1493 of yacc.c */ +#line 2696 "parse-gram.c" default: break; } + /* User semantic actions sometimes alter yychar, and that requires + that yytoken be updated with the new translation. We take the + approach of translating immediately before every use of yytoken. + One alternative is translating here after every semantic action, + but that translation would be missed if the semantic action invokes + YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or + if it invokes YYBACKUP. In the case of YYABORT or YYACCEPT, an + incorrect destructor might then be invoked immediately. In the + case of YYERROR or YYBACKUP, subsequent parser actions might lead + to an incorrect destructor call or verbose syntax error message + before the lookahead is translated. */ YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); YYPOPSTACK (yylen); @@ -2677,6 +2734,10 @@ yyreduce: | yyerrlab -- here on detecting error | `------------------------------------*/ yyerrlab: + /* Make sure we have latest lookahead translation. See comments at + user semantic actions for why this is necessary. */ + yytoken = YYTRANSLATE (yychar); + /* If not already recovering from an error, report this error. */ if (!yyerrstatus) { @@ -2684,41 +2745,32 @@ yyerrlab: #if ! YYERROR_VERBOSE yyerror (YY_("syntax error")); #else - { - YYSIZE_T yysize = yysyntax_error (0, yystate, yychar); - if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM) - { - YYSIZE_T yyalloc = 2 * yysize; - if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM)) - yyalloc = YYSTACK_ALLOC_MAXIMUM; - if (yymsg != yymsgbuf) - YYSTACK_FREE (yymsg); - yymsg = (char *) YYSTACK_ALLOC (yyalloc); - if (yymsg) - yymsg_alloc = yyalloc; - else - { - yymsg = yymsgbuf; - yymsg_alloc = sizeof yymsgbuf; - } - } - - if (0 < yysize && yysize <= yymsg_alloc) - { - (void) yysyntax_error (yymsg, yystate, yychar); - yyerror (yymsg); - } - else - { - yyerror (YY_("syntax error")); - if (yysize != 0) - goto yyexhaustedlab; - } - } + while (1) + { + int yysyntax_error_status = + yysyntax_error (&yymsg_alloc, &yymsg, yystate, yytoken); + if (yysyntax_error_status == 2 && 0 < yymsg_alloc) + { + if (yymsg != yymsgbuf) + YYSTACK_FREE (yymsg); + yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc); + if (yymsg) + continue; + yymsg = yymsgbuf; + yymsg_alloc = sizeof yymsgbuf; + } + if (yysyntax_error_status == 0) + yyerror (yymsg); + else + yyerror (YY_("syntax error")); + if (yysyntax_error_status == 2) + goto yyexhaustedlab; + break; + } #endif } - yyerror_range[0] = yylloc; + yyerror_range[1] = yylloc; if (yyerrstatus == 3) { @@ -2755,7 +2807,7 @@ yyerrorlab: if (/*CONSTCOND*/ 0) goto yyerrorlab; - yyerror_range[0] = yylsp[1-yylen]; + yyerror_range[1] = yylsp[1-yylen]; /* Do not reclaim the symbols of the rule which action triggered this YYERROR. */ YYPOPSTACK (yylen); @@ -2774,7 +2826,7 @@ yyerrlab1: for (;;) { yyn = yypact[yystate]; - if (yyn != YYPACT_NINF) + if (!yypact_value_is_default (yyn)) { yyn += YYTERROR; if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) @@ -2789,7 +2841,7 @@ yyerrlab1: if (yyssp == yyss) YYABORT; - yyerror_range[0] = *yylsp; + yyerror_range[1] = *yylsp; yydestruct ("Error: popping", yystos[yystate], yyvsp, yylsp); YYPOPSTACK (1); @@ -2799,10 +2851,10 @@ yyerrlab1: *++yyvsp = yylval; - yyerror_range[1] = yylloc; + yyerror_range[2] = yylloc; /* Using YYLLOC is tempting, but would change the location of the lookahead. YYLOC is available though. */ - YYLLOC_DEFAULT (yyloc, (yyerror_range - 1), 2); + YYLLOC_DEFAULT (yyloc, yyerror_range, 2); *++yylsp = yyloc; /* Shift the error token. */ @@ -2838,8 +2890,13 @@ yyexhaustedlab: yyreturn: if (yychar != YYEMPTY) - yydestruct ("Cleanup: discarding lookahead", - yytoken, &yylval, &yylloc); + { + /* Make sure we have latest lookahead translation. See comments at + user semantic actions for why this is necessary. */ + yytoken = YYTRANSLATE (yychar); + yydestruct ("Cleanup: discarding lookahead", + yytoken, &yylval, &yylloc); + } /* Do not reclaim the symbols of the rule which action triggered this YYABORT or YYACCEPT. */ YYPOPSTACK (yylen); @@ -2864,7 +2921,7 @@ yyreturn: -/* Line 1676 of yacc.c */ +/* Line 1724 of yacc.c */ #line 647 "parse-gram.y"