Mercurial > octave-nkf
comparison libinterp/corefcn/str2double.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 | 4f45eaf83908 |
| children |
comparison
equal
deleted
inserted
replaced
| 20586:b7ac1e94266e | 20587:f90c8372b7ba |
|---|---|
| 356 retval = str2double1 (args(0).string_value ()); | 356 retval = str2double1 (args(0).string_value ()); |
| 357 } | 357 } |
| 358 else | 358 else |
| 359 { | 359 { |
| 360 const string_vector sv = args(0).all_strings (); | 360 const string_vector sv = args(0).all_strings (); |
| 361 if (! error_state) | 361 |
| 362 retval = sv.map<Complex> (str2double1); | 362 retval = sv.map<Complex> (str2double1); |
| 363 } | 363 } |
| 364 } | 364 } |
| 365 else if (args(0).is_cell ()) | 365 else if (args(0).is_cell ()) |
| 366 { | 366 { |
| 367 const Cell cell = args(0).cell_value (); | 367 const Cell cell = args(0).cell_value (); |
| 368 | 368 |
| 369 if (! error_state) | 369 ComplexNDArray output (cell.dims (), octave_NaN); |
| 370 { | 370 for (octave_idx_type i = 0; i < cell.numel (); i++) |
| 371 ComplexNDArray output (cell.dims (), octave_NaN); | 371 { |
| 372 for (octave_idx_type i = 0; i < cell.numel (); i++) | 372 if (cell(i).is_string ()) |
| 373 { | 373 output(i) = str2double1 (cell(i).string_value ()); |
| 374 if (cell(i).is_string ()) | 374 } |
| 375 output(i) = str2double1 (cell(i).string_value ()); | 375 retval = output; |
| 376 } | |
| 377 retval = output; | |
| 378 } | |
| 379 } | 376 } |
| 380 else | 377 else |
| 381 retval = Matrix (1, 1, octave_NaN); | 378 retval = Matrix (1, 1, octave_NaN); |
| 382 | 379 |
| 383 | 380 |