Mercurial > hg > octave-lojdl
changeset 16531:f3a63fdbd725
finish botched changeset 7ca7e7d5eb91
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 17 Apr 2013 03:09:09 -0400 |
parents | 7ca7e7d5eb91 |
children | 67d4111d078d |
files | libinterp/interpfcn/debug.cc libinterp/parse-tree/pt-stmt.cc |
diffstat | 2 files changed, 15 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/interpfcn/debug.cc +++ b/libinterp/interpfcn/debug.cc @@ -289,7 +289,18 @@ std::string file = dbg_fcn->fcn_file_name (); if (cmds) - retval = cmds->add_breakpoint (file, line); + { + retval = cmds->add_breakpoint (file, line); + + for (intmap_iterator p = retval.begin (); p != retval.end (); p++) + { + if (p->second != 0) + { + bp_set.insert (fname); + break; + } + } + } } else error ("add_breakpoint: unable to find the requested function\n");
--- a/libinterp/parse-tree/pt-stmt.cc +++ b/libinterp/parse-tree/pt-stmt.cc @@ -202,7 +202,7 @@ for (int i = 0; i < len; i++) { - const_intmap_iterator p = line.find (i); + bp_table::const_intmap_iterator p = line.find (i); if (p != line.end ()) { @@ -210,13 +210,8 @@ retval[i] = set_breakpoint (lineno); - if (retval[i] != 0) - { - bp_set.insert (fname); - - if (! file.empty ()) - octave_link::update_breakpoint (true, file, retval[i]); - } + if (retval[i] != 0 && ! file.empty ()) + octave_link::update_breakpoint (true, file, retval[i]); } }