octave-nkf: src/debug.cc comparison

comparison src/debug.cc @ 9183:94ae487acd1b

use set instead of map to keep track of debugger breakpoints

author	jpswensen@compsci34-754-2010.compscidhcp.jhu.edu
date	Tue, 05 May 2009 15:10:25 -0400
parents	51dc9691f23f
children	610bf90fce2a

comparison

equal deleted inserted replaced

-:23af5910e5f5
+:94ae487acd1b
 		  int lineno = p->second;
 		  retval[i] = cmds->set_breakpoint (lineno);
 		  if (retval[i] != 0)
-		    bp_map[fname] = dbg_fcn;
+		    {
+		      bp_set.insert (fname);
+		    }
 		}
 	    }
 	}
 }
 else
 			cmds->delete_breakpoint (p->second);
 		    }
 		  results = cmds->list_breakpoints ();
-		  breakpoint_map_iterator it = bp_map.find (fname);
+		  bp_set_iterator it = bp_set.find (fname);
+		  if (results.length () == 0 && it != bp_set.end ())
-		  if (results.length () == 0 && it != bp_map.end ())
+		    bp_set.erase (it);
-		    bp_map.erase (it);
 		}
 	      retval = results.length ();
 	    }
 	}
 	      int lineno = static_cast<int> (bkpts(i).int_value ());
 	      cmds->delete_breakpoint (lineno);
 	      retval[i] = lineno;
 	    }
-	  breakpoint_map_iterator it = bp_map.find (fname);
+	  bp_set_iterator it = bp_set.find (fname);
+	  if (it != bp_set.end ())
-	  if (it != bp_map.end ())
+	    bp_set.erase (it);
-	    bp_map.erase (it);
 	}
 }
 else if (! silent)
 error ("remove_all_breakpoint_in_file: "
 	   "unable to find the function requested\n");
 }
 void
 bp_table::do_remove_all_breakpoints (void)
 {
-for (const_breakpoint_map_iterator it = bp_map.begin ();
+for (const_bp_set_iterator it = bp_set.begin (); it != bp_set.end (); it++)
-it != bp_map.end (); it++)
+remove_all_breakpoints_in_file (*it);
-remove_all_breakpoints_in_file (it->first);
 tree_evaluator::debug_mode = bp_table::have_breakpoints ();
 }
 std::string
 bp_table::fname_line_map
 bp_table::do_get_breakpoint_list (const octave_value_list& fname_list)
 {
 fname_line_map retval;
-// Clear the breakpoints in the function if it has been updated.
+for (bp_set_iterator it = bp_set.begin (); it != bp_set.end (); it++)
-// FIXME:  This is a bad way of doing this, but I can't think of another.  The
-// problem is due to the fact that out_of_date_check(...) calls
-// remove_breakpoints_in_file(...), which in turn modifies bp_map while we are
-// in the middle of iterating through it.
-std::list<octave_user_code*> usercode_list;
-for (breakpoint_map_iterator it = bp_map.begin (); it != bp_map.end (); it++)
-usercode_list.push_back (it->second);
-for (std::list<octave_user_code*>::iterator it = usercode_list.begin ();
-it != usercode_list.end (); it++)
-out_of_date_check (*it);
-// Iterate through each of the files in the map and get the
-// name and list of breakpoints.
-for (breakpoint_map_iterator it = bp_map.begin (); it != bp_map.end (); it++)
 {
 if (fname_list.length () == 0
-	  || do_find_bkpt_list (fname_list, it->first) != "")
+	  || do_find_bkpt_list (fname_list, *it) != "")
 	{
-	  octave_user_code *f = it->second;
+	  octave_user_code *f = get_user_code (*it);
-	  tree_statement_list *cmds = f->body ();
+	  if (f)
-	  if (cmds)
 	    {
-	      octave_value_list bkpts = cmds->list_breakpoints ();
+	      tree_statement_list *cmds = f->body ();
-	      octave_idx_type len = bkpts.length ();
+	      if (cmds)
-	      if (len > 0)
 		{
-		  bp_table::intmap bkpts_vec;
+		  octave_value_list bkpts = cmds->list_breakpoints ();
+		  octave_idx_type len = bkpts.length ();
-		  for (int i = 0; i < len; i++)
-		    bkpts_vec[i] = bkpts (i).double_value ();
+		  if (len > 0)
+		    {
-		  retval[it->first] = bkpts_vec;
+		      bp_table::intmap bkpts_vec;
+		      for (int i = 0; i < len; i++)
+			bkpts_vec[i] = bkpts (i).double_value ();
+		      std::string symbol_name = f->name ();
+		      retval[symbol_name] = bkpts_vec;
+		    }
 		}
 	    }
 	}
 }

Mercurial > hg > octave-nkf

comparison src/debug.cc @ 9183:94ae487acd1b