X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/ffc9da3a52d78890d793991226943c99b6bad446..a7db4add018f1136b01e11b4252df8b6a9ddbd4b:/src/parse-gram.c diff --git a/src/parse-gram.c b/src/parse-gram.c index c1642764..b322c070 100644 --- a/src/parse-gram.c +++ b/src/parse-gram.c @@ -1,7 +1,7 @@ /* 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, 2004 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. @@ -166,10 +166,10 @@ /* Copy the first part of user declarations. */ -#line 1 "parse-gram.y" +#line 1 "../../src/parse-gram.y" /* Bison Grammar Parser -*- C -*- - Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -185,8 +185,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 */ #include "system.h" @@ -198,6 +198,7 @@ #include "gram.h" #include "muscle_tab.h" #include "output.h" +#include "quotearg.h" #include "reader.h" #include "symlist.h" @@ -214,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; @@ -242,7 +239,7 @@ int current_prec = 0; #endif #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) -#line 81 "parse-gram.y" +#line 79 "../../src/parse-gram.y" typedef union YYSTYPE { symbol *symbol; symbol_list *list; @@ -252,7 +249,7 @@ typedef union YYSTYPE { uniqstr uniqstr; } YYSTYPE; /* Line 191 of yacc.c. */ -#line 256 "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 @@ -276,16 +273,23 @@ typedef struct YYLTYPE /* Line 214 of yacc.c. */ -#line 280 "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. */ @@ -295,6 +299,10 @@ typedef struct YYLTYPE # 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 @@ -302,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 */ @@ -478,14 +512,14 @@ static const yysigned_char yyrhs[] = /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const unsigned short int yyrline[] = { - 0, 174, 174, 182, 184, 188, 189, 190, 191, 192, - 193, 194, 195, 196, 197, 202, 206, 207, 208, 209, - 210, 211, 212, 213, 214, 215, 216, 217, 218, 222, - 223, 224, 228, 234, 241, 248, 252, 259, 259, 264, - 264, 269, 279, 294, 295, 296, 300, 301, 307, 308, - 313, 317, 322, 328, 334, 345, 346, 355, 356, 362, - 363, 368, 375, 375, 379, 380, 381, 386, 387, 389, - 391, 393, 395, 400, 401, 405, 411, 420, 427, 429 + 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 @@ -494,19 +528,16 @@ static const unsigned short int 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\"", "\"%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", + "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", @@ -674,22 +705,6 @@ static const unsigned char yystos[] = 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) @@ -882,7 +897,7 @@ 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. */ #ifndef YYMAXDEPTH @@ -981,6 +996,96 @@ yysymprint (yyoutput, yytype, yyvaluep, yylocationp) # 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; } @@ -1144,7 +1249,7 @@ YYLTYPE yylloc; /* User initialization code. */ -#line 71 "parse-gram.y" +#line 69 "../../src/parse-gram.y" { /* Bison's grammar can initial empty locations, hence a default location is needed. */ @@ -1152,11 +1257,9 @@ YYLTYPE yylloc; yylloc.start.line = yylloc.end.line = 1; yylloc.start.column = yylloc.end.column = 0; } -/* Line 848 of yacc.c. */ -#line 1157 "parse-gram.c" - yyvsp[0] = yylval; - yylsp[0] = yylloc; - +/* Line 870 of yacc.c. */ +#line 1262 "../../src/parse-gram.c" + yylsp[0] = yylloc; goto yysetstate; /*------------------------------------------------------------. @@ -1344,47 +1447,47 @@ yyreduce: switch (yyn) { case 6: -#line 189 "parse-gram.y" +#line 203 "../../src/parse-gram.y" { prologue_augment ((yyvsp[0].chars), (yylsp[0])); } break; case 7: -#line 190 "parse-gram.y" +#line 204 "../../src/parse-gram.y" { debug_flag = true; } break; case 8: -#line 191 "parse-gram.y" +#line 205 "../../src/parse-gram.y" { muscle_insert ((yyvsp[-1].chars), (yyvsp[0].chars)); } break; case 9: -#line 192 "parse-gram.y" +#line 206 "../../src/parse-gram.y" { defines_flag = true; } break; case 10: -#line 193 "parse-gram.y" +#line 207 "../../src/parse-gram.y" { error_verbose = true; } break; case 11: -#line 194 "parse-gram.y" +#line 208 "../../src/parse-gram.y" { expected_sr_conflicts = (yyvsp[0].integer); } break; case 12: -#line 195 "parse-gram.y" +#line 209 "../../src/parse-gram.y" { expected_rr_conflicts = (yyvsp[0].integer); } break; case 13: -#line 196 "parse-gram.y" +#line 210 "../../src/parse-gram.y" { spec_file_prefix = (yyvsp[0].chars); } break; case 14: -#line 198 "parse-gram.y" +#line 212 "../../src/parse-gram.y" { nondeterministic_parser = true; glr_parser = true; @@ -1392,81 +1495,81 @@ yyreduce: break; case 15: -#line 203 "parse-gram.y" +#line 217 "../../src/parse-gram.y" { muscle_code_grow ("initial_action", (yyvsp[0].chars), (yylsp[0])); } break; case 16: -#line 206 "parse-gram.y" +#line 220 "../../src/parse-gram.y" { add_param ("lex_param", (yyvsp[0].chars), (yylsp[0])); } break; case 17: -#line 207 "parse-gram.y" +#line 221 "../../src/parse-gram.y" { locations_flag = true; } break; case 18: -#line 208 "parse-gram.y" +#line 222 "../../src/parse-gram.y" { spec_name_prefix = (yyvsp[0].chars); } break; case 19: -#line 209 "parse-gram.y" +#line 223 "../../src/parse-gram.y" { no_lines_flag = true; } break; case 20: -#line 210 "parse-gram.y" +#line 224 "../../src/parse-gram.y" { nondeterministic_parser = true; } break; case 21: -#line 211 "parse-gram.y" +#line 225 "../../src/parse-gram.y" { spec_outfile = (yyvsp[0].chars); } break; case 22: -#line 212 "parse-gram.y" +#line 226 "../../src/parse-gram.y" { add_param ("parse_param", (yyvsp[0].chars), (yylsp[0])); } break; case 23: -#line 213 "parse-gram.y" +#line 227 "../../src/parse-gram.y" { pure_parser = true; } break; case 24: -#line 214 "parse-gram.y" +#line 228 "../../src/parse-gram.y" { skeleton = (yyvsp[0].chars); } break; case 25: -#line 215 "parse-gram.y" +#line 229 "../../src/parse-gram.y" { token_table_flag = true; } break; case 26: -#line 216 "parse-gram.y" +#line 230 "../../src/parse-gram.y" { report_flag = report_states; } break; case 27: -#line 217 "parse-gram.y" +#line 231 "../../src/parse-gram.y" { yacc_flag = true; } break; case 31: -#line 225 "parse-gram.y" +#line 239 "../../src/parse-gram.y" { grammar_start_symbol_set ((yyvsp[0].symbol), (yylsp[0])); } break; case 32: -#line 229 "parse-gram.y" +#line 243 "../../src/parse-gram.y" { typed = true; MUSCLE_INSERT_INT ("stype_line", (yylsp[0]).start.line); @@ -1475,7 +1578,7 @@ yyreduce: break; case 33: -#line 235 "parse-gram.y" +#line 249 "../../src/parse-gram.y" { symbol_list *list; for (list = (yyvsp[0].list); list; list = list->next) @@ -1485,7 +1588,7 @@ yyreduce: break; case 34: -#line 242 "parse-gram.y" +#line 256 "../../src/parse-gram.y" { symbol_list *list; for (list = (yyvsp[0].list); list; list = list->next) @@ -1495,26 +1598,26 @@ yyreduce: break; case 35: -#line 249 "parse-gram.y" +#line 263 "../../src/parse-gram.y" { default_prec = true; } break; case 36: -#line 253 "parse-gram.y" +#line 267 "../../src/parse-gram.y" { default_prec = false; } break; case 37: -#line 259 "parse-gram.y" +#line 273 "../../src/parse-gram.y" { current_class = nterm_sym; } break; case 38: -#line 260 "parse-gram.y" +#line 274 "../../src/parse-gram.y" { current_class = unknown_sym; current_type = NULL; @@ -1522,12 +1625,12 @@ yyreduce: break; case 39: -#line 264 "parse-gram.y" +#line 278 "../../src/parse-gram.y" { current_class = token_sym; } break; case 40: -#line 265 "parse-gram.y" +#line 279 "../../src/parse-gram.y" { current_class = unknown_sym; current_type = NULL; @@ -1535,7 +1638,7 @@ yyreduce: break; case 41: -#line 270 "parse-gram.y" +#line 284 "../../src/parse-gram.y" { symbol_list *list; for (list = (yyvsp[0].list); list; list = list->next) @@ -1545,7 +1648,7 @@ yyreduce: break; case 42: -#line 280 "parse-gram.y" +#line 294 "../../src/parse-gram.y" { symbol_list *list; ++current_prec; @@ -1560,49 +1663,49 @@ yyreduce: break; case 43: -#line 294 "parse-gram.y" +#line 308 "../../src/parse-gram.y" { (yyval.assoc) = left_assoc; } break; case 44: -#line 295 "parse-gram.y" +#line 309 "../../src/parse-gram.y" { (yyval.assoc) = right_assoc; } break; case 45: -#line 296 "parse-gram.y" +#line 310 "../../src/parse-gram.y" { (yyval.assoc) = non_assoc; } break; case 46: -#line 300 "parse-gram.y" +#line 314 "../../src/parse-gram.y" { current_type = NULL; } break; case 47: -#line 301 "parse-gram.y" +#line 315 "../../src/parse-gram.y" { current_type = (yyvsp[0].uniqstr); } break; case 48: -#line 307 "parse-gram.y" +#line 321 "../../src/parse-gram.y" { (yyval.list) = symbol_list_new ((yyvsp[0].symbol), (yylsp[0])); } break; case 49: -#line 308 "parse-gram.y" +#line 322 "../../src/parse-gram.y" { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), (yyvsp[0].symbol), (yylsp[0])); } break; case 50: -#line 314 "parse-gram.y" +#line 328 "../../src/parse-gram.y" { current_type = (yyvsp[0].uniqstr); } break; case 51: -#line 318 "parse-gram.y" +#line 332 "../../src/parse-gram.y" { symbol_class_set ((yyvsp[0].symbol), current_class, (yylsp[0])); symbol_type_set ((yyvsp[0].symbol), current_type, (yylsp[0])); @@ -1610,7 +1713,7 @@ yyreduce: break; case 52: -#line 323 "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])); @@ -1619,7 +1722,7 @@ yyreduce: break; case 53: -#line 329 "parse-gram.y" +#line 343 "../../src/parse-gram.y" { symbol_class_set ((yyvsp[-1].symbol), current_class, (yylsp[-1])); symbol_type_set ((yyvsp[-1].symbol), current_type, (yylsp[-1])); @@ -1628,7 +1731,7 @@ yyreduce: break; case 54: -#line 335 "parse-gram.y" +#line 349 "../../src/parse-gram.y" { symbol_class_set ((yyvsp[-2].symbol), current_class, (yylsp[-2])); symbol_type_set ((yyvsp[-2].symbol), current_type, (yylsp[-2])); @@ -1638,7 +1741,7 @@ yyreduce: break; case 60: -#line 364 "parse-gram.y" +#line 378 "../../src/parse-gram.y" { if (yacc_flag) complain_at ((yyloc), _("POSIX forbids declarations in the grammar")); @@ -1646,90 +1749,87 @@ yyreduce: break; case 61: -#line 369 "parse-gram.y" +#line 383 "../../src/parse-gram.y" { yyerrok; } break; case 62: -#line 375 "parse-gram.y" +#line 389 "../../src/parse-gram.y" { current_lhs = (yyvsp[0].symbol); current_lhs_location = (yylsp[0]); } break; case 64: -#line 379 "parse-gram.y" +#line 393 "../../src/parse-gram.y" { grammar_rule_end ((yylsp[0])); } break; case 65: -#line 380 "parse-gram.y" +#line 394 "../../src/parse-gram.y" { grammar_rule_end ((yylsp[0])); } break; case 67: -#line 386 "parse-gram.y" +#line 400 "../../src/parse-gram.y" { grammar_rule_begin (current_lhs, current_lhs_location); } break; case 68: -#line 388 "parse-gram.y" +#line 402 "../../src/parse-gram.y" { grammar_current_rule_symbol_append ((yyvsp[0].symbol), (yylsp[0])); } break; case 69: -#line 390 "parse-gram.y" +#line 404 "../../src/parse-gram.y" { grammar_current_rule_action_append ((yyvsp[0].chars), (yylsp[0])); } break; case 70: -#line 392 "parse-gram.y" +#line 406 "../../src/parse-gram.y" { grammar_current_rule_prec_set ((yyvsp[0].symbol), (yylsp[0])); } break; case 71: -#line 394 "parse-gram.y" +#line 408 "../../src/parse-gram.y" { grammar_current_rule_dprec_set ((yyvsp[0].integer), (yylsp[0])); } break; case 72: -#line 396 "parse-gram.y" +#line 410 "../../src/parse-gram.y" { grammar_current_rule_merge_set ((yyvsp[0].uniqstr), (yylsp[0])); } break; case 73: -#line 400 "parse-gram.y" +#line 414 "../../src/parse-gram.y" { (yyval.symbol) = (yyvsp[0].symbol); } break; case 74: -#line 401 "parse-gram.y" +#line 415 "../../src/parse-gram.y" { (yyval.symbol) = (yyvsp[0].symbol); } break; case 75: -#line 406 "parse-gram.y" +#line 420 "../../src/parse-gram.y" { (yyval.chars) = (yyvsp[0].chars); } break; case 76: -#line 412 "parse-gram.y" +#line 426 "../../src/parse-gram.y" { - (yyval.symbol) = symbol_get ((yyvsp[0].chars), (yylsp[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 77: -#line 421 "parse-gram.y" - { - (yyval.chars) = (yyvsp[0].chars) + 1; - (yyval.chars)[strlen ((yyval.chars)) - 1] = '\0'; - } +#line 435 "../../src/parse-gram.y" + { (yyval.chars) = (yyvsp[0].chars); } break; case 79: -#line 430 "parse-gram.y" +#line 442 "../../src/parse-gram.y" { muscle_code_grow ("epilogue", (yyvsp[0].chars), (yylsp[0])); scanner_last_string_free (); @@ -1740,8 +1840,8 @@ yyreduce: default: break; } -/* Line 1044 of yacc.c. */ -#line 1745 "parse-gram.c" +/* Line 1066 of yacc.c. */ +#line 1845 "../../src/parse-gram.c" yyvsp -= yylen; yyssp -= yylen; @@ -1780,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; @@ -1793,44 +1917,61 @@ 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 += (strlen (_("syntax error, unexpected ")) - + yystrlen (yytname[yytype]) + 1); - 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 */ @@ -1849,15 +1990,7 @@ yyerrlab: /* If at end of input, pop the error token, then the rest of the stack, then return failure. */ if (yychar == YYEOF) - for (;;) - { - yyerror_range[0] = *yylsp; - YYPOPSTACK; - if (yyssp == yyss) - YYABORT; - yydestruct (_("Error: popping"), - yystos[*yyssp], yyvsp, yylsp); - } + YYABORT; } else { @@ -1950,9 +2083,6 @@ yyacceptlab: | yyabortlab -- YYABORT comes here. | `-----------------------------------*/ yyabortlab: - yydestruct (_("Error: discarding lookahead"), - yytoken, &yylval, &yylloc); - yychar = YYEMPTY; yyresult = 1; goto yyreturn; @@ -1967,6 +2097,19 @@ yyoverflowlab: #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); @@ -1975,7 +2118,7 @@ yyreturn: } -#line 436 "parse-gram.y" +#line 448 "../../src/parse-gram.y" @@ -2060,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) {