changeset 7677:db02cc0ba8f2

handle breakpoints in tree_identifier::do_lookup
author John W. Eaton <jwe@octave.org>
date Tue, 01 Apr 2008 13:50:27 -0400
parents 6c0f7bcf5b55
children 5988e08c1ae6
files src/ChangeLog src/pt-id.h
diffstat 2 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Mon Mar 31 22:12:01 2008 -0400
+++ b/src/ChangeLog	Tue Apr 01 13:50:27 2008 -0400
@@ -1,3 +1,9 @@
+2008-04-01  John W. Eaton  <jwe@octave.org>
+
+	* pt-id.h (do_lookup (bool&, bool)): Delete.
+	(do_lookup (tree_argument_list *, const string_vector&,
+	octave_value_list&, bool&)): Call MAYBE_DO_BREAKPOINT here.
+
 2008-03-28  Jaroslav Hajek  <highegg@gmail.com>
 
 	* DLD-FUNCTIONS/lookup.cc: New file.
--- a/src/pt-id.h	Mon Mar 31 22:12:01 2008 -0400
+++ b/src/pt-id.h	Tue Apr 01 13:50:27 2008 -0400
@@ -33,6 +33,7 @@
 
 class tree_walker;
 
+#include "pt-bp.h"
 #include "pt-exp.h"
 #include "symtab.h"
 
@@ -79,18 +80,11 @@
   //     then .mex files, then .m files.
 
   octave_value
-  do_lookup (bool& script_file_executed, bool exec_script = true)
-  {
-    // FIXME -- SYMTAB: what about executing script files?
-    octave_value_list evaluated_args;
-    bool args_evaluated;
-    return sym.find (0, string_vector (), evaluated_args, args_evaluated);
-  }
-
-  octave_value
   do_lookup (tree_argument_list *args, const string_vector& arg_names,
 	     octave_value_list& evaluated_args, bool& args_evaluated)
   {
+    MAYBE_DO_BREAKPOINT;
+
     return sym.find (args, arg_names, evaluated_args, args_evaluated);
   }