Mercurial > octave-nkf
diff libinterp/parse-tree/pt-colon.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 | 7ac907da9fba |
| children | 22618d5fb6ad |
line wrap: on
line diff
--- a/libinterp/parse-tree/pt-colon.cc Mon Oct 05 12:03:16 2015 -0700 +++ b/libinterp/parse-tree/pt-colon.cc Mon Oct 05 19:29:36 2015 -0400 @@ -85,7 +85,7 @@ { octave_value retval; - if (error_state || ! op_base || ! op_limit) + if (! op_base || ! op_limit) return retval; octave_value ov_base = op_base->rvalue1 (); @@ -121,20 +121,17 @@ tmp1(0) = ov_base; } - if (!error_state) + octave_value fcn = symbol_table::find_function ("colon", tmp1); + + if (fcn.is_defined ()) { - octave_value fcn = symbol_table::find_function ("colon", tmp1); + octave_value_list tmp2 = fcn.do_multi_index_op (1, tmp1); - if (fcn.is_defined ()) - { - octave_value_list tmp2 = fcn.do_multi_index_op (1, tmp1); - - if (! error_state) - retval = tmp2 (0); - } - else - error ("can not find overloaded colon function"); + if (! error_state) + retval = tmp2 (0); } + else + error ("can not find overloaded colon function"); } else { @@ -148,9 +145,8 @@ eval_error ("invalid increment value in colon expression"); } - if (! error_state) - retval = do_colon_op (ov_base, ov_increment, ov_limit, - is_for_cmd_expr ()); + retval = do_colon_op (ov_base, ov_increment, ov_limit, + is_for_cmd_expr ()); } }