Mercurial > octave-nkf
diff libinterp/corefcn/sub2ind.cc @ 20587:f90c8372b7ba
eliminate many more simple uses of error_state
* Cell.cc, __ichol__.cc, __ilu__.cc, balance.cc, bsxfun.cc, colloc.cc,
det.cc, dlmread.cc, dynamic-ld.cc, eig.cc, fft.cc, fft2.cc, fftn.cc,
gcd.cc, getgrent.cc, getpwent.cc, givens.cc, hess.cc, input.cc,
levenshtein.cc, load-path.cc, lookup.cc, ls-mat-ascii.cc, ls-mat4.cc,
lsode.cc, lu.cc, max.cc, md5sum.cc, mex.cc, pager.cc, pinv.cc,
pr-output.cc, qz.cc, schur.cc, sparse.cc, sqrtm.cc, str2double.cc,
strfns.cc, sub2ind.cc, sysdep.cc, time.cc, toplev.cc, tril.cc,
tsearch.cc, typecast.cc, __init_gnuplot__.cc, __magick_read__.cc,
__osmesa_print__.cc, amd.cc, audiodevinfo.cc, dmperm.cc, fftw.cc,
symrcm.cc, ov-base-diag.cc, ov-base-sparse.cc, ov-base.cc,
ov-bool-sparse.cc, ov-builtin.cc, ov-complex.cc, ov-cx-diag.cc,
ov-cx-mat.cc, ov-cx-sparse.cc, ov-fcn-handle.cc, ov-fcn-inline.cc,
ov-float.cc, ov-flt-complex.cc, ov-flt-cx-diag.cc, ov-flt-cx-mat.cc,
ov-flt-re-diag.cc, ov-flt-re-mat.cc, ov-lazy-idx.cc, ov-mex-fcn.cc,
ov-perm.cc, ov-range.cc, ov-re-diag.cc, ov-re-mat.cc, ov-re-sparse.cc,
ov-scalar.cc, ov-str-mat.cc, op-bm-b.cc, op-bm-bm.cc, op-sbm-b.cc,
op-sbm-bm.cc, op-str-m.cc, op-str-s.cc, oct-parse.in.yy, pt-cbinop.cc,
pt-colon.cc, pt-decl.cc, pt-exp.cc, pt-id.cc, pt-misc.cc,
pt-select.cc, pt-unop.cc: Eliminate simple uses of error_state.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Mon, 05 Oct 2015 19:29:36 -0400 |
| parents | dd6345fd8a97 |
| children |
line wrap: on
line diff
--- a/libinterp/corefcn/sub2ind.cc Mon Oct 05 12:03:16 2015 -0700 +++ b/libinterp/corefcn/sub2ind.cc Mon Oct 05 19:29:36 2015 -0400 @@ -92,42 +92,31 @@ dim_vector dv = get_dim_vector (args(0), "sub2ind"); Array<idx_vector> idxa (dim_vector (nargin-1, 1)); - if (! error_state) + dv = dv.redim (nargin - 1); + for (int j = 0; j < nargin - 1; j++) { - dv = dv.redim (nargin - 1); - for (int j = 0; j < nargin - 1; j++) + if (args(j+1).is_numeric_type ()) { - if (args(j+1).is_numeric_type ()) + try { - try - { - idxa(j) = args(j+1).index_vector (); - if (error_state) - break; - else if (j > 0 && args(j+1).dims () != args(1).dims ()) - error ("sub2ind: all subscripts must be of the same size"); - } - catch (index_exception& e) - { - e.set_pos_if_unset (nargin-1, j+1); - e.set_var (""); // no particular variable - (*current_liboctave_error_with_id_handler) - (e.id(), e.err()); - } + idxa(j) = args(j+1).index_vector (); + + if (j > 0 && args(j+1).dims () != args(1).dims ()) + error ("sub2ind: all subscripts must be of the same size"); } - else - error ("sub2ind: subscripts must be numeric"); - - if (error_state) - break; + catch (index_exception& e) + { + e.set_pos_if_unset (nargin-1, j+1); + e.set_var (""); // no particular variable + (*current_liboctave_error_with_id_handler) + (e.id(), e.err()); + } } + else + error ("sub2ind: subscripts must be numeric"); } - if (! error_state) - { - idx_vector idx = sub2ind (dv, idxa); - retval = idx; - } + retval = sub2ind (dv, idxa); } return retval; @@ -205,17 +194,15 @@ else { dim_vector dv = get_dim_vector (args(0), "ind2sub"); + try { idx_vector idx = args(1).index_vector (); - if (! error_state) - { - if (nargout > dv.length ()) - dv = dv.redim (nargout); - Array<idx_vector> idxa = ind2sub (dv, idx); - retval = Array<octave_value> (idxa); - } + if (nargout > dv.length ()) + dv = dv.redim (nargout); + + retval = Array<octave_value> (ind2sub (dv, idx)); } catch (index_exception& e) {