Mercurial > octave-nkf
diff libinterp/corefcn/Cell.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/Cell.cc Mon Oct 05 12:03:16 2015 -0700 +++ b/libinterp/corefcn/Cell.cc Mon Oct 05 19:29:36 2015 -0400 @@ -180,8 +180,7 @@ { idx_vector i = idx_arg(0).index_vector (); - if (! error_state) - retval = Array<octave_value>::index (i, resize_ok, Matrix ()); + retval = Array<octave_value>::index (i, resize_ok, Matrix ()); } break; @@ -189,14 +188,11 @@ { idx_vector i = idx_arg(0).index_vector (); + k = 1; + idx_vector j = idx_arg(1).index_vector (); + if (! error_state) - { - k = 1; - idx_vector j = idx_arg(1).index_vector (); - - if (! error_state) - retval = Array<octave_value>::index (i, j, resize_ok, Matrix ()); - } + retval = Array<octave_value>::index (i, j, resize_ok, Matrix ()); } break; @@ -205,14 +201,9 @@ Array<idx_vector> iv (dim_vector (n, 1)); for (k = 0; k < n; k++) - { - iv(k) = idx_arg(k).index_vector (); + iv(k) = idx_arg(k).index_vector (); - if (error_state) - break; - } - if (!error_state) - retval = Array<octave_value>::index (iv, resize_ok, Matrix ()); + retval = Array<octave_value>::index (iv, resize_ok, Matrix ()); } break; }