diff src/debug.cc @ 7818:5640a70cbab1

Add Ffilemarker and fix for 'dbstep in'
author David Bateman <dbateman@free.fr>
date Sun, 25 May 2008 15:04:37 +0200
parents 6b521b1e3631
children 73ef513855e7
line wrap: on
line diff
--- a/src/debug.cc
+++ b/src/debug.cc
@@ -869,9 +869,12 @@
 
 		  tree::break_next = 0;
 
-		  tree::last_line = 0;
+		  tree::last_line = Vdebugging_current_line;
 
-		  tree::break_function = octave_call_stack::caller_user_code ();
+		  tree::break_function = 0;
+
+		  tree::last_break_function = 
+		    octave_call_stack::caller_user_code ();
 		}
 	      else if (arg == "out")
 		{
@@ -883,7 +886,11 @@
 
 		  // Next to skip 2 here. One for the oct-file dbstep and 
 		  // another for the function we actually want to step out of.
-		  tree::break_function = octave_call_stack::caller_user_code (2);
+		  tree::break_function = 
+		    octave_call_stack::caller_user_code (2);
+
+		  tree::last_break_function = 
+		    octave_call_stack::caller_user_code ();
 		}
 	      else
 		{
@@ -899,6 +906,9 @@
 		  tree::last_line = Vdebugging_current_line;
 		  
 		  tree::break_function = octave_call_stack::caller_user_code ();
+
+		  tree::last_break_function = 
+		    octave_call_stack::caller_user_code ();
 		}
 	    }
 	}
@@ -911,6 +921,9 @@
 	  tree::last_line = Vdebugging_current_line;
 		  
 	  tree::break_function = octave_call_stack::caller_user_code ();
+
+	  tree::last_break_function = 
+	    octave_call_stack::caller_user_code ();
 	}
     }
   else
@@ -974,6 +987,8 @@
 	tree::last_line = Vdebugging_current_line;
 		  
 	tree::break_function = octave_call_stack::caller_user_code ();
+
+	tree::last_break_function = octave_call_stack::caller_user_code ();
       }
     else
       print_usage ();