Mercurial > octave

changeset 29173:4363b185d31f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: merge stable to default.
author John W. Eaton <jwe@octave.org>
date Fri, 11 Dec 2020 05:15:39 -0500
parents 254ee9af5014 (current diff) 32fdcf67a683 (diff)
children 0ce474653a35
files libinterp/corefcn/mex.cc
diffstat 1 files changed, 10 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/mex.cc	Thu Dec 10 15:27:14 2020 -0800
+++ b/libinterp/corefcn/mex.cc	Fri Dec 11 05:15:39 2020 -0500
@@ -4329,6 +4329,16 @@
 
   try
     {
+      octave::tree_evaluator& tw = interp.get_evaluator ();
+
+      octave::unwind_action act
+        ([&tw] (const std::list<octave::octave_lvalue> *lvl)
+         {
+           tw.set_lvalue_list (lvl);
+         }, tw.lvalue_list ());
+
+      tw.set_lvalue_list (nullptr);
+
       retval = octave::feval (fname, args, nargout);
     }
   catch (const octave::execution_exception&)