From: Ryan Rusaw Updated. diff --git a/src/ChangeLog b/src/ChangeLog --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,12 @@ +2010-01-27 Ryan Rusaw + + * pt-eval.cc (tree_evaluator::do_breakpoint): Call do_keyboard_impl instead + of do_keyboard. + (tree_evaluator: do_keyboard_impl): and set the default to call do_keyboard. + + * pt-eval.h (tree_evaluator): Added virtual do_keyboard_impl method, so that + subclasses may override control flow in debug mode. + 2010-01-27 Jaroslav Hajek * pt-eval.cc (do_unwind_protect_cleanup_code): Save diff --git a/src/pt-eval.cc b/src/pt-eval.cc --- a/src/pt-eval.cc +++ b/src/pt-eval.cc @@ -1154,7 +1154,14 @@ } if (break_on_this_statement) - do_keyboard (); + do_keyboard_impl (); + +} + +octave_value +tree_evaluator::do_keyboard_impl (const octave_value_list& args) const +{ + return do_keyboard(args); } DEFUN (silent_functions, args, nargout, diff --git a/src/pt-eval.h b/src/pt-eval.h --- a/src/pt-eval.h +++ b/src/pt-eval.h @@ -163,6 +163,9 @@ void do_breakpoint (bool is_breakpoint, bool is_end_of_fcn_or_script = false) const; + virtual octave_value do_keyboard_impl ( + const octave_value_list& args = octave_value_list ()) const; + // No copying! tree_evaluator (const tree_evaluator&);