octave-nkf: libinterp/corefcn/error.cc comparison

comparison libinterp/corefcn/error.cc @ 20569:b70cc4bd8109

begin removal of global error_state variable * gripes.h, gripes.cc (gripe_library_execution_error): Delete. * error.cc (warning_state): Delete unused variable. (reset_error_handler): Don't set warning_state or error_state. (debug_or_throw_exception): New static function. (verror): Don't check error_state. (vmessage): Call debug_or_throw_exception instead of setting error_state. (error_1, error_2): Combine into single function, error_1 that prints error message and ultimately calls debug_or_throw_exception. (verror, verror_with_cfn, verror_with_id_cfn): Call error_1. Don't check or set warning_state. (error): Don't check error_state. (Flasterror, Flasterr): Adapt to not using error_state. (interpreter_try): Don't unwind_protect error_state. * NEWS: Update. * doc/interpreter/external.txi: Explain octave_execution_exception instead of error_state for matrix addition example. * jit-typeinfo.cc (octave_jit_gripe_nan_to_logical_conversion, octave_jit_ginvalid_index, octave_jit_gindex_range, octave_jit_paren_scalar, octave_jit_paren_scalar_subsasgn): Don't catch octave_execution_exception. * cellfun.cc (Fcellfun): Use exceptions instead of error_state. * ls-mat-ascii.cc (save_mat_ascii_data): Likewise. * mex.cc (mexCallMATLAB, mexEvalString): Likewise. * variables.cc (safe_symbol_lookup): Likewise. * svd.cc (Fsvd): Eliminate use of error_state. * __magick_read__.cc (read_file, write_file): Likewise. * variables.cc (generate_struct_completions): Eliminate use of obsolete warning_state variable. * ov-builtin.cc (octave_builtin::do_multi_index_op): Don't catch octave_execution_exception and call gripe_library_execution_error. * ov-class.cc (octave_class::reconstruct_exemplar): Eliminate use of error_state. Catch possible octave_execution_exception in do_multi_index_op. * ov-mex-fcn.cc (octave_mex_function::do_multi_index_op): Eliminate use of error_state. Catch possible octave_execution_exception in call_mex. * ov-fcn-handle.cc (octave_fcn_binder::maybe_binder): Eliminate use of error_state. * ov-oncleanup.cc (octave_oncleanup::~octave_oncleanup): Eliminate use of error_state. Propagate possible octave_execution_exception from do_multi_index_op. * ov.cc (octave_value::assign, do_binary_op, do_unary_op, octave_value::do_non_const_unary_op): Don't catch octave_execution_exception here. * oct-parse.in.yy (octave_base_parser::finish_colon_expression, octave_base_parser::finish_array_list): Eliminate use of warning_state and error_state. (Feval, Fevalin): Use exceptions instead of error_state. * pt-eval.cc, pt-eval.h (tree_evaluator::unwind_protect_exception): New static variable. * (tree_evaluator::visit_statement): Don't catch octave_execution_exception here. (tree_evaluator::visit_try_catch_command, tree_evaluator::do_unwind_protect_cleanup): Eliminate use of error_state. (tree_evaluator::visit_unwind_protect_command): Use unwind_protect_exception to track whether an exception has occurred in the try block.

author	John W. Eaton <jwe@octave.org>
date	Thu, 01 Oct 2015 16:18:19 -0400
parents	9502e0142c19
children

comparison

equal deleted inserted replaced

-:fcb792acab9b
+:b70cc4bd8109
 // Current error state.
 //
 // Valid values:
 //
-//   -2: an error has occurred, but don't print any messages.
-//   -1: an error has occurred, we are printing a traceback
 //    0: no error
 //    1: an error has occurred
 //
 int error_state = 0;
-// Current warning state.
-//
-//  Valid values:
-//
-//    0: no warning
-//    1: a warning has occurred
-//
-int warning_state = 0;
 // Tell the error handler whether to print messages, or just store
 // them for later.  Used for handling errors in eval() and
 // the 'unwind_protect' statement.
 int buffer_error_messages = 0;
 bool discard_warning_messages = false;
 void
 reset_error_handler (void)
 {
-error_state = 0;
-warning_state = 0;
 buffer_error_messages = 0;
 discard_error_messages = false;
 }
 static void
 static octave_map
 initialize_last_error_stack (void)
 {
 return octave_call_stack::empty_backtrace ();
+}
+static void
+debug_or_throw_exception (void)
+{
+if ((interactive || forced_interactive)
+&& Vdebug_on_error && octave_call_stack::caller_user_code ())
+{
+unwind_protect frame;
+frame.protect_var (Vdebug_on_error);
+Vdebug_on_error = false;
+tree_evaluator::debug_mode = true;
+tree_evaluator::current_frame = octave_call_stack::current_frame ();
+do_keyboard (octave_value_list ());
+}
+else
+octave_throw_execution_exception ();
 }
 // Warning messages are never buffered.
 static void
 octave_vformat (output_buf, fmt, args);
 std::string base_msg = output_buf.str ();
-bool to_beep_or_not_to_beep_p = Vbeep_on_error && ! error_state;
+bool to_beep_or_not_to_beep_p = Vbeep_on_error;
 std::string msg_string;
 if (to_beep_or_not_to_beep_p)
 msg_string = "\a";
 }
 }
 msg_string += base_msg + "\n";
-if (! error_state && save_last_error)
+if (save_last_error)
 {
 // This is the first error in a possible series.
 Vlast_error_id = id;
 Vlast_error_message = base_msg;
 pr_where_1 ("    %s at line %d column %d\n",
 fcn_name.c_str (), line, column);
 }
 }
-// Note that we don't actually print any message if the error string
-// is just "" or "\n".  This allows error ("") and error ("\n") to
-// just set the error state.
-static void
-error_1 (std::ostream& os, const char *name, const char *id,
-const char *fmt, va_list args, bool with_cfn = false)
-{
-if (error_state != -2)
-{
-if (fmt && *fmt)
-{
-size_t len = strlen (fmt);
-if (len > 0)
-{
-if (fmt[len - 1] == '\n')
-{
-if (len > 1)
-{
-// Strip newline before issuing error
-std::string tmp_fmt (fmt, len - 1);
-verror (true, os, name, id, tmp_fmt.c_str (),
-args, with_cfn);
-}
-error_state = -2;
-}
-else
-{
-verror (true, os, name, id, fmt, args, with_cfn);
-if (! error_state)
-error_state = 1;
-}
-}
-}
-else
-panic ("error_1: invalid format");
-}
-}
 void
 vmessage (const char *name, const char *fmt, va_list args)
 {
 verror (false, std::cerr, name, "", fmt, args);
 }
 void
 usage_1 (const char *id, const char *fmt, va_list args)
 {
 verror (true, std::cerr, "usage", id, fmt, args);
-error_state = -1;
+debug_or_throw_exception ();
 }
 void
 vusage (const char *fmt, va_list args)
 {
 vusage_with_id (id, fmt, args);
 va_end (args);
 }
 static void
-error_2 (const char *id, const char *fmt, va_list args, bool with_cfn = false)
+error_1 (std::ostream& os, const char *name, const char *id,
-{
+const char *fmt, va_list args, bool with_cfn = false)
-int init_state = error_state;
+{
+if (fmt)
-error_1 (std::cerr, "error", id, fmt, args, with_cfn);
+{
+if (*fmt)
-bool in_user_code = octave_call_stack::caller_user_code () != 0;
+{
+size_t len = strlen (fmt);
-if (error_state != -2 && in_user_code && ! discard_error_messages)
-pr_where ("error");
+if (len > 0)
+{
-if (interactive && Vdebug_on_error && init_state == 0 && in_user_code)
+if (fmt[len - 1] == '\n')
 {
-unwind_protect frame;
+if (len > 1)
-frame.protect_var (Vdebug_on_error);
+{
-Vdebug_on_error = false;
+char *tmp_fmt = strsave (fmt);
+tmp_fmt[len - 1] = '\0';
-error_state = 0;
+verror (true, os, name, id, tmp_fmt, args, with_cfn);
+delete [] tmp_fmt;
-tree_evaluator::debug_mode = true;
+}
+}
-tree_evaluator::current_frame = octave_call_stack::current_frame ();
+else
+{
-do_keyboard (octave_value_list ());
+verror (true, os, name, id, fmt, args, with_cfn);
-}
+bool in_user_code = octave_call_stack::caller_user_code () != 0;
+if (in_user_code && ! discard_error_messages)
+pr_where ("error");
+}
+}
+}
+}
+else
+panic ("error_1: invalid format");
+debug_or_throw_exception ();
 }
 void
 verror (const char *fmt, va_list args)
 {
-error_2 ("", fmt, args);
+error_1 (std::cerr, "error", "", fmt, args);
 }
 void
 error (const char *fmt, ...)
 {
 }
 void
 verror_with_cfn (const char *fmt, va_list args)
 {
-error_2 ("", fmt, args, true);
+error_1 (std::cerr, "error", "", fmt, args, true);
 }
 void
 error_with_cfn (const char *fmt, ...)
 {
 }
 void
 verror_with_id (const char *id, const char *fmt, va_list args)
 {
-error_2 (id, fmt, args);
+error_1 (std::cerr, "error", id, fmt, args);
 }
 void
 error_with_id (const char *id, const char *fmt, ...)
 {
 }
 void
 verror_with_id_cfn (const char *id, const char *fmt, va_list args)
 {
-error_2 (id, fmt, args, true);
+error_1 (std::cerr, "error", id, fmt, args, true);
 }
 void
 error_with_id_cfn (const char *id, const char *fmt, ...)
 {
 if (warn_opt == 2)
 {
 // Handle this warning as an error.
-error_2 (id, fmt, args);
+error_1 (std::cerr, "error", id, fmt, args);
 }
 else if (warn_opt == 1)
 {
 bool fmt_suppresses_backtrace = false;
 size_t fmt_len = fmt ? strlen (fmt) : 0;
 else
 vwarning ("warning", id, fmt, args);
 bool in_user_code = octave_call_stack::caller_user_code () != 0;
 if (! fmt_suppresses_backtrace && in_user_code
-&& Vbacktrace_on_warning && ! warning_state
+&& Vbacktrace_on_warning
 && ! discard_warning_messages)
 pr_where ("warning");
-warning_state = 1;
 if ((interactive || forced_interactive)
 && Vdebug_on_warning && in_user_code)
 {
 unwind_protect frame;
 print_usage ();
 else
 {
 const octave_scalar_map err = args(0).scalar_map_value ();
-if (! error_state)
+if (err.contains ("message") && err.contains ("identifier"))
 {
-if (err.contains ("message") && err.contains ("identifier"))
+std::string msg = err.contents ("message").string_value ();
+std::string id = err.contents ("identifier").string_value ();
+int len = msg.length ();
+std::string file;
+std::string nm;
+int l = -1;
+int c = -1;
+octave_map err_stack = initialize_last_error_stack ();
+if (err.contains ("stack"))
 {
-std::string msg = err.contents ("message").string_value ();
+err_stack = err.contents ("stack").map_value ();
-std::string id = err.contents ("identifier").string_value ();
-int len = msg.length ();
+if (err_stack.numel () > 0)
+{
-std::string file;
+if (err_stack.contains ("file"))
-std::string nm;
+file = err_stack.contents ("file")(0).string_value ();
-int l = -1;
-int c = -1;
+if (err_stack.contains ("name"))
+nm = err_stack.contents ("name")(0).string_value ();
-octave_map err_stack = initialize_last_error_stack ();
+if (err_stack.contains ("line"))
-if (err.contains ("stack"))
+l = err_stack.contents ("line")(0).nint_value ();
-{
-err_stack = err.contents ("stack").map_value ();
+if (err_stack.contains ("column"))
+c = err_stack.contents ("column")(0).nint_value ();
-if (err_stack.numel () > 0)
+}
+}
+// Ugh.
+char *tmp_msg = strsave (msg.c_str ());
+if (tmp_msg[len-1] == '\n')
+{
+if (len > 1)
+{
+tmp_msg[len - 1] = '\0';
+rethrow_error (id.c_str (), "%s\n", tmp_msg);
+}
+}
+else
+rethrow_error (id.c_str (), "%s", tmp_msg);
+delete [] tmp_msg;
+// FIXME: is this the right thing to do for Vlast_error_stack?
+//        Should it be saved and restored with unwind_protect?
+Vlast_error_stack = err_stack;
+if (err.contains ("stack"))
+{
+if (file.empty ())
+{
+if (nm.empty ())
 {
-if (err_stack.contains ("file"))
+if (l > 0)
-file = err_stack.contents ("file")(0).string_value ();
-if (err_stack.contains ("name"))
-nm = err_stack.contents ("name")(0).string_value ();
-if (err_stack.contains ("line"))
-l = err_stack.contents ("line")(0).nint_value ();
-if (err_stack.contains ("column"))
-c = err_stack.contents ("column")(0).nint_value ();
-}
-}
-// Ugh.
-char *tmp_msg = strsave (msg.c_str ());
-if (tmp_msg[len-1] == '\n')
-{
-if (len > 1)
-{
-tmp_msg[len - 1] = '\0';
-rethrow_error (id.c_str (), "%s\n", tmp_msg);
-}
-}
-else
-rethrow_error (id.c_str (), "%s", tmp_msg);
-delete [] tmp_msg;
-// FIXME: is this the right thing to do for Vlast_error_stack?
-//        Should it be saved and restored with unwind_protect?
-Vlast_error_stack = err_stack;
-if (err.contains ("stack"))
-{
-if (file.empty ())
-{
-if (nm.empty ())
 {
-if (l > 0)
+if (c > 0)
-{
+pr_where_1 ("error: near line %d, column %d",
-if (c > 0)
+l, c);
-pr_where_1 ("error: near line %d, column %d",
+else
-l, c);
+pr_where_1 ("error: near line %d", l);
-else
-pr_where_1 ("error: near line %d", l);
-}
-}
-else
-{
-if (l > 0)
-{
-if (c > 0)
-pr_where_1 ("error: called from '%s' near line %d, column %d",
-nm.c_str (), l, c);
-else
-pr_where_1 ("error: called from '%d' near line %d",
-nm.c_str (), l);
-}
 }
 }
 else
 {
-if (nm.empty ())
+if (l > 0)
 {
-if (l > 0)
+if (c > 0)
-{
+pr_where_1 ("error: called from '%s' near line %d, column %d",
-if (c > 0)
+nm.c_str (), l, c);
-pr_where_1 ("error: in file %s near line %d, column %d",
+else
-file.c_str (), l, c);
+pr_where_1 ("error: called from '%d' near line %d",
-else
+nm.c_str (), l);
-pr_where_1 ("error: in file %s near line %d",
-file.c_str (), l);
-}
-}
-else
-{
-if (l > 0)
-{
-if (c > 0)
-pr_where_1 ("error: called from '%s' in file %s near line %d, column %d",
-nm.c_str (), file.c_str (), l, c);
-else
-pr_where_1 ("error: called from '%d' in file %s near line %d",
-nm.c_str (), file.c_str (), l);
-}
 }
 }
 }
+else
+{
+if (nm.empty ())
+{
+if (l > 0)
+{
+if (c > 0)
+pr_where_1 ("error: in file %s near line %d, column %d",
+file.c_str (), l, c);
+else
+pr_where_1 ("error: in file %s near line %d",
+file.c_str (), l);
+}
+}
+else
+{
+if (l > 0)
+{
+if (c > 0)
+pr_where_1 ("error: called from '%s' in file %s near line %d, column %d",
+nm.c_str (), file.c_str (), l, c);
+else
+pr_where_1 ("error: called from '%d' in file %s near line %d",
+nm.c_str (), file.c_str (), l);
+}
+}
+}
 }
-else
+}
-error ("rethrow: ERR structure must contain the fields 'message and 'identifier'");
+else
-}
+error ("rethrow: ERR structure must contain the fields 'message and 'identifier'");
 }
 return retval;
 }
 // Determine whether the first argument to error or warning function
 if (nargin > 0)
 {
 std::string arg1 = args(0).string_value ();
-if (! error_state)
+// For compatibility with Matlab, an identifier must contain
-{
+// ':', but not at the beginning or the end, and it must not
-// For compatibility with Matlab, an identifier must contain
+// contain '%' (even if it is not a valid conversion
-// ':', but not at the beginning or the end, and it must not
+// operator) or whitespace.
-// contain '%' (even if it is not a valid conversion
-// operator) or whitespace.
+if (arg1.find_first_of ("% \f\n\r\t\v") == std::string::npos
+&& arg1.find (':') != std::string::npos
-if (arg1.find_first_of ("% \f\n\r\t\v") == std::string::npos
+&& arg1[0] != ':'
-&& arg1.find (':') != std::string::npos
+&& arg1[arg1.length ()-1] != ':')
-&& arg1[0] != ':'
+{
-&& arg1[arg1.length ()-1] != ':')
+if (nargin > 1)
 {
-if (nargin > 1)
+id = arg1;
-{
-id = arg1;
+nargs.resize (nargin-1);
-nargs.resize (nargin-1);
+for (int i = 1; i < nargin; i++)
+nargs(i-1) = args(i);
-for (int i = 1; i < nargin; i++)
-nargs(i-1) = args(i);
-}
-else
-nargs(0) = "call to " + caller
-+ " with message identifier requires message";
 }
+else
+nargs(0) = "call to " + caller
++ " with message identifier requires message";
 }
 }
 return have_fmt;
 }
 // FIXME: also need to handle "stack" field in error structure,
 //        but that will require some more significant surgery on
 //        handle_message, error_with_id, etc.
 }
 else
-{
+have_fmt = maybe_extract_message_id ("error", args, nargs, id);
-have_fmt = maybe_extract_message_id ("error", args, nargs, id);
-if (error_state)
-return retval;
-}
 handle_message (error_with_id, id.c_str (), "unspecified error",
 nargs, have_fmt);
 }
 Cell ident = warning_options.contents ("identifier");
 Cell state = warning_options.contents ("state");
 octave_idx_type nel = ident.numel ();
+assert (nel != 0);
 bool found = false;
 std::string val;
 break;
 }
 }
 }
-if (found)
+// The warning state "all" is always supposed to remain in the list,
-{
+// so we should always find a state, either explicitly or by using the
-retval.assign ("identifier", id);
+// state for "all".
-retval.assign ("state", val);
-}
+assert (found);
-else
-error ("warning: unable to find default warning state!");
+retval.assign ("identifier", id);
+retval.assign ("state", val);
 return retval;
 }
 static std::string
 @seealso{lasterr, error, lastwarn}\n\
 @end deftypefn")
 {
 octave_value retval;
 int nargin = args.length ();
-unwind_protect frame;
-frame.protect_var (error_state);
-error_state = 0;
 if (nargin < 2)
 {
 octave_scalar_map err;
 std::string new_error_file;
 std::string new_error_name;
 int new_error_line = -1;
 int new_error_column = -1;
-if (! error_state && new_err.contains ("message"))
+if (new_err.contains ("message"))
 {
 const std::string tmp =
 new_err.getfield ("message").string_value ();
 new_error_message = tmp;
 }
-if (! error_state && new_err.contains ("identifier"))
+if (new_err.contains ("identifier"))
 {
 const std::string tmp =
 new_err.getfield ("identifier").string_value ();
 new_error_id = tmp;
 }
-if (! error_state && new_err.contains ("stack"))
+if (new_err.contains ("stack"))
 {
 new_err_stack =
 new_err.getfield ("stack").scalar_map_value ();
-if (! error_state && new_err_stack.contains ("file"))
+if (new_err_stack.contains ("file"))
 {
 const std::string tmp =
 new_err_stack.getfield ("file").string_value ();
 new_error_file = tmp;
 }
-if (! error_state && new_err_stack.contains ("name"))
+if (new_err_stack.contains ("name"))
 {
 const std::string tmp =
 new_err_stack.getfield ("name").string_value ();
 new_error_name = tmp;
 }
-if (! error_state && new_err_stack.contains ("line"))
+if (new_err_stack.contains ("line"))
 {
 const int tmp =
 new_err_stack.getfield ("line").nint_value ();
 new_error_line = tmp;
 }
-if (! error_state && new_err_stack.contains ("column"))
+if (new_err_stack.contains ("column"))
 {
 const int tmp =
 new_err_stack.getfield ("column").nint_value ();
 new_error_column = tmp;
 }
 }
-if (! error_state)
+Vlast_error_message = new_error_message;
-{
+Vlast_error_id = new_error_id;
-Vlast_error_message = new_error_message;
-Vlast_error_id = new_error_id;
+if (new_err.contains ("stack"))
+{
-if (new_err.contains ("stack"))
+new_err_stack.setfield ("file", new_error_file);
-{
+new_err_stack.setfield ("name", new_error_name);
-new_err_stack.setfield ("file", new_error_file);
+new_err_stack.setfield ("line", new_error_line);
-new_err_stack.setfield ("name", new_error_name);
+new_err_stack.setfield ("column", new_error_column);
-new_err_stack.setfield ("line", new_error_line);
+Vlast_error_stack = new_err_stack;
-new_err_stack.setfield ("column", new_error_column);
+}
-Vlast_error_stack = new_err_stack;
+else
-}
+{
-else
+// No stack field.  Fill it in with backtrace info.
-{
+octave_idx_type curr_frame = -1;
-// No stack field.  Fill it in with backtrace info.
-octave_idx_type curr_frame = -1;
+Vlast_error_stack
+= octave_call_stack::backtrace (0, curr_frame);
-Vlast_error_stack
-= octave_call_stack::backtrace (0, curr_frame);
-}
 }
 }
 else
 error ("lasterror: argument must be a structure or a string");
 }
-if (! error_state)
+retval = err;
-retval = err;
 }
 else
 print_usage ();
 return retval;
 @seealso{lasterror, error, lastwarn}\n\
 @end deftypefn")
 {
 octave_value_list retval;
-unwind_protect frame;
-frame.protect_var (error_state);
-error_state = 0;
 int argc = args.length () + 1;
 if (argc < 4)
 {
 string_vector argv = args.make_argv ("lasterr");
-if (! error_state)
+std::string prev_error_id = Vlast_error_id;
-{
+std::string prev_error_message = Vlast_error_message;
-std::string prev_error_id = Vlast_error_id;
-std::string prev_error_message = Vlast_error_message;
+if (argc > 2)
+Vlast_error_id = argv(2);
-if (argc > 2)
-Vlast_error_id = argv(2);
+if (argc > 1)
+Vlast_error_message = argv(1);
-if (argc > 1)
-Vlast_error_message = argv(1);
+if (argc == 1 || nargout > 0)
+{
-if (argc == 1 || nargout > 0)
+retval(1) = prev_error_id;
-{
+retval(0) = prev_error_message;
-retval(1) = prev_error_id;
+}
-retval(0) = prev_error_message;
-}
-}
-else
-error ("lasterr: all arguments must be strings");
 }
 else
 print_usage ();
 return retval;
 if (argc < 4)
 {
 string_vector argv = args.make_argv ("lastwarn");
-if (! error_state)
+std::string prev_warning_id = Vlast_warning_id;
-{
+std::string prev_warning_message = Vlast_warning_message;
-std::string prev_warning_id = Vlast_warning_id;
-std::string prev_warning_message = Vlast_warning_message;
+if (argc > 2)
+Vlast_warning_id = argv(2);
-if (argc > 2)
-Vlast_warning_id = argv(2);
+if (argc > 1)
+Vlast_warning_message = argv(1);
-if (argc > 1)
-Vlast_warning_message = argv(1);
+if (argc == 1 || nargout > 0)
+{
-if (argc == 1 || nargout > 0)
+retval(1) = prev_warning_id;
-{
+retval(0) = prev_warning_message;
-warning_state = 0;
+}
-retval(1) = prev_warning_id;
-retval(0) = prev_warning_message;
-}
-}
-else
-error ("lastwarn: all arguments must be strings");
 }
 else
 print_usage ();
 return retval;
 }
 void
 interpreter_try (unwind_protect& frame)
 {
-frame.protect_var (error_state);
 frame.protect_var (buffer_error_messages);
 frame.protect_var (Vdebug_on_error);
 frame.protect_var (Vdebug_on_warning);
 buffer_error_messages++;

Mercurial > octave-nkf

comparison libinterp/corefcn/error.cc @ 20569:b70cc4bd8109