Mercurial > hg > octave-nkf

diff src/error.cc @ 7719:87eda1f8faaa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
octave_user_code: new base class for octave_user_script and octave_user_function
author John W. Eaton <jwe@octave.org>
date Wed, 16 Apr 2008 22:08:15 -0400
parents 6070c3bd69c4
children 2dee19385d32
line wrap: on
line diff
--- a/src/error.cc
+++ b/src/error.cc
@@ -234,8 +234,7 @@
 
       if (tree_statement_stack::current ())
 	{
-	  octave_function *fcn
-	    = octave_call_stack::caller_user_script_or_function ();
+	  octave_user_code *fcn = octave_call_stack::caller_user_code ();
 
 	  if (fcn)
 	    {
@@ -429,8 +428,7 @@
       int l = -1;
       int c = -1;
 
-      octave_function *fcn
-	= octave_call_stack::caller_user_script_or_function ();
+      octave_user_code *fcn = octave_call_stack::caller_user_code ();
 
       if (fcn)
 	{
@@ -494,7 +492,7 @@
 
   if ((interactive || forced_interactive)
       && Vdebug_on_error && init_state == 0
-      && octave_call_stack::caller_user_script_or_function ())
+      && octave_call_stack::caller_user_code ())
     {
       unwind_protect_bool (Vdebug_on_error);
       Vdebug_on_error = false;
@@ -655,7 +653,7 @@
 
       if ((interactive || forced_interactive)
 	  && Vdebug_on_warning
-	  && octave_call_stack::caller_user_script_or_function ())
+	  && octave_call_stack::caller_user_code ())
 	{
 	  unwind_protect_bool (Vdebug_on_warning);
 	  Vdebug_on_warning = false;