Mercurial > jwe > octave

comparison libinterp/corefcn/error.h @ 21157:94fc5f13d51b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dbstop: conditional breakpoint, dbstop if caught error etc. (bug #46795) * debug.cc (parse_dbfunction_params): Accept "in", "at" and "if" tokens. Only breakpoints are returned; "dbstop if error" etc. are processed in the parser. * debug.cc (dbstop_process_map_ags, Fdbstop): set breakpoints etc. based on the output of A=dbstatus. The structure of A is not Matlab compatible. * debug.cc (do_add_breakpoint_1, do_get_breakpoint_list): Store file (not subfunction) names in bp_set, to avoid crash in "dbclear all". * debug.cc (dbclear_all_signals, condition_valid, stop_on_err_warn_status): New function * debug.cc (do_add_breakpoint): take "condition" parameter. * debug.cc (do_get_breakpoint_list): Make invariant copy of bp_set (bug #44195) * debug.cc (do_add_breakpoint, do_remove_breakpoint, do_remove_all_breakpoints_in_file): More informative error messages. * debug.cc (Fdbclear): clear break on signals (error, warning etc.) * debug.cc (Fdbstatus): Return all breakpoints when debugging, so that "s = dbstatus; ...; dbstop (s)" works. (Related to bug #41338, bug #41556) * debug.cc (Fdbstatus): Return structure with conditions, and "if error" etc. * debug.h (debug_on_err, debug_on_caught, debug_on_warn): New functions * debug.h: Rename "fname_line_map" to "fname_bp_map", as it has conditions * error.cc (verror): Allow dbstop on selected errors, or errors in try/catch * error.h New globals: Vdebug_on_caught, in_try_catch. * toplev.cc: Experimental code for Matlab's "dbstop if naninf". * symtab.cc (load_class_constructor): Add class constructors to list of methods so they can be breakpointed * pt-pb.{cc,h} (take_action): Add "condition" to set_breakpoint call, track bp_cond_list. * pt-eval.cc visit_.*_command: Ask if breakpoint condition is satisfied. * pt-eval.cc (visit_try_catch_command): Count the number of levels of try/catch we are in to allow "dbstop if caught error". * pt-stmt.cc (set_breakpoint): Pass condition * pt-stmt.cc (is_breakpoint): If new argument is true, only return true if the condition is set. * pt-stmt.cc (bp_cond, preakpoints_and_conds): new function * pt-stmt.h: new declarations * pt.{cc,h} (meets_bp_condition, bp_cond): New function * octave-link.h (update_breakpoint): Accept condition
author Lachlan Andrew <lachlanbis@gmail.com>
date Sun, 24 Jan 2016 11:02:30 +1100
parents 2e5c1f766ac9
children 1473547f50f5
comparison
equal deleted inserted replaced
21156:80b69efcd960 21157:94fc5f13d51b
130 // TRUE means that Octave will try to enter the debugger when an error 130 // TRUE means that Octave will try to enter the debugger when an error
131 // is encountered. This will also inhibit printing of the normal 131 // is encountered. This will also inhibit printing of the normal
132 // traceback message (you will only see the top-level error message). 132 // traceback message (you will only see the top-level error message).
133 extern OCTINTERP_API bool Vdebug_on_error; 133 extern OCTINTERP_API bool Vdebug_on_error;
134 134
135 // TRUE means that Octave will try to enter the debugger when an error
136 // is encountered within the 'try' section of a 'try' / 'catch' block.
137 extern OCTINTERP_API bool Vdebug_on_caught;
138
135 // TRUE means that Octave will try to enter the debugger when a warning 139 // TRUE means that Octave will try to enter the debugger when a warning
136 // is encountered. 140 // is encountered.
137 extern OCTINTERP_API bool Vdebug_on_warning; 141 extern OCTINTERP_API bool Vdebug_on_warning;
138 142
139 // Current error state. 143 // Current error state.
144 148
145 // Tell the error handler whether to print messages, or just store 149 // Tell the error handler whether to print messages, or just store
146 // them for later. Used for handling errors in eval() and 150 // them for later. Used for handling errors in eval() and
147 // the 'unwind_protect' statement. 151 // the 'unwind_protect' statement.
148 extern OCTINTERP_API int buffer_error_messages; 152 extern OCTINTERP_API int buffer_error_messages;
153
154 // The number of layers of try / catch blocks we're in. Used to print
155 // "caught error" instead of "error" when "dbstop if caught error" is on.
156 extern OCTINTERP_API int in_try_catch;
149 157
150 // TRUE means error messages are turned off. 158 // TRUE means error messages are turned off.
151 extern OCTINTERP_API bool discard_error_messages; 159 extern OCTINTERP_API bool discard_error_messages;
152 160
153 // TRUE means warning messages are turned off. 161 // TRUE means warning messages are turned off.