Mercurial > hg > octave-nkf

changeset 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 6437fa7263dd
children bf0857c789f4
files libinterp/interpfcn/input.cc libinterp/interpfcn/load-path.cc libinterp/octave-value/ov-oncleanup.cc libinterp/parse-tree/oct-parse.yy libinterp/parse-tree/pt-eval.cc
diffstat 5 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/interpfcn/input.cc
+++ b/libinterp/interpfcn/input.cc
@@ -765,7 +765,7 @@
 
       // Unmark forced variables.
       // Restore previous value of global_command.
-      frame.run_top (2);
+      frame.run (2);
 
       octave_quit ();
     }
--- a/libinterp/interpfcn/load-path.cc
+++ b/libinterp/interpfcn/load-path.cc
@@ -603,7 +603,7 @@
     do_append (*i, warn);
 
   // Restore add hook and execute for all newly added directories.
-  frame.run_top ();
+  frame.run_first ();
 
   for (dir_info_list_iterator i = dir_info_list.begin ();
        i != dir_info_list.end ();
--- a/libinterp/octave-value/ov-oncleanup.cc
+++ b/libinterp/octave-value/ov-oncleanup.cc
@@ -103,7 +103,7 @@
   // Otherwise, set it back to what it was before.
   if (error_state)
     {
-      frame.discard_top ();
+      frame.discard_first ();
       octave_call_stack::backtrace_error_message ();
     }
 }
--- a/libinterp/parse-tree/oct-parse.yy
+++ b/libinterp/parse-tree/oct-parse.yy
@@ -4373,7 +4373,7 @@
 
       // Unmark forced variables.
       // Restore previous value of global_command.
-      frame.run_top (2);
+      frame.run (2);
 
       if (parse_status == 0)
         {
--- a/libinterp/parse-tree/pt-eval.cc
+++ b/libinterp/parse-tree/pt-eval.cc
@@ -990,11 +990,11 @@
 
   if (tree_break_command::breaking || tree_return_command::returning)
     {
-      frame.discard_top (2);
+      frame.discard (2);
     }
   else
     {
-      frame.run_top (2);
+      frame.run (2);
     }
 
   // We don't want to ignore errors that occur in the cleanup code, so
@@ -1002,9 +1002,9 @@
   // Otherwise, set it back to what it was before.
 
   if (error_state)
-    frame.discard_top (2);
+    frame.discard (2);
   else
-    frame.run_top (2);
+    frame.run (2);
 
   frame.run ();
 }