Mercurial > hg > octave-lyh

comparison libinterp/parse-tree/pt-eval.cc @ 15469:72868cae7624

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate some deprecated function warnings * input.cc, load-path.cc, ov-oncleanup.cc, oct-parse.yy, pt-eval.cc: Eliminate calls to unwind_protect::run_top and unwind_protect::discard_top.
author John W. Eaton <jwe@octave.org>
date Mon, 01 Oct 2012 18:32:31 -0400
parents 049e8bbff782
children d20cbfec6df7 6ea536cb7360
comparison
equal deleted inserted replaced
15468:6437fa7263dd 15469:72868cae7624
988 // break in the cleanup block, the values should be reset to 988 // break in the cleanup block, the values should be reset to
989 // whatever they were when the cleanup block was entered. 989 // whatever they were when the cleanup block was entered.
990 990
991 if (tree_break_command::breaking || tree_return_command::returning) 991 if (tree_break_command::breaking || tree_return_command::returning)
992 { 992 {
993 frame.discard_top (2); 993 frame.discard (2);
994 } 994 }
995 else 995 else
996 { 996 {
997 frame.run_top (2); 997 frame.run (2);
998 } 998 }
999 999
1000 // We don't want to ignore errors that occur in the cleanup code, so 1000 // We don't want to ignore errors that occur in the cleanup code, so
1001 // if an error is encountered there, leave error_state alone. 1001 // if an error is encountered there, leave error_state alone.
1002 // Otherwise, set it back to what it was before. 1002 // Otherwise, set it back to what it was before.
1003 1003
1004 if (error_state) 1004 if (error_state)
1005 frame.discard_top (2); 1005 frame.discard (2);
1006 else 1006 else
1007 frame.run_top (2); 1007 frame.run (2);
1008 1008
1009 frame.run (); 1009 frame.run ();
1010 } 1010 }
1011 1011
1012 void 1012 void