Mercurial > octave-nkf
diff libinterp/octave-value/ov.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 | a9574e3c6e9e |
| children | 56fee8f84fe7 |
line wrap: on
line diff
--- a/libinterp/octave-value/ov.cc Thu Sep 24 12:58:46 2015 +0200 +++ b/libinterp/octave-value/ov.cc Thu Oct 01 16:18:19 2015 -0400 @@ -1490,16 +1490,9 @@ if (f) { - try - { - f (*rep, octave_value_list (), *rhs.rep); - // Usually unnecessary, but may be needed (complex arrays). - maybe_mutate (); - } - catch (octave_execution_exception) - { - gripe_library_execution_error (); - } + f (*rep, octave_value_list (), *rhs.rep); + // Usually unnecessary, but may be needed (complex arrays). + maybe_mutate (); } else { @@ -1993,14 +1986,7 @@ if (f) { - try - { - retval = f (v1, v2); - } - catch (octave_execution_exception) - { - gripe_library_execution_error (); - } + retval = f (v1, v2); } else gripe_binary_op (octave_value::binary_op_as_string (op), @@ -2015,16 +2001,7 @@ = octave_value_typeinfo::lookup_binary_op (op, t1, t2); if (f) - { - try - { - retval = f (*v1.rep, *v2.rep); - } - catch (octave_execution_exception) - { - gripe_library_execution_error (); - } - } + retval = f (*v1.rep, *v2.rep); else { octave_value tv1; @@ -2143,16 +2120,7 @@ f = octave_value_typeinfo::lookup_binary_op (op, t1, t2); if (f) - { - try - { - retval = f (*tv1.rep, *tv2.rep); - } - catch (octave_execution_exception) - { - gripe_library_execution_error (); - } - } + retval = f (*tv1.rep, *tv2.rep); else gripe_binary_op (octave_value::binary_op_as_string (op), v1.type_name (), v2.type_name ()); @@ -2251,16 +2219,7 @@ = octave_value_typeinfo::lookup_binary_class_op (op); if (f) - { - try - { - retval = f (v1, v2); - } - catch (octave_execution_exception) - { - gripe_library_execution_error (); - } - } + retval = f (v1, v2); else retval = decompose_binary_op (op, v1, v2); } @@ -2270,16 +2229,7 @@ = octave_value_typeinfo::lookup_binary_op (op, t1, t2); if (f) - { - try - { - retval = f (*v1.rep, *v2.rep); - } - catch (octave_execution_exception) - { - gripe_library_execution_error (); - } - } + retval = f (*v1.rep, *v2.rep); else retval = decompose_binary_op (op, v1, v2); } @@ -2316,16 +2266,7 @@ = octave_value_typeinfo::lookup_cat_op (t1, t2); if (f) - { - try - { - retval = f (*v1.rep, *v2.rep, ra_idx); - } - catch (octave_execution_exception) - { - gripe_library_execution_error (); - } - } + retval = f (*v1.rep, *v2.rep, ra_idx); else { octave_value tv1; @@ -2521,16 +2462,7 @@ = octave_value_typeinfo::lookup_unary_class_op (op); if (f) - { - try - { - retval = f (v); - } - catch (octave_execution_exception) - { - gripe_library_execution_error (); - } - } + retval = f (v); else gripe_unary_op (octave_value::unary_op_as_string (op), v.class_name ()); @@ -2544,16 +2476,7 @@ = octave_value_typeinfo::lookup_unary_op (op, t); if (f) - { - try - { - retval = f (*v.rep); - } - catch (octave_execution_exception) - { - gripe_library_execution_error (); - } - } + retval = f (*v.rep); else { octave_value tv; @@ -2615,14 +2538,7 @@ { make_unique (); - try - { - f (*rep); - } - catch (octave_execution_exception) - { - gripe_library_execution_error (); - } + f (*rep); } else { @@ -2643,14 +2559,7 @@ if (f) { - try - { - f (*rep); - } - catch (octave_execution_exception) - { - gripe_library_execution_error (); - } + f (*rep); if (old_rep && --old_rep->count == 0) delete old_rep; @@ -2690,16 +2599,7 @@ f = octave_value_typeinfo::lookup_non_const_unary_op (op, t); if (f) - { - try - { - f (*rep); - } - catch (octave_execution_exception) - { - gripe_library_execution_error (); - } - } + f (*rep); else *this = do_unary_op (op, *this); }