changeset 7205:f3d508351e49

[project @ 2007-11-27 21:36:46 by jwe]
author jwe
date Tue, 27 Nov 2007 21:36:47 +0000
parents ccda60eac3d4
children 6e4ceeeb1940
files src/ChangeLog src/pt-bp.cc src/pt-decl.cc
diffstat 3 files changed, 13 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Tue Nov 27 20:30:05 2007 +0000
+++ b/src/ChangeLog	Tue Nov 27 21:36:47 2007 +0000
@@ -1,5 +1,10 @@
 2007-11-27  John W. Eaton  <jwe@octave.org>
 
+	* pt-bp.cc (tree_breakpoint::visit_decl_command): Also check line
+	number of cmd.
+	* pt-decl.cc (tree_global_command::eval, tree_static_command::eval):
+	Insert MAYBE_DO_BREAKPOINT here.
+
 	* error.cc (Fwarning): If setting state "all" to "error", leave
 	Octave:matlab-incompatible warning state unchanged.
 
--- a/src/pt-bp.cc	Tue Nov 27 20:30:05 2007 +0000
+++ b/src/pt-bp.cc	Tue Nov 27 21:36:47 2007 +0000
@@ -186,6 +186,9 @@
   if (found)
     return;
 
+  if (cmd.line () >= line)
+    take_action (cmd);
+
   tree_decl_init_list *init_list = cmd.initializer_list ();
 
   if (init_list)
--- a/src/pt-decl.cc	Tue Nov 27 20:30:05 2007 +0000
+++ b/src/pt-decl.cc	Tue Nov 27 21:36:47 2007 +0000
@@ -30,6 +30,7 @@
 #include "pt-cmd.h"
 #include "ov.h"
 #include "oct-lvalue.h"
+#include "pt-bp.h"
 #include "pt-decl.h"
 #include "pt-exp.h"
 #include "pt-id.h"
@@ -165,6 +166,8 @@
 void
 tree_global_command::eval (void)
 {
+  MAYBE_DO_BREAKPOINT;
+
   if (init_list)
     {
       init_list->eval (do_init);
@@ -216,6 +219,8 @@
 void
 tree_static_command::eval (void)
 {
+  MAYBE_DO_BREAKPOINT;
+
   // Static variables only need to be marked and initialized once.
 
   if (init_list && ! initialized)