Mercurial > hg > octave-max
comparison src/pt-eval.cc @ 10194:d4f813c3f5ed
more debug mode fixes
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Sat, 23 Jan 2010 11:19:46 -0500 |
parents | 97ae300aa73a |
children | 752f349052a2 |
comparison
equal
deleted
inserted
replaced
10193:1a4074e277fe | 10194:d4f813c3f5ed |
---|---|
117 } | 117 } |
118 | 118 |
119 void | 119 void |
120 tree_evaluator::reset_debug_state (void) | 120 tree_evaluator::reset_debug_state (void) |
121 { | 121 { |
122 debug_mode = bp_table::have_breakpoints (); | 122 debug_mode = bp_table::have_breakpoints () || Vdebugging; |
123 | 123 |
124 dbstep_flag = 0; | 124 dbstep_flag = 0; |
125 } | 125 } |
126 | 126 |
127 static inline void | 127 static inline void |
645 if (Vdebugging | 645 if (Vdebugging |
646 && octave_call_stack::current_frame () == current_frame) | 646 && octave_call_stack::current_frame () == current_frame) |
647 { | 647 { |
648 Vdebugging = false; | 648 Vdebugging = false; |
649 | 649 |
650 reset_debug_state; | 650 reset_debug_state (); |
651 } | 651 } |
652 else if (tree_evaluator::in_fcn_or_script_body | 652 else if (tree_evaluator::in_fcn_or_script_body |
653 || tree_evaluator::in_loop_command) | 653 || tree_evaluator::in_loop_command) |
654 tree_return_command::returning = 1; | 654 tree_return_command::returning = 1; |
655 } | 655 } |