From: Paul Eggert Date: Thu, 13 Oct 2005 06:24:04 +0000 (+0000) Subject: Regenerate. X-Git-Tag: v2.3b~594 X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/2ed284440f1960cbb3fb10d26298fa99be2cbe24 Regenerate. --- diff --git a/src/parse-gram.c b/src/parse-gram.c index a5a1a210..1ce884fd 100644 --- a/src/parse-gram.c +++ b/src/parse-gram.c @@ -172,7 +172,7 @@ /* Copy the first part of user declarations. */ -#line 1 "../../src/parse-gram.y" +#line 1 "parse-gram.y" /* Bison Grammar Parser -*- C -*- Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. @@ -253,7 +253,7 @@ static int current_prec = 0; #endif #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) -#line 82 "../../src/parse-gram.y" +#line 82 "parse-gram.y" typedef union YYSTYPE { symbol *symbol; symbol_list *list; @@ -263,7 +263,7 @@ typedef union YYSTYPE { uniqstr uniqstr; } YYSTYPE; /* Line 196 of yacc.c. */ -#line 267 "../../src/parse-gram.c" +#line 267 "parse-gram.c" # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 # define YYSTYPE_IS_TRIVIAL 1 @@ -287,17 +287,19 @@ typedef struct YYLTYPE /* Line 219 of yacc.c. */ -#line 291 "../../src/parse-gram.c" - -/* Define YYMODERN_C if this compiler supports C89 or better. Some - modern compilers (e.g., IBM xlc 7.0) don't define __STDC__ for - pedantic reasons, but they define __STDC_VERSION__ so check that - as well. Consider a C++ compiler to be modern if it defines - __cplusplus. */ -#if defined (__STDC__) || defined (__STDC_VERSION__) || defined (__cplusplus) -# define YYMODERN_C 1 -#else -# define YYMODERN_C 0 +#line 291 "parse-gram.c" + +/* Define YYMODERN_C if this compiler supports C89 or better. If + __STDC__ is defined, the compiler is modern. IBM xlc 7.0 when run + as 'cc' doesn't define __STDC__ (or __STDC_VERSION__) for pedantic + reasons, but it defines __C99__FUNC__ so check that as well. + Consider a C++ compiler to be modern if it defines __cplusplus. */ +#ifndef YYMODERN_C +# if defined (__STDC__) || defined (__C99__FUNC__) || defined (__cplusplus) +# define YYMODERN_C 1 +# else +# define YYMODERN_C 0 +# endif #endif #ifndef YYSIZE_T @@ -878,7 +880,7 @@ do { \ | TOP (included). | `------------------------------------------------------------------*/ -#if defined (__STDC__) || defined (__STDC_VERSION__) || defined (__cplusplus) +#if defined (__STDC__) || defined (__C99__FUNC__) || defined (__cplusplus) static void yy_stack_print (short int *bottom, short int *top) #else @@ -905,7 +907,7 @@ do { \ | Report that the YYRULE is going to be reduced. | `------------------------------------------------*/ -#if defined (__STDC__) || defined (__STDC_VERSION__) || defined (__cplusplus) +#if defined (__STDC__) || defined (__C99__FUNC__) || defined (__cplusplus) static void yy_reduce_print (int yyrule) #else @@ -1173,7 +1175,7 @@ yysyntax_error (char *yyresult, int yystate, int yychar) | Print this symbol on YYOUTPUT. | `--------------------------------*/ -#if defined (__STDC__) || defined (__STDC_VERSION__) || defined (__cplusplus) +#if defined (__STDC__) || defined (__C99__FUNC__) || defined (__cplusplus) static void yysymprint (FILE *yyoutput, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocationp) #else @@ -1203,94 +1205,94 @@ yysymprint (yyoutput, yytype, yyvaluep, yylocationp) switch (yytype) { case 3: /* "\"string\"" */ -#line 169 "../../src/parse-gram.y" +#line 169 "parse-gram.y" { fprintf (stderr, "\"%s\"", (yyvaluep->chars)); }; -#line 1209 "../../src/parse-gram.c" +#line 1211 "parse-gram.c" break; case 4: /* "\"integer\"" */ -#line 182 "../../src/parse-gram.y" +#line 182 "parse-gram.y" { fprintf (stderr, "%d", (yyvaluep->integer)); }; -#line 1214 "../../src/parse-gram.c" +#line 1216 "parse-gram.c" break; case 8: /* "\"%destructor {...}\"" */ -#line 171 "../../src/parse-gram.y" +#line 171 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -#line 1219 "../../src/parse-gram.c" +#line 1221 "parse-gram.c" break; case 9: /* "\"%printer {...}\"" */ -#line 175 "../../src/parse-gram.y" +#line 175 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -#line 1224 "../../src/parse-gram.c" +#line 1226 "parse-gram.c" break; case 10: /* "\"%union {...}\"" */ -#line 176 "../../src/parse-gram.y" +#line 176 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -#line 1229 "../../src/parse-gram.c" +#line 1231 "parse-gram.c" break; case 26: /* "\"%initial-action {...}\"" */ -#line 172 "../../src/parse-gram.y" +#line 172 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -#line 1234 "../../src/parse-gram.c" +#line 1236 "parse-gram.c" break; case 27: /* "\"%lex-param {...}\"" */ -#line 173 "../../src/parse-gram.y" +#line 173 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -#line 1239 "../../src/parse-gram.c" +#line 1241 "parse-gram.c" break; case 34: /* "\"%parse-param {...}\"" */ -#line 174 "../../src/parse-gram.y" +#line 174 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -#line 1244 "../../src/parse-gram.c" +#line 1246 "parse-gram.c" break; case 42: /* "\"type\"" */ -#line 180 "../../src/parse-gram.y" +#line 180 "parse-gram.y" { fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); }; -#line 1249 "../../src/parse-gram.c" +#line 1251 "parse-gram.c" break; case 46: /* "\"identifier\"" */ -#line 184 "../../src/parse-gram.y" +#line 184 "parse-gram.y" { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; -#line 1254 "../../src/parse-gram.c" +#line 1256 "parse-gram.c" break; case 47: /* "\"identifier:\"" */ -#line 186 "../../src/parse-gram.y" +#line 186 "parse-gram.y" { fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); }; -#line 1259 "../../src/parse-gram.c" +#line 1261 "parse-gram.c" break; case 49: /* "\"%{...%}\"" */ -#line 178 "../../src/parse-gram.y" +#line 178 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -#line 1264 "../../src/parse-gram.c" +#line 1266 "parse-gram.c" break; case 50: /* "\"epilogue\"" */ -#line 178 "../../src/parse-gram.y" +#line 178 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -#line 1269 "../../src/parse-gram.c" +#line 1271 "parse-gram.c" break; case 51: /* "\"{...}\"" */ -#line 177 "../../src/parse-gram.y" +#line 177 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -#line 1274 "../../src/parse-gram.c" +#line 1276 "parse-gram.c" break; case 72: /* "symbol" */ -#line 184 "../../src/parse-gram.y" +#line 184 "parse-gram.y" { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; -#line 1279 "../../src/parse-gram.c" +#line 1281 "parse-gram.c" break; case 73: /* "action" */ -#line 177 "../../src/parse-gram.y" +#line 177 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -#line 1284 "../../src/parse-gram.c" +#line 1286 "parse-gram.c" break; case 74: /* "string_as_id" */ -#line 184 "../../src/parse-gram.y" +#line 184 "parse-gram.y" { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; -#line 1289 "../../src/parse-gram.c" +#line 1291 "parse-gram.c" break; case 75: /* "string_content" */ -#line 169 "../../src/parse-gram.y" +#line 169 "parse-gram.y" { fprintf (stderr, "\"%s\"", (yyvaluep->chars)); }; -#line 1294 "../../src/parse-gram.c" +#line 1296 "parse-gram.c" break; default: break; @@ -1303,7 +1305,7 @@ yysymprint (yyoutput, yytype, yyvaluep, yylocationp) | Release the memory associated to this symbol. | `-----------------------------------------------*/ -#if defined (__STDC__) || defined (__STDC_VERSION__) || defined (__cplusplus) +#if defined (__STDC__) || defined (__C99__FUNC__) || defined (__cplusplus) static void yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocationp) #else @@ -1364,7 +1366,7 @@ int yyparse (YYPARSE_PARAM) void *YYPARSE_PARAM; # endif #else /* ! YYPARSE_PARAM */ -#if defined (__STDC__) || defined (__STDC_VERSION__) || defined (__cplusplus) +#if defined (__STDC__) || defined (__C99__FUNC__) || defined (__cplusplus) int yyparse (void) #else @@ -1460,7 +1462,7 @@ YYLTYPE yylloc; /* User initialization code. */ -#line 72 "../../src/parse-gram.y" +#line 72 "parse-gram.y" { /* Bison's grammar can initial empty locations, hence a default location is needed. */ @@ -1468,8 +1470,8 @@ YYLTYPE yylloc; yylloc.start.line = yylloc.end.line = 1; yylloc.start.column = yylloc.end.column = 0; } -/* Line 1064 of yacc.c. */ -#line 1473 "../../src/parse-gram.c" +/* Line 1066 of yacc.c. */ +#line 1475 "parse-gram.c" yylsp[0] = yylloc; goto yysetstate; @@ -1658,52 +1660,52 @@ yyreduce: switch (yyn) { case 6: -#line 207 "../../src/parse-gram.y" +#line 207 "parse-gram.y" { prologue_augment ((yyvsp[0].chars), (yylsp[0])); } break; case 7: -#line 208 "../../src/parse-gram.y" +#line 208 "parse-gram.y" { debug_flag = true; } break; case 8: -#line 209 "../../src/parse-gram.y" +#line 209 "parse-gram.y" { muscle_insert ((yyvsp[0].chars), "1"); } break; case 9: -#line 210 "../../src/parse-gram.y" +#line 210 "parse-gram.y" { muscle_insert ((yyvsp[-1].chars), (yyvsp[0].chars)); } break; case 10: -#line 211 "../../src/parse-gram.y" +#line 211 "parse-gram.y" { defines_flag = true; } break; case 11: -#line 212 "../../src/parse-gram.y" +#line 212 "parse-gram.y" { error_verbose = true; } break; case 12: -#line 213 "../../src/parse-gram.y" +#line 213 "parse-gram.y" { expected_sr_conflicts = (yyvsp[0].integer); } break; case 13: -#line 214 "../../src/parse-gram.y" +#line 214 "parse-gram.y" { expected_rr_conflicts = (yyvsp[0].integer); } break; case 14: -#line 215 "../../src/parse-gram.y" +#line 215 "parse-gram.y" { spec_file_prefix = (yyvsp[0].chars); } break; case 15: -#line 217 "../../src/parse-gram.y" +#line 217 "parse-gram.y" { nondeterministic_parser = true; glr_parser = true; @@ -1711,86 +1713,86 @@ yyreduce: break; case 16: -#line 222 "../../src/parse-gram.y" +#line 222 "parse-gram.y" { muscle_code_grow ("initial_action", (yyvsp[0].chars), (yylsp[0])); } break; case 17: -#line 225 "../../src/parse-gram.y" +#line 225 "parse-gram.y" { add_param ("lex_param", (yyvsp[0].chars), (yylsp[0])); } break; case 18: -#line 226 "../../src/parse-gram.y" +#line 226 "parse-gram.y" { locations_flag = true; } break; case 19: -#line 227 "../../src/parse-gram.y" +#line 227 "parse-gram.y" { spec_name_prefix = (yyvsp[0].chars); } break; case 20: -#line 228 "../../src/parse-gram.y" +#line 228 "parse-gram.y" { no_lines_flag = true; } break; case 21: -#line 229 "../../src/parse-gram.y" +#line 229 "parse-gram.y" { nondeterministic_parser = true; } break; case 22: -#line 230 "../../src/parse-gram.y" +#line 230 "parse-gram.y" { spec_outfile = (yyvsp[0].chars); } break; case 23: -#line 231 "../../src/parse-gram.y" +#line 231 "parse-gram.y" { add_param ("parse_param", (yyvsp[0].chars), (yylsp[0])); } break; case 24: -#line 232 "../../src/parse-gram.y" +#line 232 "parse-gram.y" { pure_parser = true; } break; case 25: -#line 233 "../../src/parse-gram.y" +#line 233 "parse-gram.y" { version_check (&(yylsp[0]), (yyvsp[0].chars)); } break; case 26: -#line 234 "../../src/parse-gram.y" +#line 234 "parse-gram.y" { skeleton = (yyvsp[0].chars); } break; case 27: -#line 235 "../../src/parse-gram.y" +#line 235 "parse-gram.y" { token_table_flag = true; } break; case 28: -#line 236 "../../src/parse-gram.y" +#line 236 "parse-gram.y" { report_flag = report_states; } break; case 29: -#line 237 "../../src/parse-gram.y" +#line 237 "parse-gram.y" { yacc_flag = true; } break; case 33: -#line 245 "../../src/parse-gram.y" +#line 245 "parse-gram.y" { grammar_start_symbol_set ((yyvsp[0].symbol), (yylsp[0])); } break; case 34: -#line 249 "../../src/parse-gram.y" +#line 249 "parse-gram.y" { typed = true; MUSCLE_INSERT_INT ("stype_line", (yylsp[0]).start.line); @@ -1799,7 +1801,7 @@ yyreduce: break; case 35: -#line 255 "../../src/parse-gram.y" +#line 255 "parse-gram.y" { symbol_list *list; for (list = (yyvsp[0].list); list; list = list->next) @@ -1809,7 +1811,7 @@ yyreduce: break; case 36: -#line 262 "../../src/parse-gram.y" +#line 262 "parse-gram.y" { symbol_list *list; for (list = (yyvsp[0].list); list; list = list->next) @@ -1819,26 +1821,26 @@ yyreduce: break; case 37: -#line 269 "../../src/parse-gram.y" +#line 269 "parse-gram.y" { default_prec = true; } break; case 38: -#line 273 "../../src/parse-gram.y" +#line 273 "parse-gram.y" { default_prec = false; } break; case 39: -#line 279 "../../src/parse-gram.y" +#line 279 "parse-gram.y" { current_class = nterm_sym; } break; case 40: -#line 280 "../../src/parse-gram.y" +#line 280 "parse-gram.y" { current_class = unknown_sym; current_type = NULL; @@ -1846,12 +1848,12 @@ yyreduce: break; case 41: -#line 284 "../../src/parse-gram.y" +#line 284 "parse-gram.y" { current_class = token_sym; } break; case 42: -#line 285 "../../src/parse-gram.y" +#line 285 "parse-gram.y" { current_class = unknown_sym; current_type = NULL; @@ -1859,7 +1861,7 @@ yyreduce: break; case 43: -#line 290 "../../src/parse-gram.y" +#line 290 "parse-gram.y" { symbol_list *list; for (list = (yyvsp[0].list); list; list = list->next) @@ -1869,7 +1871,7 @@ yyreduce: break; case 44: -#line 300 "../../src/parse-gram.y" +#line 300 "parse-gram.y" { symbol_list *list; ++current_prec; @@ -1884,49 +1886,49 @@ yyreduce: break; case 45: -#line 314 "../../src/parse-gram.y" +#line 314 "parse-gram.y" { (yyval.assoc) = left_assoc; } break; case 46: -#line 315 "../../src/parse-gram.y" +#line 315 "parse-gram.y" { (yyval.assoc) = right_assoc; } break; case 47: -#line 316 "../../src/parse-gram.y" +#line 316 "parse-gram.y" { (yyval.assoc) = non_assoc; } break; case 48: -#line 320 "../../src/parse-gram.y" +#line 320 "parse-gram.y" { current_type = NULL; } break; case 49: -#line 321 "../../src/parse-gram.y" +#line 321 "parse-gram.y" { current_type = (yyvsp[0].uniqstr); } break; case 50: -#line 327 "../../src/parse-gram.y" +#line 327 "parse-gram.y" { (yyval.list) = symbol_list_new ((yyvsp[0].symbol), (yylsp[0])); } break; case 51: -#line 328 "../../src/parse-gram.y" +#line 328 "parse-gram.y" { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), (yyvsp[0].symbol), (yylsp[0])); } break; case 52: -#line 334 "../../src/parse-gram.y" +#line 334 "parse-gram.y" { current_type = (yyvsp[0].uniqstr); } break; case 53: -#line 338 "../../src/parse-gram.y" +#line 338 "parse-gram.y" { symbol_class_set ((yyvsp[0].symbol), current_class, (yylsp[0])); symbol_type_set ((yyvsp[0].symbol), current_type, (yylsp[0])); @@ -1934,7 +1936,7 @@ yyreduce: break; case 54: -#line 343 "../../src/parse-gram.y" +#line 343 "parse-gram.y" { symbol_class_set ((yyvsp[-1].symbol), current_class, (yylsp[-1])); symbol_type_set ((yyvsp[-1].symbol), current_type, (yylsp[-1])); @@ -1943,7 +1945,7 @@ yyreduce: break; case 55: -#line 349 "../../src/parse-gram.y" +#line 349 "parse-gram.y" { symbol_class_set ((yyvsp[-1].symbol), current_class, (yylsp[-1])); symbol_type_set ((yyvsp[-1].symbol), current_type, (yylsp[-1])); @@ -1952,7 +1954,7 @@ yyreduce: break; case 56: -#line 355 "../../src/parse-gram.y" +#line 355 "parse-gram.y" { symbol_class_set ((yyvsp[-2].symbol), current_class, (yylsp[-2])); symbol_type_set ((yyvsp[-2].symbol), current_type, (yylsp[-2])); @@ -1962,7 +1964,7 @@ yyreduce: break; case 62: -#line 384 "../../src/parse-gram.y" +#line 384 "parse-gram.y" { if (yacc_flag) complain_at ((yyloc), _("POSIX forbids declarations in the grammar")); @@ -1970,74 +1972,74 @@ yyreduce: break; case 63: -#line 389 "../../src/parse-gram.y" +#line 389 "parse-gram.y" { yyerrok; } break; case 64: -#line 395 "../../src/parse-gram.y" +#line 395 "parse-gram.y" { current_lhs = (yyvsp[0].symbol); current_lhs_location = (yylsp[0]); } break; case 66: -#line 399 "../../src/parse-gram.y" +#line 399 "parse-gram.y" { grammar_rule_end ((yylsp[0])); } break; case 67: -#line 400 "../../src/parse-gram.y" +#line 400 "parse-gram.y" { grammar_rule_end ((yylsp[0])); } break; case 69: -#line 406 "../../src/parse-gram.y" +#line 406 "parse-gram.y" { grammar_rule_begin (current_lhs, current_lhs_location); } break; case 70: -#line 408 "../../src/parse-gram.y" +#line 408 "parse-gram.y" { grammar_current_rule_symbol_append ((yyvsp[0].symbol), (yylsp[0])); } break; case 71: -#line 410 "../../src/parse-gram.y" +#line 410 "parse-gram.y" { grammar_current_rule_action_append ((yyvsp[0].chars), (yylsp[0])); } break; case 72: -#line 412 "../../src/parse-gram.y" +#line 412 "parse-gram.y" { grammar_current_rule_prec_set ((yyvsp[0].symbol), (yylsp[0])); } break; case 73: -#line 414 "../../src/parse-gram.y" +#line 414 "parse-gram.y" { grammar_current_rule_dprec_set ((yyvsp[0].integer), (yylsp[0])); } break; case 74: -#line 416 "../../src/parse-gram.y" +#line 416 "parse-gram.y" { grammar_current_rule_merge_set ((yyvsp[0].uniqstr), (yylsp[0])); } break; case 75: -#line 420 "../../src/parse-gram.y" +#line 420 "parse-gram.y" { (yyval.symbol) = (yyvsp[0].symbol); } break; case 76: -#line 421 "../../src/parse-gram.y" +#line 421 "parse-gram.y" { (yyval.symbol) = (yyvsp[0].symbol); } break; case 77: -#line 426 "../../src/parse-gram.y" +#line 426 "parse-gram.y" { (yyval.chars) = (yyvsp[0].chars); } break; case 78: -#line 432 "../../src/parse-gram.y" +#line 432 "parse-gram.y" { (yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[0].chars)), (yylsp[0])); symbol_class_set ((yyval.symbol), token_sym, (yylsp[0])); @@ -2045,12 +2047,12 @@ yyreduce: break; case 79: -#line 441 "../../src/parse-gram.y" +#line 441 "parse-gram.y" { (yyval.chars) = (yyvsp[0].chars); } break; case 81: -#line 448 "../../src/parse-gram.y" +#line 448 "parse-gram.y" { muscle_code_grow ("epilogue", (yyvsp[0].chars), (yylsp[0])); scanner_last_string_free (); @@ -2061,8 +2063,8 @@ yyreduce: default: break; } -/* Line 1260 of yacc.c. */ -#line 2066 "../../src/parse-gram.c" +/* Line 1262 of yacc.c. */ +#line 2068 "parse-gram.c" yyvsp -= yylen; yyssp -= yylen; @@ -2272,7 +2274,7 @@ yyreturn: } -#line 454 "../../src/parse-gram.y" +#line 454 "parse-gram.y" diff --git a/src/parse-gram.h b/src/parse-gram.h index c8aba092..e60f5df0 100644 --- a/src/parse-gram.h +++ b/src/parse-gram.h @@ -137,7 +137,7 @@ #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) -#line 82 "../../src/parse-gram.y" +#line 82 "parse-gram.y" typedef union YYSTYPE { symbol *symbol; symbol_list *list; @@ -146,8 +146,8 @@ typedef union YYSTYPE { assoc assoc; uniqstr uniqstr; } YYSTYPE; -/* Line 1516 of yacc.c. */ -#line 151 "../../src/parse-gram.h" +/* Line 1518 of yacc.c. */ +#line 151 "parse-gram.h" # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 # define YYSTYPE_IS_TRIVIAL 1