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

Destroy the variants that remain on the stack in case of error.

Browse Source 
* data/lalr1-fusion.cc (yydestruct_): Invoke the variant's
	destructor.
	Display the value only if yymsg is nonnull.
	(yyreduce): Invoke yydestruct_ when popping lhs symbols.
This commit is contained in:
Akim Demaille
2008-07-28 16:01:57 +02:00
parent 2d32fc9fe2
commit a3d4c6fbb1
2 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@@ -1,3 +1,11 @@
2008-11-07 Akim Demaille <demaille@gostai.com>
Destroy the variants that remain on the stack in case of error.
* data/lalr1-fusion.cc (yydestruct_): Invoke the variant's
destructor.
Display the value only if yymsg is nonnull.
(yyreduce): Invoke yydestruct_ when popping lhs symbols.
2008-11-07 Akim Demaille <demaille@gostai.com> 2008-11-07 Akim Demaille <demaille@gostai.com>
Add "%define assert" to variants. Add "%define assert" to variants.

31
data/lalr1-fusion.cc
View File

@@ -450,6 +450,7 @@ m4_ifdef([b4_stype],
/// \brief Reclaim the memory associated to a symbol. /// \brief Reclaim the memory associated to a symbol.
/// \param yymsg Why this token is reclaimed. /// \param yymsg Why this token is reclaimed.
/// If null, nothing is printed at all.
/// \param yytype The symbol type. /// \param yytype The symbol type.
/// \param yyvalue Its semantic value. /// \param yyvalue Its semantic value.
/// \param yylocation Its location. /// \param yylocation Its location.
@@ -693,14 +694,19 @@ b4_percent_code_get[]dnl
YYUSE (yyvalue); YYUSE (yyvalue);
YYUSE (yylocation); YYUSE (yylocation);
YY_SYMBOL_PRINT (yymsg, yytype, yyvalue, yylocation); if (yymsg)
YY_SYMBOL_PRINT (yymsg, yytype, yyvalue, yylocation);
// User destructor.
switch (yytype) switch (yytype)
{ {
]m4_map([b4_symbol_actions], m4_defn([b4_symbol_destructors]))[ ]m4_map([b4_symbol_actions], m4_defn([b4_symbol_destructors]))[
default: default:
break; break;
} }]b4_variant_if([
// Type destructor.
b4_symbol_variant([[yytype]], [[yyvalue]], [[destroy]])])[
} }
]b4_parser_class_name[::data_type::data_type () ]b4_parser_class_name[::data_type::data_type ()
@@ -926,16 +932,21 @@ m4_ifdef([b4_lex_param], [, ]b4_lex_param))[;
break; break;
} }
YY_SYMBOL_PRINT ("-> $$ =", yyr1_[yyn], yyval, yyloc); YY_SYMBOL_PRINT ("-> $$ =", yyr1_[yyn], yyval, yyloc);
]b4_variant_if([[
]b4_variant_if([
// Destroy the lhs symbols. // Destroy the lhs symbols.
for (int i = 0; i < yylen; ++i) for (int i = 0; i < yylen; ++i)
{ // Destroy a variant which value may have be swapped with yyval.
b4_symbol_variant([[yystos_[yystack_@{i@}.state]]], // The value of yyval (hence maybe one of these lhs symbols)
[[yystack_@{i@}.value]], // depends on what does the default contruction for this type.
[[destroy]]) // In the case of pointers for instance, nothing is done, so the
}])dnl // value is junk. Therefore do not try to report the content in
[ // the debug trace, it's junk. Hence yymsg = 0. Besides, that
// keeps exactly the same traces as with the other Bison
// skeletons.
yydestruct_ (0,
yystos_[yystack_[i].state],
yystack_[i].value, yystack_[i].location);]])[
yypop_ (yylen); yypop_ (yylen);
yylen = 0; yylen = 0;
YY_STACK_PRINT (); YY_STACK_PRINT ();