Mercurial > octave
diff libinterp/corefcn/pr-output.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 | a9574e3c6e9e |
| children | a542a9bf177e |
line wrap: on
line diff
--- a/libinterp/corefcn/pr-output.cc Mon Oct 05 12:03:16 2015 -0700 +++ b/libinterp/corefcn/pr-output.cc Mon Oct 05 19:29:36 2015 -0400 @@ -3442,46 +3442,43 @@ if (nargin == 2) rat_string_len = args(1).nint_value (); - if (! error_state) + octave_value arg = args(0); + + if (arg.is_numeric_type ()) { - octave_value arg = args(0); - - if (arg.is_numeric_type ()) + frame.protect_var (rat_format); + + rat_format = true; + + std::ostringstream buf; + arg.print (buf); + std::string s = buf.str (); + + std::list<std::string> lst; + + size_t n = 0; + size_t s_len = s.length (); + + while (n < s_len) { - frame.protect_var (rat_format); - - rat_format = true; - - std::ostringstream buf; - arg.print (buf); - std::string s = buf.str (); - - std::list<std::string> lst; - - size_t n = 0; - size_t s_len = s.length (); - - while (n < s_len) + size_t m = s.find ('\n', n); + + if (m == std::string::npos) + { + lst.push_back (s.substr (n)); + break; + } + else { - size_t m = s.find ('\n', n); - - if (m == std::string::npos) - { - lst.push_back (s.substr (n)); - break; - } - else - { - lst.push_back (s.substr (n, m - n)); - n = m + 1; - } + lst.push_back (s.substr (n, m - n)); + n = m + 1; } - - retval = string_vector (lst); } - else - error ("rats: X must be numeric"); + + retval = string_vector (lst); } + else + error ("rats: X must be numeric"); } return retval; @@ -3565,17 +3562,14 @@ octave_stream os = octave_stream_list::lookup (fid, "fdisp"); - if (! error_state) - { - std::ostream *osp = os.output_stream (); - - octave_value arg = args(1); - - if (osp) - arg.print (*osp); - else - error ("fdisp: stream FID not open for writing"); - } + std::ostream *osp = os.output_stream (); + + octave_value arg = args(1); + + if (osp) + arg.print (*osp); + else + error ("fdisp: stream FID not open for writing"); } else print_usage (); @@ -4069,9 +4063,6 @@ string_vector argv = args.make_argv ("format"); - if (error_state) - return retval; - set_format_style (argc, argv); return retval;