# HG changeset patch # User John W. Eaton # Date 1444095423 14400 # Node ID 0650b8431037461fd9d75761a92b7a8153fcac4d # Parent 1a0a433c8263cd7bdc1379361d9e4729c1ea4ab0 eliminate more simple uses of error_state * besselj.cc, bitfcns.cc, utils.cc, chol.cc, ov-java.cc: Eliminate simple uses of error_state. diff -r 1a0a433c8263 -r 0650b8431037 libinterp/corefcn/besselj.cc --- a/libinterp/corefcn/besselj.cc Mon Oct 05 21:13:12 2015 -0400 +++ b/libinterp/corefcn/besselj.cc Mon Oct 05 21:37:03 2015 -0400 @@ -616,54 +616,51 @@ error ("airy: K must be an integer value"); } - if (! error_state) - { - int idx = nargin == 1 ? 0 : 1; + int idx = nargin == 1 ? 0 : 1; - if (args(idx).is_single_type ()) - { - FloatComplexNDArray z = args(idx).float_complex_array_value (); - - if (! error_state) - { - Array ierr; - octave_value result; + if (args(idx).is_single_type ()) + { + FloatComplexNDArray z = args(idx).float_complex_array_value (); - if (kind > 1) - result = biry (z, kind == 3, scale, ierr); - else - result = airy (z, kind == 1, scale, ierr); + if (! error_state) + { + Array ierr; + octave_value result; - if (nargout > 1) - retval(1) = NDArray (ierr); + if (kind > 1) + result = biry (z, kind == 3, scale, ierr); + else + result = airy (z, kind == 1, scale, ierr); - retval(0) = result; - } - else - error ("airy: Z must be a complex matrix"); + if (nargout > 1) + retval(1) = NDArray (ierr); + + retval(0) = result; } else - { - ComplexNDArray z = args(idx).complex_array_value (); + error ("airy: Z must be a complex matrix"); + } + else + { + ComplexNDArray z = args(idx).complex_array_value (); - if (! error_state) - { - Array ierr; - octave_value result; + if (! error_state) + { + Array ierr; + octave_value result; - if (kind > 1) - result = biry (z, kind == 3, scale, ierr); - else - result = airy (z, kind == 1, scale, ierr); + if (kind > 1) + result = biry (z, kind == 3, scale, ierr); + else + result = airy (z, kind == 1, scale, ierr); - if (nargout > 1) - retval(1) = NDArray (ierr); + if (nargout > 1) + retval(1) = NDArray (ierr); - retval(0) = result; - } - else - error ("airy: Z must be a complex matrix"); + retval(0) = result; } + else + error ("airy: Z must be a complex matrix"); } } else diff -r 1a0a433c8263 -r 0650b8431037 libinterp/corefcn/bitfcns.cc --- a/libinterp/corefcn/bitfcns.cc Mon Oct 05 21:13:12 2015 -0400 +++ b/libinterp/corefcn/bitfcns.cc Mon Oct 05 21:37:03 2015 -0400 @@ -182,22 +182,22 @@ { boolNDArray x (args(0).bool_array_value ()); boolNDArray y (args(1).bool_array_value ()); - if (! error_state) - retval = bitopx (fname, x, y).bool_array_value (); + + retval = bitopx (fname, x, y).bool_array_value (); } else if (arg0_is_float && arg1_is_float) { uint64NDArray x (args(0).float_array_value ()); uint64NDArray y (args(1).float_array_value ()); - if (! error_state) - retval = bitopx (fname, x, y).float_array_value (); + + retval = bitopx (fname, x, y).float_array_value (); } else if (! (arg0_is_float || arg1_is_float)) { uint64NDArray x (args(0).array_value ()); uint64NDArray y (args(1).array_value ()); - if (! error_state) - retval = bitopx (fname, x, y).array_value (); + + retval = bitopx (fname, x, y).array_value (); } else { @@ -206,8 +206,8 @@ uint64NDArray x (args(p).array_value ()); uint64NDArray y (args(q).float_array_value ()); - if (! error_state) - retval = bitopx (fname, x, y).float_array_value (); + + retval = bitopx (fname, x, y).float_array_value (); } } else @@ -222,64 +222,64 @@ { uint64NDArray x (dx); uint64NDArray y = args(q).uint64_array_value (); - if (! error_state) - retval = bitopx (fname, x, y); + + retval = bitopx (fname, x, y); } else if (args(q).type_id () == octave_uint32_matrix::static_type_id () || args(q).type_id () == octave_uint32_scalar::static_type_id ()) { uint32NDArray x (dx); uint32NDArray y = args(q).uint32_array_value (); - if (! error_state) - retval = bitopx (fname, x, y); + + retval = bitopx (fname, x, y); } else if (args(q).type_id () == octave_uint16_matrix::static_type_id () || args(q).type_id () == octave_uint16_scalar::static_type_id ()) { uint16NDArray x (dx); uint16NDArray y = args(q).uint16_array_value (); - if (! error_state) - retval = bitopx (fname, x, y); + + retval = bitopx (fname, x, y); } else if (args(q).type_id () == octave_uint8_matrix::static_type_id () || args(q).type_id () == octave_uint8_scalar::static_type_id ()) { uint8NDArray x (dx); uint8NDArray y = args(q).uint8_array_value (); - if (! error_state) - retval = bitopx (fname, x, y); + + retval = bitopx (fname, x, y); } else if (args(q).type_id () == octave_int64_matrix::static_type_id () || args(q).type_id () == octave_int64_scalar::static_type_id ()) { int64NDArray x (dx); int64NDArray y = args(q).int64_array_value (); - if (! error_state) - retval = bitopx (fname, x, y); + + retval = bitopx (fname, x, y); } else if (args(q).type_id () == octave_int32_matrix::static_type_id () || args(q).type_id () == octave_int32_scalar::static_type_id ()) { int32NDArray x (dx); int32NDArray y = args(q).int32_array_value (); - if (! error_state) - retval = bitopx (fname, x, y); + + retval = bitopx (fname, x, y); } else if (args(q).type_id () == octave_int16_matrix::static_type_id () || args(q).type_id () == octave_int16_scalar::static_type_id ()) { int16NDArray x (dx); int16NDArray y = args(q).int16_array_value (); - if (! error_state) - retval = bitopx (fname, x, y); + + retval = bitopx (fname, x, y); } else if (args(q).type_id () == octave_int8_matrix::static_type_id () || args(q).type_id () == octave_int8_scalar::static_type_id ()) { int8NDArray x (dx); int8NDArray y = args(q).int8_array_value (); - if (! error_state) - retval = bitopx (fname, x, y); + + retval = bitopx (fname, x, y); } else error ("%s: invalid operand type", fname.c_str ()); @@ -292,64 +292,64 @@ { uint64NDArray x = args(0).uint64_array_value (); uint64NDArray y = args(1).uint64_array_value (); - if (! error_state) - retval = bitopx (fname, x, y); + + retval = bitopx (fname, x, y); } else if (args(0).type_id () == octave_uint32_matrix::static_type_id () || args(0).type_id () == octave_uint32_scalar::static_type_id ()) { uint32NDArray x = args(0).uint32_array_value (); uint32NDArray y = args(1).uint32_array_value (); - if (! error_state) - retval = bitopx (fname, x, y); + + retval = bitopx (fname, x, y); } else if (args(0).type_id () == octave_uint16_matrix::static_type_id () || args(0).type_id () == octave_uint16_scalar::static_type_id ()) { uint16NDArray x = args(0).uint16_array_value (); uint16NDArray y = args(1).uint16_array_value (); - if (! error_state) - retval = bitopx (fname, x, y); + + retval = bitopx (fname, x, y); } else if (args(0).type_id () == octave_uint8_matrix::static_type_id () || args(0).type_id () == octave_uint8_scalar::static_type_id ()) { uint8NDArray x = args(0).uint8_array_value (); uint8NDArray y = args(1).uint8_array_value (); - if (! error_state) - retval = bitopx (fname, x, y); + + retval = bitopx (fname, x, y); } else if (args(0).type_id () == octave_int64_matrix::static_type_id () || args(0).type_id () == octave_int64_scalar::static_type_id ()) { int64NDArray x = args(0).int64_array_value (); int64NDArray y = args(1).int64_array_value (); - if (! error_state) - retval = bitopx (fname, x, y); + + retval = bitopx (fname, x, y); } else if (args(0).type_id () == octave_int32_matrix::static_type_id () || args(0).type_id () == octave_int32_scalar::static_type_id ()) { int32NDArray x = args(0).int32_array_value (); int32NDArray y = args(1).int32_array_value (); - if (! error_state) - retval = bitopx (fname, x, y); + + retval = bitopx (fname, x, y); } else if (args(0).type_id () == octave_int16_matrix::static_type_id () || args(0).type_id () == octave_int16_scalar::static_type_id ()) { int16NDArray x = args(0).int16_array_value (); int16NDArray y = args(1).int16_array_value (); - if (! error_state) - retval = bitopx (fname, x, y); + + retval = bitopx (fname, x, y); } else if (args(0).type_id () == octave_int8_matrix::static_type_id () || args(0).type_id () == octave_int8_scalar::static_type_id ()) { int8NDArray x = args(0).int8_array_value (); int8NDArray y = args(1).int8_array_value (); - if (! error_state) - retval = bitopx (fname, x, y); + + retval = bitopx (fname, x, y); } else error ("%s: invalid operand type", fname.c_str ()); @@ -460,52 +460,49 @@ // shift. #define DO_BITSHIFT(T) \ - if (! error_state) \ - { \ - double d1, d2; \ + double d1, d2; \ \ - if (n.all_integers (d1, d2)) \ - { \ - int m_nel = m.numel (); \ - int n_nel = n.numel (); \ + if (n.all_integers (d1, d2)) \ + { \ + int m_nel = m.numel (); \ + int n_nel = n.numel (); \ + \ + bool is_scalar_op = (m_nel == 1 || n_nel == 1); \ \ - bool is_scalar_op = (m_nel == 1 || n_nel == 1); \ - \ - dim_vector m_dv = m.dims (); \ - dim_vector n_dv = n.dims (); \ + dim_vector m_dv = m.dims (); \ + dim_vector n_dv = n.dims (); \ \ - bool is_array_op = (m_dv == n_dv); \ + bool is_array_op = (m_dv == n_dv); \ \ - if (is_array_op || is_scalar_op) \ - { \ - T ## NDArray result; \ + if (is_array_op || is_scalar_op) \ + { \ + T ## NDArray result; \ \ - if (m_nel != 1) \ - result.resize (m_dv); \ - else \ - result.resize (n_dv); \ + if (m_nel != 1) \ + result.resize (m_dv); \ + else \ + result.resize (n_dv); \ \ - for (int i = 0; i < m_nel; i++) \ - if (is_scalar_op) \ - for (int k = 0; k < n_nel; k++) \ - if (static_cast (n(k)) >= bits_in_type) \ - result(i+k) = 0; \ - else \ - result(i+k) = bitshift (m(i), static_cast (n(k)), mask); \ + for (int i = 0; i < m_nel; i++) \ + if (is_scalar_op) \ + for (int k = 0; k < n_nel; k++) \ + if (static_cast (n(k)) >= bits_in_type) \ + result(i+k) = 0; \ else \ - if (static_cast (n(i)) >= bits_in_type) \ - result(i) = 0; \ - else \ - result(i) = bitshift (m(i), static_cast (n(i)), mask); \ + result(i+k) = bitshift (m(i), static_cast (n(k)), mask); \ + else \ + if (static_cast (n(i)) >= bits_in_type) \ + result(i) = 0; \ + else \ + result(i) = bitshift (m(i), static_cast (n(i)), mask); \ \ - retval = result; \ - } \ - else \ - error ("bitshift: size of A and N must match, or one operand must be a scalar"); \ + retval = result; \ } \ else \ - error ("bitshift: expecting integer as second argument"); \ - } + error ("bitshift: size of A and N must match, or one operand must be a scalar"); \ + } \ + else \ + error ("bitshift: expecting integer as second argument"); \ #define DO_UBITSHIFT(T, N) \ do \ @@ -601,9 +598,6 @@ } } - if (error_state) - return retval; - octave_value m_arg = args(0); std::string cname = m_arg.class_name (); diff -r 1a0a433c8263 -r 0650b8431037 libinterp/corefcn/utils.cc --- a/libinterp/corefcn/utils.cc Mon Oct 05 21:13:12 2015 -0400 +++ b/libinterp/corefcn/utils.cc Mon Oct 05 21:37:03 2015 -0400 @@ -1215,9 +1215,6 @@ { Array v = a.vector_value (); - if (error_state) - return; - octave_idx_type n = v.numel (); dim.resize (n); for (octave_idx_type i = 0; i < n; i++) @@ -1227,8 +1224,7 @@ error ("%s (A): use %s (size (A)) instead", warn_for, warn_for); } - if (! error_state) - check_dimensions (dim, warn_for); // May set error_state. + check_dimensions (dim, warn_for); } @@ -1249,8 +1245,6 @@ { Array v = a.vector_value (); - if (error_state) - return; nr = static_cast (fix (v (0))); nc = static_cast (fix (v (1))); @@ -1259,8 +1253,7 @@ error ("%s (A): use %s (size (A)) instead", warn_for, warn_for); } - if (! error_state) - check_dimensions (nr, nc, warn_for); // May set error_state. + check_dimensions (nr, nc, warn_for); } void @@ -1273,7 +1266,7 @@ if (error_state) error ("%s: expecting two scalar arguments", warn_for); else - check_dimensions (nr, nc, warn_for); // May set error_state. + check_dimensions (nr, nc, warn_for); } octave_idx_type @@ -1301,8 +1294,7 @@ try { idx_vector jdx = idxi.index_vector (); - if (error_state) - break; + retval *= jdx.length (dv(i)); } catch (index_exception& e) @@ -1458,33 +1450,23 @@ else if (nargin != 1) print_usage (); - if (! error_state) - { - unwind_protect frame; - - frame.protect_var (error_state); + unwind_protect frame; - frame.protect_var (discard_error_messages); - discard_error_messages = true; + frame.protect_var (discard_error_messages); + discard_error_messages = true; - try - { - idx_vector idx = args(0).index_vector (true); + try + { + idx_vector idx = args(0).index_vector (true); - if (! error_state) - { - if (nargin == 2) - retval = idx.extent (n) <= n; - else - retval = true; - } - else - retval = false; - } - catch (const octave_execution_exception&) - { - retval = false; - } + if (nargin == 2) + retval = idx.extent (n) <= n; + else + retval = true; + } + catch (const octave_execution_exception&) + { + retval = false; } return retval; @@ -1542,40 +1524,35 @@ } } - if (! error_state) - { - for (int i = 0; i < nargout; i++) - rcells[i].clear (dims); + for (int i = 0; i < nargout; i++) + rcells[i].clear (dims); - for (octave_idx_type j = 0; j < numel; j++) - { - for (int i = 0; i < nargin; i++) - if (iscell[i]) - new_args(i) = ccells[i](j); + for (octave_idx_type j = 0; j < numel; j++) + { + for (int i = 0; i < nargin; i++) + if (iscell[i]) + new_args(i) = ccells[i](j); - octave_quit (); + octave_quit (); - const octave_value_list tmp = fun (new_args, nargout); + const octave_value_list tmp = fun (new_args, nargout); - if (tmp.length () < nargout) - { - error ("%s: do_simple_cellfun: internal error", fun_name); - break; - } - else - { - for (int i = 0; i < nargout; i++) - rcells[i](j) = tmp(i); - } + if (tmp.length () < nargout) + { + error ("%s: do_simple_cellfun: internal error", fun_name); + break; + } + else + { + for (int i = 0; i < nargout; i++) + rcells[i](j) = tmp(i); } } - if (! error_state) - { - retval.resize (nargout); - for (int i = 0; i < nargout; i++) - retval(i) = rcells[i]; - } + retval.resize (nargout); + + for (int i = 0; i < nargout; i++) + retval(i) = rcells[i]; return retval; } diff -r 1a0a433c8263 -r 0650b8431037 libinterp/dldfcn/chol.cc --- a/libinterp/dldfcn/chol.cc Mon Oct 05 21:13:12 2015 -0400 +++ b/libinterp/dldfcn/chol.cc Mon Oct 05 21:37:03 2015 -0400 @@ -160,7 +160,7 @@ } int n = 1; - while (n < nargin && ! error_state) + while (n < nargin) { std::string tmp = args(n++).string_value (); @@ -179,181 +179,160 @@ error ("chol: expecting trailing string arguments"); } - if (! error_state) - { - octave_value arg = args(0); + octave_value arg = args(0); - octave_idx_type nr = arg.rows (); - octave_idx_type nc = arg.columns (); + octave_idx_type nr = arg.rows (); + octave_idx_type nc = arg.columns (); + + int arg_is_empty = empty_arg ("chol", nr, nc); - int arg_is_empty = empty_arg ("chol", nr, nc); + if (arg_is_empty < 0) + return retval; + if (arg_is_empty > 0) + return octave_value (Matrix ()); - if (arg_is_empty < 0) - return retval; - if (arg_is_empty > 0) - return octave_value (Matrix ()); + if (arg.is_sparse_type ()) + { + octave_idx_type info; + bool natural = (nargout != 3); + bool force = nargout > 1; - if (arg.is_sparse_type ()) + if (arg.is_real_type ()) { - octave_idx_type info; - bool natural = (nargout != 3); - bool force = nargout > 1; + SparseMatrix m = arg.sparse_matrix_value (); - if (arg.is_real_type ()) - { - SparseMatrix m = arg.sparse_matrix_value (); + SparseCHOL fact (m, info, natural, force); - if (! error_state) - { - SparseCHOL fact (m, info, natural, force); - - if (nargout == 3) - { - if (vecout) - retval(2) = fact.perm (); - else - retval(2) = fact.Q (); - } + if (nargout == 3) + { + if (vecout) + retval(2) = fact.perm (); + else + retval(2) = fact.Q (); + } - if (nargout > 1 || info == 0) - { - retval(1) = info; - if (LLt) - retval(0) = fact.L (); - else - retval(0) = fact.R (); - } - else - error ("chol: input matrix must be positive definite"); - } + if (nargout > 1 || info == 0) + { + retval(1) = info; + if (LLt) + retval(0) = fact.L (); + else + retval(0) = fact.R (); } - else if (arg.is_complex_type ()) - { - SparseComplexMatrix m = arg.sparse_complex_matrix_value (); - - if (! error_state) - { - SparseComplexCHOL fact (m, info, natural, force); + else + error ("chol: input matrix must be positive definite"); + } + else if (arg.is_complex_type ()) + { + SparseComplexMatrix m = arg.sparse_complex_matrix_value (); - if (nargout == 3) - { - if (vecout) - retval(2) = fact.perm (); - else - retval(2) = fact.Q (); - } + SparseComplexCHOL fact (m, info, natural, force); - if (nargout > 1 || info == 0) - { - retval(1) = info; - if (LLt) - retval(0) = fact.L (); - else - retval(0) = fact.R (); - } - else - error ("chol: input matrix must be positive definite"); - } + if (nargout == 3) + { + if (vecout) + retval(2) = fact.perm (); + else + retval(2) = fact.Q (); + } + + if (nargout > 1 || info == 0) + { + retval(1) = info; + if (LLt) + retval(0) = fact.L (); + else + retval(0) = fact.R (); } else - gripe_wrong_type_arg ("chol", arg); + error ("chol: input matrix must be positive definite"); } - else if (arg.is_single_type ()) + else + gripe_wrong_type_arg ("chol", arg); + } + else if (arg.is_single_type ()) + { + if (arg.is_real_type ()) { - if (arg.is_real_type ()) - { - FloatMatrix m = arg.float_matrix_value (); - - if (! error_state) - { - octave_idx_type info; - - FloatCHOL fact; - fact = FloatCHOL (m, info, LLt != true); + FloatMatrix m = arg.float_matrix_value (); - if (nargout == 2 || info == 0) - { - retval(1) = info; - retval(0) = get_chol (fact); - } - else - error ("chol: input matrix must be positive definite"); - } - } - else if (arg.is_complex_type ()) - { - FloatComplexMatrix m = arg.float_complex_matrix_value (); + octave_idx_type info; - if (! error_state) - { - octave_idx_type info; + FloatCHOL fact; + fact = FloatCHOL (m, info, LLt != true); - FloatComplexCHOL fact; - if (LLt) - fact = FloatComplexCHOL (m.transpose (), info); - else - fact = FloatComplexCHOL (m, info); - - if (nargout == 2 || info == 0) - { - retval(1) = info; - if (LLt) - retval(0) = get_chol_l (fact); - else - retval(0) = get_chol_r (fact); - } - else - error ("chol: input matrix must be positive definite"); - } + if (nargout == 2 || info == 0) + { + retval(1) = info; + retval(0) = get_chol (fact); } else - gripe_wrong_type_arg ("chol", arg); + error ("chol: input matrix must be positive definite"); + } + else if (arg.is_complex_type ()) + { + FloatComplexMatrix m = arg.float_complex_matrix_value (); + + octave_idx_type info; + + FloatComplexCHOL fact; + if (LLt) + fact = FloatComplexCHOL (m.transpose (), info); + else + fact = FloatComplexCHOL (m, info); + + if (nargout == 2 || info == 0) + { + retval(1) = info; + if (LLt) + retval(0) = get_chol_l (fact); + else + retval(0) = get_chol_r (fact); + } + else + error ("chol: input matrix must be positive definite"); } else + gripe_wrong_type_arg ("chol", arg); + } + else + { + if (arg.is_real_type ()) { - if (arg.is_real_type ()) - { - Matrix m = arg.matrix_value (); - - if (! error_state) - { - octave_idx_type info; - - CHOL fact; - fact = CHOL (m, info, LLt != true); + Matrix m = arg.matrix_value (); - if (nargout == 2 || info == 0) - { - retval(1) = info; - retval(0) = get_chol (fact); - } - else - error ("chol: input matrix must be positive definite"); - } - } - else if (arg.is_complex_type ()) - { - ComplexMatrix m = arg.complex_matrix_value (); + octave_idx_type info; + + CHOL fact; + fact = CHOL (m, info, LLt != true); - if (! error_state) - { - octave_idx_type info; - - ComplexCHOL fact; - fact = ComplexCHOL (m, info, LLt != true); - - if (nargout == 2 || info == 0) - { - retval(1) = info; - retval(0) = get_chol (fact); - } - else - error ("chol: input matrix must be positive definite"); - } + if (nargout == 2 || info == 0) + { + retval(1) = info; + retval(0) = get_chol (fact); } else - gripe_wrong_type_arg ("chol", arg); + error ("chol: input matrix must be positive definite"); } + else if (arg.is_complex_type ()) + { + ComplexMatrix m = arg.complex_matrix_value (); + + octave_idx_type info; + + ComplexCHOL fact; + fact = ComplexCHOL (m, info, LLt != true); + + if (nargout == 2 || info == 0) + { + retval(1) = info; + retval(0) = get_chol (fact); + } + else + error ("chol: input matrix must be positive definite"); + } + else + gripe_wrong_type_arg ("chol", arg); } return retval; @@ -405,29 +384,23 @@ { SparseMatrix m = arg.sparse_matrix_value (); - if (! error_state) - { - SparseCHOL chol (m, info); + SparseCHOL chol (m, info); - if (info == 0) - retval = chol.inverse (); - else - error ("cholinv: A must be positive definite"); - } + if (info == 0) + retval = chol.inverse (); + else + error ("cholinv: A must be positive definite"); } else if (arg.is_complex_type ()) { SparseComplexMatrix m = arg.sparse_complex_matrix_value (); - if (! error_state) - { - SparseComplexCHOL chol (m, info); + SparseComplexCHOL chol (m, info); - if (info == 0) - retval = chol.inverse (); - else - error ("cholinv: A must be positive definite"); - } + if (info == 0) + retval = chol.inverse (); + else + error ("cholinv: A must be positive definite"); } else gripe_wrong_type_arg ("cholinv", arg); @@ -438,29 +411,23 @@ { FloatMatrix m = arg.float_matrix_value (); - if (! error_state) - { - octave_idx_type info; - FloatCHOL chol (m, info); - if (info == 0) - retval = chol.inverse (); - else - error ("cholinv: A must be positive definite"); - } + octave_idx_type info; + FloatCHOL chol (m, info); + if (info == 0) + retval = chol.inverse (); + else + error ("cholinv: A must be positive definite"); } else if (arg.is_complex_type ()) { FloatComplexMatrix m = arg.float_complex_matrix_value (); - if (! error_state) - { - octave_idx_type info; - FloatComplexCHOL chol (m, info); - if (info == 0) - retval = chol.inverse (); - else - error ("cholinv: A must be positive definite"); - } + octave_idx_type info; + FloatComplexCHOL chol (m, info); + if (info == 0) + retval = chol.inverse (); + else + error ("cholinv: A must be positive definite"); } else gripe_wrong_type_arg ("chol", arg); @@ -471,29 +438,23 @@ { Matrix m = arg.matrix_value (); - if (! error_state) - { - octave_idx_type info; - CHOL chol (m, info); - if (info == 0) - retval = chol.inverse (); - else - error ("cholinv: A must be positive definite"); - } + octave_idx_type info; + CHOL chol (m, info); + if (info == 0) + retval = chol.inverse (); + else + error ("cholinv: A must be positive definite"); } else if (arg.is_complex_type ()) { ComplexMatrix m = arg.complex_matrix_value (); - if (! error_state) - { - octave_idx_type info; - ComplexCHOL chol (m, info); - if (info == 0) - retval = chol.inverse (); - else - error ("cholinv: A must be positive definite"); - } + octave_idx_type info; + ComplexCHOL chol (m, info); + if (info == 0) + retval = chol.inverse (); + else + error ("cholinv: A must be positive definite"); } else gripe_wrong_type_arg ("chol", arg); @@ -554,15 +515,13 @@ { SparseMatrix r = arg.sparse_matrix_value (); - if (! error_state) - retval = chol2inv (r); + retval = chol2inv (r); } else if (arg.is_complex_type ()) { SparseComplexMatrix r = arg.sparse_complex_matrix_value (); - if (! error_state) - retval = chol2inv (r); + retval = chol2inv (r); } else gripe_wrong_type_arg ("chol2inv", arg); @@ -573,15 +532,13 @@ { FloatMatrix r = arg.float_matrix_value (); - if (! error_state) - retval = chol2inv (r); + retval = chol2inv (r); } else if (arg.is_complex_type ()) { FloatComplexMatrix r = arg.float_complex_matrix_value (); - if (! error_state) - retval = chol2inv (r); + retval = chol2inv (r); } else gripe_wrong_type_arg ("chol2inv", arg); @@ -593,15 +550,13 @@ { Matrix r = arg.matrix_value (); - if (! error_state) - retval = chol2inv (r); + retval = chol2inv (r); } else if (arg.is_complex_type ()) { ComplexMatrix r = arg.complex_matrix_value (); - if (! error_state) - retval = chol2inv (r); + retval = chol2inv (r); } else gripe_wrong_type_arg ("chol2inv", arg); diff -r 1a0a433c8263 -r 0650b8431037 libinterp/octave-value/ov-java.cc --- a/libinterp/octave-value/ov-java.cc Mon Oct 05 21:13:12 2015 -0400 +++ b/libinterp/octave-value/ov-java.cc Mon Oct 05 21:37:03 2015 -0400 @@ -831,24 +831,16 @@ { idx_vector v = idx(i).index_vector (); - if (! error_state) - { - jintArray_ref i_array (jni_env, jni_env->NewIntArray (v.length ())); - jint *buf = jni_env->GetIntArrayElements (i_array, 0); - - for (int k = 0; k < v.length (); k++) - buf[k] = v(k); - - jni_env->ReleaseIntArrayElements (i_array, buf, 0); - jni_env->SetObjectArrayElement (retval, i, i_array); - - check_exception (jni_env); - - if (error_state) - break; - } - else - break; + jintArray_ref i_array (jni_env, jni_env->NewIntArray (v.length ())); + jint *buf = jni_env->GetIntArrayElements (i_array, 0); + + for (int k = 0; k < v.length (); k++) + buf[k] = v(k); + + jni_env->ReleaseIntArrayElements (i_array, buf, 0); + jni_env->SetObjectArrayElement (retval, i, i_array); + + check_exception (jni_env); } catch (index_exception& e) { @@ -868,12 +860,9 @@ jobject_ref resObj (jni_env); jobject_ref java_idx (jni_env, make_java_index (jni_env, idx)); - if (! error_state) - { - jclass_ref helperClass (jni_env, find_octave_class (jni_env, "org/octave/ClassHelper")); - jmethodID mID = jni_env->GetStaticMethodID (helperClass, "arraySubsref", "(Ljava/lang/Object;[[I)Ljava/lang/Object;"); - resObj = jni_env->CallStaticObjectMethod (helperClass, mID, jobj, jobject (java_idx)); - } + jclass_ref helperClass (jni_env, find_octave_class (jni_env, "org/octave/ClassHelper")); + jmethodID mID = jni_env->GetStaticMethodID (helperClass, "arraySubsref", "(Ljava/lang/Object;[[I)Ljava/lang/Object;"); + resObj = jni_env->CallStaticObjectMethod (helperClass, mID, jobj, jobject (java_idx)); if (resObj) retval = box (jni_env, resObj); @@ -896,7 +885,7 @@ jobject_ref rhsObj (jni_env); jobject_ref java_idx (jni_env, make_java_index (jni_env, idx)); - if (! error_state && unbox (jni_env, rhs, rhsObj, rhsCls)) + if (unbox (jni_env, rhs, rhsObj, rhsCls)) { jclass_ref helperClass (jni_env, find_octave_class (jni_env, "org/octave/ClassHelper")); jmethodID mID = jni_env->GetStaticMethodID (helperClass, "arraySubsasgn", @@ -985,12 +974,7 @@ if (js) c(i) = octave_value (jstring_to_string (jni_env, js), type); else - { - c(i) = check_exception (jni_env); - - if (error_state) - break; - } + c(i) = check_exception (jni_env); } retval = octave_value (c); @@ -1568,8 +1552,6 @@ varargin(i) = box (env, env->GetObjectArrayElement (argin, i), 0); varargout = feval (fname, varargin, nargout); - if (error_state) - return false; jobjectArray_ref out_objs (env, argout), out_clss (env); out_objs.detach (); @@ -1598,38 +1580,31 @@ { jobject_ref jobj (env, env->GetObjectArrayElement (args, i)); oct_args(i) = box (env, jobj, 0); - - if (error_state) - break; } - if (! error_state) + BEGIN_INTERRUPT_WITH_EXCEPTIONS; + + if (val.is_function_handle ()) + { + octave_function *fcn = val.function_value (); + feval (fcn, oct_args); + } + else if (val.is_cell () && val.length () > 0 + && (val.rows () == 1 || val.columns () == 1) + && val.cell_value()(0).is_function_handle ()) { - BEGIN_INTERRUPT_WITH_EXCEPTIONS; - - if (val.is_function_handle ()) - { - octave_function *fcn = val.function_value (); - feval (fcn, oct_args); - } - else if (val.is_cell () && val.length () > 0 - && (val.rows () == 1 || val.columns () == 1) - && val.cell_value()(0).is_function_handle ()) - { - Cell c = val.cell_value (); - octave_function *fcn = c(0).function_value (); - - for (int i=1; i 2 && type[1] == '(') { @@ -1766,33 +1739,25 @@ new_idx.push_back (*it++); new_idx.push_back (*it++); octave_value_list u = subsref (type.substr (0, 2), new_idx, 1); - if (! error_state) - { - std::list next_idx (idx); - next_idx.erase (next_idx.begin ()); - next_idx.erase (next_idx.begin ()); - u(0).subsasgn (type.substr (2), next_idx, rhs); - if (! error_state) - { - count++; - retval = octave_value (this); - } - } + + std::list next_idx (idx); + next_idx.erase (next_idx.begin ()); + next_idx.erase (next_idx.begin ()); + u(0).subsasgn (type.substr (2), next_idx, rhs); + + count++; + retval = octave_value (this); } else if (type[1] == '.') { octave_value_list u = subsref (type.substr (0, 1), idx, 1); - if (! error_state) - { - std::list next_idx (idx); - next_idx.erase (next_idx.begin ()); - u(0).subsasgn (type.substr (1), next_idx, rhs); - if (! error_state) - { - count++; - retval = octave_value (this); - } - } + + std::list next_idx (idx); + next_idx.erase (next_idx.begin ()); + u(0).subsasgn (type.substr (1), next_idx, rhs); + + count++; + retval = octave_value (this); } else error ("invalid indexing/assignment on Java object"); @@ -1802,11 +1767,9 @@ if (current_env) { set_array_elements (current_env, to_java (), idx.front (), rhs); - if (! error_state) - { - count++; - retval = octave_value (this); - } + + count++; + retval = octave_value (this); } break; @@ -2122,8 +2085,7 @@ initialize_java (); - if (! error_state) - retval = 1; + retval = 1; return retval; #else @@ -2175,27 +2137,24 @@ initialize_java (); - if (! error_state) + JNIEnv *current_env = octave_java::thread_jni_env (); + + if (args.length () > 0) { - JNIEnv *current_env = octave_java::thread_jni_env (); - - if (args.length () > 0) + if (args(0).is_string ()) { - if (args(0).is_string ()) - { - std::string classname = args(0).string_value (); - - octave_value_list tmp; - for (int i=1; i 1) { - JNIEnv *current_env = octave_java::thread_jni_env (); - - if (args.length () > 1) + if (args(0).is_string ()) { - if (args(0).is_string ()) + std::string methodname = args(0).string_value (); + + octave_value_list tmp; + for (int i=2; ido_javaMethod (current_env, methodname, tmp); - } - else if (args(1).is_string ()) - { - std::string cls = args(1).string_value (); - retval = octave_java::do_javaMethod (current_env, cls, methodname, tmp); - } - else - error ("javaMethod: OBJ must be a Java object or a string"); + octave_java *jobj = TO_JAVA (args(1)); + retval = jobj->do_javaMethod (current_env, methodname, tmp); + } + else if (args(1).is_string ()) + { + std::string cls = args(1).string_value (); + retval = octave_java::do_javaMethod (current_env, cls, methodname, tmp); } else - error ("javaMethod: METHODNAME must be a string"); + error ("javaMethod: OBJ must be a Java object or a string"); } else - print_usage (); + error ("javaMethod: METHODNAME must be a string"); } + else + print_usage (); return retval; #else @@ -2318,35 +2274,32 @@ initialize_java (); - if (! error_state) + JNIEnv *current_env = octave_java::thread_jni_env (); + + if (args.length () == 2) { - JNIEnv *current_env = octave_java::thread_jni_env (); - - if (args.length () == 2) + if (args(1).is_string ()) { - if (args(1).is_string ()) + std::string name = args(1).string_value (); + + if (args(0).is_java ()) { - std::string name = args(1).string_value (); - - if (args(0).is_java ()) - { - octave_java *jobj = TO_JAVA (args(0)); - retval = jobj->do_java_get (current_env, name); - } - else if (args(0).is_string ()) - { - std::string cls = args(0).string_value (); - retval = octave_java::do_java_get (current_env, cls, name); - } - else - error ("__java_get__: OBJ must be a Java object or a string"); + octave_java *jobj = TO_JAVA (args(0)); + retval = jobj->do_java_get (current_env, name); + } + else if (args(0).is_string ()) + { + std::string cls = args(0).string_value (); + retval = octave_java::do_java_get (current_env, cls, name); } else - error ("__java_get__: NAME must be a string"); + error ("__java_get__: OBJ must be a Java object or a string"); } else - print_usage (); + error ("__java_get__: NAME must be a string"); } + else + print_usage (); return retval; #else @@ -2383,35 +2336,32 @@ initialize_java (); - if (! error_state) + JNIEnv *current_env = octave_java::thread_jni_env (); + + if (args.length () == 3) { - JNIEnv *current_env = octave_java::thread_jni_env (); - - if (args.length () == 3) + if (args(1).is_string ()) { - if (args(1).is_string ()) + std::string name = args(1).string_value (); + + if (args(0).is_java ()) { - std::string name = args(1).string_value (); - - if (args(0).is_java ()) - { - octave_java *jobj = TO_JAVA (args(0)); - retval = jobj->do_java_set (current_env, name, args(2)); - } - else if (args(0).is_string ()) - { - std::string cls = args(0).string_value (); - retval = octave_java::do_java_set (current_env, cls, name, args(2)); - } - else - error ("__java_set__: OBJ must be a Java object or a string"); + octave_java *jobj = TO_JAVA (args(0)); + retval = jobj->do_java_set (current_env, name, args(2)); + } + else if (args(0).is_string ()) + { + std::string cls = args(0).string_value (); + retval = octave_java::do_java_set (current_env, cls, name, args(2)); } else - error ("__java_set__: NAME must be a string"); + error ("__java_set__: OBJ must be a Java object or a string"); } else - print_usage (); + error ("__java_set__: NAME must be a string"); } + else + print_usage (); return retval; #else @@ -2431,23 +2381,20 @@ initialize_java (); - if (! error_state) + JNIEnv *current_env = octave_java::thread_jni_env (); + + if (args.length () == 1) { - JNIEnv *current_env = octave_java::thread_jni_env (); - - if (args.length () == 1) + if (args(0).is_java ()) { - if (args(0).is_java ()) - { - octave_java *jobj = TO_JAVA (args(0)); - retval(0) = box_more (current_env, jobj->to_java (), 0); - } - else - retval(0) = args(0); + octave_java *jobj = TO_JAVA (args(0)); + retval(0) = box_more (current_env, jobj->to_java (), 0); } else - print_usage (); + retval(0) = args(0); } + else + print_usage (); return retval; #else