Mercurial > octave-nkf
comparison libinterp/octave-value/ov-flt-re-mat.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 | df4165dfc676 |
| children |
comparison
equal
deleted
inserted
replaced
| 20586:b7ac1e94266e | 20587:f90c8372b7ba |
|---|---|
| 525 | 525 |
| 526 FloatNDArray m(dv); | 526 FloatNDArray m(dv); |
| 527 float *re = m.fortran_vec (); | 527 float *re = m.fortran_vec (); |
| 528 read_floats (is, re, static_cast<save_type> (tmp), dv.numel (), | 528 read_floats (is, re, static_cast<save_type> (tmp), dv.numel (), |
| 529 swap, fmt); | 529 swap, fmt); |
| 530 if (error_state || ! is) | 530 |
| 531 if (! is) | |
| 531 return false; | 532 return false; |
| 533 | |
| 532 matrix = m; | 534 matrix = m; |
| 533 } | 535 } |
| 534 else | 536 else |
| 535 { | 537 { |
| 536 int32_t nr, nc; | 538 int32_t nr, nc; |
| 543 return false; | 545 return false; |
| 544 FloatMatrix m (nr, nc); | 546 FloatMatrix m (nr, nc); |
| 545 float *re = m.fortran_vec (); | 547 float *re = m.fortran_vec (); |
| 546 octave_idx_type len = nr * nc; | 548 octave_idx_type len = nr * nc; |
| 547 read_floats (is, re, static_cast<save_type> (tmp), len, swap, fmt); | 549 read_floats (is, re, static_cast<save_type> (tmp), len, swap, fmt); |
| 548 if (error_state || ! is) | 550 |
| 551 if (! is) | |
| 549 return false; | 552 return false; |
| 553 | |
| 550 matrix = m; | 554 matrix = m; |
| 551 } | 555 } |
| 552 return true; | 556 return true; |
| 553 } | 557 } |
| 554 | 558 |
| 839 case umap_xisupper: | 843 case umap_xisupper: |
| 840 case umap_xisxdigit: | 844 case umap_xisxdigit: |
| 841 case umap_xtoascii: | 845 case umap_xtoascii: |
| 842 { | 846 { |
| 843 octave_value str_conv = convert_to_str (true, true); | 847 octave_value str_conv = convert_to_str (true, true); |
| 844 return error_state ? octave_value () : str_conv.map (umap); | 848 return str_conv.map (umap); |
| 845 } | 849 } |
| 846 | 850 |
| 847 default: | 851 default: |
| 848 return octave_base_value::map (umap); | 852 return octave_base_value::map (umap); |
| 849 } | 853 } |