X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/66ef8b9d658b091bb3deb7a25067d6b2aa7566dc..22dda0f00476e140b490979a3894d75ebc45b0cb:/src/parse-gram.c diff --git a/src/parse-gram.c b/src/parse-gram.c index c2f4f27f..b322c070 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 2.0a. */ /* 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, 2005 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 @@ -15,8 +15,8 @@ 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. */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ /* As a special exception, when this file is copied by Bison into a Bison output file, you may use that output file without restriction. @@ -45,8 +45,7 @@ /* Using locations. */ #define YYLSP_NEEDED 1 -/* If NAME_PREFIX is specified substitute the variables and functions - names. */ +/* Substitute the variable and function names. */ #define yyparse gram_parse #define yylex gram_lex #define yyerror gram_error @@ -83,33 +82,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_DEFAULT_PREC = 284, - PERCENT_NO_LINES = 285, - PERCENT_NONDETERMINISTIC_PARSER = 286, - PERCENT_OUTPUT = 287, - PERCENT_PARSE_PARAM = 288, - PERCENT_PURE_PARSER = 289, - PERCENT_SKELETON = 290, - PERCENT_START = 291, - PERCENT_TOKEN_TABLE = 292, - PERCENT_VERBOSE = 293, - PERCENT_YACC = 294, - TYPE = 295, - EQUAL = 296, - SEMICOLON = 297, - PIPE = 298, - ID = 299, - ID_COLON = 300, - PERCENT_PERCENT = 301, - PROLOGUE = 302, - EPILOGUE = 303, - BRACED_CODE = 304 + 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 @@ -133,39 +133,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_DEFAULT_PREC 284 -#define PERCENT_NO_LINES 285 -#define PERCENT_NONDETERMINISTIC_PARSER 286 -#define PERCENT_OUTPUT 287 -#define PERCENT_PARSE_PARAM 288 -#define PERCENT_PURE_PARSER 289 -#define PERCENT_SKELETON 290 -#define PERCENT_START 291 -#define PERCENT_TOKEN_TABLE 292 -#define PERCENT_VERBOSE 293 -#define PERCENT_YACC 294 -#define TYPE 295 -#define EQUAL 296 -#define SEMICOLON 297 -#define PIPE 298 -#define ID 299 -#define ID_COLON 300 -#define PERCENT_PERCENT 301 -#define PROLOGUE 302 -#define EPILOGUE 303 -#define BRACED_CODE 304 +#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 "../../src/parse-gram.y" +/* Bison Grammar Parser -*- C -*- + + Copyright (C) 2002, 2003, 2004, 2005 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., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301 USA +*/ #include "system.h" @@ -176,12 +198,16 @@ #include "gram.h" #include "muscle_tab.h" #include "output.h" +#include "quotearg.h" #include "reader.h" #include "symlist.h" #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 @@ -189,10 +215,6 @@ static YYLTYPE lloc_default (YYLTYPE const *, int); gram_error (&yylloc, Msg) static void gram_error (location const *, char const *); -#define YYPRINT(File, Type, Value) \ - print_token_value (File, Type, &Value) -static void print_token_value (FILE *, int, YYSTYPE const *); - static void add_param (char const *, char *, location); symbol_class current_class = unknown_sym; @@ -217,7 +239,7 @@ int current_prec = 0; #endif #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) -#line 80 "parse-gram.y" +#line 79 "../../src/parse-gram.y" typedef union YYSTYPE { symbol *symbol; symbol_list *list; @@ -227,7 +249,7 @@ typedef union YYSTYPE { uniqstr uniqstr; } YYSTYPE; /* Line 191 of yacc.c. */ -#line 231 "parse-gram.c" +#line 253 "../../src/parse-gram.c" # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 # define YYSTYPE_IS_TRIVIAL 1 @@ -251,29 +273,36 @@ typedef struct YYLTYPE /* Line 214 of yacc.c. */ -#line 255 "parse-gram.c" +#line 277 "../../src/parse-gram.c" -#if ! defined (yyoverflow) || YYERROR_VERBOSE +#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) +# define YYSIZE_T __SIZE_TYPE__ +#endif +#if ! defined (YYSIZE_T) && defined (size_t) +# define YYSIZE_T size_t +#endif +#if ! defined (YYSIZE_T) && (defined (__STDC__) || defined (__cplusplus)) +# include /* INFRINGES ON USER NAME SPACE */ +# define YYSIZE_T size_t +#endif +#if ! defined (YYSIZE_T) +# define YYSIZE_T unsigned int +#endif -# ifndef YYFREE -# define YYFREE free -# endif -# ifndef YYMALLOC -# define YYMALLOC malloc -# endif +#if ! defined (yyoverflow) || YYERROR_VERBOSE /* The parser invokes alloca or malloc; define the necessary symbols. */ # ifdef YYSTACK_USE_ALLOCA # if YYSTACK_USE_ALLOCA -# define YYSTACK_ALLOC alloca -# endif -# else -# if defined (alloca) || defined (_ALLOCA_H) -# define YYSTACK_ALLOC alloca -# else # ifdef __GNUC__ # define YYSTACK_ALLOC __builtin_alloca +# else +# define YYSTACK_ALLOC alloca +# if defined (__STDC__) || defined (__cplusplus) +# include /* INFRINGES ON USER NAME SPACE */ +# define YYINCLUDED_STDLIB_H +# endif # endif # endif # endif @@ -281,13 +310,39 @@ typedef struct YYLTYPE # ifdef YYSTACK_ALLOC /* Pacify GCC's `empty if-body' warning. */ # define YYSTACK_FREE(Ptr) do { /* empty */; } while (0) -# else -# if defined (__STDC__) || defined (__cplusplus) -# include /* INFRINGES ON USER NAME SPACE */ -# define YYSIZE_T size_t +# ifndef YYSTACK_ALLOC_MAXIMUM + /* The OS might guarantee only one guard page at the bottom of the stack, + and a page size can be as small as 4096 bytes. So we cannot safely + invoke alloca (N) if N exceeds 4096. Use a slightly smaller number + to allow for a few compiler-allocated temporary stack slots. */ +# define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2005 */ # endif +# else # define YYSTACK_ALLOC YYMALLOC # define YYSTACK_FREE YYFREE +# ifndef YYSTACK_ALLOC_MAXIMUM +# define YYSTACK_ALLOC_MAXIMUM ((YYSIZE_T) -1) +# endif +# ifdef __cplusplus +extern "C" { +# endif +# ifndef YYMALLOC +# define YYMALLOC malloc +# if (! defined (malloc) && ! defined (YYINCLUDED_STDLIB_H) \ + && (defined (__STDC__) || defined (__cplusplus))) +void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ +# endif +# endif +# ifndef YYFREE +# define YYFREE free +# if (! defined (free) && ! defined (YYINCLUDED_STDLIB_H) \ + && (defined (__STDC__) || defined (__cplusplus))) +void free (void *); /* INFRINGES ON USER NAME SPACE */ +# endif +# endif +# ifdef __cplusplus +} +# endif # endif #endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */ @@ -300,7 +355,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; }; @@ -311,7 +366,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 @@ -324,7 +379,7 @@ union yyalloc # define YYCOPY(To, From, Count) \ do \ { \ - register YYSIZE_T yyi; \ + YYSIZE_T yyi; \ for (yyi = 0; yyi < (Count); yyi++) \ (To)[yyi] = (From)[yyi]; \ } \ @@ -353,26 +408,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 156 +#define YYLAST 158 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 50 +#define YYNTOKENS 51 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 25 /* YYNRULES -- Number of rules. */ -#define YYNRULES 78 +#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 304 +#define YYMAXUTOK 305 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -410,7 +465,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, 49 + 45, 46, 47, 48, 49, 50 }; #if YYDEBUG @@ -419,51 +474,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, 85, 87, 88, 92, 93, - 97, 101, 105, 107, 109, 111, 112, 114, 116, 119, - 121, 123, 126, 129, 133, 135, 138, 140, 143, 145, - 148, 151, 152, 156, 158, 162, 165, 166, 169, 172, - 176, 180, 184, 186, 188, 190, 192, 194, 195 + 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[] = { - 51, 0, -1, 52, 46, 64, 74, -1, -1, 52, - 53, -1, 54, -1, 47, -1, 17, -1, 19, 73, - 73, -1, 20, -1, 21, -1, 22, 4, -1, 23, - 41, 73, -1, 24, -1, 25, -1, 26, -1, 27, - -1, 28, 41, 73, -1, 30, -1, 31, -1, 32, - 41, 73, -1, 33, -1, 34, -1, 35, 73, -1, - 37, -1, 38, -1, 39, -1, 42, -1, 58, -1, - 55, -1, 36, 70, -1, 10, -1, 8, 61, -1, - 9, 61, -1, 18, -1, 29, -1, -1, 6, 56, - 63, -1, -1, 5, 57, 63, -1, 7, 40, 61, - -1, 59, 60, 61, -1, 11, -1, 12, -1, 13, - -1, -1, 40, -1, 70, -1, 61, 70, -1, 40, - -1, 44, -1, 44, 4, -1, 44, 72, -1, 44, - 4, 72, -1, 62, -1, 63, 62, -1, 65, -1, - 64, 65, -1, 66, -1, 54, 42, -1, 1, 42, - -1, -1, 45, 67, 68, -1, 69, -1, 68, 43, - 69, -1, 68, 42, -1, -1, 69, 70, -1, 69, - 71, -1, 69, 14, 70, -1, 69, 15, 4, -1, - 69, 16, 40, -1, 44, -1, 72, -1, 49, -1, - 3, -1, 3, -1, -1, 46, 48, -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, 172, 172, 180, 182, 186, 187, 188, 189, 190, - 191, 192, 193, 194, 199, 203, 204, 205, 206, 207, - 208, 209, 210, 211, 212, 213, 214, 215, 219, 220, - 221, 225, 231, 238, 245, 249, 256, 256, 261, 261, - 266, 276, 291, 292, 293, 297, 298, 304, 305, 310, - 314, 319, 325, 331, 342, 343, 352, 353, 359, 360, - 365, 372, 372, 376, 377, 378, 383, 384, 386, 388, - 390, 392, 397, 398, 402, 408, 417, 424, 426 + 0, 188, 188, 196, 198, 202, 203, 204, 205, 206, + 207, 208, 209, 210, 211, 216, 220, 221, 222, 223, + 224, 225, 226, 227, 228, 229, 230, 231, 232, 236, + 237, 238, 242, 248, 255, 262, 266, 273, 273, 278, + 278, 283, 293, 308, 309, 310, 314, 315, 321, 322, + 327, 331, 336, 342, 348, 359, 360, 369, 370, 376, + 377, 382, 389, 389, 393, 394, 395, 400, 401, 403, + 405, 407, 409, 414, 415, 419, 425, 434, 439, 441 }; #endif @@ -472,19 +528,16 @@ static const unsigned short yyrline[] = First, the terminals, then, starting at YYNTOKENS, nonterminals. */ static const char *const yytname[] = { - "\"end of file\"", "error", "$undefined", "\"string\"", "\"integer\"", - "\"%token\"", "\"%nterm\"", "\"%type\"", "\"%destructor {...}\"", - "\"%printer {...}\"", "\"%union {...}\"", "\"%left\"", "\"%right\"", - "\"%nonassoc\"", "\"%prec\"", "\"%dprec\"", "\"%merge\"", "\"%debug\"", - "\"%default-prec\"", "\"%define\"", "\"%defines\"", "\"%error-verbose\"", - "\"%expect\"", "\"%file-prefix\"", "\"%glr-parser\"", - "\"%initial-action {...}\"", "\"%lex-param {...}\"", "\"%locations\"", - "\"%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", + "end of file", "error", "$undefined", "string", "integer", "%token", + "%nterm", "%type", "%destructor {...}", "%printer {...}", "%union {...}", + "%left", "%right", "%nonassoc", "%prec", "%dprec", "%merge", "%debug", + "%default-prec", "%define", "%defines", "%error-verbose", "%expect", + "%expect-rr", "%file-prefix", "%glr-parser", "%initial-action {...}", + "%lex-param {...}", "%locations", "%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", @@ -493,43 +546,49 @@ static const char *const yytname[] = }; #endif +/* INFRINGES ON USER NAME SPACE */ +#ifndef _ +# define _(msgid) msgid +#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, 304 + 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, 50, 51, 52, 52, 53, 53, 53, 53, 53, - 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, - 53, 53, 53, 53, 53, 53, 53, 53, 54, 54, - 54, 54, 54, 54, 54, 54, 56, 55, 57, 55, - 55, 58, 59, 59, 59, 60, 60, 61, 61, 62, - 62, 62, 62, 62, 63, 63, 64, 64, 65, 65, - 65, 67, 66, 68, 68, 68, 69, 69, 69, 69, - 69, 69, 70, 70, 71, 72, 73, 74, 74 + 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, 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 + 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 @@ -537,25 +596,25 @@ static const unsigned char yyr2[] = means the default is an error. */ static const unsigned char yydefact[] = { - 3, 0, 0, 1, 38, 36, 0, 0, 0, 31, - 42, 43, 44, 7, 34, 0, 9, 10, 0, 0, - 13, 14, 15, 16, 0, 35, 18, 19, 0, 21, - 22, 0, 0, 24, 25, 26, 27, 0, 6, 4, - 5, 29, 28, 45, 0, 0, 0, 75, 72, 32, - 47, 73, 33, 76, 0, 11, 0, 0, 0, 23, - 30, 0, 61, 0, 0, 56, 58, 46, 0, 49, - 50, 54, 39, 37, 40, 48, 8, 12, 17, 20, - 60, 66, 59, 0, 57, 2, 41, 51, 52, 55, - 62, 63, 78, 53, 65, 66, 0, 0, 0, 74, - 67, 68, 64, 69, 70, 71 + 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, 39, 63, 41, 45, 44, 42, 43, - 68, 49, 71, 72, 64, 65, 66, 81, 90, 91, - 50, 101, 51, 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 @@ -563,105 +622,89 @@ static const yysigned_char yydefgoto[] = #define YYPACT_NINF -67 static const yysigned_char yypact[] = { - -67, 8, 109, -67, -67, -67, -30, 0, 0, -67, - -67, -67, -67, -67, -67, 13, -67, -67, 20, -16, - -67, -67, -67, -67, -15, -67, -67, -67, -5, -67, - -67, 13, 0, -67, -67, -67, -67, 68, -67, -67, - -67, -67, -67, -3, -35, -35, 0, -67, -67, 0, - -67, -67, 0, -67, 13, -67, 13, 13, 13, -67, - -67, -4, -67, 4, 22, -67, -67, -67, 0, -67, - 3, -67, -35, -35, 0, -67, -67, -67, -67, -67, - -67, -67, -67, 1, -67, -67, 0, 38, -67, -67, - -31, -1, -67, -67, -67, -67, 0, 41, 7, -67, - -67, -67, -1, -67, -67, -67 + -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[] = { - -67, -67, -67, -67, 48, -67, -67, -67, -67, -67, - -67, -7, -54, 10, -67, -12, -67, -67, -67, -42, - -32, -67, -66, 31, -67 + -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 -78 +#define YYTABLE_NINF -79 static const yysigned_char yytable[] = { - 60, 52, 47, 47, 88, 69, 47, 87, 3, 70, - 46, 94, 95, 96, 97, 98, 53, 75, 89, 89, - 75, 93, -77, 61, 55, 56, 57, 4, 5, 6, - 7, 8, 9, 10, 11, 12, 58, 67, 80, 74, - 14, 47, 75, 48, 48, 104, 82, 105, 99, 92, - 40, 25, 84, 102, 75, 73, 0, 0, 32, 100, - 0, 86, 59, 0, 103, 0, 0, 62, 83, 61, - 100, 0, 0, 4, 5, 6, 7, 8, 9, 10, - 11, 12, 0, 0, 0, 76, 14, 77, 78, 79, - 0, 0, 0, 0, 0, 0, 0, 25, 0, 0, - 0, 0, 0, 0, 32, 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, 35, 0, - 0, 36, 0, 0, 0, 37, 38 + 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[] = { - 32, 8, 3, 3, 70, 40, 3, 4, 0, 44, - 40, 42, 43, 14, 15, 16, 3, 49, 72, 73, - 52, 87, 0, 1, 4, 41, 41, 5, 6, 7, - 8, 9, 10, 11, 12, 13, 41, 40, 42, 46, - 18, 3, 74, 44, 44, 4, 42, 40, 49, 48, - 2, 29, 64, 95, 86, 45, -1, -1, 36, 91, - -1, 68, 31, -1, 96, -1, -1, 45, 46, 1, - 102, -1, -1, 5, 6, 7, 8, 9, 10, 11, - 12, 13, -1, -1, -1, 54, 18, 56, 57, 58, - -1, -1, -1, -1, -1, -1, -1, 29, -1, -1, - -1, -1, -1, -1, 36, -1, -1, -1, -1, -1, - -1, -1, -1, 45, 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, -1, - -1, 42, -1, -1, -1, 46, 47 + 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, 51, 52, 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, 39, 42, 46, 47, 53, - 54, 55, 58, 59, 57, 56, 40, 3, 44, 61, - 70, 72, 61, 3, 73, 4, 41, 41, 41, 73, - 70, 1, 45, 54, 64, 65, 66, 40, 60, 40, - 44, 62, 63, 63, 61, 70, 73, 73, 73, 73, - 42, 67, 42, 46, 65, 74, 61, 4, 72, 62, - 68, 69, 48, 72, 42, 43, 14, 15, 16, 49, - 70, 71, 69, 70, 4, 40 + 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__) -# define YYSIZE_T __SIZE_TYPE__ -#endif -#if ! defined (YYSIZE_T) && defined (size_t) -# define YYSIZE_T size_t -#endif -#if ! defined (YYSIZE_T) -# if defined (__STDC__) || defined (__cplusplus) -# include /* INFRINGES ON USER NAME SPACE */ -# define YYSIZE_T size_t -# endif -#endif -#if ! defined (YYSIZE_T) -# define YYSIZE_T unsigned int -#endif - #define yyerrok (yyerrstatus = 0) #define yyclearin (yychar = YYEMPTY) #define YYEMPTY (-2) @@ -692,25 +735,58 @@ do \ } \ else \ { \ - yyerror ("syntax error: cannot back up");\ + yyerror (_("syntax error: cannot back up")); \ YYERROR; \ } \ 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). */ + +#define YYRHSLOC(Rhs, K) ((Rhs)[K]) #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 = YYRHSLOC (Rhs, 1).first_line; \ + (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ + (Current).last_line = YYRHSLOC (Rhs, N).last_line; \ + (Current).last_column = YYRHSLOC (Rhs, N).last_column; \ + } \ + else \ + { \ + (Current).first_line = (Current).last_line = \ + YYRHSLOC (Rhs, 0).last_line; \ + (Current).first_column = (Current).last_column = \ + YYRHSLOC (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 @@ -733,19 +809,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) @@ -757,15 +827,15 @@ 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"); + YYFPRINTF (stderr, _("Stack now")); for (/* Nothing. */; bottom <= top; ++bottom) YYFPRINTF (stderr, " %d", *bottom); YYFPRINTF (stderr, "\n"); @@ -793,7 +863,7 @@ yy_reduce_print (yyrule) { int yyi; unsigned int yylno = yyrline[yyrule]; - YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ", + YYFPRINTF (stderr, _("Reducing stack by rule %d (line %u), "), yyrule - 1, yylno); /* Print the symbols being reduced, and their result. */ for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++) @@ -812,8 +882,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 */ @@ -828,13 +897,9 @@ int yydebug; if the built-in stack extension method is used). Do not make this value too large; the results are undefined if - SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH) + YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH) evaluated with infinite-precision integer arithmetic. */ -#if defined (YYMAXDEPTH) && YYMAXDEPTH == 0 -# undef YYMAXDEPTH -#endif - #ifndef YYMAXDEPTH # define YYMAXDEPTH 10000 #endif @@ -856,7 +921,7 @@ yystrlen (yystr) const char *yystr; # endif { - register const char *yys = yystr; + const char *yys = yystr; while (*yys++ != '\0') continue; @@ -881,8 +946,8 @@ yystpcpy (yydest, yysrc) const char *yysrc; # endif { - register char *yyd = yydest; - register const char *yys = yysrc; + char *yyd = yydest; + const char *yys = yysrc; while ((*yyd++ = *yys++) != '\0') continue; @@ -918,17 +983,109 @@ 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) { + case 3: /* "\"string\"" */ +#line 165 "../../src/parse-gram.y" + { fprintf (stderr, "\"%s\"", (yyvaluep->chars)); }; +#line 1003 "../../src/parse-gram.c" + break; + case 4: /* "\"integer\"" */ +#line 178 "../../src/parse-gram.y" + { fprintf (stderr, "%d", (yyvaluep->integer)); }; +#line 1008 "../../src/parse-gram.c" + break; + case 8: /* "\"%destructor {...}\"" */ +#line 167 "../../src/parse-gram.y" + { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; +#line 1013 "../../src/parse-gram.c" + break; + case 9: /* "\"%printer {...}\"" */ +#line 171 "../../src/parse-gram.y" + { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; +#line 1018 "../../src/parse-gram.c" + break; + case 10: /* "\"%union {...}\"" */ +#line 172 "../../src/parse-gram.y" + { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; +#line 1023 "../../src/parse-gram.c" + break; + case 26: /* "\"%initial-action {...}\"" */ +#line 168 "../../src/parse-gram.y" + { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; +#line 1028 "../../src/parse-gram.c" + break; + case 27: /* "\"%lex-param {...}\"" */ +#line 169 "../../src/parse-gram.y" + { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; +#line 1033 "../../src/parse-gram.c" + break; + case 34: /* "\"%parse-param {...}\"" */ +#line 170 "../../src/parse-gram.y" + { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; +#line 1038 "../../src/parse-gram.c" + break; + case 41: /* "\"type\"" */ +#line 176 "../../src/parse-gram.y" + { fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); }; +#line 1043 "../../src/parse-gram.c" + break; + case 45: /* "\"identifier\"" */ +#line 180 "../../src/parse-gram.y" + { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; +#line 1048 "../../src/parse-gram.c" + break; + case 46: /* "\"identifier:\"" */ +#line 182 "../../src/parse-gram.y" + { fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); }; +#line 1053 "../../src/parse-gram.c" + break; + case 48: /* "\"%{...%}\"" */ +#line 174 "../../src/parse-gram.y" + { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; +#line 1058 "../../src/parse-gram.c" + break; + case 49: /* "\"epilogue\"" */ +#line 174 "../../src/parse-gram.y" + { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; +#line 1063 "../../src/parse-gram.c" + break; + case 50: /* "\"{...}\"" */ +#line 173 "../../src/parse-gram.y" + { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; +#line 1068 "../../src/parse-gram.c" + break; + case 71: /* "symbol" */ +#line 180 "../../src/parse-gram.y" + { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; +#line 1073 "../../src/parse-gram.c" + break; + case 72: /* "action" */ +#line 173 "../../src/parse-gram.y" + { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; +#line 1078 "../../src/parse-gram.c" + break; + case 73: /* "string_as_id" */ +#line 180 "../../src/parse-gram.y" + { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; +#line 1083 "../../src/parse-gram.c" + break; + case 74: /* "string_content" */ +#line 165 "../../src/parse-gram.y" + { fprintf (stderr, "\"%s\"", (yyvaluep->chars)); }; +#line 1088 "../../src/parse-gram.c" + break; default: break; } @@ -942,10 +1099,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; @@ -955,6 +1113,10 @@ yydestruct (yytype, yyvaluep, yylocationp) (void) yyvaluep; (void) yylocationp; + if (!yymsg) + yymsg = "Deleting"; + YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); + switch (yytype) { @@ -1007,23 +1169,23 @@ 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; - register int yyn; + int yystate; + int yyn; 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: @@ -1035,20 +1197,21 @@ 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; + short int *yyssp; /* The semantic value stack. */ YYSTYPE yyvsa[YYINITDEPTH]; YYSTYPE *yyvs = yyvsa; - register YYSTYPE *yyvsp; + YYSTYPE *yyvsp; /* The location stack. */ 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--) @@ -1078,18 +1241,25 @@ 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 69 "../../src/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 1093 "parse-gram.c" +/* Line 870 of yacc.c. */ +#line 1262 "../../src/parse-gram.c" + yylsp[0] = yylloc; goto yysetstate; /*------------------------------------------------------------. @@ -1115,14 +1285,14 @@ 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 data in use in that stack, in bytes. This used to be a conditional around just the two extra args, but that might be undefined if yyoverflow is a macro. */ - yyoverflow ("parser stack overflow", + yyoverflow (_("parser stack overflow"), &yyss1, yysize * sizeof (*yyssp), &yyvs1, yysize * sizeof (*yyvsp), &yyls1, yysize * sizeof (*yylsp), @@ -1143,7 +1313,7 @@ YYLTYPE yylloc; yystacksize = YYMAXDEPTH; { - short *yyss1 = yyss; + short int *yyss1 = yyss; union yyalloc *yyptr = (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); if (! yyptr) @@ -1162,14 +1332,14 @@ YYLTYPE yylloc; yyvsp = yyvs + yysize - 1; yylsp = yyls + yysize - 1; - YYDPRINTF ((stderr, "Stack size increased to %lu\n", + YYDPRINTF ((stderr, _("Stack size increased to %lu\n"), (unsigned long int) yystacksize)); if (yyss + yystacksize - 1 <= yyssp) YYABORT; } - YYDPRINTF ((stderr, "Entering state %d\n", yystate)); + YYDPRINTF ((stderr, _("Entering state %d\n"), yystate)); goto yybackup; @@ -1179,33 +1349,33 @@ 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: ")); + YYDPRINTF ((stderr, _("Reading a token: "))); yychar = YYLEX; } if (yychar <= YYEOF) { yychar = yytoken = YYEOF; - YYDPRINTF ((stderr, "Now at end of input.\n")); + YYDPRINTF ((stderr, _("Now at end of input.\n"))); } 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 @@ -1225,8 +1395,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) @@ -1277,398 +1447,401 @@ yyreduce: switch (yyn) { case 6: -#line 187 "parse-gram.y" - { prologue_augment (yyvsp[0].chars, yylsp[0]); } +#line 203 "../../src/parse-gram.y" + { prologue_augment ((yyvsp[0].chars), (yylsp[0])); } break; case 7: -#line 188 "parse-gram.y" +#line 204 "../../src/parse-gram.y" { debug_flag = true; } break; case 8: -#line 189 "parse-gram.y" - { muscle_insert (yyvsp[-1].chars, yyvsp[0].chars); } +#line 205 "../../src/parse-gram.y" + { muscle_insert ((yyvsp[-1].chars), (yyvsp[0].chars)); } break; case 9: -#line 190 "parse-gram.y" +#line 206 "../../src/parse-gram.y" { defines_flag = true; } break; case 10: -#line 191 "parse-gram.y" +#line 207 "../../src/parse-gram.y" { error_verbose = true; } break; case 11: -#line 192 "parse-gram.y" - { expected_conflicts = yyvsp[0].integer; } +#line 208 "../../src/parse-gram.y" + { expected_sr_conflicts = (yyvsp[0].integer); } break; case 12: -#line 193 "parse-gram.y" - { spec_file_prefix = yyvsp[0].chars; } +#line 209 "../../src/parse-gram.y" + { expected_rr_conflicts = (yyvsp[0].integer); } break; case 13: -#line 195 "parse-gram.y" - { - nondeterministic_parser = true; - glr_parser = true; - } +#line 210 "../../src/parse-gram.y" + { spec_file_prefix = (yyvsp[0].chars); } break; case 14: -#line 200 "parse-gram.y" +#line 212 "../../src/parse-gram.y" { - muscle_code_grow ("initial_action", yyvsp[0].chars, yylsp[0]); + nondeterministic_parser = true; + glr_parser = true; } break; case 15: -#line 203 "parse-gram.y" - { add_param ("lex_param", yyvsp[0].chars, yylsp[0]); } +#line 217 "../../src/parse-gram.y" + { + muscle_code_grow ("initial_action", (yyvsp[0].chars), (yylsp[0])); + } break; case 16: -#line 204 "parse-gram.y" - { locations_flag = true; } +#line 220 "../../src/parse-gram.y" + { add_param ("lex_param", (yyvsp[0].chars), (yylsp[0])); } break; case 17: -#line 205 "parse-gram.y" - { spec_name_prefix = yyvsp[0].chars; } +#line 221 "../../src/parse-gram.y" + { locations_flag = true; } break; case 18: -#line 206 "parse-gram.y" - { no_lines_flag = true; } +#line 222 "../../src/parse-gram.y" + { spec_name_prefix = (yyvsp[0].chars); } break; case 19: -#line 207 "parse-gram.y" - { nondeterministic_parser = true; } +#line 223 "../../src/parse-gram.y" + { no_lines_flag = true; } break; case 20: -#line 208 "parse-gram.y" - { spec_outfile = yyvsp[0].chars; } +#line 224 "../../src/parse-gram.y" + { nondeterministic_parser = true; } break; case 21: -#line 209 "parse-gram.y" - { add_param ("parse_param", yyvsp[0].chars, yylsp[0]); } +#line 225 "../../src/parse-gram.y" + { spec_outfile = (yyvsp[0].chars); } break; case 22: -#line 210 "parse-gram.y" - { pure_parser = true; } +#line 226 "../../src/parse-gram.y" + { add_param ("parse_param", (yyvsp[0].chars), (yylsp[0])); } break; case 23: -#line 211 "parse-gram.y" - { skeleton = yyvsp[0].chars; } +#line 227 "../../src/parse-gram.y" + { pure_parser = true; } break; case 24: -#line 212 "parse-gram.y" - { token_table_flag = true; } +#line 228 "../../src/parse-gram.y" + { skeleton = (yyvsp[0].chars); } break; case 25: -#line 213 "parse-gram.y" - { report_flag = report_states; } +#line 229 "../../src/parse-gram.y" + { token_table_flag = true; } break; case 26: -#line 214 "parse-gram.y" +#line 230 "../../src/parse-gram.y" + { report_flag = report_states; } + break; + + case 27: +#line 231 "../../src/parse-gram.y" { yacc_flag = true; } break; - case 30: -#line 222 "parse-gram.y" + case 31: +#line 239 "../../src/parse-gram.y" { - grammar_start_symbol_set (yyvsp[0].symbol, yylsp[0]); + grammar_start_symbol_set ((yyvsp[0].symbol), (yylsp[0])); } break; - case 31: -#line 226 "parse-gram.y" + case 32: +#line 243 "../../src/parse-gram.y" { typed = true; - MUSCLE_INSERT_INT ("stype_line", yylsp[0].start.line); - muscle_insert ("stype", yyvsp[0].chars); + MUSCLE_INSERT_INT ("stype_line", (yylsp[0]).start.line); + muscle_insert ("stype", (yyvsp[0].chars)); } break; - case 32: -#line 232 "parse-gram.y" + case 33: +#line 249 "../../src/parse-gram.y" { symbol_list *list; - for (list = yyvsp[0].list; list; list = list->next) - symbol_destructor_set (list->sym, yyvsp[-1].chars, yylsp[-1]); - symbol_list_free (yyvsp[0].list); + for (list = (yyvsp[0].list); list; list = list->next) + symbol_destructor_set (list->sym, (yyvsp[-1].chars), (yylsp[-1])); + symbol_list_free ((yyvsp[0].list)); } break; - case 33: -#line 239 "parse-gram.y" + case 34: +#line 256 "../../src/parse-gram.y" { symbol_list *list; - for (list = yyvsp[0].list; list; list = list->next) - symbol_printer_set (list->sym, yyvsp[-1].chars, list->location); - symbol_list_free (yyvsp[0].list); + for (list = (yyvsp[0].list); list; list = list->next) + symbol_printer_set (list->sym, (yyvsp[-1].chars), list->location); + symbol_list_free ((yyvsp[0].list)); } break; - case 34: -#line 246 "parse-gram.y" + case 35: +#line 263 "../../src/parse-gram.y" { default_prec = true; } break; - case 35: -#line 250 "parse-gram.y" + case 36: +#line 267 "../../src/parse-gram.y" { default_prec = false; } break; - case 36: -#line 256 "parse-gram.y" + case 37: +#line 273 "../../src/parse-gram.y" { current_class = nterm_sym; } break; - case 37: -#line 257 "parse-gram.y" + case 38: +#line 274 "../../src/parse-gram.y" { current_class = unknown_sym; current_type = NULL; } break; - case 38: -#line 261 "parse-gram.y" + case 39: +#line 278 "../../src/parse-gram.y" { current_class = token_sym; } break; - case 39: -#line 262 "parse-gram.y" + case 40: +#line 279 "../../src/parse-gram.y" { current_class = unknown_sym; current_type = NULL; } break; - case 40: -#line 267 "parse-gram.y" + case 41: +#line 284 "../../src/parse-gram.y" { symbol_list *list; - for (list = yyvsp[0].list; list; list = list->next) - symbol_type_set (list->sym, yyvsp[-1].uniqstr, yylsp[-1]); - symbol_list_free (yyvsp[0].list); + for (list = (yyvsp[0].list); list; list = list->next) + symbol_type_set (list->sym, (yyvsp[-1].uniqstr), (yylsp[-1])); + symbol_list_free ((yyvsp[0].list)); } break; - case 41: -#line 277 "parse-gram.y" + case 42: +#line 294 "../../src/parse-gram.y" { symbol_list *list; ++current_prec; - for (list = yyvsp[0].list; list; list = list->next) + for (list = (yyvsp[0].list); list; list = list->next) { - symbol_type_set (list->sym, current_type, yylsp[-1]); - symbol_precedence_set (list->sym, current_prec, yyvsp[-2].assoc, yylsp[-2]); + symbol_type_set (list->sym, current_type, (yylsp[-1])); + symbol_precedence_set (list->sym, current_prec, (yyvsp[-2].assoc), (yylsp[-2])); } - symbol_list_free (yyvsp[0].list); + symbol_list_free ((yyvsp[0].list)); current_type = NULL; } break; - case 42: -#line 291 "parse-gram.y" - { yyval.assoc = left_assoc; } - break; - case 43: -#line 292 "parse-gram.y" - { yyval.assoc = right_assoc; } +#line 308 "../../src/parse-gram.y" + { (yyval.assoc) = left_assoc; } break; case 44: -#line 293 "parse-gram.y" - { yyval.assoc = non_assoc; } +#line 309 "../../src/parse-gram.y" + { (yyval.assoc) = right_assoc; } break; case 45: -#line 297 "parse-gram.y" - { current_type = NULL; } +#line 310 "../../src/parse-gram.y" + { (yyval.assoc) = non_assoc; } break; case 46: -#line 298 "parse-gram.y" - { current_type = yyvsp[0].uniqstr; } +#line 314 "../../src/parse-gram.y" + { current_type = NULL; } break; case 47: -#line 304 "parse-gram.y" - { yyval.list = symbol_list_new (yyvsp[0].symbol, yylsp[0]); } +#line 315 "../../src/parse-gram.y" + { current_type = (yyvsp[0].uniqstr); } break; case 48: -#line 305 "parse-gram.y" - { yyval.list = symbol_list_prepend (yyvsp[-1].list, yyvsp[0].symbol, yylsp[0]); } +#line 321 "../../src/parse-gram.y" + { (yyval.list) = symbol_list_new ((yyvsp[0].symbol), (yylsp[0])); } break; case 49: -#line 311 "parse-gram.y" - { - current_type = yyvsp[0].uniqstr; - } +#line 322 "../../src/parse-gram.y" + { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), (yyvsp[0].symbol), (yylsp[0])); } break; case 50: -#line 315 "parse-gram.y" +#line 328 "../../src/parse-gram.y" { - symbol_class_set (yyvsp[0].symbol, current_class, yylsp[0]); - symbol_type_set (yyvsp[0].symbol, current_type, yylsp[0]); + current_type = (yyvsp[0].uniqstr); } break; case 51: -#line 320 "parse-gram.y" +#line 332 "../../src/parse-gram.y" { - symbol_class_set (yyvsp[-1].symbol, current_class, yylsp[-1]); - symbol_type_set (yyvsp[-1].symbol, current_type, yylsp[-1]); - symbol_user_token_number_set (yyvsp[-1].symbol, yyvsp[0].integer, yylsp[0]); - } + symbol_class_set ((yyvsp[0].symbol), current_class, (yylsp[0])); + symbol_type_set ((yyvsp[0].symbol), current_type, (yylsp[0])); + } break; case 52: -#line 326 "parse-gram.y" +#line 337 "../../src/parse-gram.y" { - symbol_class_set (yyvsp[-1].symbol, current_class, yylsp[-1]); - symbol_type_set (yyvsp[-1].symbol, current_type, yylsp[-1]); - symbol_make_alias (yyvsp[-1].symbol, yyvsp[0].symbol, yyloc); + symbol_class_set ((yyvsp[-1].symbol), current_class, (yylsp[-1])); + symbol_type_set ((yyvsp[-1].symbol), current_type, (yylsp[-1])); + symbol_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer), (yylsp[0])); } break; case 53: -#line 332 "parse-gram.y" +#line 343 "../../src/parse-gram.y" { - symbol_class_set (yyvsp[-2].symbol, current_class, yylsp[-2]); - symbol_type_set (yyvsp[-2].symbol, current_type, yylsp[-2]); - symbol_user_token_number_set (yyvsp[-2].symbol, yyvsp[-1].integer, yylsp[-1]); - symbol_make_alias (yyvsp[-2].symbol, yyvsp[0].symbol, yyloc); + symbol_class_set ((yyvsp[-1].symbol), current_class, (yylsp[-1])); + symbol_type_set ((yyvsp[-1].symbol), current_type, (yylsp[-1])); + symbol_make_alias ((yyvsp[-1].symbol), (yyvsp[0].symbol), (yyloc)); } break; - case 59: -#line 361 "parse-gram.y" + case 54: +#line 349 "../../src/parse-gram.y" { - if (yacc_flag) - complain_at (yyloc, _("POSIX forbids declarations in the grammar")); + symbol_class_set ((yyvsp[-2].symbol), current_class, (yylsp[-2])); + symbol_type_set ((yyvsp[-2].symbol), current_type, (yylsp[-2])); + symbol_user_token_number_set ((yyvsp[-2].symbol), (yyvsp[-1].integer), (yylsp[-1])); + symbol_make_alias ((yyvsp[-2].symbol), (yyvsp[0].symbol), (yyloc)); } break; case 60: -#line 366 "parse-gram.y" +#line 378 "../../src/parse-gram.y" { - yyerrok; + if (yacc_flag) + complain_at ((yyloc), _("POSIX forbids declarations in the grammar")); } break; case 61: -#line 372 "parse-gram.y" - { current_lhs = yyvsp[0].symbol; current_lhs_location = yylsp[0]; } +#line 383 "../../src/parse-gram.y" + { + yyerrok; + } break; - case 63: -#line 376 "parse-gram.y" - { grammar_rule_end (yylsp[0]); } + case 62: +#line 389 "../../src/parse-gram.y" + { current_lhs = (yyvsp[0].symbol); current_lhs_location = (yylsp[0]); } break; case 64: -#line 377 "parse-gram.y" - { grammar_rule_end (yylsp[0]); } +#line 393 "../../src/parse-gram.y" + { grammar_rule_end ((yylsp[0])); } break; - case 66: -#line 383 "parse-gram.y" - { grammar_rule_begin (current_lhs, current_lhs_location); } + case 65: +#line 394 "../../src/parse-gram.y" + { grammar_rule_end ((yylsp[0])); } break; case 67: -#line 385 "parse-gram.y" - { grammar_current_rule_symbol_append (yyvsp[0].symbol, yylsp[0]); } +#line 400 "../../src/parse-gram.y" + { grammar_rule_begin (current_lhs, current_lhs_location); } break; case 68: -#line 387 "parse-gram.y" - { grammar_current_rule_action_append (yyvsp[0].chars, yylsp[0]); } +#line 402 "../../src/parse-gram.y" + { grammar_current_rule_symbol_append ((yyvsp[0].symbol), (yylsp[0])); } break; case 69: -#line 389 "parse-gram.y" - { grammar_current_rule_prec_set (yyvsp[0].symbol, yylsp[0]); } +#line 404 "../../src/parse-gram.y" + { grammar_current_rule_action_append ((yyvsp[0].chars), (yylsp[0])); } break; case 70: -#line 391 "parse-gram.y" - { grammar_current_rule_dprec_set (yyvsp[0].integer, yylsp[0]); } +#line 406 "../../src/parse-gram.y" + { grammar_current_rule_prec_set ((yyvsp[0].symbol), (yylsp[0])); } break; case 71: -#line 393 "parse-gram.y" - { grammar_current_rule_merge_set (yyvsp[0].uniqstr, yylsp[0]); } +#line 408 "../../src/parse-gram.y" + { grammar_current_rule_dprec_set ((yyvsp[0].integer), (yylsp[0])); } break; case 72: -#line 397 "parse-gram.y" - { yyval.symbol = yyvsp[0].symbol; } +#line 410 "../../src/parse-gram.y" + { grammar_current_rule_merge_set ((yyvsp[0].uniqstr), (yylsp[0])); } break; case 73: -#line 398 "parse-gram.y" - { yyval.symbol = yyvsp[0].symbol; } +#line 414 "../../src/parse-gram.y" + { (yyval.symbol) = (yyvsp[0].symbol); } break; case 74: -#line 403 "parse-gram.y" - { yyval.chars = yyvsp[0].chars; } +#line 415 "../../src/parse-gram.y" + { (yyval.symbol) = (yyvsp[0].symbol); } break; case 75: -#line 409 "parse-gram.y" - { - yyval.symbol = symbol_get (yyvsp[0].chars, yylsp[0]); - symbol_class_set (yyval.symbol, token_sym, yylsp[0]); - } +#line 420 "../../src/parse-gram.y" + { (yyval.chars) = (yyvsp[0].chars); } break; case 76: -#line 418 "parse-gram.y" +#line 426 "../../src/parse-gram.y" { - yyval.chars = yyvsp[0].chars + 1; - yyval.chars[strlen (yyval.chars) - 1] = '\0'; + (yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[0].chars)), (yylsp[0])); + symbol_class_set ((yyval.symbol), token_sym, (yylsp[0])); } break; - case 78: -#line 427 "parse-gram.y" + case 77: +#line 435 "../../src/parse-gram.y" + { (yyval.chars) = (yyvsp[0].chars); } + break; + + case 79: +#line 442 "../../src/parse-gram.y" { - muscle_code_grow ("epilogue", yyvsp[0].chars, yylsp[0]); + muscle_code_grow ("epilogue", (yyvsp[0].chars), (yylsp[0])); scanner_last_string_free (); } break; + default: break; } -/* Line 1010 of yacc.c. */ -#line 1672 "parse-gram.c" +/* Line 1066 of yacc.c. */ +#line 1845 "../../src/parse-gram.c" yyvsp -= yylen; yyssp -= yylen; @@ -1707,12 +1880,36 @@ yyerrlab: if (YYPACT_NINF < yyn && yyn < YYLAST) { - YYSIZE_T yysize = 0; int yytype = YYTRANSLATE (yychar); - const char* yyprefix; - char *yymsg; + YYSIZE_T yysize0 = yystrlen (yytname[yytype]); + YYSIZE_T yysize = yysize0; + YYSIZE_T yysize1; + int yysize_overflow = 0; + char *yymsg = 0; +# define YYERROR_VERBOSE_ARGS_MAXIMUM 5 + 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. */ + _("syntax error, unexpected %s"); + _("syntax error, unexpected %s, expecting %s"); + _("syntax error, unexpected %s, expecting %s or %s"); + _("syntax error, unexpected %s, expecting %s or %s or %s"); + _("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. */ int yyxbegin = yyn < 0 ? -yyn : 0; @@ -1720,55 +1917,72 @@ yyerrlab: /* Stay within bounds of both yycheck and yytname. */ int yychecklim = YYLAST - yyn; int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; - int yycount = 0; + int yycount = 1; + + yyarg[0] = yytname[yytype]; + yyfmt = yystpcpy (yyformat, yyunexpected); - yyprefix = ", expecting "; for (yyx = yyxbegin; yyx < yyxend; ++yyx) if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) { - yysize += yystrlen (yyprefix) + yystrlen (yytname [yyx]); - yycount += 1; - if (yycount == 5) + if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) { - yysize = 0; + yycount = 1; + yysize = yysize0; + yyformat[sizeof yyunexpected - 1] = '\0'; break; } + yyarg[yycount++] = yytname[yyx]; + yysize1 = yysize + yystrlen (yytname[yyx]); + yysize_overflow |= yysize1 < yysize; + yysize = yysize1; + yyfmt = yystpcpy (yyfmt, yyprefix); + yyprefix = yyor; } - yysize += (sizeof ("syntax error, unexpected ") - + yystrlen (yytname[yytype])); - yymsg = (char *) YYSTACK_ALLOC (yysize); - if (yymsg != 0) - { - char *yyp = yystpcpy (yymsg, "syntax error, unexpected "); - yyp = yystpcpy (yyp, yytname[yytype]); - if (yycount < 5) + yyf = _(yyformat); + yysize1 = yysize + yystrlen (yyf); + yysize_overflow |= yysize1 < yysize; + yysize = yysize1; + + if (!yysize_overflow && yysize <= YYSTACK_ALLOC_MAXIMUM) + yymsg = (char *) YYSTACK_ALLOC (yysize); + if (yymsg) + { + /* 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 = *yyf)) { - yyprefix = ", expecting "; - for (yyx = yyxbegin; yyx < yyxend; ++yyx) - if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) - { - yyp = yystpcpy (yyp, yyprefix); - yyp = yystpcpy (yyp, yytname[yyx]); - yyprefix = " or "; - } + if (*yyp == '%' && yyf[1] == 's' && yyi < yycount) + { + yyp = yystpcpy (yyp, yyarg[yyi++]); + yyf += 2; + } + else + { + yyp++; + yyf++; + } } yyerror (yymsg); YYSTACK_FREE (yymsg); } else - yyerror ("syntax error; also virtual memory exhausted"); + yyerror (_("syntax error; also memory exhausted")); } else #endif /* YYERROR_VERBOSE */ - yyerror ("syntax error"); + 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) @@ -1776,25 +1990,16 @@ yyerrlab: /* If at end of input, pop the error token, then the rest of the stack, then return failure. */ if (yychar == YYEOF) - for (;;) - { - YYPOPSTACK; - if (yyssp == yyss) - YYABORT; - YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp); - yydestruct (yystos[*yyssp], yyvsp, yylsp); - } + YYABORT; } 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; @@ -1804,19 +2009,17 @@ yyerrlab: `---------------------------------------------------*/ yyerrorlab: -#ifdef __GNUC__ - /* Pacify GCC when the user code never invokes YYERROR and the label - yyerrorlab therefore never appears in user code. */ + /* Pacify compilers like GCC when the user code never invokes + YYERROR and the label yyerrorlab therefore never appears in user + code. */ if (0) 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; @@ -1844,8 +2047,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); @@ -1854,12 +2057,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; @@ -1883,12 +2091,25 @@ yyabortlab: | yyoverflowlab -- parser overflow comes here. | `----------------------------------------------*/ yyoverflowlab: - yyerror ("parser stack overflow"); + yyerror (_("parser stack overflow")); yyresult = 2; /* Fall through. */ #endif yyreturn: + if (yychar != YYEOF && yychar != YYEMPTY) + yydestruct (_("Error: discarding lookahead"), + yytoken, &yylval, &yylloc); + if (yyssp != yyss) + for (;;) + { + yyerror_range[0] = *yylsp; + YYPOPSTACK; + if (yyssp == yyss) + break; + yydestruct (_("Error: popping"), + yystos[*yyssp], yyvsp, yylsp); + } #ifndef yyoverflow if (yyss != yyssa) YYSTACK_FREE (yyss); @@ -1897,7 +2118,7 @@ yyreturn: } -#line 433 "parse-gram.y" +#line 448 "../../src/parse-gram.y" @@ -1911,7 +2132,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, @@ -1933,22 +2158,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")); @@ -1958,7 +2189,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; @@ -1972,49 +2203,6 @@ add_param (char const *type, char *decl, location loc) scanner_last_string_free (); } -/*----------------------------------------------------. -| When debugging the parser, display tokens' values. | -`----------------------------------------------------*/ - -static void -print_token_value (FILE *file, int type, YYSTYPE const *value) -{ - fputc (' ', file); - switch (type) - { - case ID: - fprintf (file, " = %s", value->symbol->tag); - break; - - case INT: - fprintf (file, " = %d", value->integer); - break; - - case STRING: - fprintf (file, " = \"%s\"", value->chars); - break; - - case TYPE: - fprintf (file, " = <%s>", value->uniqstr); - break; - - case BRACED_CODE: - case PERCENT_DESTRUCTOR: - case PERCENT_LEX_PARAM: - case PERCENT_PARSE_PARAM: - case PERCENT_PRINTER: - case PERCENT_UNION: - case PROLOGUE: - case EPILOGUE: - fprintf (file, " = {{ %s }}", value->chars); - break; - - default: - fprintf (file, "unknown token type"); - break; - } -} - static void gram_error (location const *loc, char const *msg) {