From ea6046b9f6f8ab16f2f0f03a0d15499243971ae2 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 8 Oct 2010 12:12:48 -0700 Subject: [PATCH] Fix portability problem on OpenBSD 4.7. Jim Meyering reported this in . * data/yacc.c: Use EXIT_SUCCESS as a witness for stdlib.h, not _STDLIB_H. EXIT_SUCCESS has been defined by the standard for quite some time. * src/parse-gram.c, src/parse-gram.h: Regenerate. * tests/regression.at: Tamper with the renamed witness. (cherry picked from commit 8ff146cd31d887f9bb28ec5f96bffcad4b4057f7) Conflicts: ChangeLog src/parse-gram.c src/parse-gram.h --- ChangeLog | 10 ++ data/yacc.c | 16 +-- src/parse-gram.c | 310 ++++++++++++++++++++++---------------------- src/parse-gram.h | 9 +- tests/regression.at | 6 +- 5 files changed, 182 insertions(+), 169 deletions(-) diff --git a/ChangeLog b/ChangeLog index d7df79fe..0517bbe7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,15 @@ 2010-10-08 Paul Eggert + Fix portability problem on OpenBSD 4.7. + + Jim Meyering reported this in + . + * data/yacc.c: Use EXIT_SUCCESS as a witness for stdlib.h, + not _STDLIB_H. EXIT_SUCCESS has been defined by the standard + for quite some time. + * src/parse-gram.c, src/parse-gram.h: Regenerate. + * tests/regression.at: Tamper with the renamed witness. + Adjust to recent changes to gnulib bootstrap. * .cvsignore, build-aux/.cvsignore, doc/.cvsignore, etc/.cvsignore: diff --git a/data/yacc.c b/data/yacc.c index 3280267e..fa3612cf 100644 --- a/data/yacc.c +++ b/data/yacc.c @@ -418,10 +418,10 @@ typedef short int yytype_int16; # define alloca _alloca # else # define YYSTACK_ALLOC alloca -# if ! defined _ALLOCA_H && ! defined _STDLIB_H && ]b4_c_modern[ +# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && ]b4_c_modern[ # include /* INFRINGES ON USER NAME SPACE */ -# ifndef _STDLIB_H -# define _STDLIB_H 1 +# ifndef EXIT_SUCCESS +# define EXIT_SUCCESS 0 # endif # endif # endif @@ -445,23 +445,23 @@ typedef short int yytype_int16; # ifndef YYSTACK_ALLOC_MAXIMUM # define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM # endif -# if (defined __cplusplus && ! defined _STDLIB_H \ +# if (defined __cplusplus && ! defined EXIT_SUCCESS \ && ! ((defined YYMALLOC || defined malloc) \ && (defined YYFREE || defined free))) # include /* INFRINGES ON USER NAME SPACE */ -# ifndef _STDLIB_H -# define _STDLIB_H 1 +# ifndef EXIT_SUCCESS +# define EXIT_SUCCESS 0 # endif # endif # ifndef YYMALLOC # define YYMALLOC malloc -# if ! defined malloc && ! defined _STDLIB_H && ]b4_c_modern[ +# if ! defined malloc && ! defined EXIT_SUCCESS && ]b4_c_modern[ void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ # endif # endif # ifndef YYFREE # define YYFREE free -# if ! defined free && ! defined _STDLIB_H && ]b4_c_modern[ +# if ! defined free && ! defined EXIT_SUCCESS && ]b4_c_modern[ void free (void *); /* INFRINGES ON USER NAME SPACE */ # endif # endif diff --git a/src/parse-gram.c b/src/parse-gram.c index 4d4e1722..4a1ae312 100644 --- a/src/parse-gram.c +++ b/src/parse-gram.c @@ -1,8 +1,9 @@ -/* A Bison parser, made by GNU Bison 2.4.1.206-8a8b-dirty. */ +/* A Bison parser, made by GNU Bison 2.4.1.243-8699. */ /* Skeleton implementation for Bison's Yacc-like parsers in C - Copyright (C) 1984, 1989-1990, 2000-2010 Free Software Foundation, Inc. + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006, + 2007, 2008, 2009, 2010 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -44,7 +45,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.4.1.206-8a8b-dirty" +#define YYBISON_VERSION "2.4.1.243-8699" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -77,7 +78,8 @@ #line 1 "parse-gram.y" /* Bison Grammar Parser -*- C -*- - Copyright (C) 2002-2010 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 + Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -150,7 +152,7 @@ static int current_prec = 0; /* Line 251 of yacc.c */ -#line 154 "parse-gram.c" +#line 156 "parse-gram.c" /* Enabling traces. */ #ifndef YYDEBUG @@ -301,7 +303,7 @@ typedef union YYSTYPE { /* Line 276 of yacc.c */ -#line 93 "parse-gram.y" +#line 94 "parse-gram.y" symbol *symbol; symbol_list *list; @@ -316,7 +318,7 @@ typedef union YYSTYPE /* Line 276 of yacc.c */ -#line 320 "parse-gram.c" +#line 322 "parse-gram.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -341,7 +343,7 @@ typedef struct YYLTYPE /* Line 326 of yacc.c */ -#line 345 "parse-gram.c" +#line 347 "parse-gram.c" #ifdef short # undef short @@ -444,11 +446,11 @@ YYID (yyi) # define alloca _alloca # else # define YYSTACK_ALLOC alloca -# if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ +# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) # include /* INFRINGES ON USER NAME SPACE */ -# ifndef _STDLIB_H -# define _STDLIB_H 1 +# ifndef EXIT_SUCCESS +# define EXIT_SUCCESS 0 # endif # endif # endif @@ -471,24 +473,24 @@ YYID (yyi) # ifndef YYSTACK_ALLOC_MAXIMUM # define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM # endif -# if (defined __cplusplus && ! defined _STDLIB_H \ +# if (defined __cplusplus && ! defined EXIT_SUCCESS \ && ! ((defined YYMALLOC || defined malloc) \ && (defined YYFREE || defined free))) # include /* INFRINGES ON USER NAME SPACE */ -# ifndef _STDLIB_H -# define _STDLIB_H 1 +# ifndef EXIT_SUCCESS +# define EXIT_SUCCESS 0 # endif # endif # ifndef YYMALLOC # define YYMALLOC malloc -# if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ +# if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ # endif # endif # ifndef YYFREE # define YYFREE free -# if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ +# if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) void free (void *); /* INFRINGES ON USER NAME SPACE */ # endif @@ -667,17 +669,17 @@ static const yytype_int8 yyrhs[] = /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 208, 208, 216, 218, 222, 223, 233, 234, 239, - 240, 245, 246, 247, 248, 249, 250, 255, 264, 265, - 266, 267, 268, 269, 270, 271, 272, 273, 274, 289, - 290, 314, 315, 316, 317, 321, 322, 323, 327, 334, - 341, 345, 349, 356, 371, 372, 376, 388, 388, 393, - 393, 398, 409, 424, 425, 426, 430, 431, 436, 438, - 443, 444, 449, 451, 456, 457, 461, 462, 463, 464, - 469, 474, 479, 485, 491, 502, 503, 512, 513, 519, - 520, 521, 528, 528, 533, 534, 535, 540, 542, 544, - 546, 548, 550, 555, 557, 568, 569, 574, 575, 576, - 585, 605, 607, 616, 621, 622, 627, 634, 636 + 0, 209, 209, 217, 219, 223, 224, 234, 235, 240, + 241, 246, 247, 248, 249, 250, 251, 256, 265, 266, + 267, 268, 269, 270, 271, 272, 273, 274, 275, 290, + 291, 315, 316, 317, 318, 322, 323, 324, 328, 335, + 342, 346, 350, 357, 372, 373, 377, 389, 389, 394, + 394, 399, 410, 425, 426, 427, 431, 432, 437, 439, + 444, 445, 450, 452, 457, 458, 462, 463, 464, 465, + 470, 475, 480, 486, 492, 503, 504, 513, 514, 520, + 521, 522, 529, 529, 534, 535, 536, 541, 543, 545, + 547, 549, 551, 556, 558, 569, 570, 575, 576, 577, + 586, 606, 608, 617, 622, 623, 628, 635, 637 }; #endif @@ -1048,164 +1050,164 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp) case 3: /* "\"string\"" */ /* Line 797 of yacc.c */ -#line 183 "parse-gram.y" +#line 184 "parse-gram.y" { fputs (quotearg_style (c_quoting_style, (yyvaluep->chars)), stderr); }; /* Line 797 of yacc.c */ -#line 1056 "parse-gram.c" +#line 1058 "parse-gram.c" break; case 4: /* "\"integer\"" */ /* Line 797 of yacc.c */ -#line 195 "parse-gram.y" +#line 196 "parse-gram.y" { fprintf (stderr, "%d", (yyvaluep->integer)); }; /* Line 797 of yacc.c */ -#line 1065 "parse-gram.c" +#line 1067 "parse-gram.c" break; case 43: /* "\"{...}\"" */ /* Line 797 of yacc.c */ -#line 185 "parse-gram.y" +#line 186 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->code)); }; /* Line 797 of yacc.c */ -#line 1074 "parse-gram.c" +#line 1076 "parse-gram.c" break; case 44: /* "\"[identifier]\"" */ /* Line 797 of yacc.c */ -#line 190 "parse-gram.y" +#line 191 "parse-gram.y" { fprintf (stderr, "[%s]", (yyvaluep->uniqstr)); }; /* Line 797 of yacc.c */ -#line 1083 "parse-gram.c" +#line 1085 "parse-gram.c" break; case 45: /* "\"char\"" */ /* Line 797 of yacc.c */ -#line 177 "parse-gram.y" +#line 178 "parse-gram.y" { fputs (char_name ((yyvaluep->character)), stderr); }; /* Line 797 of yacc.c */ -#line 1092 "parse-gram.c" +#line 1094 "parse-gram.c" break; case 46: /* "\"epilogue\"" */ /* Line 797 of yacc.c */ -#line 185 "parse-gram.y" +#line 186 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; /* Line 797 of yacc.c */ -#line 1101 "parse-gram.c" +#line 1103 "parse-gram.c" break; case 48: /* "\"identifier\"" */ /* Line 797 of yacc.c */ -#line 189 "parse-gram.y" +#line 190 "parse-gram.y" { fputs ((yyvaluep->uniqstr), stderr); }; /* Line 797 of yacc.c */ -#line 1110 "parse-gram.c" +#line 1112 "parse-gram.c" break; case 49: /* "\"identifier:\"" */ /* Line 797 of yacc.c */ -#line 191 "parse-gram.y" +#line 192 "parse-gram.y" { fprintf (stderr, "%s:", (yyvaluep->uniqstr)); }; /* Line 797 of yacc.c */ -#line 1119 "parse-gram.c" +#line 1121 "parse-gram.c" break; case 52: /* "\"%{...%}\"" */ /* Line 797 of yacc.c */ -#line 185 "parse-gram.y" +#line 186 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; /* Line 797 of yacc.c */ -#line 1128 "parse-gram.c" +#line 1130 "parse-gram.c" break; case 54: /* "\"type\"" */ /* Line 797 of yacc.c */ -#line 192 "parse-gram.y" +#line 193 "parse-gram.y" { fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); }; /* Line 797 of yacc.c */ -#line 1137 "parse-gram.c" +#line 1139 "parse-gram.c" break; case 71: /* "symbol.prec" */ /* Line 797 of yacc.c */ -#line 198 "parse-gram.y" +#line 199 "parse-gram.y" { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; /* Line 797 of yacc.c */ -#line 1146 "parse-gram.c" +#line 1148 "parse-gram.c" break; case 84: /* "variable" */ /* Line 797 of yacc.c */ -#line 189 "parse-gram.y" +#line 190 "parse-gram.y" { fputs ((yyvaluep->uniqstr), stderr); }; /* Line 797 of yacc.c */ -#line 1155 "parse-gram.c" +#line 1157 "parse-gram.c" break; case 85: /* "content.opt" */ /* Line 797 of yacc.c */ -#line 185 "parse-gram.y" +#line 186 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; /* Line 797 of yacc.c */ -#line 1164 "parse-gram.c" +#line 1166 "parse-gram.c" break; case 86: /* "braceless" */ /* Line 797 of yacc.c */ -#line 185 "parse-gram.y" +#line 186 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; /* Line 797 of yacc.c */ -#line 1173 "parse-gram.c" +#line 1175 "parse-gram.c" break; case 87: /* "id" */ /* Line 797 of yacc.c */ -#line 198 "parse-gram.y" +#line 199 "parse-gram.y" { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; /* Line 797 of yacc.c */ -#line 1182 "parse-gram.c" +#line 1184 "parse-gram.c" break; case 88: /* "id_colon" */ /* Line 797 of yacc.c */ -#line 199 "parse-gram.y" +#line 200 "parse-gram.y" { fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); }; /* Line 797 of yacc.c */ -#line 1191 "parse-gram.c" +#line 1193 "parse-gram.c" break; case 89: /* "symbol" */ /* Line 797 of yacc.c */ -#line 198 "parse-gram.y" +#line 199 "parse-gram.y" { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; /* Line 797 of yacc.c */ -#line 1200 "parse-gram.c" +#line 1202 "parse-gram.c" break; case 90: /* "string_as_id" */ /* Line 797 of yacc.c */ -#line 198 "parse-gram.y" +#line 199 "parse-gram.y" { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; /* Line 797 of yacc.c */ -#line 1209 "parse-gram.c" +#line 1211 "parse-gram.c" break; default: break; @@ -1733,7 +1735,7 @@ YYLTYPE yylloc; /* User initialization code. */ /* Line 1280 of yacc.c */ -#line 85 "parse-gram.y" +#line 86 "parse-gram.y" { /* Bison's grammar can initial empty locations, hence a default location is needed. */ @@ -1742,7 +1744,7 @@ YYLTYPE yylloc; } /* Line 1280 of yacc.c */ -#line 1746 "parse-gram.c" +#line 1748 "parse-gram.c" yylsp[0] = yylloc; goto yysetstate; @@ -1930,7 +1932,7 @@ yyreduce: case 6: /* Line 1493 of yacc.c */ -#line 224 "parse-gram.y" +#line 225 "parse-gram.y" { code_props plain_code; code_props_plain_init (&plain_code, (yyvsp[(1) - (1)].chars), (yylsp[(1) - (1)])); @@ -1945,14 +1947,14 @@ yyreduce: case 7: /* Line 1493 of yacc.c */ -#line 233 "parse-gram.y" +#line 234 "parse-gram.y" { debug_flag = true; } break; case 8: /* Line 1493 of yacc.c */ -#line 235 "parse-gram.y" +#line 236 "parse-gram.y" { muscle_percent_define_insert ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars), MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE); @@ -1962,14 +1964,14 @@ yyreduce: case 9: /* Line 1493 of yacc.c */ -#line 239 "parse-gram.y" +#line 240 "parse-gram.y" { defines_flag = true; } break; case 10: /* Line 1493 of yacc.c */ -#line 241 "parse-gram.y" +#line 242 "parse-gram.y" { defines_flag = true; spec_defines_file = xstrdup ((yyvsp[(2) - (2)].chars)); @@ -1979,42 +1981,42 @@ yyreduce: case 11: /* Line 1493 of yacc.c */ -#line 245 "parse-gram.y" +#line 246 "parse-gram.y" { error_verbose = true; } break; case 12: /* Line 1493 of yacc.c */ -#line 246 "parse-gram.y" +#line 247 "parse-gram.y" { expected_sr_conflicts = (yyvsp[(2) - (2)].integer); } break; case 13: /* Line 1493 of yacc.c */ -#line 247 "parse-gram.y" +#line 248 "parse-gram.y" { expected_rr_conflicts = (yyvsp[(2) - (2)].integer); } break; case 14: /* Line 1493 of yacc.c */ -#line 248 "parse-gram.y" +#line 249 "parse-gram.y" { spec_file_prefix = (yyvsp[(2) - (2)].chars); } break; case 15: /* Line 1493 of yacc.c */ -#line 249 "parse-gram.y" +#line 250 "parse-gram.y" { spec_file_prefix = (yyvsp[(3) - (3)].chars); } break; case 16: /* Line 1493 of yacc.c */ -#line 251 "parse-gram.y" +#line 252 "parse-gram.y" { nondeterministic_parser = true; glr_parser = true; @@ -2024,7 +2026,7 @@ yyreduce: case 17: /* Line 1493 of yacc.c */ -#line 256 "parse-gram.y" +#line 257 "parse-gram.y" { code_props action; code_props_symbol_action_init (&action, (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); @@ -2038,77 +2040,77 @@ yyreduce: case 18: /* Line 1493 of yacc.c */ -#line 264 "parse-gram.y" +#line 265 "parse-gram.y" { language_argmatch ((yyvsp[(2) - (2)].chars), grammar_prio, (yylsp[(1) - (2)])); } break; case 19: /* Line 1493 of yacc.c */ -#line 265 "parse-gram.y" +#line 266 "parse-gram.y" { add_param ("lex_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); } break; case 20: /* Line 1493 of yacc.c */ -#line 266 "parse-gram.y" +#line 267 "parse-gram.y" { locations_flag = true; } break; case 21: /* Line 1493 of yacc.c */ -#line 267 "parse-gram.y" +#line 268 "parse-gram.y" { spec_name_prefix = (yyvsp[(2) - (2)].chars); } break; case 22: /* Line 1493 of yacc.c */ -#line 268 "parse-gram.y" +#line 269 "parse-gram.y" { spec_name_prefix = (yyvsp[(3) - (3)].chars); } break; case 23: /* Line 1493 of yacc.c */ -#line 269 "parse-gram.y" +#line 270 "parse-gram.y" { no_lines_flag = true; } break; case 24: /* Line 1493 of yacc.c */ -#line 270 "parse-gram.y" +#line 271 "parse-gram.y" { nondeterministic_parser = true; } break; case 25: /* Line 1493 of yacc.c */ -#line 271 "parse-gram.y" +#line 272 "parse-gram.y" { spec_outfile = (yyvsp[(2) - (2)].chars); } break; case 26: /* Line 1493 of yacc.c */ -#line 272 "parse-gram.y" +#line 273 "parse-gram.y" { spec_outfile = (yyvsp[(3) - (3)].chars); } break; case 27: /* Line 1493 of yacc.c */ -#line 273 "parse-gram.y" +#line 274 "parse-gram.y" { add_param ("parse_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); } break; case 28: /* Line 1493 of yacc.c */ -#line 275 "parse-gram.y" +#line 276 "parse-gram.y" { /* %pure-parser is deprecated in favor of `%define api.pure', so use `%define api.pure' in a backward-compatible manner here. First, don't @@ -2128,14 +2130,14 @@ yyreduce: case 29: /* Line 1493 of yacc.c */ -#line 289 "parse-gram.y" +#line 290 "parse-gram.y" { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); } break; case 30: /* Line 1493 of yacc.c */ -#line 291 "parse-gram.y" +#line 292 "parse-gram.y" { char const *skeleton_user = (yyvsp[(2) - (2)].chars); if (strchr (skeleton_user, '/')) @@ -2164,28 +2166,28 @@ yyreduce: case 31: /* Line 1493 of yacc.c */ -#line 314 "parse-gram.y" +#line 315 "parse-gram.y" { token_table_flag = true; } break; case 32: /* Line 1493 of yacc.c */ -#line 315 "parse-gram.y" +#line 316 "parse-gram.y" { report_flag |= report_states; } break; case 33: /* Line 1493 of yacc.c */ -#line 316 "parse-gram.y" +#line 317 "parse-gram.y" { yacc_flag = true; } break; case 37: /* Line 1493 of yacc.c */ -#line 324 "parse-gram.y" +#line 325 "parse-gram.y" { grammar_start_symbol_set ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); } @@ -2194,7 +2196,7 @@ yyreduce: case 38: /* Line 1493 of yacc.c */ -#line 328 "parse-gram.y" +#line 329 "parse-gram.y" { symbol_list *list; for (list = (yyvsp[(3) - (3)].list); list; list = list->next) @@ -2206,7 +2208,7 @@ yyreduce: case 39: /* Line 1493 of yacc.c */ -#line 335 "parse-gram.y" +#line 336 "parse-gram.y" { symbol_list *list; for (list = (yyvsp[(3) - (3)].list); list; list = list->next) @@ -2218,7 +2220,7 @@ yyreduce: case 40: /* Line 1493 of yacc.c */ -#line 342 "parse-gram.y" +#line 343 "parse-gram.y" { default_prec = true; } @@ -2227,7 +2229,7 @@ yyreduce: case 41: /* Line 1493 of yacc.c */ -#line 346 "parse-gram.y" +#line 347 "parse-gram.y" { default_prec = false; } @@ -2236,7 +2238,7 @@ yyreduce: case 42: /* Line 1493 of yacc.c */ -#line 350 "parse-gram.y" +#line 351 "parse-gram.y" { /* Do not invoke muscle_percent_code_grow here since it invokes muscle_user_name_list_grow. */ @@ -2248,7 +2250,7 @@ yyreduce: case 43: /* Line 1493 of yacc.c */ -#line 357 "parse-gram.y" +#line 358 "parse-gram.y" { muscle_percent_code_grow ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)])); code_scanner_last_string_free (); @@ -2258,21 +2260,21 @@ yyreduce: case 44: /* Line 1493 of yacc.c */ -#line 371 "parse-gram.y" +#line 372 "parse-gram.y" {} break; case 45: /* Line 1493 of yacc.c */ -#line 372 "parse-gram.y" +#line 373 "parse-gram.y" { muscle_code_grow ("union_name", (yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; case 46: /* Line 1493 of yacc.c */ -#line 377 "parse-gram.y" +#line 378 "parse-gram.y" { union_seen = true; muscle_code_grow ("stype", (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)])); @@ -2283,14 +2285,14 @@ yyreduce: case 47: /* Line 1493 of yacc.c */ -#line 388 "parse-gram.y" +#line 389 "parse-gram.y" { current_class = nterm_sym; } break; case 48: /* Line 1493 of yacc.c */ -#line 389 "parse-gram.y" +#line 390 "parse-gram.y" { current_class = unknown_sym; current_type = NULL; @@ -2300,14 +2302,14 @@ yyreduce: case 49: /* Line 1493 of yacc.c */ -#line 393 "parse-gram.y" +#line 394 "parse-gram.y" { current_class = token_sym; } break; case 50: /* Line 1493 of yacc.c */ -#line 394 "parse-gram.y" +#line 395 "parse-gram.y" { current_class = unknown_sym; current_type = NULL; @@ -2317,7 +2319,7 @@ yyreduce: case 51: /* Line 1493 of yacc.c */ -#line 399 "parse-gram.y" +#line 400 "parse-gram.y" { symbol_list *list; tag_seen = true; @@ -2330,7 +2332,7 @@ yyreduce: case 52: /* Line 1493 of yacc.c */ -#line 410 "parse-gram.y" +#line 411 "parse-gram.y" { symbol_list *list; ++current_prec; @@ -2347,126 +2349,126 @@ yyreduce: case 53: /* Line 1493 of yacc.c */ -#line 424 "parse-gram.y" +#line 425 "parse-gram.y" { (yyval.assoc) = left_assoc; } break; case 54: /* Line 1493 of yacc.c */ -#line 425 "parse-gram.y" +#line 426 "parse-gram.y" { (yyval.assoc) = right_assoc; } break; case 55: /* Line 1493 of yacc.c */ -#line 426 "parse-gram.y" +#line 427 "parse-gram.y" { (yyval.assoc) = non_assoc; } break; case 56: /* Line 1493 of yacc.c */ -#line 430 "parse-gram.y" +#line 431 "parse-gram.y" { current_type = NULL; } break; case 57: /* Line 1493 of yacc.c */ -#line 431 "parse-gram.y" +#line 432 "parse-gram.y" { current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; } break; case 58: /* Line 1493 of yacc.c */ -#line 437 "parse-gram.y" +#line 438 "parse-gram.y" { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); } break; case 59: /* Line 1493 of yacc.c */ -#line 439 "parse-gram.y" +#line 440 "parse-gram.y" { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); } break; case 60: /* Line 1493 of yacc.c */ -#line 443 "parse-gram.y" +#line 444 "parse-gram.y" { (yyval.symbol) = (yyvsp[(1) - (1)].symbol); } break; case 61: /* Line 1493 of yacc.c */ -#line 444 "parse-gram.y" +#line 445 "parse-gram.y" { (yyval.symbol) = (yyvsp[(1) - (2)].symbol); symbol_user_token_number_set ((yyvsp[(1) - (2)].symbol), (yyvsp[(2) - (2)].integer), (yylsp[(2) - (2)])); } break; case 62: /* Line 1493 of yacc.c */ -#line 450 "parse-gram.y" +#line 451 "parse-gram.y" { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); } break; case 63: /* Line 1493 of yacc.c */ -#line 452 "parse-gram.y" +#line 453 "parse-gram.y" { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); } break; case 64: /* Line 1493 of yacc.c */ -#line 456 "parse-gram.y" +#line 457 "parse-gram.y" { (yyval.list) = (yyvsp[(1) - (1)].list); } break; case 65: /* Line 1493 of yacc.c */ -#line 457 "parse-gram.y" +#line 458 "parse-gram.y" { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); } break; case 66: /* Line 1493 of yacc.c */ -#line 461 "parse-gram.y" +#line 462 "parse-gram.y" { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); } break; case 67: /* Line 1493 of yacc.c */ -#line 462 "parse-gram.y" +#line 463 "parse-gram.y" { (yyval.list) = symbol_list_type_new ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; case 68: /* Line 1493 of yacc.c */ -#line 463 "parse-gram.y" +#line 464 "parse-gram.y" { (yyval.list) = symbol_list_default_tagged_new ((yylsp[(1) - (1)])); } break; case 69: /* Line 1493 of yacc.c */ -#line 464 "parse-gram.y" +#line 465 "parse-gram.y" { (yyval.list) = symbol_list_default_tagless_new ((yylsp[(1) - (1)])); } break; case 70: /* Line 1493 of yacc.c */ -#line 470 "parse-gram.y" +#line 471 "parse-gram.y" { current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; @@ -2476,7 +2478,7 @@ yyreduce: case 71: /* Line 1493 of yacc.c */ -#line 475 "parse-gram.y" +#line 476 "parse-gram.y" { symbol_class_set ((yyvsp[(1) - (1)].symbol), current_class, (yylsp[(1) - (1)]), true); symbol_type_set ((yyvsp[(1) - (1)].symbol), current_type, (yylsp[(1) - (1)])); @@ -2486,7 +2488,7 @@ yyreduce: case 72: /* Line 1493 of yacc.c */ -#line 480 "parse-gram.y" +#line 481 "parse-gram.y" { symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true); symbol_type_set ((yyvsp[(1) - (2)].symbol), current_type, (yylsp[(1) - (2)])); @@ -2497,7 +2499,7 @@ yyreduce: case 73: /* Line 1493 of yacc.c */ -#line 486 "parse-gram.y" +#line 487 "parse-gram.y" { symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true); symbol_type_set ((yyvsp[(1) - (2)].symbol), current_type, (yylsp[(1) - (2)])); @@ -2508,7 +2510,7 @@ yyreduce: case 74: /* Line 1493 of yacc.c */ -#line 492 "parse-gram.y" +#line 493 "parse-gram.y" { symbol_class_set ((yyvsp[(1) - (3)].symbol), current_class, (yylsp[(1) - (3)]), true); symbol_type_set ((yyvsp[(1) - (3)].symbol), current_type, (yylsp[(1) - (3)])); @@ -2520,7 +2522,7 @@ yyreduce: case 81: /* Line 1493 of yacc.c */ -#line 522 "parse-gram.y" +#line 523 "parse-gram.y" { yyerrok; } @@ -2529,7 +2531,7 @@ yyreduce: case 82: /* Line 1493 of yacc.c */ -#line 528 "parse-gram.y" +#line 529 "parse-gram.y" { current_lhs = (yyvsp[(1) - (2)].symbol); current_lhs_location = (yylsp[(1) - (2)]); current_lhs_named_ref = (yyvsp[(2) - (2)].named_ref); } break; @@ -2537,21 +2539,21 @@ yyreduce: case 84: /* Line 1493 of yacc.c */ -#line 533 "parse-gram.y" +#line 534 "parse-gram.y" { grammar_current_rule_end ((yylsp[(1) - (1)])); } break; case 85: /* Line 1493 of yacc.c */ -#line 534 "parse-gram.y" +#line 535 "parse-gram.y" { grammar_current_rule_end ((yylsp[(3) - (3)])); } break; case 87: /* Line 1493 of yacc.c */ -#line 540 "parse-gram.y" +#line 541 "parse-gram.y" { grammar_current_rule_begin (current_lhs, current_lhs_location, current_lhs_named_ref); } break; @@ -2559,77 +2561,77 @@ yyreduce: case 88: /* Line 1493 of yacc.c */ -#line 543 "parse-gram.y" +#line 544 "parse-gram.y" { grammar_current_rule_symbol_append ((yyvsp[(2) - (3)].symbol), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].named_ref)); } break; case 89: /* Line 1493 of yacc.c */ -#line 545 "parse-gram.y" +#line 546 "parse-gram.y" { grammar_current_rule_action_append ((yyvsp[(2) - (3)].code), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].named_ref)); } break; case 90: /* Line 1493 of yacc.c */ -#line 547 "parse-gram.y" +#line 548 "parse-gram.y" { grammar_current_rule_prec_set ((yyvsp[(3) - (3)].symbol), (yylsp[(3) - (3)])); } break; case 91: /* Line 1493 of yacc.c */ -#line 549 "parse-gram.y" +#line 550 "parse-gram.y" { grammar_current_rule_dprec_set ((yyvsp[(3) - (3)].integer), (yylsp[(3) - (3)])); } break; case 92: /* Line 1493 of yacc.c */ -#line 551 "parse-gram.y" +#line 552 "parse-gram.y" { grammar_current_rule_merge_set ((yyvsp[(3) - (3)].uniqstr), (yylsp[(3) - (3)])); } break; case 93: /* Line 1493 of yacc.c */ -#line 555 "parse-gram.y" +#line 556 "parse-gram.y" { (yyval.named_ref) = 0; } break; case 94: /* Line 1493 of yacc.c */ -#line 557 "parse-gram.y" +#line 558 "parse-gram.y" { (yyval.named_ref) = named_ref_new((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; case 96: /* Line 1493 of yacc.c */ -#line 569 "parse-gram.y" +#line 570 "parse-gram.y" { (yyval.uniqstr) = uniqstr_new ((yyvsp[(1) - (1)].chars)); } break; case 97: /* Line 1493 of yacc.c */ -#line 574 "parse-gram.y" +#line 575 "parse-gram.y" { (yyval.chars) = ""; } break; case 98: /* Line 1493 of yacc.c */ -#line 575 "parse-gram.y" +#line 576 "parse-gram.y" { (yyval.chars) = (yyvsp[(1) - (1)].uniqstr); } break; case 100: /* Line 1493 of yacc.c */ -#line 586 "parse-gram.y" +#line 587 "parse-gram.y" { code_props plain_code; (yyvsp[(1) - (1)].code)[strlen ((yyvsp[(1) - (1)].code)) - 1] = '\n'; @@ -2643,14 +2645,14 @@ yyreduce: case 101: /* Line 1493 of yacc.c */ -#line 606 "parse-gram.y" +#line 607 "parse-gram.y" { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; case 102: /* Line 1493 of yacc.c */ -#line 608 "parse-gram.y" +#line 609 "parse-gram.y" { (yyval.symbol) = symbol_get (char_name ((yyvsp[(1) - (1)].character)), (yylsp[(1) - (1)])); symbol_class_set ((yyval.symbol), token_sym, (yylsp[(1) - (1)]), false); @@ -2661,14 +2663,14 @@ yyreduce: case 103: /* Line 1493 of yacc.c */ -#line 616 "parse-gram.y" +#line 617 "parse-gram.y" { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; case 106: /* Line 1493 of yacc.c */ -#line 628 "parse-gram.y" +#line 629 "parse-gram.y" { (yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[(1) - (1)].chars)), (yylsp[(1) - (1)])); symbol_class_set ((yyval.symbol), token_sym, (yylsp[(1) - (1)]), false); @@ -2678,7 +2680,7 @@ yyreduce: case 108: /* Line 1493 of yacc.c */ -#line 637 "parse-gram.y" +#line 638 "parse-gram.y" { code_props plain_code; code_props_plain_init (&plain_code, (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); @@ -2692,7 +2694,7 @@ yyreduce: /* Line 1493 of yacc.c */ -#line 2696 "parse-gram.c" +#line 2698 "parse-gram.c" default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -2922,7 +2924,7 @@ yyreturn: /* Line 1724 of yacc.c */ -#line 647 "parse-gram.y" +#line 648 "parse-gram.y" diff --git a/src/parse-gram.h b/src/parse-gram.h index 189fb7d6..024bed56 100644 --- a/src/parse-gram.h +++ b/src/parse-gram.h @@ -1,8 +1,9 @@ -/* A Bison parser, made by GNU Bison 2.4.1.206-8a8b-dirty. */ +/* A Bison parser, made by GNU Bison 2.4.1.243-8699. */ /* Skeleton interface for Bison's Yacc-like parsers in C - Copyright (C) 1984, 1989-1990, 2000-2010 Free Software Foundation, Inc. + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006, + 2007, 2008, 2009, 2010 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -161,7 +162,7 @@ typedef union YYSTYPE { /* Line 1725 of yacc.c */ -#line 93 "parse-gram.y" +#line 94 "parse-gram.y" symbol *symbol; symbol_list *list; @@ -176,7 +177,7 @@ typedef union YYSTYPE /* Line 1725 of yacc.c */ -#line 180 "parse-gram.h" +#line 181 "parse-gram.h" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ diff --git a/tests/regression.at b/tests/regression.at index 57d0609d..544565ad 100644 --- a/tests/regression.at +++ b/tests/regression.at @@ -1375,11 +1375,11 @@ AT_DATA_GRAMMAR([input.y], large enough to overflow size_t. */ #define YYSIZE_T unsigned char - /* Bring in malloc and set _STDLIB_H so yacc.c doesn't try to + /* Bring in malloc and set EXIT_SUCCESS so yacc.c doesn't try to provide a malloc prototype using our YYSIZE_T. */ #include - #ifndef _STDLIB_H - # define _STDLIB_H 1 + #ifndef EXIT_SUCCESS + # define EXIT_SUCCESS 0 #endif /* Max depth is usually much smaller than YYSTACK_ALLOC_MAXIMUM, and -- 2.47.2