Mercurial > octave
diff libinterp/octave-value/ov-str-mat.cc @ 20555: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 | 40ed9b46a800 |
line wrap: on
line diff
--- a/libinterp/octave-value/ov-str-mat.cc Mon Oct 05 12:03:16 2015 -0700 +++ b/libinterp/octave-value/ov-str-mat.cc Mon Oct 05 19:29:36 2015 -0400 @@ -68,13 +68,10 @@ NDArray nda = v.array_value (true); - if (! error_state) - { - if (nda.numel () == 1) - retval = new octave_scalar (nda(0)); - else - retval = new octave_matrix (nda); - } + if (nda.numel () == 1) + retval = new octave_scalar (nda(0)); + else + retval = new octave_matrix (nda); return retval; } @@ -112,9 +109,8 @@ { idx_vector i = idx (0).index_vector (); - if (! error_state) - retval = octave_value (charNDArray (matrix.index (i, resize_ok)), - type); + retval = octave_value (charNDArray (matrix.index (i, resize_ok)), + type); } break; @@ -124,9 +120,8 @@ k = 1; idx_vector j = idx (1).index_vector (); - if (! error_state) - retval = octave_value (charNDArray (matrix.index (i, j, resize_ok)), - type); + retval = octave_value (charNDArray (matrix.index (i, j, resize_ok)), + type); } break; @@ -137,10 +132,9 @@ for (k = 0; k < len; k++) idx_vec(k) = idx(k).index_vector (); - if (! error_state) - retval = - octave_value (charNDArray (matrix.index (idx_vec, resize_ok)), - type); + retval = + octave_value (charNDArray (matrix.index (idx_vec, resize_ok)), + type); } break; } @@ -443,8 +437,7 @@ } } - if (! error_state) - matrix = chm; + matrix = chm; } else { @@ -555,8 +548,9 @@ char *tmp = m.fortran_vec (); is.read (tmp, dv.numel ()); - if (error_state || ! is) + if (! is) return false; + matrix = m; } else