From 235af9bf33f7a2136dd51a58844ca9961f5c8fbf Mon Sep 17 00:00:00 2001 From: dinghram Date: Mon, 5 Mar 2018 11:04:59 -0700 Subject: [PATCH] Class with type_conversion from int and "==" operator causes switch statement to compare destroyed objects I added a Function_Push_Pop to save the match_value and the value from evaluating the case statement. This makes the code look like Fold_Right_Binary_Operator_AST_Node::do_oper, which does not have the same defect behavior. --- include/chaiscript/language/chaiscript_eval.hpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/include/chaiscript/language/chaiscript_eval.hpp b/include/chaiscript/language/chaiscript_eval.hpp index f6472933..a085b921 100644 --- a/include/chaiscript/language/chaiscript_eval.hpp +++ b/include/chaiscript/language/chaiscript_eval.hpp @@ -1027,9 +1027,19 @@ namespace chaiscript if (this->children[currentCase]->identifier == AST_Node_Type::Case) { //This is a little odd, but because want to see both the switch and the case simultaneously, I do a downcast here. try { - if (hasMatched || boxed_cast(t_ss->call_function("==", m_loc, {match_value, this->children[currentCase]->children[0]->eval(t_ss)}, t_ss.conversions()))) { + if (hasMatched) { this->children[currentCase]->eval(t_ss); - hasMatched = true; + } + else { + auto case_value = this->children[currentCase]->children[0]->eval(t_ss); + + chaiscript::eval::detail::Function_Push_Pop fpp(t_ss); + fpp.save_params({match_value, case_value}); + + if (boxed_cast(t_ss->call_function("==", m_loc, {match_value, case_value}, t_ss.conversions()))) { + this->children[currentCase]->eval(t_ss); + hasMatched = true; + } } } catch (const exception::bad_boxed_cast &) {