comparison libinterp/parse-tree/pt-eval.cc @ 29065:be19672a3c49

maint: merge stable to default.
author John W. Eaton <jwe@octave.org>
date Fri, 13 Nov 2020 20:43:19 -0500
parents d632d99d5c2e 336356206de7
children 10a35049bad7
comparison
equal deleted inserted replaced
29063:c170ff385070 29065:be19672a3c49
2859 user_function.restore_warning_states (); 2859 user_function.restore_warning_states ();
2860 }); 2860 });
2861 2861
2862 // Evaluate the commands that make up the function. 2862 // Evaluate the commands that make up the function.
2863 2863
2864 unwind_protect_var<stmt_list_type> 2864 unwind_protect_var<stmt_list_type> upv (m_statement_context, SC_FUNCTION);
2865 upv (m_statement_context, SC_FUNCTION); 2865
2866 2866 unwind_action act1 ([] (std::shared_ptr<stack_frame> frame)
2867 unwind_action act1 ([=] () { 2867 {
2868 m_call_stack.clear_current_frame_values (); 2868 frame->clear_values ();
2869 }); 2869 }, m_call_stack.get_current_stack_frame ());
2870 2870
2871 tree_statement_list *cmd_list = user_function.body (); 2871 tree_statement_list *cmd_list = user_function.body ();
2872 2872
2873 if (cmd_list) 2873 if (cmd_list)
2874 { 2874 {