Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-19 09:13:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

In impure push mode, don't allow more than one yypstate to be allocated

Browse Source 
since multiple impure parsers would corrupt yynerrs.
* data/push.c (yypstate_allocated): New static global variable
initialized to 0.
(yypull_parse): If yypstate_new returns 0, don't report it as memory
exhaustion if yypstate_allocated is 1, but still return 2.
(yypstate_new): Invoke yyerror and return 0 if yypstate_allocated is
already 1.  Otherwise, set it to 1.
(yypstate_delete): Set it to 0.
* tests/push.at (Push Parsing: Multiple impure instances): New test
case.
This commit is contained in:
Joel E. Denny
2007-08-18 00:45:52 +00:00
parent 9987d1b3cc
commit 1b17b01d0f
5 changed files with 231 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@@ -1,3 +1,17 @@
2007-08-17 Joel E. Denny <jdenny@ces.clemson.edu>
In impure push mode, don't allow more than one yypstate to be allocated
since multiple impure parsers would corrupt yynerrs.
* data/push.c (yypstate_allocated): New static global variable
initialized to 0.
(yypull_parse): If yypstate_new returns 0, don't report it as memory
exhaustion if yypstate_allocated is 1, but still return 2.
(yypstate_new): Invoke yyerror and return 0 if yypstate_allocated is
already 1. Otherwise, set it to 1.
(yypstate_delete): Set it to 0.
* tests/push.at (Push Parsing: Multiple impure instances): New test
case.
2007-08-17 Bob Rossi <bob@brasko.net> 2007-08-17 Bob Rossi <bob@brasko.net>
* doc/bison.texinfo (Push Decl): Document the push parser. * doc/bison.texinfo (Push Decl): Document the push parser.

24
data/push.c
View File

@@ -1076,7 +1076,9 @@ b4_push_if(
{ {
return yypull_parse (0]m4_ifset([b4_parse_param], return yypull_parse (0]m4_ifset([b4_parse_param],
[[, ]b4_c_args(b4_parse_param)])[); [[, ]b4_c_args(b4_parse_param)])[);
} }]b4_pure_if([], [[
static char yypstate_allocated = 0;]])[
]b4_c_function_def([[yypull_parse]], [[int]], ]b4_c_function_def([[yypull_parse]], [[int]],
[[[yypstate *yyps]], [[yyps]]]m4_ifset([b4_parse_param], [, [[[yypstate *yyps]], [[yyps]]]m4_ifset([b4_parse_param], [,
@@ -1092,8 +1094,10 @@ b4_push_if(
{ {
yyps_local = yypstate_new (); yyps_local = yypstate_new ();
if (!yyps_local) if (!yyps_local)
{ {]b4_pure_if([[
yyerror (]b4_yyerror_args[YY_("memory exhausted")); yyerror (]b4_yyerror_args[YY_("memory exhausted"));]], [[
if (!yypstate_allocated)
yyerror (]b4_yyerror_args[YY_("memory exhausted"));]])[
return 2; return 2;
} }
} }
@@ -1112,10 +1116,17 @@ b4_push_if(
/* Initialize the parser data structure. */ /* Initialize the parser data structure. */
]b4_c_function_def([[yypstate_new]], [[yypstate *]])[ ]b4_c_function_def([[yypstate_new]], [[yypstate *]])[
{ {
yypstate *yyps = (yypstate *) malloc (sizeof *yyps); yypstate *yyps;]b4_pure_if([], [[
if (yypstate_allocated)
{
yyerror (]b4_yyerror_args[YY_("cannot allocate multiple impure push-parser instances"));
return 0;
}]])[
yyps = (yypstate *) malloc (sizeof *yyps);
if (!yyps) if (!yyps)
return 0; return 0;
yyps->yynew = 1; yyps->yynew = 1;]b4_pure_if([], [[
yypstate_allocated = 1;]])[
return yyps; return yyps;
} }
@@ -1128,7 +1139,8 @@ b4_push_if(
if (!yyps->yynew && yyps->yyss != yyps->yyssa) if (!yyps->yynew && yyps->yyss != yyps->yyssa)
YYSTACK_FREE (yyps->yyss); YYSTACK_FREE (yyps->yyss);
#endif #endif
free (yyps); free (yyps);]b4_pure_if([], [[
yypstate_allocated = 0;]])[
} }
]b4_pure_if([[#define ]b4_prefix[nerrs yyps->]b4_prefix[nerrs ]b4_pure_if([[#define ]b4_prefix[nerrs yyps->]b4_prefix[nerrs

246
src/parse-gram.c
View File

@@ -75,7 +75,7 @@
/* Copy the first part of user declarations. */ /* Copy the first part of user declarations. */
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 1 "parse-gram.y" #line 1 "parse-gram.y"
/* Bison Grammar Parser -*- C -*- /* Bison Grammar Parser -*- C -*-
@@ -152,7 +152,7 @@ static int current_prec = 0;
#define YYTYPE_UINT8 uint_fast8_t #define YYTYPE_UINT8 uint_fast8_t
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 157 "parse-gram.c" #line 157 "parse-gram.c"
/* Enabling traces. */ /* Enabling traces. */
@@ -305,7 +305,7 @@ static int current_prec = 0;
typedef union YYSTYPE typedef union YYSTYPE
{ {
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 94 "parse-gram.y" #line 94 "parse-gram.y"
symbol *symbol; symbol *symbol;
@@ -319,7 +319,7 @@ typedef union YYSTYPE
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 324 "parse-gram.c" #line 324 "parse-gram.c"
} YYSTYPE; } YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1 # define YYSTYPE_IS_TRIVIAL 1
@@ -344,7 +344,7 @@ typedef struct YYLTYPE
/* Copy the second part of user declarations. */ /* Copy the second part of user declarations. */
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 349 "parse-gram.c" #line 349 "parse-gram.c"
#ifdef short #ifdef short
@@ -1035,146 +1035,146 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
{ {
case 3: /* "\"string\"" */ case 3: /* "\"string\"" */
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 185 "parse-gram.y" #line 185 "parse-gram.y"
{ fputs (quotearg_style (c_quoting_style, (yyvaluep->chars)), stderr); }; { fputs (quotearg_style (c_quoting_style, (yyvaluep->chars)), stderr); };
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 1044 "parse-gram.c" #line 1044 "parse-gram.c"
break; break;
case 4: /* "\"integer\"" */ case 4: /* "\"integer\"" */
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 196 "parse-gram.y" #line 196 "parse-gram.y"
{ fprintf (stderr, "%d", (yyvaluep->integer)); }; { fprintf (stderr, "%d", (yyvaluep->integer)); };
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 1053 "parse-gram.c" #line 1053 "parse-gram.c"
break; break;
case 45: /* "\"{...}\"" */ case 45: /* "\"{...}\"" */
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 187 "parse-gram.y" #line 187 "parse-gram.y"
{ fprintf (stderr, "{\n%s\n}", (yyvaluep->code)); }; { fprintf (stderr, "{\n%s\n}", (yyvaluep->code)); };
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 1062 "parse-gram.c" #line 1062 "parse-gram.c"
break; break;
case 46: /* "\"char\"" */ case 46: /* "\"char\"" */
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 179 "parse-gram.y" #line 179 "parse-gram.y"
{ fputs (char_name ((yyvaluep->character)), stderr); }; { fputs (char_name ((yyvaluep->character)), stderr); };
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 1071 "parse-gram.c" #line 1071 "parse-gram.c"
break; break;
case 47: /* "\"epilogue\"" */ case 47: /* "\"epilogue\"" */
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 187 "parse-gram.y" #line 187 "parse-gram.y"
{ fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 1080 "parse-gram.c" #line 1080 "parse-gram.c"
break; break;
case 49: /* "\"identifier\"" */ case 49: /* "\"identifier\"" */
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 192 "parse-gram.y" #line 192 "parse-gram.y"
{ fputs ((yyvaluep->uniqstr), stderr); }; { fputs ((yyvaluep->uniqstr), stderr); };
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 1089 "parse-gram.c" #line 1089 "parse-gram.c"
break; break;
case 50: /* "\"identifier:\"" */ case 50: /* "\"identifier:\"" */
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 193 "parse-gram.y" #line 193 "parse-gram.y"
{ fprintf (stderr, "%s:", (yyvaluep->uniqstr)); }; { fprintf (stderr, "%s:", (yyvaluep->uniqstr)); };
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 1098 "parse-gram.c" #line 1098 "parse-gram.c"
break; break;
case 53: /* "\"%{...%}\"" */ case 53: /* "\"%{...%}\"" */
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 187 "parse-gram.y" #line 187 "parse-gram.y"
{ fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 1107 "parse-gram.c" #line 1107 "parse-gram.c"
break; break;
case 55: /* "\"type\"" */ case 55: /* "\"type\"" */
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 191 "parse-gram.y" #line 191 "parse-gram.y"
{ fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); }; { fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); };
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 1116 "parse-gram.c" #line 1116 "parse-gram.c"
break; break;
case 82: /* "variable" */ case 82: /* "variable" */
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 192 "parse-gram.y" #line 192 "parse-gram.y"
{ fputs ((yyvaluep->uniqstr), stderr); }; { fputs ((yyvaluep->uniqstr), stderr); };
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 1125 "parse-gram.c" #line 1125 "parse-gram.c"
break; break;
case 83: /* "content.opt" */ case 83: /* "content.opt" */
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 187 "parse-gram.y" #line 187 "parse-gram.y"
{ fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 1134 "parse-gram.c" #line 1134 "parse-gram.c"
break; break;
case 84: /* "braceless" */ case 84: /* "braceless" */
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 187 "parse-gram.y" #line 187 "parse-gram.y"
{ fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 1143 "parse-gram.c" #line 1143 "parse-gram.c"
break; break;
case 85: /* "id" */ case 85: /* "id" */
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 199 "parse-gram.y" #line 199 "parse-gram.y"
{ fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 1152 "parse-gram.c" #line 1152 "parse-gram.c"
break; break;
case 86: /* "id_colon" */ case 86: /* "id_colon" */
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 200 "parse-gram.y" #line 200 "parse-gram.y"
{ fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); }; { fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); };
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 1161 "parse-gram.c" #line 1161 "parse-gram.c"
break; break;
case 87: /* "symbol" */ case 87: /* "symbol" */
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 199 "parse-gram.y" #line 199 "parse-gram.y"
{ fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 1170 "parse-gram.c" #line 1170 "parse-gram.c"
break; break;
case 88: /* "string_as_id" */ case 88: /* "string_as_id" */
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 199 "parse-gram.y" #line 199 "parse-gram.y"
{ fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 1179 "parse-gram.c" #line 1179 "parse-gram.c"
break; break;
default: default:
@@ -1689,7 +1689,7 @@ YYLTYPE yylloc;
/* User initialization code. */ /* User initialization code. */
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 86 "parse-gram.y" #line 86 "parse-gram.y"
{ {
/* Bison's grammar can initial empty locations, hence a default /* Bison's grammar can initial empty locations, hence a default
@@ -1698,7 +1698,7 @@ YYLTYPE yylloc;
boundary_set (&yylloc.end, current_file, 1, 1); boundary_set (&yylloc.end, current_file, 1, 1);
} }
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 1703 "parse-gram.c" #line 1703 "parse-gram.c"
yylsp[0] = yylloc; yylsp[0] = yylloc;
goto yysetstate; goto yysetstate;
@@ -1884,7 +1884,7 @@ yyreduce:
{ {
case 6: case 6:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 223 "parse-gram.y" #line 223 "parse-gram.y"
{ {
code_props plain_code; code_props plain_code;
@@ -1899,14 +1899,14 @@ yyreduce:
case 7: case 7:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 232 "parse-gram.y" #line 232 "parse-gram.y"
{ debug_flag = true; } { debug_flag = true; }
break; break;
case 8: case 8:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 234 "parse-gram.y" #line 234 "parse-gram.y"
{ {
muscle_percent_define_insert ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars)); muscle_percent_define_insert ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars));
@@ -1915,14 +1915,14 @@ yyreduce:
case 9: case 9:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 237 "parse-gram.y" #line 237 "parse-gram.y"
{ defines_flag = true; } { defines_flag = true; }
break; break;
case 10: case 10:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 239 "parse-gram.y" #line 239 "parse-gram.y"
{ {
defines_flag = true; defines_flag = true;
@@ -1932,42 +1932,42 @@ yyreduce:
case 11: case 11:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 243 "parse-gram.y" #line 243 "parse-gram.y"
{ error_verbose = true; } { error_verbose = true; }
break; break;
case 12: case 12:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 244 "parse-gram.y" #line 244 "parse-gram.y"
{ expected_sr_conflicts = (yyvsp[(2) - (2)].integer); } { expected_sr_conflicts = (yyvsp[(2) - (2)].integer); }
break; break;
case 13: case 13:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 245 "parse-gram.y" #line 245 "parse-gram.y"
{ expected_rr_conflicts = (yyvsp[(2) - (2)].integer); } { expected_rr_conflicts = (yyvsp[(2) - (2)].integer); }
break; break;
case 14: case 14:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 246 "parse-gram.y" #line 246 "parse-gram.y"
{ spec_file_prefix = (yyvsp[(2) - (2)].chars); } { spec_file_prefix = (yyvsp[(2) - (2)].chars); }
break; break;
case 15: case 15:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 247 "parse-gram.y" #line 247 "parse-gram.y"
{ spec_file_prefix = (yyvsp[(3) - (3)].chars); } { spec_file_prefix = (yyvsp[(3) - (3)].chars); }
break; break;
case 16: case 16:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 249 "parse-gram.y" #line 249 "parse-gram.y"
{ {
nondeterministic_parser = true; nondeterministic_parser = true;
@@ -1977,7 +1977,7 @@ yyreduce:
case 17: case 17:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 254 "parse-gram.y" #line 254 "parse-gram.y"
{ {
code_props action; code_props action;
@@ -1991,105 +1991,105 @@ yyreduce:
case 18: case 18:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 262 "parse-gram.y" #line 262 "parse-gram.y"
{ language_argmatch ((yyvsp[(2) - (2)].chars), 1, &(yylsp[(1) - (2)])); } { language_argmatch ((yyvsp[(2) - (2)].chars), 1, &(yylsp[(1) - (2)])); }
break; break;
case 19: case 19:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 263 "parse-gram.y" #line 263 "parse-gram.y"
{ add_param ("lex_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); } { add_param ("lex_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
break; break;
case 20: case 20:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 264 "parse-gram.y" #line 264 "parse-gram.y"
{ locations_flag = true; } { locations_flag = true; }
break; break;
case 21: case 21:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 265 "parse-gram.y" #line 265 "parse-gram.y"
{ spec_name_prefix = (yyvsp[(2) - (2)].chars); } { spec_name_prefix = (yyvsp[(2) - (2)].chars); }
break; break;
case 22: case 22:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 266 "parse-gram.y" #line 266 "parse-gram.y"
{ spec_name_prefix = (yyvsp[(3) - (3)].chars); } { spec_name_prefix = (yyvsp[(3) - (3)].chars); }
break; break;
case 23: case 23:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 267 "parse-gram.y" #line 267 "parse-gram.y"
{ no_lines_flag = true; } { no_lines_flag = true; }
break; break;
case 24: case 24:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 268 "parse-gram.y" #line 268 "parse-gram.y"
{ nondeterministic_parser = true; } { nondeterministic_parser = true; }
break; break;
case 25: case 25:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 269 "parse-gram.y" #line 269 "parse-gram.y"
{ spec_outfile = (yyvsp[(2) - (2)].chars); } { spec_outfile = (yyvsp[(2) - (2)].chars); }
break; break;
case 26: case 26:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 270 "parse-gram.y" #line 270 "parse-gram.y"
{ spec_outfile = (yyvsp[(3) - (3)].chars); } { spec_outfile = (yyvsp[(3) - (3)].chars); }
break; break;
case 27: case 27:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 271 "parse-gram.y" #line 271 "parse-gram.y"
{ add_param ("parse_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); } { add_param ("parse_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
break; break;
case 28: case 28:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 272 "parse-gram.y" #line 272 "parse-gram.y"
{ pure_parser = true; } { pure_parser = true; }
break; break;
case 29: case 29:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 273 "parse-gram.y" #line 273 "parse-gram.y"
{ push_parser = true; pull_parser = false; } { push_parser = true; pull_parser = false; }
break; break;
case 30: case 30:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 274 "parse-gram.y" #line 274 "parse-gram.y"
{ push_parser = true; pull_parser = true; } { push_parser = true; pull_parser = true; }
break; break;
case 31: case 31:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 275 "parse-gram.y" #line 275 "parse-gram.y"
{ version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); } { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); }
break; break;
case 32: case 32:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 277 "parse-gram.y" #line 277 "parse-gram.y"
{ {
char const *skeleton_user = (yyvsp[(2) - (2)].chars); char const *skeleton_user = (yyvsp[(2) - (2)].chars);
@@ -2118,28 +2118,28 @@ yyreduce:
case 33: case 33:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 300 "parse-gram.y" #line 300 "parse-gram.y"
{ token_table_flag = true; } { token_table_flag = true; }
break; break;
case 34: case 34:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 301 "parse-gram.y" #line 301 "parse-gram.y"
{ report_flag = report_states; } { report_flag = report_states; }
break; break;
case 35: case 35:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 302 "parse-gram.y" #line 302 "parse-gram.y"
{ yacc_flag = true; } { yacc_flag = true; }
break; break;
case 39: case 39:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 310 "parse-gram.y" #line 310 "parse-gram.y"
{ {
grammar_start_symbol_set ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); grammar_start_symbol_set ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]));
@@ -2148,7 +2148,7 @@ yyreduce:
case 40: case 40:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 314 "parse-gram.y" #line 314 "parse-gram.y"
{ {
symbol_list *list; symbol_list *list;
@@ -2160,7 +2160,7 @@ yyreduce:
case 41: case 41:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 321 "parse-gram.y" #line 321 "parse-gram.y"
{ {
symbol_list *list; symbol_list *list;
@@ -2172,7 +2172,7 @@ yyreduce:
case 42: case 42:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 328 "parse-gram.y" #line 328 "parse-gram.y"
{ {
default_prec = true; default_prec = true;
@@ -2181,7 +2181,7 @@ yyreduce:
case 43: case 43:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 332 "parse-gram.y" #line 332 "parse-gram.y"
{ {
default_prec = false; default_prec = false;
@@ -2190,7 +2190,7 @@ yyreduce:
case 44: case 44:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 336 "parse-gram.y" #line 336 "parse-gram.y"
{ {
/* Do not invoke muscle_percent_code_grow here since it invokes /* Do not invoke muscle_percent_code_grow here since it invokes
@@ -2202,7 +2202,7 @@ yyreduce:
case 45: case 45:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 343 "parse-gram.y" #line 343 "parse-gram.y"
{ {
muscle_percent_code_grow ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)])); muscle_percent_code_grow ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)]));
@@ -2212,21 +2212,21 @@ yyreduce:
case 46: case 46:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 357 "parse-gram.y" #line 357 "parse-gram.y"
{} {}
break; break;
case 47: case 47:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 358 "parse-gram.y" #line 358 "parse-gram.y"
{ muscle_code_grow ("union_name", (yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } { muscle_code_grow ("union_name", (yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
break; break;
case 48: case 48:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 363 "parse-gram.y" #line 363 "parse-gram.y"
{ {
union_seen = true; union_seen = true;
@@ -2237,14 +2237,14 @@ yyreduce:
case 49: case 49:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 374 "parse-gram.y" #line 374 "parse-gram.y"
{ current_class = nterm_sym; } { current_class = nterm_sym; }
break; break;
case 50: case 50:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 375 "parse-gram.y" #line 375 "parse-gram.y"
{ {
current_class = unknown_sym; current_class = unknown_sym;
@@ -2254,14 +2254,14 @@ yyreduce:
case 51: case 51:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 379 "parse-gram.y" #line 379 "parse-gram.y"
{ current_class = token_sym; } { current_class = token_sym; }
break; break;
case 52: case 52:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 380 "parse-gram.y" #line 380 "parse-gram.y"
{ {
current_class = unknown_sym; current_class = unknown_sym;
@@ -2271,7 +2271,7 @@ yyreduce:
case 53: case 53:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 385 "parse-gram.y" #line 385 "parse-gram.y"
{ {
symbol_list *list; symbol_list *list;
@@ -2284,7 +2284,7 @@ yyreduce:
case 54: case 54:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 396 "parse-gram.y" #line 396 "parse-gram.y"
{ {
symbol_list *list; symbol_list *list;
@@ -2301,98 +2301,98 @@ yyreduce:
case 55: case 55:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 410 "parse-gram.y" #line 410 "parse-gram.y"
{ (yyval.assoc) = left_assoc; } { (yyval.assoc) = left_assoc; }
break; break;
case 56: case 56:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 411 "parse-gram.y" #line 411 "parse-gram.y"
{ (yyval.assoc) = right_assoc; } { (yyval.assoc) = right_assoc; }
break; break;
case 57: case 57:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 412 "parse-gram.y" #line 412 "parse-gram.y"
{ (yyval.assoc) = non_assoc; } { (yyval.assoc) = non_assoc; }
break; break;
case 58: case 58:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 416 "parse-gram.y" #line 416 "parse-gram.y"
{ current_type = NULL; } { current_type = NULL; }
break; break;
case 59: case 59:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 417 "parse-gram.y" #line 417 "parse-gram.y"
{ current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; } { current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; }
break; break;
case 60: case 60:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 423 "parse-gram.y" #line 423 "parse-gram.y"
{ (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); } { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
break; break;
case 61: case 61:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 425 "parse-gram.y" #line 425 "parse-gram.y"
{ (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); } { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); }
break; break;
case 62: case 62:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 429 "parse-gram.y" #line 429 "parse-gram.y"
{ (yyval.list) = (yyvsp[(1) - (1)].list); } { (yyval.list) = (yyvsp[(1) - (1)].list); }
break; break;
case 63: case 63:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 430 "parse-gram.y" #line 430 "parse-gram.y"
{ (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); } { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); }
break; break;
case 64: case 64:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 434 "parse-gram.y" #line 434 "parse-gram.y"
{ (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); } { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
break; break;
case 65: case 65:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 435 "parse-gram.y" #line 435 "parse-gram.y"
{ (yyval.list) = symbol_list_type_new ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } { (yyval.list) = symbol_list_type_new ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
break; break;
case 66: case 66:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 436 "parse-gram.y" #line 436 "parse-gram.y"
{ (yyval.list) = symbol_list_default_tagged_new ((yylsp[(1) - (1)])); } { (yyval.list) = symbol_list_default_tagged_new ((yylsp[(1) - (1)])); }
break; break;
case 67: case 67:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 437 "parse-gram.y" #line 437 "parse-gram.y"
{ (yyval.list) = symbol_list_default_tagless_new ((yylsp[(1) - (1)])); } { (yyval.list) = symbol_list_default_tagless_new ((yylsp[(1) - (1)])); }
break; break;
case 68: case 68:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 443 "parse-gram.y" #line 443 "parse-gram.y"
{ {
current_type = (yyvsp[(1) - (1)].uniqstr); current_type = (yyvsp[(1) - (1)].uniqstr);
@@ -2402,7 +2402,7 @@ yyreduce:
case 69: case 69:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 448 "parse-gram.y" #line 448 "parse-gram.y"
{ {
symbol_class_set ((yyvsp[(1) - (1)].symbol), current_class, (yylsp[(1) - (1)]), true); symbol_class_set ((yyvsp[(1) - (1)].symbol), current_class, (yylsp[(1) - (1)]), true);
@@ -2412,7 +2412,7 @@ yyreduce:
case 70: case 70:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 453 "parse-gram.y" #line 453 "parse-gram.y"
{ {
symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true); symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true);
@@ -2423,7 +2423,7 @@ yyreduce:
case 71: case 71:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 459 "parse-gram.y" #line 459 "parse-gram.y"
{ {
symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true); symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true);
@@ -2434,7 +2434,7 @@ yyreduce:
case 72: case 72:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 465 "parse-gram.y" #line 465 "parse-gram.y"
{ {
symbol_class_set ((yyvsp[(1) - (3)].symbol), current_class, (yylsp[(1) - (3)]), true); symbol_class_set ((yyvsp[(1) - (3)].symbol), current_class, (yylsp[(1) - (3)]), true);
@@ -2446,7 +2446,7 @@ yyreduce:
case 79: case 79:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 495 "parse-gram.y" #line 495 "parse-gram.y"
{ {
yyerrok; yyerrok;
@@ -2455,77 +2455,77 @@ yyreduce:
case 80: case 80:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 501 "parse-gram.y" #line 501 "parse-gram.y"
{ current_lhs = (yyvsp[(1) - (1)].symbol); current_lhs_location = (yylsp[(1) - (1)]); } { current_lhs = (yyvsp[(1) - (1)].symbol); current_lhs_location = (yylsp[(1) - (1)]); }
break; break;
case 82: case 82:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 505 "parse-gram.y" #line 505 "parse-gram.y"
{ grammar_current_rule_end ((yylsp[(1) - (1)])); } { grammar_current_rule_end ((yylsp[(1) - (1)])); }
break; break;
case 83: case 83:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 506 "parse-gram.y" #line 506 "parse-gram.y"
{ grammar_current_rule_end ((yylsp[(3) - (3)])); } { grammar_current_rule_end ((yylsp[(3) - (3)])); }
break; break;
case 85: case 85:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 512 "parse-gram.y" #line 512 "parse-gram.y"
{ grammar_current_rule_begin (current_lhs, current_lhs_location); } { grammar_current_rule_begin (current_lhs, current_lhs_location); }
break; break;
case 86: case 86:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 514 "parse-gram.y" #line 514 "parse-gram.y"
{ grammar_current_rule_symbol_append ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); } { grammar_current_rule_symbol_append ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); }
break; break;
case 87: case 87:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 516 "parse-gram.y" #line 516 "parse-gram.y"
{ grammar_current_rule_action_append ((yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); } { grammar_current_rule_action_append ((yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
break; break;
case 88: case 88:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 518 "parse-gram.y" #line 518 "parse-gram.y"
{ grammar_current_rule_prec_set ((yyvsp[(3) - (3)].symbol), (yylsp[(3) - (3)])); } { grammar_current_rule_prec_set ((yyvsp[(3) - (3)].symbol), (yylsp[(3) - (3)])); }
break; break;
case 89: case 89:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 520 "parse-gram.y" #line 520 "parse-gram.y"
{ grammar_current_rule_dprec_set ((yyvsp[(3) - (3)].integer), (yylsp[(3) - (3)])); } { grammar_current_rule_dprec_set ((yyvsp[(3) - (3)].integer), (yylsp[(3) - (3)])); }
break; break;
case 90: case 90:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 522 "parse-gram.y" #line 522 "parse-gram.y"
{ grammar_current_rule_merge_set ((yyvsp[(3) - (3)].uniqstr), (yylsp[(3) - (3)])); } { grammar_current_rule_merge_set ((yyvsp[(3) - (3)].uniqstr), (yylsp[(3) - (3)])); }
break; break;
case 92: case 92:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 532 "parse-gram.y" #line 532 "parse-gram.y"
{ (yyval.uniqstr) = uniqstr_new ((yyvsp[(1) - (1)].chars)); } { (yyval.uniqstr) = uniqstr_new ((yyvsp[(1) - (1)].chars)); }
break; break;
case 93: case 93:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 538 "parse-gram.y" #line 538 "parse-gram.y"
{ {
(yyval.chars) = ""; (yyval.chars) = "";
@@ -2534,7 +2534,7 @@ yyreduce:
case 95: case 95:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 551 "parse-gram.y" #line 551 "parse-gram.y"
{ {
code_props plain_code; code_props plain_code;
@@ -2548,14 +2548,14 @@ yyreduce:
case 96: case 96:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 571 "parse-gram.y" #line 571 "parse-gram.y"
{ (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
break; break;
case 97: case 97:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 573 "parse-gram.y" #line 573 "parse-gram.y"
{ {
(yyval.symbol) = symbol_get (char_name ((yyvsp[(1) - (1)].character)), (yylsp[(1) - (1)])); (yyval.symbol) = symbol_get (char_name ((yyvsp[(1) - (1)].character)), (yylsp[(1) - (1)]));
@@ -2566,14 +2566,14 @@ yyreduce:
case 98: case 98:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 581 "parse-gram.y" #line 581 "parse-gram.y"
{ (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
break; break;
case 101: case 101:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 593 "parse-gram.y" #line 593 "parse-gram.y"
{ {
(yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[(1) - (1)].chars)), (yylsp[(1) - (1)])); (yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[(1) - (1)].chars)), (yylsp[(1) - (1)]));
@@ -2583,7 +2583,7 @@ yyreduce:
case 103: case 103:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 602 "parse-gram.y" #line 602 "parse-gram.y"
{ {
code_props plain_code; code_props plain_code;
@@ -2597,7 +2597,7 @@ yyreduce:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 2602 "parse-gram.c" #line 2602 "parse-gram.c"
default: break; default: break;
} }
@@ -2816,7 +2816,7 @@ yyreturn:
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 612 "parse-gram.y" #line 612 "parse-gram.y"

4
src/parse-gram.h
View File

@@ -164,7 +164,7 @@
typedef union YYSTYPE typedef union YYSTYPE
{ {
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 94 "parse-gram.y" #line 94 "parse-gram.y"
symbol *symbol; symbol *symbol;
@@ -178,7 +178,7 @@ typedef union YYSTYPE
/* Line 22 of yacc.c */ /* Line 1535 of yacc.c */
#line 183 "parse-gram.h" #line 183 "parse-gram.h"
} YYSTYPE; } YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1 # define YYSTYPE_IS_TRIVIAL 1

74
tests/push.at
View File

@@ -76,3 +76,77 @@ AT_COMPILE([[input]])
AT_PARSER_CHECK([[./input]]) AT_PARSER_CHECK([[./input]])
AT_CLEANUP AT_CLEANUP
## ----------------------------------------- ##
## Push Parsing: Multiple impure instances. ##
## ----------------------------------------- ##
AT_SETUP([[Push Parsing: Multiple impure instances]])
AT_DATA_GRAMMAR([[input.y]],
[[
%{
#include <assert.h>
#include <stdio.h>
void yyerror (char const *msg);
int yylex (void);
%}
%push-pull-parser
%%
start: ;
%%
void
yyerror (char const *msg)
{
fprintf (stderr, "%s\n", msg);
}
int
yylex (void)
{
return 0;
}
int
main (void)
{
yypstate *ps;
int i;
for (i = 0; i < 2; ++i)
{
ps = yypstate_new ();
assert (ps);
assert (yypstate_new () == NULL);
assert (yyparse () == 2);
yychar = 0;
assert (yypush_parse (ps) == 0);
assert (yypstate_new () == NULL);
assert (yyparse () == 2);
yypstate_delete (ps);
}
return 0;
}
]])
AT_CHECK([[bison -o input.c input.y]])
AT_COMPILE([[input]])
AT_PARSER_CHECK([[./input]], 0, [],
[[cannot allocate multiple impure push-parser instances
cannot allocate multiple impure push-parser instances
cannot allocate multiple impure push-parser instances
cannot allocate multiple impure push-parser instances
cannot allocate multiple impure push-parser instances
cannot allocate multiple impure push-parser instances
cannot allocate multiple impure push-parser instances
cannot allocate multiple impure push-parser instances
]])
AT_CLEANUP