Mercurial > octave
changeset 22327:d0562b3159c7
move more classes inside octave namespace
* ov-complex.cc, quit.h, lo-array-errwarn.h, lo-array-errwarn.cc,
lo-array-gripes.cc: Move classes inside octave namespace.
* NEWS, file-editor-tab.cc, Cell.cc, __qp__.cc, cellfun.cc, daspk.cc,
dasrt.cc, dassl.cc, data.cc, error.cc, error.h, errwarn.cc, errwarn.h,
file-io.cc, gcd.cc, graphics.cc, graphics.in.h, gripes.cc, gripes.h,
input.cc, interpreter.cc, interpreter.h, inv.cc, jit-typeinfo.cc,
load-path.cc, ls-mat-ascii.cc, ls-mat5.cc, lsode.cc, mex.cc,
oct-handle.h, oct-map.cc, oct-stream.cc, quad.cc, rand.cc,
sparse-xdiv.cc, sparse-xpow.cc, sparse.cc, sub2ind.cc, toplev.cc,
utils.cc, variables.cc, xdiv.cc, xpow.cc, __eigs__.cc,
__init_gnuplot__.cc, ov-base-diag.cc, ov-base-mat.cc,
ov-base-scalar.cc, ov-base-sparse.cc, ov-base.cc, ov-class.cc,
ov-classdef.cc, ov-complex.h, ov-complex.cc, ov-cx-mat.cc,
ov-cx-sparse.cc, ov-fcn-handle.cc, ov-float.cc, ov-float.h,
ov-flt-complex.h, ov-flt-cx-mat.cc, ov-flt-re-mat.cc, ov-java.cc,
ov-oncleanup.cc, ov-perm.cc, ov-range.cc, ov-re-diag.cc, ov-re-mat.cc,
ov-re-sparse.cc, ov-scalar.cc, ov-scalar.h, ov-str-mat.cc, ov.cc,
op-cs-cs.cc, op-fcs-fcs.cc, op-fs-fs.cc, op-int.h, op-s-s.cc, ops.h,
oct-parse.in.yy, pt-assign.cc, pt-eval.cc, pt-idx.cc, pt.cc,
Array-util.cc, Array.cc, CColVector.cc, CDiagMatrix.cc, CMatrix.cc,
CNDArray.cc, CRowVector.cc, CSparse.cc, DiagArray2.cc, MDiagArray2.cc,
MSparse.cc, PermMatrix.cc, Range.cc, Sparse.cc, dColVector.cc,
dDiagMatrix.cc, dMatrix.cc, dNDArray.cc, dRowVector.cc, dSparse.cc,
fCColVector.cc, fCDiagMatrix.cc, fCMatrix.cc, fCNDArray.cc,
fCRowVector.cc, fColVector.cc, fDiagMatrix.cc, fMatrix.cc,
fNDArray.cc, fRowVector.cc, idx-vector.cc, quit.cc, quit.h,
gepbalance.cc, Sparse-diag-op-defs.h, Sparse-op-defs.h,
Sparse-perm-op-defs.h, mx-inlines.cc, mx-op-defs.h, cmd-edit.cc,
lo-array-errwarn.cc, lo-array-errwarn.h, lo-array-gripes.cc,
lo-array-gripes.h, oct-binmap.h: Update to use namespace.
line wrap: on
line diff
--- a/NEWS Wed Aug 17 02:57:50 2016 -0400 +++ b/NEWS Wed Aug 17 03:41:42 2016 -0400 @@ -176,7 +176,7 @@ ** The global error_state variable in Octave's C++ API has been deprecated and will be removed in a future version. Now the error and print_usage functions throw an exception - (octave_execution_exception) after displaying the error message. + (octave::execution_exception) after displaying the error message. This makes the error and print_usage functions in C++ work more like the corresponding functions in the scripting language.
--- a/libgui/src/m-editor/file-editor-tab.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libgui/src/m-editor/file-editor-tab.cc Wed Aug 17 03:41:42 2016 -0400 @@ -389,9 +389,9 @@ bp_table::condition_valid (new_condition.toStdString ()); valid = true; } - catch (const index_exception& e) { } - catch (const octave_execution_exception& e) { } - catch (const octave_interrupt_exception&) + catch (const octave::index_exception& e) { } + catch (const octave::execution_exception& e) { } + catch (const octave::interrupt_exception&) { ok = false; valid = true; @@ -1758,7 +1758,7 @@ { sym = symbol_table::find (base_name); } - catch (const octave_execution_exception& e) + catch (const octave::execution_exception& e) { // Ignore syntax error. // It was in the old file on disk; the user may have fixed it already.
--- a/libinterp/corefcn/Cell.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/corefcn/Cell.cc Wed Aug 17 03:41:42 2016 -0400 @@ -204,7 +204,7 @@ break; } } - catch (index_exception& e) + catch (octave::index_exception& e) { // Rethrow to allow more info to be reported later. e.set_pos_if_unset (n, k+1); @@ -235,7 +235,7 @@ { ra_idx(i) = idx_arg(i).index_vector (); } - catch (index_exception& e) + catch (octave::index_exception& e) { // Rethrow to allow more info to be reported later. e.set_pos (len, i+1); @@ -259,7 +259,7 @@ { ra_idx.xelem (i) = idx_arg(i).index_vector (); } - catch (index_exception& e) + catch (octave::index_exception& e) { // Rethrow to allow more info to be reported later. e.set_pos (len, i+1);
--- a/libinterp/corefcn/__qp__.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/corefcn/__qp__.cc Wed Aug 17 03:41:42 2016 -0400 @@ -142,7 +142,7 @@ { eigH = EIG (H); } - catch (octave_execution_exception& e) + catch (octave::execution_exception& e) { error (e, "qp: failed to compute eigenvalues of H"); } @@ -290,7 +290,7 @@ { eigrH = EIG (rH); } - catch (octave_execution_exception& e) + catch (octave::execution_exception& e) { error (e, "qp: failed to compute eigenvalues of rH"); }
--- a/libinterp/corefcn/cellfun.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/corefcn/cellfun.cc Wed Aug 17 03:41:42 2016 -0400 @@ -78,7 +78,7 @@ { tmp = func.do_multi_index_op (nargout, inputlist); } - catch (const octave_execution_exception& e) + catch (const octave::execution_exception& e) { if (error_handler.is_defined ()) {
--- a/libinterp/corefcn/daspk.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/corefcn/daspk.cc Wed Aug 17 03:41:42 2016 -0400 @@ -79,7 +79,7 @@ { tmp = daspk_fcn->do_multi_index_op (1, args); } - catch (octave_execution_exception& e) + catch (octave::execution_exception& e) { err_user_supplied_eval (e, "daspk"); } @@ -129,7 +129,7 @@ { tmp = daspk_jac->do_multi_index_op (1, args); } - catch (octave_execution_exception& e) + catch (octave::execution_exception& e) { err_user_supplied_eval (e, "daspk"); }
--- a/libinterp/corefcn/dasrt.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/corefcn/dasrt.cc Wed Aug 17 03:41:42 2016 -0400 @@ -79,7 +79,7 @@ { tmp = dasrt_f->do_multi_index_op (1, args); } - catch (octave_execution_exception& e) + catch (octave::execution_exception& e) { err_user_supplied_eval (e, "dasrt"); } @@ -120,7 +120,7 @@ { tmp = dasrt_cf->do_multi_index_op (1, args); } - catch (octave_execution_exception& e) + catch (octave::execution_exception& e) { err_user_supplied_eval (e, "dasrt"); } @@ -166,7 +166,7 @@ { tmp = dasrt_j->do_multi_index_op (1, args); } - catch (octave_execution_exception& e) + catch (octave::execution_exception& e) { err_user_supplied_eval (e, "dasrt"); }
--- a/libinterp/corefcn/dassl.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/corefcn/dassl.cc Wed Aug 17 03:41:42 2016 -0400 @@ -79,7 +79,7 @@ { tmp = dassl_fcn->do_multi_index_op (1, args); } - catch (octave_execution_exception& e) + catch (octave::execution_exception& e) { err_user_supplied_eval (e, "dassl"); } @@ -129,7 +129,7 @@ { tmp = dassl_jac->do_multi_index_op (1, args); } - catch (octave_execution_exception& e) + catch (octave::execution_exception& e) { err_user_supplied_eval (e, "dassl"); }
--- a/libinterp/corefcn/data.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/corefcn/data.cc Wed Aug 17 03:41:42 2016 -0400 @@ -1799,7 +1799,7 @@ { result = fcn.do_multi_index_op (1, octave_value_list (1, ov)); } - catch (octave_execution_exception& e) + catch (octave::execution_exception& e) { error (e, "conversion from %s to %s failed", dtype.c_str (), cname.c_str ()); @@ -1827,7 +1827,7 @@ { result = fcn.do_multi_index_op (1, octave_value_list (1, ov)); } - catch (octave_execution_exception& e) + catch (octave::execution_exception& e) { error (e, "%s constructor failed for %s argument", dtype.c_str (), cname.c_str ()); @@ -1864,7 +1864,7 @@ { tmp2 = fcn.do_multi_index_op (1, ovl); } - catch (octave_execution_exception& e) + catch (octave::execution_exception& e) { error (e, "%s/%s method failed", dtype.c_str (), cattype.c_str ()); } @@ -6922,7 +6922,7 @@ err_wrong_type_arg ("nth_element", argx); } } - catch (const index_exception& e) + catch (const octave::index_exception& e) { index_error ("nth_element: invalid N value %s. %s", e.idx (), e.details ()); @@ -7007,7 +7007,7 @@ else err_wrong_type_arg ("accumarray", vals); } - catch (const index_exception& e) + catch (const octave::index_exception& e) { index_error ("__accumarray_sum__: invalid IDX %s. %s", e.idx (), e.details ()); @@ -7119,7 +7119,7 @@ err_wrong_type_arg ("accumarray", vals); } } - catch (const index_exception& e) + catch (const octave::index_exception& e) { index_error ("do_accumarray_minmax_fun: invalid index %s. %s", e.idx (), e.details ()); @@ -7227,7 +7227,7 @@ else err_wrong_type_arg ("accumdim", vals); } - catch (const index_exception& e) + catch (const octave::index_exception& e) { index_error ("__accumdim_sum__: invalid IDX %s. %s", e.idx (), e.details ());
--- a/libinterp/corefcn/error.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/corefcn/error.cc Wed Aug 17 03:41:42 2016 -0400 @@ -297,14 +297,14 @@ } } -static octave_execution_exception +static octave::execution_exception make_execution_exception (const char *who) { std::ostringstream buf; pr_where (buf, who); - octave_execution_exception retval; + octave::execution_exception retval; retval.set_stack_trace (buf.str ()); @@ -312,7 +312,7 @@ } static void -maybe_enter_debugger (octave_execution_exception& e, +maybe_enter_debugger (octave::execution_exception& e, bool show_stack_trace = false) { if ((octave::application::interactive () @@ -415,7 +415,7 @@ OCTAVE_NORETURN static void -usage_1 (octave_execution_exception& e, const char *id, +usage_1 (octave::execution_exception& e, const char *id, const char *fmt, va_list args) { verror (true, std::cerr, "usage", id, fmt, args); @@ -429,7 +429,7 @@ void usage_1 (const char *id, const char *fmt, va_list args) { - octave_execution_exception e = make_execution_exception ("usage"); + octave::execution_exception e = make_execution_exception ("usage"); usage_1 (e, id, fmt, args); } @@ -466,7 +466,7 @@ OCTAVE_NORETURN static void -error_1 (octave_execution_exception& e, std::ostream& os, +error_1 (octave::execution_exception& e, std::ostream& os, const char *name, const char *id, const char *fmt, va_list args, bool with_cfn = false) { @@ -517,7 +517,7 @@ error_1 (std::ostream& os, const char *name, const char *id, const char *fmt, va_list args, bool with_cfn = false) { - octave_execution_exception e = make_execution_exception ("error"); + octave::execution_exception e = make_execution_exception ("error"); error_1 (e, os, name, id, fmt, args, with_cfn); } @@ -538,13 +538,13 @@ } void -verror (octave_execution_exception& e, const char *fmt, va_list args) +verror (octave::execution_exception& e, const char *fmt, va_list args) { error_1 (e, std::cerr, "error", "", fmt, args); } void -error (octave_execution_exception& e, const char *fmt, ...) +error (octave::execution_exception& e, const char *fmt, ...) { va_list args; va_start (args, fmt);
--- a/libinterp/corefcn/error.h Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/corefcn/error.h Wed Aug 17 03:41:42 2016 -0400 @@ -32,7 +32,10 @@ class octave_map; class octave_value_list; -class octave_execution_exception; +namespace octave +{ + class execution_exception; +} #define panic_impossible() \ panic ("impossible state reached in file '%s' at line %d", __FILE__, __LINE__) @@ -64,9 +67,9 @@ void error (const char *fmt, ...); OCTAVE_NORETURN OCTINTERP_API extern -void verror (octave_execution_exception&, const char *fmt, va_list args); +void verror (octave::execution_exception&, const char *fmt, va_list args); OCTAVE_NORETURN OCTINTERP_API extern -void error (octave_execution_exception&, const char *fmt, ...); +void error (octave::execution_exception&, const char *fmt, ...); OCTAVE_NORETURN OCTINTERP_API extern void verror_with_cfn (const char *fmt, va_list args);
--- a/libinterp/corefcn/errwarn.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/corefcn/errwarn.cc Wed Aug 17 03:41:42 2016 -0400 @@ -141,13 +141,13 @@ void err_user_supplied_eval (const char *name) { - octave_execution_exception e; + octave::execution_exception e; err_user_supplied_eval (e, name); } void -err_user_supplied_eval (octave_execution_exception& e, const char *name) +err_user_supplied_eval (octave::execution_exception& e, const char *name) { error (e, "%s: evaluation of user-supplied function failed", name); } @@ -155,13 +155,13 @@ void err_wrong_type_arg (const char *name, const char *s) { - octave_execution_exception e; + octave::execution_exception e; err_wrong_type_arg (e, name, s); } void -err_wrong_type_arg (octave_execution_exception& e, +err_wrong_type_arg (octave::execution_exception& e, const char *name, const char *s) { error (e, "%s: wrong type argument '%s'", name, s); @@ -170,13 +170,13 @@ void err_wrong_type_arg (const char *name, const std::string& s) { - octave_execution_exception e; + octave::execution_exception e; err_wrong_type_arg (e, name, s.c_str ()); } void -err_wrong_type_arg (octave_execution_exception& e, +err_wrong_type_arg (octave::execution_exception& e, const char *name, const std::string& s) { err_wrong_type_arg (e, name, s.c_str ()); @@ -185,13 +185,13 @@ void err_wrong_type_arg (const char *name, const octave_value& tc) { - octave_execution_exception e; + octave::execution_exception e; err_wrong_type_arg (e, name, tc); } void -err_wrong_type_arg (octave_execution_exception& e, +err_wrong_type_arg (octave::execution_exception& e, const char *name, const octave_value& tc) { std::string type = tc.type_name (); @@ -202,13 +202,13 @@ void err_wrong_type_arg (const std::string& name, const octave_value& tc) { - octave_execution_exception e; + octave::execution_exception e; err_wrong_type_arg (e, name, tc); } void -err_wrong_type_arg (octave_execution_exception& e, +err_wrong_type_arg (octave::execution_exception& e, const std::string& name, const octave_value& tc) { err_wrong_type_arg (e, name.c_str (), tc); @@ -217,13 +217,13 @@ void err_wrong_type_arg (const char *s) { - octave_execution_exception e; + octave::execution_exception e; err_wrong_type_arg (e, s); } void -err_wrong_type_arg (octave_execution_exception& e, const char *s) +err_wrong_type_arg (octave::execution_exception& e, const char *s) { error (e, "wrong type argument '%s'", s); } @@ -231,13 +231,13 @@ void err_wrong_type_arg (const std::string& s) { - octave_execution_exception e; + octave::execution_exception e; err_wrong_type_arg (e, s); } void -err_wrong_type_arg (octave_execution_exception& e, const std::string& s) +err_wrong_type_arg (octave::execution_exception& e, const std::string& s) { err_wrong_type_arg (e, s.c_str ()); } @@ -245,13 +245,13 @@ void err_wrong_type_arg (const octave_value& tc) { - octave_execution_exception e; + octave::execution_exception e; err_wrong_type_arg (e, tc); } void -err_wrong_type_arg (octave_execution_exception& e, const octave_value& tc) +err_wrong_type_arg (octave::execution_exception& e, const octave_value& tc) { std::string type = tc.type_name ();
--- a/libinterp/corefcn/errwarn.h Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/corefcn/errwarn.h Wed Aug 17 03:41:42 2016 -0400 @@ -30,7 +30,10 @@ #include "lo-array-errwarn.h" class octave_value; -class octave_execution_exception; +namespace octave +{ + class execution_exception; +} //////////////////////////////////////////////////////////////////////////////// // Alphabetized list of common errors and warnings. @@ -90,53 +93,53 @@ err_user_supplied_eval (const char *name); OCTAVE_NORETURN OCTINTERP_API extern void -err_user_supplied_eval (octave_execution_exception& e, const char *name); +err_user_supplied_eval (octave::execution_exception& e, const char *name); OCTAVE_NORETURN OCTINTERP_API extern void err_wrong_type_arg (const char *name, const char *s); OCTAVE_NORETURN OCTINTERP_API extern void -err_wrong_type_arg (octave_execution_exception& e, const char *name, +err_wrong_type_arg (octave::execution_exception& e, const char *name, const char *s); OCTAVE_NORETURN OCTINTERP_API extern void err_wrong_type_arg (const char *name, const std::string& s); OCTAVE_NORETURN OCTINTERP_API extern void -err_wrong_type_arg (octave_execution_exception& e, const char *name, +err_wrong_type_arg (octave::execution_exception& e, const char *name, const std::string& s); OCTAVE_NORETURN OCTINTERP_API extern void err_wrong_type_arg (const char *name, const octave_value& tc); OCTAVE_NORETURN OCTINTERP_API extern void -err_wrong_type_arg (octave_execution_exception& e, const char *name, +err_wrong_type_arg (octave::execution_exception& e, const char *name, const octave_value& tc); OCTAVE_NORETURN OCTINTERP_API extern void err_wrong_type_arg (const std::string& name, const octave_value& tc); OCTAVE_NORETURN OCTINTERP_API extern void -err_wrong_type_arg (octave_execution_exception& e, const std::string& name, +err_wrong_type_arg (octave::execution_exception& e, const std::string& name, const octave_value& tc); OCTAVE_NORETURN OCTINTERP_API extern void err_wrong_type_arg (const char *s); OCTAVE_NORETURN OCTINTERP_API extern void -err_wrong_type_arg (octave_execution_exception& e, const char *s); +err_wrong_type_arg (octave::execution_exception& e, const char *s); OCTAVE_NORETURN OCTINTERP_API extern void err_wrong_type_arg (const std::string& s); OCTAVE_NORETURN OCTINTERP_API extern void -err_wrong_type_arg (octave_execution_exception& e, const std::string& s); +err_wrong_type_arg (octave::execution_exception& e, const std::string& s); OCTAVE_NORETURN OCTINTERP_API extern void err_wrong_type_arg (const octave_value& tc); OCTAVE_NORETURN OCTINTERP_API extern void -err_wrong_type_arg (octave_execution_exception& e, const octave_value& tc); +err_wrong_type_arg (octave::execution_exception& e, const octave_value& tc); OCTAVE_NORETURN OCTINTERP_API extern void err_wrong_type_arg_for_binary_op (const octave_value& op);
--- a/libinterp/corefcn/file-io.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/corefcn/file-io.cc Wed Aug 17 03:41:42 2016 -0400 @@ -2258,7 +2258,7 @@ oct_data_conv::string_to_data_type (prec, block_size, input_type, output_type); } - catch (octave_execution_exception& e) + catch (octave::execution_exception& e) { error (e, "fread: invalid PRECISION specified"); } @@ -2269,7 +2269,7 @@ { skip = skip_arg.int_value (true); } - catch (octave_execution_exception& e) + catch (octave::execution_exception& e) { error (e, "fread: SKIP must be an integer"); } @@ -2506,7 +2506,7 @@ { oct_data_conv::string_to_data_type (prec, block_size, output_type); } - catch (octave_execution_exception& e) + catch (octave::execution_exception& e) { error (e, "fwrite: invalid PRECISION specified"); } @@ -2517,7 +2517,7 @@ { skip = skip_arg.int_value (true); } - catch (octave_execution_exception& e) + catch (octave::execution_exception& e) { error (e, "fwrite: SKIP must be an integer"); }
--- a/libinterp/corefcn/gcd.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/corefcn/gcd.cc Wed Aug 17 03:41:42 2016 -0400 @@ -336,7 +336,7 @@ if (aa.numel () == 1) dv = bb.dims (); else if (bb.numel () != 1 && bb.dims () != dv) - err_nonconformant ("gcd", a.dims (), b.dims ()); + octave::err_nonconformant ("gcd", a.dims (), b.dims ()); NDA gg (dv), xx (dv), yy (dv);
--- a/libinterp/corefcn/graphics.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/corefcn/graphics.cc Wed Aug 17 03:41:42 2016 -0400 @@ -1322,7 +1322,7 @@ return true; } } - catch (octave_execution_exception& e) + catch (octave::execution_exception& e) { error (e, "invalid value for color property \"%s\" (value = %s)", get_name ().c_str (), s.c_str ()); @@ -2905,7 +2905,7 @@ { bgo.set (pname, prop_val_p.second); } - catch (octave_execution_exception& e) + catch (octave::execution_exception& e) { error (e, "error setting default property %s", pname.c_str ()); } @@ -3222,7 +3222,7 @@ if (p.ok ()) p.delete_listener (); } - catch (const octave_execution_exception&) + catch (const octave::execution_exception&) { recover_from_exception (); } @@ -9547,7 +9547,7 @@ { eval_string (s, false, status, 0); } - catch (octave_execution_exception&) + catch (octave::execution_exception&) { std::cerr << "execution error in graphics callback function" << std::endl; @@ -9580,7 +9580,7 @@ { feval (fcn, args); } - catch (octave_execution_exception&) + catch (octave::execution_exception&) { std::cerr << "execution error in graphics callback function" << std::endl; @@ -10380,7 +10380,7 @@ integer_figure_handle, false, false); } - catch (octave_execution_exception& e) + catch (octave::execution_exception& e) { error (e, "__go%s__: unable to create graphics handle", go_name.c_str ());
--- a/libinterp/corefcn/graphics.in.h Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/corefcn/graphics.in.h Wed Aug 17 03:41:42 2016 -0400 @@ -792,7 +792,7 @@ { nda = val.array_value (); } - catch (octave_execution_exception& e) + catch (octave::execution_exception& e) { error (e, "set: invalid string property value for \"%s\"", get_name ().c_str ()); @@ -1672,7 +1672,7 @@ { new_kids = val.matrix_value (); } - catch (octave_execution_exception& e) + catch (octave::execution_exception& e) { error (e, "set: children must be an array of graphics handles"); }
--- a/libinterp/corefcn/gripes.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/corefcn/gripes.cc Wed Aug 17 03:41:42 2016 -0400 @@ -197,7 +197,7 @@ void gripe_user_supplied_eval (const char *name) { - octave_execution_exception e; + octave::execution_exception e; #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) # pragma GCC diagnostic push @@ -212,7 +212,7 @@ } void -gripe_user_supplied_eval (octave_execution_exception& e, +gripe_user_supplied_eval (octave::execution_exception& e, const char *name) { error (e, "%s: evaluation of user-supplied function failed", name); @@ -228,7 +228,7 @@ void gripe_wrong_type_arg (const char *name, const char *s, bool is_error) { - octave_execution_exception e; + octave::execution_exception e; #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) # pragma GCC diagnostic push @@ -243,7 +243,7 @@ } void -gripe_wrong_type_arg (octave_execution_exception& e, +gripe_wrong_type_arg (octave::execution_exception& e, const char *name, const char *s, bool is_error) { if (is_error) @@ -255,7 +255,7 @@ void gripe_wrong_type_arg (const char *name, const std::string& s, bool is_error) { - octave_execution_exception e; + octave::execution_exception e; #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) # pragma GCC diagnostic push @@ -270,7 +270,7 @@ } void -gripe_wrong_type_arg (octave_execution_exception& e, +gripe_wrong_type_arg (octave::execution_exception& e, const char *name, const std::string& s, bool is_error) { #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) @@ -289,7 +289,7 @@ gripe_wrong_type_arg (const char *name, const octave_value& tc, bool is_error) { - octave_execution_exception e; + octave::execution_exception e; #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) # pragma GCC diagnostic push @@ -304,7 +304,7 @@ } void -gripe_wrong_type_arg (octave_execution_exception& e, +gripe_wrong_type_arg (octave::execution_exception& e, const char *name, const octave_value& tc, bool is_error) { @@ -326,7 +326,7 @@ gripe_wrong_type_arg (const std::string& name, const octave_value& tc, bool is_error) { - octave_execution_exception e; + octave::execution_exception e; #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) # pragma GCC diagnostic push @@ -341,7 +341,7 @@ } void -gripe_wrong_type_arg (octave_execution_exception& e, +gripe_wrong_type_arg (octave::execution_exception& e, const std::string& name, const octave_value& tc, bool is_error) { @@ -360,7 +360,7 @@ void gripe_wrong_type_arg (const char *s, bool is_error) { - octave_execution_exception e; + octave::execution_exception e; #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) # pragma GCC diagnostic push @@ -375,7 +375,7 @@ } void -gripe_wrong_type_arg (octave_execution_exception& e, +gripe_wrong_type_arg (octave::execution_exception& e, const char *s, bool is_error) { if (is_error) @@ -387,7 +387,7 @@ void gripe_wrong_type_arg (const std::string& s, bool is_error) { - octave_execution_exception e; + octave::execution_exception e; #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) # pragma GCC diagnostic push @@ -402,7 +402,7 @@ } void -gripe_wrong_type_arg (octave_execution_exception& e, +gripe_wrong_type_arg (octave::execution_exception& e, const std::string& s, bool is_error) { #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) @@ -420,7 +420,7 @@ void gripe_wrong_type_arg (const octave_value& tc, bool is_error) { - octave_execution_exception e; + octave::execution_exception e; #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) # pragma GCC diagnostic push @@ -435,7 +435,7 @@ } void -gripe_wrong_type_arg (octave_execution_exception& e, +gripe_wrong_type_arg (octave::execution_exception& e, const octave_value& tc, bool is_error) { std::string type = tc.type_name ();
--- a/libinterp/corefcn/gripes.h Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/corefcn/gripes.h Wed Aug 17 03:41:42 2016 -0400 @@ -31,7 +31,10 @@ #include "lo-array-gripes.h" class octave_value; -class octave_execution_exception; +namespace octave +{ + class execution_exception; +} //////////////////////////////////////////////////////////////////////////////// // Alphabetized list of gripes. @@ -144,7 +147,7 @@ OCTAVE_DEPRECATED ("use 'err_user_supplied_eval' instead") OCTAVE_NORETURN OCTINTERP_API extern void -gripe_user_supplied_eval (octave_execution_exception& e, const char *name); +gripe_user_supplied_eval (octave::execution_exception& e, const char *name); OCTAVE_DEPRECATED ("use 'warn_complex_cmp' instead") OCTINTERP_API extern void @@ -157,7 +160,7 @@ OCTAVE_DEPRECATED ("use 'err_wrong_type_arg' instead") OCTINTERP_API extern void -gripe_wrong_type_arg (octave_execution_exception& e, +gripe_wrong_type_arg (octave::execution_exception& e, const char *name, const char *s, bool is_error = true); @@ -168,7 +171,7 @@ OCTAVE_DEPRECATED ("use 'err_wrong_type_arg' instead") OCTINTERP_API extern void -gripe_wrong_type_arg (octave_execution_exception& e, +gripe_wrong_type_arg (octave::execution_exception& e, const char *name, const std::string& s, bool is_error = true); @@ -179,7 +182,7 @@ OCTAVE_DEPRECATED ("use 'err_wrong_type_arg' instead") OCTINTERP_API extern void -gripe_wrong_type_arg (octave_execution_exception& e, +gripe_wrong_type_arg (octave::execution_exception& e, const char *name, const octave_value& tc, bool is_error = true); @@ -190,7 +193,7 @@ OCTAVE_DEPRECATED ("use 'err_wrong_type_arg' instead") OCTINTERP_API extern void -gripe_wrong_type_arg (octave_execution_exception& e, +gripe_wrong_type_arg (octave::execution_exception& e, const std::string& name, const octave_value& tc, bool is_error = true); @@ -200,7 +203,7 @@ OCTAVE_DEPRECATED ("use 'err_wrong_type_arg' instead") OCTINTERP_API extern void -gripe_wrong_type_arg (octave_execution_exception& e, const char *s, +gripe_wrong_type_arg (octave::execution_exception& e, const char *s, bool is_error = true); OCTAVE_DEPRECATED ("use 'err_wrong_type_arg' instead") @@ -209,7 +212,7 @@ OCTAVE_DEPRECATED ("use 'err_wrong_type_arg' instead") OCTINTERP_API extern void -gripe_wrong_type_arg (octave_execution_exception& e, const std::string& s, +gripe_wrong_type_arg (octave::execution_exception& e, const std::string& s, bool is_error = true); OCTAVE_DEPRECATED ("use 'err_wrong_type_arg' instead") @@ -218,7 +221,7 @@ OCTAVE_DEPRECATED ("use 'err_wrong_type_arg' instead") OCTINTERP_API extern void -gripe_wrong_type_arg (octave_execution_exception& e, const octave_value& tc, +gripe_wrong_type_arg (octave::execution_exception& e, const octave_value& tc, bool is_error = true); OCTAVE_DEPRECATED ("use 'err_wrong_type_arg_for_binary_op' instead")
--- a/libinterp/corefcn/input.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/corefcn/input.cc Wed Aug 17 03:41:42 2016 -0400 @@ -204,7 +204,7 @@ { feval ("drawnow"); } - catch (const octave_execution_exception& e) + catch (const octave::execution_exception& e) { eval_error = true; @@ -710,7 +710,7 @@ octave_quit (); } } - catch (const octave_execution_exception& e) + catch (const octave::execution_exception& e) { std::string stack_trace = e.info ();
--- a/libinterp/corefcn/interpreter.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/corefcn/interpreter.cc Wed Aug 17 03:41:42 2016 -0400 @@ -362,24 +362,24 @@ { source_file (file_name, context, verbose, require_file, warn_for); } - catch (const index_exception& e) + catch (const octave::index_exception& e) { recover_from_exception (); std::cerr << "error: index exception in " << file_name << ": " << e.message () << std::endl; } - catch (const octave_exit_exception& ex) + catch (const octave::exit_exception& ex) { recover_from_exception (); clean_up_and_exit (ex.exit_status (), ex.safe_to_return ()); } - catch (const octave_interrupt_exception&) + catch (const octave::interrupt_exception&) { recover_from_exception (); } - catch (const octave_execution_exception&) + catch (const octave::execution_exception&) { recover_from_exception (); @@ -396,24 +396,24 @@ { load_path::execute_pkg_add (dir); } - catch (const index_exception& e) + catch (const octave::index_exception& e) { recover_from_exception (); std::cerr << "error: index exception in " << file_name << ": " << e.message () << std::endl; } - catch (const octave_exit_exception& ex) + catch (const octave::exit_exception& ex) { recover_from_exception (); clean_up_and_exit (ex.exit_status (), ex.safe_to_return ()); } - catch (const octave_interrupt_exception&) + catch (const octave::interrupt_exception&) { recover_from_exception (); } - catch (const octave_execution_exception&) + catch (const octave::execution_exception&) { recover_from_exception (); @@ -678,7 +678,7 @@ { parse_status = execute_eval_option_code (code_to_eval); } - catch (const octave_execution_exception&) + catch (const octave::execution_exception&) { recover_from_exception (); @@ -711,7 +711,7 @@ execute_command_line_file (script_args[0]); } - catch (const octave_execution_exception&) + catch (const octave::execution_exception&) { recover_from_exception (); @@ -788,17 +788,17 @@ { eval_string (code, false, parse_status, 0); } - catch (const octave_exit_exception& ex) + catch (const octave::exit_exception& ex) { recover_from_exception (); clean_up_and_exit (ex.exit_status (), ex.safe_to_return ()); } - catch (const octave_interrupt_exception&) + catch (const octave::interrupt_exception&) { recover_from_exception (); } - catch (const octave_execution_exception&) + catch (const octave::execution_exception&) { recover_from_exception (); @@ -914,13 +914,13 @@ break; } } - catch (const octave_exit_exception& ex) + catch (const octave::exit_exception& ex) { recover_from_exception (); clean_up_and_exit (ex.exit_status (), ex.safe_to_return ()); } - catch (const octave_interrupt_exception&) + catch (const octave::interrupt_exception&) { recover_from_exception (); @@ -928,7 +928,7 @@ if (octave::application::interactive ()) octave_stdout << "\n"; } - catch (const index_exception& e) + catch (const octave::index_exception& e) { recover_from_exception (); @@ -936,7 +936,7 @@ << e.message () << " -- trying to return to prompt" << std::endl; } - catch (const octave_execution_exception& e) + catch (const octave::execution_exception& e) { std::string stack_trace = e.info ();
--- a/libinterp/corefcn/interpreter.h Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/corefcn/interpreter.h Wed Aug 17 03:41:42 2016 -0400 @@ -79,8 +79,8 @@ \ F ARGS; \ } \ - OCTAVE_IGNORE_EXCEPTION (const octave_interrupt_exception&) \ - OCTAVE_IGNORE_EXCEPTION (const octave_execution_exception&) \ + OCTAVE_IGNORE_EXCEPTION (const octave::interrupt_exception&) \ + OCTAVE_IGNORE_EXCEPTION (const octave::execution_exception&) \ OCTAVE_IGNORE_EXCEPTION (const std::bad_alloc&) \ } \ while (0)
--- a/libinterp/corefcn/inv.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/corefcn/inv.cc Wed Aug 17 03:41:42 2016 -0400 @@ -206,7 +206,7 @@ } if (nargout < 2 && (info == -1 || rcond_plus_one_eq_one)) - warn_singular_matrix (isfloat ? frcond : rcond); + octave::warn_singular_matrix (isfloat ? frcond : rcond); return retval; }
--- a/libinterp/corefcn/jit-typeinfo.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/corefcn/jit-typeinfo.cc Wed Aug 17 03:41:42 2016 -0400 @@ -213,24 +213,24 @@ } extern "C" void -octave_jit_err_nan_to_logical_conversion (void) +octave_jit_octave::err_nan_to_logical_conversion (void) { - err_nan_to_logical_conversion (); + octave::err_nan_to_logical_conversion (); } extern "C" void octave_jit_ginvalid_index (void) { - // FIXME: 0-argument form of err_invalid_index removed in cset dd6345fd8a97 + // FIXME: 0-argument form of octave::err_invalid_index removed in cset dd6345fd8a97 // Report -1 as the bad index for all occurrences. - err_invalid_index (static_cast<octave_idx_type> (-1)); + octave::err_invalid_index (static_cast<octave_idx_type> (-1)); } extern "C" void octave_jit_gindex_range (int nd, int dim, octave_idx_type iext, octave_idx_type ext) { - err_index_out_of_range (nd, dim, iext, ext); + octave::err_index_out_of_range (nd, dim, iext, ext); } extern "C" jit_matrix @@ -1506,7 +1506,7 @@ logically_true_fn.stash_name ("logically_true"); jit_function gripe_nantl - = create_external (JIT_FN (octave_jit_err_nan_to_logical_conversion), 0); + = create_external (JIT_FN (octave_jit_octave::err_nan_to_logical_conversion), 0); gripe_nantl.mark_can_error (); fn = create_internal ("octave_jit_logically_true_scalar", boolean, scalar);
--- a/libinterp/corefcn/load-path.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/corefcn/load-path.cc Wed Aug 17 03:41:42 2016 -0400 @@ -91,7 +91,7 @@ initialize (); } } - catch (const octave_execution_exception&) + catch (const octave::execution_exception&) { // Skip updating if we don't know where we are but // don't treat it as an error. @@ -159,7 +159,7 @@ abs_dir_cache[abs_name] = *this; } - catch (const octave_execution_exception&) + catch (const octave::execution_exception&) { // Skip updating if we don't know where we are but don't treat // it as an error.
--- a/libinterp/corefcn/ls-mat-ascii.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/corefcn/ls-mat-ascii.cc Wed Aug 17 03:41:42 2016 -0400 @@ -358,7 +358,7 @@ { m = val.matrix_value (true); } - catch (const octave_execution_exception& e) + catch (const octave::execution_exception& e) { recover_from_exception ();
--- a/libinterp/corefcn/ls-mat5.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/corefcn/ls-mat5.cc Wed Aug 17 03:41:42 2016 -0400 @@ -1213,7 +1213,7 @@ tc = tmp(0); } - catch (const octave_execution_exception&) + catch (const octave::execution_exception&) { goto data_read_error; } @@ -2610,7 +2610,7 @@ m = tmp(0).map_value (); } - catch (const octave_execution_exception&) + catch (const octave::execution_exception&) { error ("save: error while writing '%s' to MAT file", name.c_str ());
--- a/libinterp/corefcn/lsode.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/corefcn/lsode.cc Wed Aug 17 03:41:42 2016 -0400 @@ -76,7 +76,7 @@ { tmp = lsode_fcn->do_multi_index_op (1, args); } - catch (octave_execution_exception& e) + catch (octave::execution_exception& e) { err_user_supplied_eval (e, "lsode"); } @@ -116,7 +116,7 @@ { tmp = lsode_jac->do_multi_index_op (1, args); } - catch (octave_execution_exception& e) + catch (octave::execution_exception& e) { err_user_supplied_eval (e, "lsode"); }
--- a/libinterp/corefcn/mex.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/corefcn/mex.cc Wed Aug 17 03:41:42 2016 -0400 @@ -3069,7 +3069,7 @@ { retval = feval (fname, args, nargout); } - catch (const octave_execution_exception&) + catch (const octave::execution_exception&) { if (mex_context->trap_feval_error) recover_from_exception (); @@ -3124,7 +3124,7 @@ { ret = eval_string (s, false, parse_status, 0); } - catch (const octave_execution_exception&) + catch (const octave::execution_exception&) { recover_from_exception ();
--- a/libinterp/corefcn/oct-handle.h Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/corefcn/oct-handle.h Wed Aug 17 03:41:42 2016 -0400 @@ -48,7 +48,7 @@ { val = a.double_value (); } - catch (octave_execution_exception& e) + catch (octave::execution_exception& e) { error (e, "invalid handle"); }
--- a/libinterp/corefcn/oct-map.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/corefcn/oct-map.cc Wed Aug 17 03:41:42 2016 -0400 @@ -651,7 +651,7 @@ new_map_list[i], perm); } } - catch (octave_execution_exception& e) + catch (octave::execution_exception& e) { error (e, "cat: field names mismatch in concatenating structs"); } @@ -935,7 +935,7 @@ break; } } - catch (index_exception& e) + catch (octave::index_exception& e) { // Rethrow to allow more info to be reported later. e.set_pos_if_unset (n_idx, k+1); @@ -998,7 +998,7 @@ { rhs1 = rhs.orderfields (*this, perm); } - catch (octave_execution_exception& e) + catch (octave::execution_exception& e) { error (e, "incompatible fields in struct assignment"); } @@ -1046,7 +1046,7 @@ { rhs1 = rhs.orderfields (*this, perm); } - catch (octave_execution_exception& e) + catch (octave::execution_exception& e) { error (e, "incompatible fields in struct assignment"); } @@ -1094,7 +1094,7 @@ { rhs1 = rhs.orderfields (*this, perm); } - catch (octave_execution_exception& e) + catch (octave::execution_exception& e) { error (e, "incompatible fields in struct assignment"); } @@ -1150,7 +1150,7 @@ break; } } - catch (index_exception& e) + catch (octave::index_exception& e) { // Rethrow to allow more info to be reported later. e.set_pos_if_unset (n_idx, k+1); @@ -1269,7 +1269,7 @@ { ia(i) = idx(i).index_vector (); } - catch (index_exception& e) + catch (octave::index_exception& e) { // Rethrow to allow more info to be reported later. e.set_pos_if_unset (n_idx, i+1);
--- a/libinterp/corefcn/oct-stream.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/corefcn/oct-stream.cc Wed Aug 17 03:41:42 2016 -0400 @@ -87,7 +87,7 @@ { dval = tc.double_value (); } - catch (const octave_execution_exception&) + catch (const octave::execution_exception&) { recover_from_exception (); @@ -6464,7 +6464,7 @@ { get_size (size, nr, nc, one_elt_size_spec, "fread"); } - catch (const octave_execution_exception&) + catch (const octave::execution_exception&) { invalid_operation ("fread", "reading"); }
--- a/libinterp/corefcn/quad.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/corefcn/quad.cc Wed Aug 17 03:41:42 2016 -0400 @@ -73,7 +73,7 @@ { tmp = quad_fcn->do_multi_index_op (1, args); } - catch (octave_execution_exception& e) + catch (octave::execution_exception& e) { err_user_supplied_eval (e, "quad"); } @@ -109,7 +109,7 @@ { tmp = quad_fcn->do_multi_index_op (1, args); } - catch (octave_execution_exception& e) + catch (octave::execution_exception& e) { err_user_supplied_eval (e, "quad"); }
--- a/libinterp/corefcn/rand.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/corefcn/rand.cc Wed Aug 17 03:41:42 2016 -0400 @@ -185,7 +185,7 @@ { iv = tmp.int_vector_value (true); } - catch (octave_execution_exception& e) + catch (octave::execution_exception& e) { error (e, "%s: dimensions must be a scalar or array of integers", fcn); }
--- a/libinterp/corefcn/sparse-xdiv.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/corefcn/sparse-xdiv.cc Wed Aug 17 03:41:42 2016 -0400 @@ -44,7 +44,7 @@ static void solve_singularity_warning (double rcond) { - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); } template <typename T1, typename T2> @@ -59,7 +59,7 @@ octave_idx_type a_nc = a.cols (); octave_idx_type b_nc = b.cols (); - err_nonconformant ("operator \\", a_nr, a_nc, b_nr, b_nc); + octave::err_nonconformant ("operator \\", a_nr, a_nc, b_nr, b_nc); } return true; @@ -93,7 +93,7 @@ octave_idx_type a_nr = a.rows (); octave_idx_type b_nr = b.rows (); - err_nonconformant ("operator /", a_nr, a_nc, b_nr, b_nc); + octave::err_nonconformant ("operator /", a_nr, a_nc, b_nr, b_nc); } return true;
--- a/libinterp/corefcn/sparse-xpow.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/corefcn/sparse-xpow.cc Wed Aug 17 03:41:42 2016 -0400 @@ -416,7 +416,7 @@ return scalar_xpow (a(0), b); if (nr != b_nr || nc != b_nc) - err_nonconformant ("operator .^", nr, nc, b_nr, b_nc); + octave::err_nonconformant ("operator .^", nr, nc, b_nr, b_nc); int convert_to_complex = 0; for (octave_idx_type j = 0; j < nc; j++) @@ -518,7 +518,7 @@ return scalar_xpow (a(0), b); if (nr != b_nr || nc != b_nc) - err_nonconformant ("operator .^", nr, nc, b_nr, b_nc); + octave::err_nonconformant ("operator .^", nr, nc, b_nr, b_nc); SparseComplexMatrix result (nr, nc, Complex (1.0, 0.0)); for (octave_idx_type j = 0; j < nc; j++) @@ -658,7 +658,7 @@ return scalar_xpow (a(0), b); if (nr != b_nr || nc != b_nc) - err_nonconformant ("operator .^", nr, nc, b_nr, b_nc); + octave::err_nonconformant ("operator .^", nr, nc, b_nr, b_nc); SparseComplexMatrix result (nr, nc, Complex (1.0, 0.0)); for (octave_idx_type j = 0; j < nc; j++) @@ -725,7 +725,7 @@ return scalar_xpow (a(0), b); if (nr != b_nr || nc != b_nc) - err_nonconformant ("operator .^", nr, nc, b_nr, b_nc); + octave::err_nonconformant ("operator .^", nr, nc, b_nr, b_nc); SparseComplexMatrix result (nr, nc, Complex (1.0, 0.0)); for (octave_idx_type j = 0; j < nc; j++)
--- a/libinterp/corefcn/sparse.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/corefcn/sparse.cc Wed Aug 17 03:41:42 2016 -0400 @@ -209,7 +209,7 @@ else err_wrong_type_arg ("sparse", args(2)); } - catch (index_exception& e) + catch (octave::index_exception& e) { // Rethrow to allow more info to be reported later. e.set_pos_if_unset (2, k+1);
--- a/libinterp/corefcn/sub2ind.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/corefcn/sub2ind.cc Wed Aug 17 03:41:42 2016 -0400 @@ -112,7 +112,7 @@ if (j > 0 && args(j+1).dims () != args(1).dims ()) error ("sub2ind: all subscripts must be of the same size"); } - catch (index_exception& e) + catch (octave::index_exception& e) { e.set_pos_if_unset (nargin-1, j+1); e.set_var (); @@ -234,7 +234,7 @@ { retval = Array<octave_value> (ind2sub (dv, args(1).index_vector ())); } - catch (const index_exception& e) + catch (const octave::index_exception& e) { error ("ind2sub: Invalid index %s. %s", e.idx ().c_str (), e.details ().c_str ());
--- a/libinterp/corefcn/toplev.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/corefcn/toplev.cc Wed Aug 17 03:41:42 2016 -0400 @@ -229,7 +229,7 @@ { return_output = args(1).is_true (); } - catch (octave_execution_exception& e) + catch (octave::execution_exception& e) { error (e, "system: RETURN_OUTPUT must be boolean value true or false"); }
--- a/libinterp/corefcn/utils.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/corefcn/utils.cc Wed Aug 17 03:41:42 2016 -0400 @@ -1204,7 +1204,7 @@ retval *= jdx.length (dv(i)); } - catch (const index_exception& e) + catch (const octave::index_exception& e) { std::string idx = e.idx (); std::string msg = e.details (); @@ -1372,7 +1372,7 @@ else retval = true; } - catch (const octave_execution_exception&) + catch (const octave::execution_exception&) { recover_from_exception ();
--- a/libinterp/corefcn/variables.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/corefcn/variables.cc Wed Aug 17 03:41:42 2016 -0400 @@ -284,7 +284,7 @@ && (tmp.is_map () || tmp.is_java () || tmp.is_classdef_object ())) names = tmp.map_keys (); } - catch (const octave_execution_exception&) + catch (const octave::execution_exception&) { recover_from_exception (); }
--- a/libinterp/corefcn/xdiv.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/corefcn/xdiv.cc Wed Aug 17 03:41:42 2016 -0400 @@ -59,7 +59,7 @@ static void solve_singularity_warning (double rcond) { - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); } template <typename T1, typename T2> @@ -75,7 +75,7 @@ : a.rows (); octave_idx_type b_nc = b.cols (); - err_nonconformant ("operator \\", a_nr, a_nc, b_nr, b_nc); + octave::err_nonconformant ("operator \\", a_nr, a_nc, b_nr, b_nc); } return true; @@ -101,7 +101,7 @@ octave_idx_type a_nr = a.rows (); octave_idx_type b_nr = b.rows (); - err_nonconformant ("operator /", a_nr, a_nc, b_nr, b_nc); + octave::err_nonconformant ("operator /", a_nr, a_nc, b_nr, b_nc); } return true; @@ -403,7 +403,7 @@ static void solve_singularity_warning (float rcond) { - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); } INSTANTIATE_MX_LEFTDIV_CONFORM (FloatMatrix, FloatMatrix);
--- a/libinterp/corefcn/xpow.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/corefcn/xpow.cc Wed Aug 17 03:41:42 2016 -0400 @@ -141,7 +141,7 @@ else retval = C; } - catch (const octave_execution_exception&) + catch (const octave::execution_exception&) { err_failed_diagonalization (); } @@ -188,7 +188,7 @@ retval = ComplexMatrix (Q * D * Q.inverse ()); } - catch (const octave_execution_exception&) + catch (const octave::execution_exception&) { err_failed_diagonalization (); } @@ -271,7 +271,7 @@ retval = ComplexMatrix (Q * D * Q.inverse ()); } - catch (const octave_execution_exception&) + catch (const octave::execution_exception&) { err_failed_diagonalization (); } @@ -347,7 +347,7 @@ retval = ComplexMatrix (Q * D * Q.inverse ()); } - catch (const octave_execution_exception&) + catch (const octave::execution_exception&) { err_failed_diagonalization (); } @@ -400,7 +400,7 @@ retval = ComplexMatrix (Q * D * Q.inverse ()); } - catch (const octave_execution_exception&) + catch (const octave::execution_exception&) { err_failed_diagonalization (); } @@ -448,7 +448,7 @@ retval = ComplexMatrix (Q * D * Q.inverse ()); } - catch (const octave_execution_exception&) + catch (const octave::execution_exception&) { err_failed_diagonalization (); } @@ -531,7 +531,7 @@ retval = ComplexMatrix (Q * D * Q.inverse ()); } - catch (const octave_execution_exception&) + catch (const octave::execution_exception&) { err_failed_diagonalization (); } @@ -566,7 +566,7 @@ retval = ComplexMatrix (Q * D * Q.inverse ()); } - catch (const octave_execution_exception&) + catch (const octave::execution_exception&) { err_failed_diagonalization (); } @@ -796,7 +796,7 @@ octave_idx_type b_nc = b.cols (); if (nr != b_nr || nc != b_nc) - err_nonconformant ("operator .^", nr, nc, b_nr, b_nc); + octave::err_nonconformant ("operator .^", nr, nc, b_nr, b_nc); int convert_to_complex = 0; for (octave_idx_type j = 0; j < nc; j++) @@ -876,7 +876,7 @@ octave_idx_type b_nc = b.cols (); if (nr != b_nr || nc != b_nc) - err_nonconformant ("operator .^", nr, nc, b_nr, b_nc); + octave::err_nonconformant ("operator .^", nr, nc, b_nr, b_nc); ComplexMatrix result (nr, nc); @@ -1013,7 +1013,7 @@ octave_idx_type b_nc = b.cols (); if (nr != b_nr || nc != b_nc) - err_nonconformant ("operator .^", nr, nc, b_nr, b_nc); + octave::err_nonconformant ("operator .^", nr, nc, b_nr, b_nc); ComplexMatrix result (nr, nc); @@ -1061,7 +1061,7 @@ octave_idx_type b_nc = b.cols (); if (nr != b_nr || nc != b_nc) - err_nonconformant ("operator .^", nr, nc, b_nr, b_nc); + octave::err_nonconformant ("operator .^", nr, nc, b_nr, b_nc); ComplexMatrix result (nr, nc); @@ -1233,7 +1233,7 @@ if (a_dims != b_dims) { if (! is_valid_bsxfun ("operator .^", a_dims, b_dims)) - err_nonconformant ("operator .^", a_dims, b_dims); + octave::err_nonconformant ("operator .^", a_dims, b_dims); //Potentially complex results NDArray xa = octave_value_extract<NDArray> (a); @@ -1316,7 +1316,7 @@ if (a_dims != b_dims) { if (! is_valid_bsxfun ("operator .^", a_dims, b_dims)) - err_nonconformant ("operator .^", a_dims, b_dims); + octave::err_nonconformant ("operator .^", a_dims, b_dims); return bsxfun_pow (a, b); } @@ -1410,7 +1410,7 @@ if (a_dims != b_dims) { if (! is_valid_bsxfun ("operator .^", a_dims, b_dims)) - err_nonconformant ("operator .^", a_dims, b_dims); + octave::err_nonconformant ("operator .^", a_dims, b_dims); return bsxfun_pow (a, b); } @@ -1455,7 +1455,7 @@ if (a_dims != b_dims) { if (! is_valid_bsxfun ("operator .^", a_dims, b_dims)) - err_nonconformant ("operator .^", a_dims, b_dims); + octave::err_nonconformant ("operator .^", a_dims, b_dims); return bsxfun_pow (a, b); } @@ -1546,7 +1546,7 @@ else retval = C; } - catch (const octave_execution_exception&) + catch (const octave::execution_exception&) { err_failed_diagonalization (); } @@ -1593,7 +1593,7 @@ retval = FloatComplexMatrix (Q * D * Q.inverse ()); } - catch (const octave_execution_exception&) + catch (const octave::execution_exception&) { err_failed_diagonalization (); } @@ -1676,7 +1676,7 @@ retval = FloatComplexMatrix (Q * D * Q.inverse ()); } - catch (const octave_execution_exception&) + catch (const octave::execution_exception&) { err_failed_diagonalization (); } @@ -1742,7 +1742,7 @@ retval = FloatComplexMatrix (Q * D * Q.inverse ()); } - catch (const octave_execution_exception&) + catch (const octave::execution_exception&) { err_failed_diagonalization (); } @@ -1795,7 +1795,7 @@ retval = FloatComplexMatrix (Q * D * Q.inverse ()); } - catch (const octave_execution_exception&) + catch (const octave::execution_exception&) { err_failed_diagonalization (); } @@ -1843,7 +1843,7 @@ retval = FloatComplexMatrix (Q * D * Q.inverse ()); } - catch (const octave_execution_exception&) + catch (const octave::execution_exception&) { err_failed_diagonalization (); } @@ -1926,7 +1926,7 @@ retval = FloatComplexMatrix (Q * D * Q.inverse ()); } - catch (const octave_execution_exception&) + catch (const octave::execution_exception&) { err_failed_diagonalization (); } @@ -1961,7 +1961,7 @@ retval = FloatComplexMatrix (Q * D * Q.inverse ()); } - catch (const octave_execution_exception&) + catch (const octave::execution_exception&) { err_failed_diagonalization (); } @@ -2147,7 +2147,7 @@ octave_idx_type b_nc = b.cols (); if (nr != b_nr || nc != b_nc) - err_nonconformant ("operator .^", nr, nc, b_nr, b_nc); + octave::err_nonconformant ("operator .^", nr, nc, b_nr, b_nc); int convert_to_complex = 0; for (octave_idx_type j = 0; j < nc; j++) @@ -2227,7 +2227,7 @@ octave_idx_type b_nc = b.cols (); if (nr != b_nr || nc != b_nc) - err_nonconformant ("operator .^", nr, nc, b_nr, b_nc); + octave::err_nonconformant ("operator .^", nr, nc, b_nr, b_nc); FloatComplexMatrix result (nr, nc); @@ -2325,7 +2325,7 @@ octave_idx_type b_nc = b.cols (); if (nr != b_nr || nc != b_nc) - err_nonconformant ("operator .^", nr, nc, b_nr, b_nc); + octave::err_nonconformant ("operator .^", nr, nc, b_nr, b_nc); FloatComplexMatrix result (nr, nc); @@ -2373,7 +2373,7 @@ octave_idx_type b_nc = b.cols (); if (nr != b_nr || nc != b_nc) - err_nonconformant ("operator .^", nr, nc, b_nr, b_nc); + octave::err_nonconformant ("operator .^", nr, nc, b_nr, b_nc); FloatComplexMatrix result (nr, nc); @@ -2545,7 +2545,7 @@ if (a_dims != b_dims) { if (! is_valid_bsxfun ("operator .^", a_dims, b_dims)) - err_nonconformant ("operator .^", a_dims, b_dims); + octave::err_nonconformant ("operator .^", a_dims, b_dims); //Potentially complex results FloatNDArray xa = octave_value_extract<FloatNDArray> (a); @@ -2628,7 +2628,7 @@ if (a_dims != b_dims) { if (! is_valid_bsxfun ("operator .^", a_dims, b_dims)) - err_nonconformant ("operator .^", a_dims, b_dims); + octave::err_nonconformant ("operator .^", a_dims, b_dims); return bsxfun_pow (a, b); } @@ -2722,7 +2722,7 @@ if (a_dims != b_dims) { if (! is_valid_bsxfun ("operator .^", a_dims, b_dims)) - err_nonconformant ("operator .^", a_dims, b_dims); + octave::err_nonconformant ("operator .^", a_dims, b_dims); return bsxfun_pow (a, b); } @@ -2767,7 +2767,7 @@ if (a_dims != b_dims) { if (! is_valid_bsxfun ("operator .^", a_dims, b_dims)) - err_nonconformant ("operator .^", a_dims, b_dims); + octave::err_nonconformant ("operator .^", a_dims, b_dims); return bsxfun_pow (a, b); }
--- a/libinterp/dldfcn/__eigs__.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/dldfcn/__eigs__.cc Wed Aug 17 03:41:42 2016 -0400 @@ -63,7 +63,7 @@ { tmp = eigs_fcn->do_multi_index_op (1, args); } - catch (octave_execution_exception& e) + catch (octave::execution_exception& e) { err_user_supplied_eval (e, "eigs"); } @@ -103,7 +103,7 @@ { tmp = eigs_fcn->do_multi_index_op (1, args); } - catch (octave_execution_exception& e) + catch (octave::execution_exception& e) { err_user_supplied_eval (e, "eigs"); }
--- a/libinterp/dldfcn/__init_gnuplot__.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/dldfcn/__init_gnuplot__.cc Wed Aug 17 03:41:42 2016 -0400 @@ -198,7 +198,7 @@ retval = fs.exists (); } } - catch (octave_execution_exception&) + catch (octave::execution_exception&) { }
--- a/libinterp/octave-value/ov-base-diag.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/octave-value/ov-base-diag.cc Wed Aug 17 03:41:42 2016 -0400 @@ -128,7 +128,7 @@ retval = to_dense ().do_index_op (idx, resize_ok); } } - catch (index_exception& e) + catch (octave::index_exception& e) { // Rethrow to allow more info to be reported later. e.set_pos_if_unset (2, k+1); @@ -192,7 +192,7 @@ dense_cache = octave_value (); } } - catch (index_exception& e) + catch (octave::index_exception& e) { // Rethrow to allow more info to be reported later. e.set_pos_if_unset (2, k+1); @@ -220,7 +220,7 @@ dense_cache = octave_value (); } } - catch (index_exception& e) + catch (octave::index_exception& e) { // Rethrow to allow more info to be reported later. e.set_pos_if_unset (2, k+1);
--- a/libinterp/octave-value/ov-base-mat.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/octave-value/ov-base-mat.cc Wed Aug 17 03:41:42 2016 -0400 @@ -199,7 +199,7 @@ break; } } - catch (index_exception& e) + catch (octave::index_exception& e) { // Rethrow to allow more info to be reported later. e.set_pos_if_unset (n_idx, k+1); @@ -260,9 +260,9 @@ break; } } - catch (const index_exception& e) + catch (const octave::index_exception& e) { - err_invalid_index (e.idx (), n_idx, k+1); + octave::err_invalid_index (e.idx (), n_idx, k+1); } // Clear cache. @@ -364,9 +364,9 @@ break; } } - catch (const index_exception& e) + catch (const octave::index_exception& e) { - err_invalid_index (e.idx (), n_idx, k+1); + octave::err_invalid_index (e.idx (), n_idx, k+1); } // Clear cache. @@ -416,7 +416,7 @@ MT t1 (matrix.reshape (dim_vector (nel, 1))); if (t1.any_element_is_nan ()) - err_nan_to_logical_conversion (); + octave::err_nan_to_logical_conversion (); if (nel > 1) warn_array_as_logical (dv);
--- a/libinterp/octave-value/ov-base-scalar.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/octave-value/ov-base-scalar.cc Wed Aug 17 03:41:42 2016 -0400 @@ -142,7 +142,7 @@ octave_base_scalar<ST>::is_true (void) const { if (octave::math::isnan (scalar)) - err_nan_to_logical_conversion (); + octave::err_nan_to_logical_conversion (); return (scalar != ST ()); }
--- a/libinterp/octave-value/ov-base-sparse.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/octave-value/ov-base-sparse.cc Wed Aug 17 03:41:42 2016 -0400 @@ -93,7 +93,7 @@ error ("sparse indexing needs 1 or 2 indices"); } } - catch (index_exception& e) + catch (octave::index_exception& e) { // Rethrow to allow more info to be reported later. e.set_pos_if_unset (n_idx, k+1); @@ -218,7 +218,7 @@ error ("sparse indexing needs 1 or 2 indices"); } } - catch (index_exception& e) + catch (octave::index_exception& e) { // Rethrow to allow more info to be reported later. e.set_pos_if_unset (len, k+1); @@ -270,7 +270,7 @@ error ("sparse indexing needs 1 or 2 indices"); } } - catch (index_exception& e) + catch (octave::index_exception& e) { // Rethrow to allow more info to be reported later. e.set_pos_if_unset (len, k+1); @@ -304,7 +304,7 @@ T t1 (matrix.reshape (dim_vector (nel, 1))); if (t1.any_element_is_nan ()) - err_nan_to_logical_conversion (); + octave::err_nan_to_logical_conversion (); if (nel > 1) warn_array_as_logical (dv);
--- a/libinterp/octave-value/ov-base.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/octave-value/ov-base.cc Wed Aug 17 03:41:42 2016 -0400 @@ -274,7 +274,7 @@ octave_base_value::index_vector (bool /* require_integers */) const { std::string nm = "<" + type_name () + ">"; - err_invalid_index (nm.c_str ()); + octave::err_invalid_index (nm.c_str ()); } octave_value @@ -507,7 +507,7 @@ { \ d = double_value (frc_str_conv); \ } \ - catch (octave_execution_exception& e) \ + catch (octave::execution_exception& e) \ { \ err_wrong_type_arg (e, "octave_base_value::" #F "_value ()", type_name ()); \ } \ @@ -545,7 +545,7 @@ { d = double_value (frc_str_conv); } - catch (octave_execution_exception& e) + catch (octave::execution_exception& e) { err_wrong_type_arg (e, "octave_base_value::nint_value ()", type_name ()); }
--- a/libinterp/octave-value/ov-class.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/octave-value/ov-class.cc Wed Aug 17 03:41:42 2016 -0400 @@ -1092,7 +1092,7 @@ { result = ctor.do_multi_index_op (1, octave_value_list ()); } - catch (const octave_execution_exception&) + catch (const octave::execution_exception&) { recover_from_exception ();
--- a/libinterp/octave-value/ov-classdef.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/octave-value/ov-classdef.cc Wed Aug 17 03:41:42 2016 -0400 @@ -1521,7 +1521,7 @@ { iv(i) = ival(i).index_vector (); } - catch (index_exception& e) + catch (octave::index_exception& e) { // Rethrow to allow more info to be reported later. e.set_pos_if_unset (ival.length (), i+1); @@ -1617,7 +1617,7 @@ { iv(i) = ival(i).index_vector (); } - catch (index_exception& e) + catch (octave::index_exception& e) { e.set_pos_if_unset (ival.length (), i+1); throw; // var name set in pt-idx.cc / pt-assign.cc @@ -1661,7 +1661,7 @@ { iv(i) = ival(i).index_vector (); } - catch (index_exception& e) + catch (octave::index_exception& e) { // Rethrow to allow more info to be reported later. e.set_pos_if_unset (ival.length (), i+1);
--- a/libinterp/octave-value/ov-complex.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/octave-value/ov-complex.cc Wed Aug 17 03:41:42 2016 -0400 @@ -61,28 +61,31 @@ DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_complex, "complex scalar", "double"); -// Complain if a complex value is used as a subscript. - -class complex_index_exception : public index_exception +namespace octave { -public: + // Complain if a complex value is used as a subscript. - complex_index_exception (const std::string& value) - : index_exception (value) { } + class complex_index_exception : public index_exception + { + public: - ~complex_index_exception (void) { } + complex_index_exception (const std::string& value) + : index_exception (value) { } + + ~complex_index_exception (void) { } - std::string details (void) const - { - return "subscripts must be real (forgot to initialize i or j?)"; - } + std::string details (void) const + { + return "subscripts must be real (forgot to initialize i or j?)"; + } - // ID of error to throw. - const char *err_id (void) const - { - return "Octave:invalid-index"; - } -}; + // ID of error to throw. + const char *err_id (void) const + { + return "Octave:invalid-index"; + } + }; +} static octave_base_value * default_numeric_demotion_function (const octave_base_value& a) @@ -137,7 +140,7 @@ { std::ostringstream buf; buf << scalar.real () << std::showpos << scalar.imag () << "i"; - complex_index_exception e (buf.str ()); + octave::complex_index_exception e (buf.str ()); throw e; }
--- a/libinterp/octave-value/ov-complex.h Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/octave-value/ov-complex.h Wed Aug 17 03:41:42 2016 -0400 @@ -141,7 +141,7 @@ bool bool_value (bool warn = false) const { if (octave::math::isnan (scalar)) - err_nan_to_logical_conversion (); + octave::err_nan_to_logical_conversion (); if (warn && scalar != 0.0 && scalar != 1.0) warn_logical_conversion (); @@ -151,7 +151,7 @@ boolNDArray bool_array_value (bool warn = false) const { if (octave::math::isnan (scalar)) - err_nan_to_logical_conversion (); + octave::err_nan_to_logical_conversion (); if (warn && scalar != 0.0 && scalar != 1.0) warn_logical_conversion ();
--- a/libinterp/octave-value/ov-cx-mat.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/octave-value/ov-cx-mat.cc Wed Aug 17 03:41:42 2016 -0400 @@ -236,7 +236,7 @@ octave_complex_matrix::bool_array_value (bool warn) const { if (matrix.any_element_is_nan ()) - err_nan_to_logical_conversion (); + octave::err_nan_to_logical_conversion (); if (warn && (! matrix.all_elements_are_real () || real (matrix).any_element_not_one_or_zero ())) warn_logical_conversion ();
--- a/libinterp/octave-value/ov-cx-sparse.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/octave-value/ov-cx-sparse.cc Wed Aug 17 03:41:42 2016 -0400 @@ -213,7 +213,7 @@ octave_sparse_complex_matrix::sparse_bool_matrix_value (bool warn) const { if (matrix.any_element_is_nan ()) - err_nan_to_logical_conversion (); + octave::err_nan_to_logical_conversion (); if (warn && (! matrix.all_elements_are_real () || real (matrix).any_element_not_one_or_zero ())) warn_logical_conversion ();
--- a/libinterp/octave-value/ov-fcn-handle.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/octave-value/ov-fcn-handle.cc Wed Aug 17 03:41:42 2016 -0400 @@ -2047,7 +2047,7 @@ { root_val = make_fcn_handle (head_name); } - catch (const octave_execution_exception&) + catch (const octave::execution_exception&) { recover_from_exception ();
--- a/libinterp/octave-value/ov-float.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/octave-value/ov-float.cc Wed Aug 17 03:41:42 2016 -0400 @@ -173,7 +173,7 @@ octave_value retval; if (octave::math::isnan (scalar)) - err_nan_to_character_conversion (); + octave::err_nan_to_character_conversion (); int ival = octave::math::nint (scalar);
--- a/libinterp/octave-value/ov-float.h Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/octave-value/ov-float.h Wed Aug 17 03:41:42 2016 -0400 @@ -201,7 +201,7 @@ bool bool_value (bool warn = false) const { if (octave::math::isnan (scalar)) - err_nan_to_logical_conversion (); + octave::err_nan_to_logical_conversion (); if (warn && scalar != 0 && scalar != 1) warn_logical_conversion (); @@ -211,7 +211,7 @@ boolNDArray bool_array_value (bool warn = false) const { if (octave::math::isnan (scalar)) - err_nan_to_logical_conversion (); + octave::err_nan_to_logical_conversion (); if (warn && scalar != 0 && scalar != 1) warn_logical_conversion ();
--- a/libinterp/octave-value/ov-flt-complex.h Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/octave-value/ov-flt-complex.h Wed Aug 17 03:41:42 2016 -0400 @@ -137,7 +137,7 @@ bool bool_value (bool warn = false) const { if (octave::math::isnan (scalar)) - err_nan_to_logical_conversion (); + octave::err_nan_to_logical_conversion (); if (warn && scalar != 0.0f && scalar != 1.0f) warn_logical_conversion (); @@ -147,7 +147,7 @@ boolNDArray bool_array_value (bool warn = false) const { if (octave::math::isnan (scalar)) - err_nan_to_logical_conversion (); + octave::err_nan_to_logical_conversion (); if (warn && scalar != 0.0f && scalar != 1.0f) warn_logical_conversion ();
--- a/libinterp/octave-value/ov-flt-cx-mat.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/octave-value/ov-flt-cx-mat.cc Wed Aug 17 03:41:42 2016 -0400 @@ -210,7 +210,7 @@ octave_float_complex_matrix::bool_array_value (bool warn) const { if (matrix.any_element_is_nan ()) - err_nan_to_logical_conversion (); + octave::err_nan_to_logical_conversion (); if (warn && (! matrix.all_elements_are_real () || real (matrix).any_element_not_one_or_zero ())) warn_logical_conversion ();
--- a/libinterp/octave-value/ov-flt-re-mat.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/octave-value/ov-flt-re-mat.cc Wed Aug 17 03:41:42 2016 -0400 @@ -214,7 +214,7 @@ octave_float_matrix::bool_array_value (bool warn) const { if (matrix.any_element_is_nan ()) - err_nan_to_logical_conversion (); + octave::err_nan_to_logical_conversion (); if (warn && matrix.any_element_not_one_or_zero ()) warn_logical_conversion (); @@ -352,7 +352,7 @@ float d = matrix(i); if (octave::math::isnan (d)) - err_nan_to_character_conversion (); + octave::err_nan_to_character_conversion (); int ival = octave::math::nint (d);
--- a/libinterp/octave-value/ov-java.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/octave-value/ov-java.cc Wed Aug 17 03:41:42 2016 -0400 @@ -946,7 +946,7 @@ check_exception (jni_env); } - catch (index_exception& e) + catch (octave::index_exception& e) { // Rethrow to allow more info to be reported later. e.set_pos_if_unset (idx.length (), i+1);
--- a/libinterp/octave-value/ov-oncleanup.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/octave-value/ov-oncleanup.cc Wed Aug 17 03:41:42 2016 -0400 @@ -83,13 +83,13 @@ // Run the actual code. fcn.do_multi_index_op (0, octave_value_list ()); } - catch (const octave_interrupt_exception&) + catch (const octave::interrupt_exception&) { recover_from_exception (); warning ("onCleanup: interrupt occurred in cleanup action"); } - catch (const octave_execution_exception&) + catch (const octave::execution_exception&) { std::string msg = last_error_message (); warning ("onCleanup: error caught while executing cleanup function:\n%s\n",
--- a/libinterp/octave-value/ov-perm.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/octave-value/ov-perm.cc Wed Aug 17 03:41:42 2016 -0400 @@ -81,7 +81,7 @@ k = 1; idx1 = idx(1).index_vector (); } - catch (index_exception& e) + catch (octave::index_exception& e) { // Rethrow to allow more info to be reported later. e.set_pos_if_unset (2, k+1);
--- a/libinterp/octave-value/ov-range.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/octave-value/ov-range.cc Wed Aug 17 03:41:42 2016 -0400 @@ -148,7 +148,7 @@ else retval = range.index (i); } - catch (index_exception& e) + catch (octave::index_exception& e) { // More info may be added later before displaying error. @@ -358,7 +358,7 @@ Matrix m = range.matrix_value (); if (m.any_element_is_nan ()) - err_nan_to_logical_conversion (); + octave::err_nan_to_logical_conversion (); if (warn && m.any_element_not_one_or_zero ()) warn_logical_conversion ();
--- a/libinterp/octave-value/ov-re-diag.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/octave-value/ov-re-diag.cc Wed Aug 17 03:41:42 2016 -0400 @@ -119,7 +119,7 @@ } } } - catch (index_exception& e) + catch (octave::index_exception& e) { // Rethrow to allow more info to be reported later. e.set_pos_if_unset (2, k+1);
--- a/libinterp/octave-value/ov-re-mat.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/octave-value/ov-re-mat.cc Wed Aug 17 03:41:42 2016 -0400 @@ -223,7 +223,7 @@ octave_matrix::bool_array_value (bool warn) const { if (matrix.any_element_is_nan ()) - err_nan_to_logical_conversion (); + octave::err_nan_to_logical_conversion (); if (warn && matrix.any_element_not_one_or_zero ()) warn_logical_conversion (); @@ -454,7 +454,7 @@ double d = matrix(i); if (octave::math::isnan (d)) - err_nan_to_character_conversion (); + octave::err_nan_to_character_conversion (); int ival = octave::math::nint (d);
--- a/libinterp/octave-value/ov-re-sparse.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/octave-value/ov-re-sparse.cc Wed Aug 17 03:41:42 2016 -0400 @@ -62,7 +62,7 @@ else { std::string nm = "<" + type_name () + ">"; - err_invalid_index (nm.c_str ()); + octave::err_invalid_index (nm.c_str ()); } } @@ -141,7 +141,7 @@ NDArray m = matrix.matrix_value (); if (m.any_element_is_nan ()) - err_nan_to_logical_conversion (); + octave::err_nan_to_logical_conversion (); if (warn && m.any_element_not_one_or_zero ()) warn_logical_conversion (); @@ -184,7 +184,7 @@ octave_sparse_matrix::sparse_bool_matrix_value (bool warn) const { if (matrix.any_element_is_nan ()) - err_nan_to_logical_conversion (); + octave::err_nan_to_logical_conversion (); if (warn && matrix.any_element_not_one_or_zero ()) warn_logical_conversion (); @@ -220,7 +220,7 @@ double d = matrix.data (i); if (octave::math::isnan (d)) - err_nan_to_character_conversion (); + octave::err_nan_to_character_conversion (); int ival = octave::math::nint (d);
--- a/libinterp/octave-value/ov-scalar.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/octave-value/ov-scalar.cc Wed Aug 17 03:41:42 2016 -0400 @@ -192,7 +192,7 @@ octave_value retval; if (octave::math::isnan (scalar)) - err_nan_to_character_conversion (); + octave::err_nan_to_character_conversion (); int ival = octave::math::nint (scalar);
--- a/libinterp/octave-value/ov-scalar.h Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/octave-value/ov-scalar.h Wed Aug 17 03:41:42 2016 -0400 @@ -200,7 +200,7 @@ bool bool_value (bool warn = false) const { if (octave::math::isnan (scalar)) - err_nan_to_logical_conversion (); + octave::err_nan_to_logical_conversion (); if (warn && scalar != 0 && scalar != 1) warn_logical_conversion (); @@ -210,7 +210,7 @@ boolNDArray bool_array_value (bool warn = false) const { if (octave::math::isnan (scalar)) - err_nan_to_logical_conversion (); + octave::err_nan_to_logical_conversion (); if (warn && scalar != 0 && scalar != 1) warn_logical_conversion ();
--- a/libinterp/octave-value/ov-str-mat.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/octave-value/ov-str-mat.cc Wed Aug 17 03:41:42 2016 -0400 @@ -139,7 +139,7 @@ break; } } - catch (index_exception& e) + catch (octave::index_exception& e) { // Rethrow to allow more info to be reported later. e.set_pos_if_unset (len, k+1);
--- a/libinterp/octave-value/ov.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/octave-value/ov.cc Wed Aug 17 03:41:42 2016 -0400 @@ -2042,7 +2042,7 @@ { \ retval = FCN (); \ } \ - catch (octave_execution_exception& e) \ + catch (octave::execution_exception& e) \ { \ if (fmt) \ { \ @@ -2588,7 +2588,7 @@ { m_base = base.matrix_value (true); } - catch (octave_execution_exception& e) + catch (octave::execution_exception& e) { error (e, "invalid base value in colon expression"); } @@ -2597,7 +2597,7 @@ { m_limit = limit.matrix_value (true); } - catch (octave_execution_exception& e) + catch (octave::execution_exception& e) { error (e, "invalid limit value in colon expression"); } @@ -2608,7 +2608,7 @@ ? increment.matrix_value (true) : Matrix (1, 1, 1.0)); } - catch (octave_execution_exception& e) + catch (octave::execution_exception& e) { error (e, "invalid increment value in colon expression"); }
--- a/libinterp/operators/op-cs-cs.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/operators/op-cs-cs.cc Wed Aug 17 03:41:42 2016 -0400 @@ -45,7 +45,7 @@ const octave_complex& v = dynamic_cast<const octave_complex&> (a); Complex x = v.complex_value (); if (octave::math::isnan (x)) - err_nan_to_logical_conversion (); + octave::err_nan_to_logical_conversion (); return octave_value (x == 0.0); }
--- a/libinterp/operators/op-fcs-fcs.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/operators/op-fcs-fcs.cc Wed Aug 17 03:41:42 2016 -0400 @@ -43,7 +43,7 @@ const octave_float_complex& v = dynamic_cast<const octave_float_complex&> (a); FloatComplex x = v.float_complex_value (); if (octave::math::isnan (x)) - err_nan_to_logical_conversion (); + octave::err_nan_to_logical_conversion (); return octave_value (x == 0.0f); }
--- a/libinterp/operators/op-fs-fs.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/operators/op-fs-fs.cc Wed Aug 17 03:41:42 2016 -0400 @@ -45,7 +45,7 @@ const octave_float_scalar& v = dynamic_cast<const octave_float_scalar&> (a); float x = v.float_value (); if (octave::math::isnan (x)) - err_nan_to_logical_conversion (); + octave::err_nan_to_logical_conversion (); return octave_value (x == 0.0f); }
--- a/libinterp/operators/op-int.h Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/operators/op-int.h Wed Aug 17 03:41:42 2016 -0400 @@ -731,7 +731,7 @@ if (a_dims != b_dims) \ { \ if (! is_valid_bsxfun ("operator .^", a_dims, b_dims)) \ - err_nonconformant ("operator .^", a_dims, b_dims); \ + octave::err_nonconformant ("operator .^", a_dims, b_dims); \ \ return bsxfun_pow (a, b); \ } \ @@ -752,7 +752,7 @@ if (a_dims != b_dims) \ { \ if (! is_valid_bsxfun ("operator .^", a_dims, b_dims)) \ - err_nonconformant ("operator .^", a_dims, b_dims); \ + octave::err_nonconformant ("operator .^", a_dims, b_dims); \ \ return bsxfun_pow (a, b); \ } \ @@ -773,7 +773,7 @@ if (a_dims != b_dims) \ { \ if (! is_valid_bsxfun ("operator .^", a_dims, b_dims)) \ - err_nonconformant ("operator .^", a_dims, b_dims); \ + octave::err_nonconformant ("operator .^", a_dims, b_dims); \ \ return bsxfun_pow (a, b); \ } \ @@ -794,7 +794,7 @@ if (a_dims != b_dims) \ { \ if (! is_valid_bsxfun ("operator .^", a_dims, b_dims)) \ - err_nonconformant ("operator .^", a_dims, b_dims); \ + octave::err_nonconformant ("operator .^", a_dims, b_dims); \ \ return bsxfun_pow (a, b); \ } \ @@ -815,7 +815,7 @@ if (a_dims != b_dims) \ { \ if (! is_valid_bsxfun ("operator .^", a_dims, b_dims)) \ - err_nonconformant ("operator .^", a_dims, b_dims); \ + octave::err_nonconformant ("operator .^", a_dims, b_dims); \ \ return bsxfun_pow (a, b); \ } \
--- a/libinterp/operators/op-s-s.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/operators/op-s-s.cc Wed Aug 17 03:41:42 2016 -0400 @@ -46,7 +46,7 @@ const octave_scalar& v = dynamic_cast<const octave_scalar&> (a); double x = v.scalar_value (); if (octave::math::isnan (x)) - err_nan_to_logical_conversion (); + octave::err_nan_to_logical_conversion (); return octave_value (x == 0.0); }
--- a/libinterp/operators/ops.h Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/operators/ops.h Wed Aug 17 03:41:42 2016 -0400 @@ -260,7 +260,7 @@ const CONCAT2 (octave_, t2)& v2 = dynamic_cast<const CONCAT2 (octave_, t2)&> (a2); \ \ if (octave::math::isnan (v1.CONCAT2 (t1, _value) ()) || octave::math::isnan (v2.CONCAT2 (t2, _value) ())) \ - err_nan_to_logical_conversion (); \ + octave::err_nan_to_logical_conversion (); \ \ return octave_value \ (v1.CONCAT2 (t1, _value) () op v2.CONCAT2 (t2, _value) ()); \
--- a/libinterp/parse-tree/oct-parse.in.yy Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/parse-tree/oct-parse.in.yy Wed Aug 17 03:41:42 2016 -0400 @@ -2248,7 +2248,7 @@ retval = tc_retval; } - catch (const octave_execution_exception&) + catch (const octave::execution_exception&) { recover_from_exception (); } @@ -3865,7 +3865,7 @@ retval = tc_retval; } - catch (const octave_execution_exception&) + catch (const octave::execution_exception&) { recover_from_exception (); } @@ -4032,7 +4032,7 @@ { status = octave_pull_parse (pstate, *this); } - catch (octave_execution_exception& e) + catch (octave::execution_exception& e) { std::string file = lexer.fcn_file_full_name; @@ -4041,7 +4041,7 @@ else error (e, "parse error in %s", file.c_str ()); } - catch (octave_interrupt_exception &) + catch (octave::interrupt_exception &) { throw; } @@ -4092,7 +4092,7 @@ { status = octave_push_parse (pstate, token, &lval, *this); } - catch (octave_execution_exception& e) + catch (octave::execution_exception& e) { std::string file = lexer.fcn_file_full_name; @@ -4101,7 +4101,7 @@ else error (e, "parse error in %s", file.c_str ()); } - catch (octave_interrupt_exception &) + catch (octave::interrupt_exception &) { throw; } @@ -4631,7 +4631,7 @@ fcn = parse_fcn_file (file_full_name, file_name, "", "", require_file, true, false, false, warn_for); } - catch (octave_execution_exception& e) + catch (octave::execution_exception& e) { error (e, "source: error sourcing file '%s'", file_full_name.c_str ()); @@ -4791,7 +4791,7 @@ { maybe_missing_function_hook (name); } - catch (octave_execution_exception& e) + catch (octave::execution_exception& e) { error (e, "feval: function '%s' not found", name.c_str ()); } @@ -5115,7 +5115,7 @@ { tmp = eval_string (args(0), nargout > 0, parse_status, nargout); } - catch (const octave_execution_exception&) + catch (const octave::execution_exception&) { recover_from_exception (); @@ -5285,7 +5285,7 @@ tmp = eval_string (args(1), nargout > 0, parse_status, nargout); } - catch (const octave_execution_exception&) + catch (const octave::execution_exception&) { recover_from_exception (); @@ -5370,12 +5370,12 @@ octave_value_list retval; int eval_nargout = std::max (0, nargout - 1); - const octave_execution_exception* eval_exception = 0; + const octave::execution_exception* eval_exception = 0; try { retval = Feval (args, eval_nargout); } - catch (const octave_execution_exception& e) + catch (const octave::execution_exception& e) { // hold back exception from eval until we have restored streams eval_exception = &e;
--- a/libinterp/parse-tree/pt-assign.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/parse-tree/pt-assign.cc Wed Aug 17 03:41:42 2016 -0400 @@ -121,7 +121,7 @@ lhs->name ()); } } - catch (index_exception& e) + catch (octave::index_exception& e) { e.set_var (lhs->name ()); std::string msg = e.message ();
--- a/libinterp/parse-tree/pt-eval.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/parse-tree/pt-eval.cc Wed Aug 17 03:41:42 2016 -0400 @@ -840,7 +840,7 @@ try_code->accept (*this); in_try_catch--; } - catch (const octave_execution_exception&) + catch (const octave::execution_exception&) { recover_from_exception (); @@ -912,7 +912,7 @@ if (list) list->accept (*this); } - catch (const octave_execution_exception&) + catch (const octave::execution_exception&) { recover_from_exception (); @@ -972,7 +972,7 @@ { unwind_protect_code->accept (*this); } - catch (const octave_execution_exception&) + catch (const octave::execution_exception&) { // FIXME: Maybe we should be able to temporarily set the // interpreter's exception handling state to something "safe"
--- a/libinterp/parse-tree/pt-idx.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/parse-tree/pt-idx.cc Wed Aug 17 03:41:42 2016 -0400 @@ -274,7 +274,7 @@ // be needed by pt-lvalue, which calls subsref?) static void -final_index_error (index_exception& e, const tree_expression *expr) +final_index_error (octave::index_exception& e, const tree_expression *expr) { if (expr->is_identifier () && dynamic_cast<const tree_identifier *> (expr)->is_variable ()) @@ -386,7 +386,7 @@ } } } - catch (index_exception& e) // problems with index range, type etc. + catch (octave::index_exception& e) // problems with index range, type etc. { final_index_error (e, expr); } @@ -428,7 +428,7 @@ retval = tmp.subsref (type.substr (tmpi, n - tmpi), idx, nargout, lvalue_list); } - catch (index_exception& e) // problems with range, invalid index type etc. + catch (octave::index_exception& e) // problems with range, invalid index type etc. { final_index_error (e, expr); } @@ -498,7 +498,7 @@ { tmp = tmp.subsref (type.substr (tmpi, i-tmpi), tmpidx, true); } - catch (index_exception& e) // problems with range, invalid type etc. + catch (octave::index_exception& e) // problems with range, invalid type etc. { final_index_error (e, expr); }
--- a/libinterp/parse-tree/pt.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/libinterp/parse-tree/pt.cc Wed Aug 17 03:41:42 2016 -0400 @@ -89,7 +89,7 @@ else warning ("Error parsing breakpoint condition"); } - catch (const octave_execution_exception& e) + catch (const octave::execution_exception& e) { warning ("Error evaluating breakpoint condition:\n %s", last_error_message ().c_str ());
--- a/liboctave/array/Array-util.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/liboctave/array/Array-util.cc Wed Aug 17 03:41:42 2016 -0400 @@ -176,9 +176,9 @@ compute_index (octave_idx_type n, const dim_vector& dims) { if (n < 0) - err_invalid_index (n, 1, 1); + octave::err_invalid_index (n, 1, 1); if (n >= dims.numel ()) - err_index_out_of_range (1, 1, n+1, dims.numel (), dims); + octave::err_index_out_of_range (1, 1, n+1, dims.numel (), dims); return n; } @@ -187,13 +187,13 @@ compute_index (octave_idx_type i, octave_idx_type j, const dim_vector& dims) { if (i < 0) - err_invalid_index (i, 2, 1); + octave::err_invalid_index (i, 2, 1); if (j < 0) - err_invalid_index (j, 2, 2); + octave::err_invalid_index (j, 2, 2); if (i >= dims(0)) - err_index_out_of_range (2, 1, i+1, dims(0), dims); + octave::err_index_out_of_range (2, 1, i+1, dims(0), dims); if (j >= dims.numel (1)) - err_index_out_of_range (2, 2, j+1, dims.numel (1), dims); + octave::err_index_out_of_range (2, 2, j+1, dims.numel (1), dims); return j*dims(0) + i; } @@ -203,17 +203,17 @@ const dim_vector& dims) { if (i < 0) - err_invalid_index (i, 3, 1); + octave::err_invalid_index (i, 3, 1); if (j < 0) - err_invalid_index (j, 3, 2); + octave::err_invalid_index (j, 3, 2); if (k < 0) - err_invalid_index (k, 3, 3); + octave::err_invalid_index (k, 3, 3); if (i >= dims(0)) - err_index_out_of_range (3, 1, i+1, dims(0), dims); + octave::err_index_out_of_range (3, 1, i+1, dims(0), dims); if (j >= dims(1)) - err_index_out_of_range (3, 2, j+1, dims(1), dims); + octave::err_index_out_of_range (3, 2, j+1, dims(1), dims); if (k >= dims.numel (2)) - err_index_out_of_range (3, 3, k+1, dims.numel (2), dims); + octave::err_index_out_of_range (3, 3, k+1, dims.numel (2), dims); return (k*dims(1) + j)*dims(0) + i; } @@ -226,9 +226,9 @@ for (int d = 0; d < nd; d++) { if (ra_idx(d) < 0) - err_invalid_index (ra_idx(d), nd, d+1); + octave::err_invalid_index (ra_idx(d), nd, d+1); if (ra_idx(d) >= dv(d)) - err_index_out_of_range (nd, d+1, ra_idx(d)+1, dv(d), dims); + octave::err_index_out_of_range (nd, d+1, ra_idx(d)+1, dv(d), dims); } return dv.compute_index (ra_idx.data ()); @@ -558,9 +558,9 @@ ("sub2ind: lengths of indices must match"); if (idx.extent (n) > n) - err_index_out_of_range (len, i+1, idx.extent (n), n); + octave::err_index_out_of_range (len, i+1, idx.extent (n), n); } - catch (index_exception& e) + catch (octave::index_exception& e) { e.set_pos_if_unset (len, i+1); e.set_var ();
--- a/liboctave/array/Array.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/liboctave/array/Array.cc Wed Aug 17 03:41:42 2016 -0400 @@ -201,9 +201,9 @@ { // Do checks directly to avoid recomputing slice_len. if (n < 0) - err_invalid_index (n); + octave::err_invalid_index (n); if (n >= slice_len) - err_index_out_of_range (1, 1, n+1, slice_len, dimensions); + octave::err_index_out_of_range (1, 1, n+1, slice_len, dimensions); return elem (n); } @@ -235,9 +235,9 @@ { // Do checks directly to avoid recomputing slice_len. if (n < 0) - err_invalid_index (n); + octave::err_invalid_index (n); if (n >= slice_len) - err_index_out_of_range (1, 1, n+1, slice_len, dimensions); + octave::err_index_out_of_range (1, 1, n+1, slice_len, dimensions); return elem (n); } @@ -271,7 +271,7 @@ octave_idx_type r = dimensions(0); #if defined (OCTAVE_ENABLE_BOUNDS_CHECK) if (k < 0 || k > dimensions.numel (1)) - err_index_out_of_range (2, 2, k+1, dimensions.numel (1), dimensions); + octave::err_index_out_of_range (2, 2, k+1, dimensions.numel (1), dimensions); #endif return Array<T> (*this, dim_vector (r, 1), k*r, k*r + r); @@ -286,7 +286,7 @@ octave_idx_type p = r*c; #if defined (OCTAVE_ENABLE_BOUNDS_CHECK) if (k < 0 || k > dimensions.numel (2)) - err_index_out_of_range (3, 3, k+1, dimensions.numel (2), dimensions); + octave::err_index_out_of_range (3, 3, k+1, dimensions.numel (2), dimensions); #endif return Array<T> (*this, dim_vector (r, c), k*p, k*p + p); @@ -298,9 +298,9 @@ { #if defined (OCTAVE_ENABLE_BOUNDS_CHECK) if (lo < 0) - err_index_out_of_range (1, 1, lo+1, numel (), dimensions); + octave::err_index_out_of_range (1, 1, lo+1, numel (), dimensions); if (up > numel ()) - err_index_out_of_range (1, 1, up, numel (), dimensions); + octave::err_index_out_of_range (1, 1, up, numel (), dimensions); #endif if (up < lo) up = lo; return Array<T> (*this, dim_vector (up - lo, 1), lo, up); @@ -728,7 +728,7 @@ else { if (i.extent (n) != n) - err_index_out_of_range (1, 1, i.extent (n), n, dimensions); // throws + octave::err_index_out_of_range (1, 1, i.extent (n), n, dimensions); // throws // FIXME: this is the only place where orig_dimensions are used. dim_vector rd = i.orig_dimensions (); @@ -795,9 +795,9 @@ else { if (i.extent (r) != r) - err_index_out_of_range (2, 1, i.extent (r), r, dimensions); // throws + octave::err_index_out_of_range (2, 1, i.extent (r), r, dimensions); // throws if (j.extent (c) != c) - err_index_out_of_range (2, 2, j.extent (c), c, dimensions); // throws + octave::err_index_out_of_range (2, 2, j.extent (c), c, dimensions); // throws octave_idx_type n = numel (); octave_idx_type il = i.length (r); @@ -857,7 +857,7 @@ for (int i = 0; i < ial; i++) { if (ia(i).extent (dv(i)) != dv(i)) - err_index_out_of_range (ial, i+1, ia(i).extent (dv(i)), dv(i), dimensions); // throws + octave::err_index_out_of_range (ial, i+1, ia(i).extent (dv(i)), dv(i), dimensions); // throws all_colons = all_colons && ia(i).is_colon (); } @@ -914,7 +914,7 @@ Array<T>::resize1 (octave_idx_type n, const T& rfv) { if (n < 0 || ndims () != 2) - err_invalid_resize (); + octave::err_invalid_resize (); dim_vector dv; // This is driven by Matlab's behavior of giving a *row* vector @@ -933,7 +933,7 @@ invalid = true; if (invalid) - err_invalid_resize (); + octave::err_invalid_resize (); octave_idx_type nx = numel (); if (n == nx - 1 && n > 0) @@ -985,7 +985,7 @@ Array<T>::resize2 (octave_idx_type r, octave_idx_type c, const T& rfv) { if (r < 0 || c < 0 || ndims () != 2) - err_invalid_resize (); + octave::err_invalid_resize (); octave_idx_type rx = rows (); octave_idx_type cx = columns (); @@ -1032,7 +1032,7 @@ else if (dimensions != dv) { if (dimensions.ndims () > dvl || dv.any_neg ()) - err_invalid_resize (); + octave::err_invalid_resize (); Array<T> tmp (dv); // Prepare for recursive resizing. @@ -1135,7 +1135,7 @@ octave_idx_type rhl = rhs.numel (); if (rhl != 1 && i.length (n) != rhl) - err_nonconformant ("=", dim_vector(i.length(n),1), rhs.dims()); + octave::err_nonconformant ("=", dim_vector(i.length(n),1), rhs.dims()); octave_idx_type nx = i.extent (n); bool colon = i.is_colon_equiv (nx); @@ -1274,7 +1274,7 @@ } // any empty RHS can be assigned to an empty LHS else if ((il != 0 && jl != 0) || (rhdv(0) != 0 && rhdv(1) != 0)) - err_nonconformant ("=", il, jl, rhs.dim1 (), rhs.dim2 ()); + octave::err_nonconformant ("=", il, jl, rhs.dim1 (), rhs.dim2 ()); } // Assignment to a multi-dimensional array @@ -1388,7 +1388,7 @@ rhsempty = rhsempty || (rhdv(j++) == 0); } if (! lhsempty || ! rhsempty) - err_nonconformant ("=", dv, rhdv); + octave::err_nonconformant ("=", dv, rhdv); } } } @@ -1413,7 +1413,7 @@ else if (i.length (n) != 0) { if (i.extent (n) != n) - err_del_index_out_of_range (true, i.extent (n), n); + octave::err_del_index_out_of_range (true, i.extent (n), n); octave_idx_type l, u; bool col_vec = ndims () == 2 && columns () == 1 && rows () != 1; @@ -1456,7 +1456,7 @@ else if (i.length (n) != 0) { if (i.extent (n) != n) - err_del_index_out_of_range (false, i.extent (n), n); + octave::err_del_index_out_of_range (false, i.extent (n), n); octave_idx_type l, u;
--- a/liboctave/array/CColVector.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/liboctave/array/CColVector.cc Wed Aug 17 03:41:42 2016 -0400 @@ -257,7 +257,7 @@ octave_idx_type a_len = a.numel (); if (len != a_len) - err_nonconformant ("operator +=", len, a_len); + octave::err_nonconformant ("operator +=", len, a_len); if (len == 0) return *this; @@ -276,7 +276,7 @@ octave_idx_type a_len = a.numel (); if (len != a_len) - err_nonconformant ("operator -=", len, a_len); + octave::err_nonconformant ("operator -=", len, a_len); if (len == 0) return *this; @@ -307,7 +307,7 @@ octave_idx_type a_len = a.numel (); if (nc != a_len) - err_nonconformant ("operator *", nr, nc, a_len, 1); + octave::err_nonconformant ("operator *", nr, nc, a_len, 1); retval.clear (nr); @@ -351,7 +351,7 @@ octave_idx_type a_len = a.numel (); if (nc != a_len) - err_nonconformant ("operator *", nr, nc, a_len, 1); + octave::err_nonconformant ("operator *", nr, nc, a_len, 1); if (nc == 0 || nr == 0) return ComplexColumnVector (0); @@ -376,7 +376,7 @@ octave_idx_type a_len = a.numel (); if (nc != a_len) - err_nonconformant ("operator *", nr, nc, a_len, 1); + octave::err_nonconformant ("operator *", nr, nc, a_len, 1); if (nc == 0 || nr == 0) return ComplexColumnVector (0); @@ -401,7 +401,7 @@ octave_idx_type a_len = a.numel (); if (nc != a_len) - err_nonconformant ("operator *", nr, nc, a_len, 1); + octave::err_nonconformant ("operator *", nr, nc, a_len, 1); if (nc == 0 || nr == 0) return ComplexColumnVector (0);
--- a/liboctave/array/CDiagMatrix.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/liboctave/array/CDiagMatrix.cc Wed Aug 17 03:41:42 2016 -0400 @@ -370,7 +370,7 @@ octave_idx_type a_nc = a.cols (); if (r != a_nr || c != a_nc) - err_nonconformant ("operator +=", r, c, a_nr, a_nc); + octave::err_nonconformant ("operator +=", r, c, a_nr, a_nc); if (r == 0 || c == 0) return *this; @@ -391,7 +391,7 @@ octave_idx_type b_nc = b.cols (); if (a_nc != b_nr) - err_nonconformant ("operator *", a_nr, a_nc, b_nr, b_nc); + octave::err_nonconformant ("operator *", a_nr, a_nc, b_nr, b_nc); ComplexDiagMatrix c (a_nr, b_nc); @@ -416,7 +416,7 @@ octave_idx_type b_nc = b.cols (); if (a_nc != b_nr) - err_nonconformant ("operator *", a_nr, a_nc, b_nr, b_nc); + octave::err_nonconformant ("operator *", a_nr, a_nc, b_nr, b_nc); if (a_nr == 0 || a_nc == 0 || b_nc == 0) return ComplexDiagMatrix (a_nr, a_nc, 0.0); @@ -446,7 +446,7 @@ octave_idx_type b_nc = b.cols (); if (a_nc != b_nr) - err_nonconformant ("operator *", a_nr, a_nc, b_nr, b_nc); + octave::err_nonconformant ("operator *", a_nr, a_nc, b_nr, b_nc); if (a_nr == 0 || a_nc == 0 || b_nc == 0) return ComplexDiagMatrix (a_nr, a_nc, 0.0);
--- a/liboctave/array/CMatrix.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/liboctave/array/CMatrix.cc Wed Aug 17 03:41:42 2016 -0400 @@ -1710,7 +1710,7 @@ if (sing_handler) sing_handler (rcon); else - warn_singular_matrix (rcon); + octave::warn_singular_matrix (rcon); } } } @@ -1800,7 +1800,7 @@ if (sing_handler) sing_handler (rcon); else - warn_singular_matrix (rcon); + octave::warn_singular_matrix (rcon); } } } @@ -1881,7 +1881,7 @@ if (sing_handler) sing_handler (rcon); else - warn_singular_matrix (rcon); + octave::warn_singular_matrix (rcon); } } @@ -1941,7 +1941,7 @@ if (sing_handler) sing_handler (rcon); else - warn_singular_matrix (); + octave::warn_singular_matrix (); mattype.mark_as_rectangular (); } @@ -1969,7 +1969,7 @@ if (sing_handler) sing_handler (rcon); else - warn_singular_matrix (rcon); + octave::warn_singular_matrix (rcon); } } @@ -2699,7 +2699,7 @@ octave_idx_type a_nc = cols (); if (nr != a_nr || nc != a_nc) - err_nonconformant ("operator +=", nr, nc, a_nr, a_nc); + octave::err_nonconformant ("operator +=", nr, nc, a_nr, a_nc); for (octave_idx_type i = 0; i < a.length (); i++) elem (i, i) += a.elem (i, i); @@ -2717,7 +2717,7 @@ octave_idx_type a_nc = cols (); if (nr != a_nr || nc != a_nc) - err_nonconformant ("operator -=", nr, nc, a_nr, a_nc); + octave::err_nonconformant ("operator -=", nr, nc, a_nr, a_nc); for (octave_idx_type i = 0; i < a.length (); i++) elem (i, i) -= a.elem (i, i); @@ -2735,7 +2735,7 @@ octave_idx_type a_nc = cols (); if (nr != a_nr || nc != a_nc) - err_nonconformant ("operator +=", nr, nc, a_nr, a_nc); + octave::err_nonconformant ("operator +=", nr, nc, a_nr, a_nc); for (octave_idx_type i = 0; i < a.length (); i++) elem (i, i) += a.elem (i, i); @@ -2753,7 +2753,7 @@ octave_idx_type a_nc = cols (); if (nr != a_nr || nc != a_nc) - err_nonconformant ("operator -=", nr, nc, a_nr, a_nc); + octave::err_nonconformant ("operator -=", nr, nc, a_nr, a_nc); for (octave_idx_type i = 0; i < a.length (); i++) elem (i, i) -= a.elem (i, i); @@ -2773,7 +2773,7 @@ octave_idx_type a_nc = a.cols (); if (nr != a_nr || nc != a_nc) - err_nonconformant ("operator +=", nr, nc, a_nr, a_nc); + octave::err_nonconformant ("operator +=", nr, nc, a_nr, a_nc); if (nr == 0 || nc == 0) return *this; @@ -2794,7 +2794,7 @@ octave_idx_type a_nc = a.cols (); if (nr != a_nr || nc != a_nc) - err_nonconformant ("operator -=", nr, nc, a_nr, a_nc); + octave::err_nonconformant ("operator -=", nr, nc, a_nr, a_nc); if (nr == 0 || nc == 0) return *this; @@ -3385,7 +3385,7 @@ octave_idx_type b_nc = trb ? b.rows () : b.cols (); if (a_nc != b_nr) - err_nonconformant ("operator *", a_nr, a_nc, b_nr, b_nc); + octave::err_nonconformant ("operator *", a_nr, a_nc, b_nr, b_nc); if (a_nr == 0 || a_nc == 0 || b_nc == 0) retval = ComplexMatrix (a_nr, b_nc, 0.0);
--- a/liboctave/array/CNDArray.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/liboctave/array/CNDArray.cc Wed Aug 17 03:41:42 2016 -0400 @@ -485,7 +485,7 @@ ComplexNDArray::operator ! (void) const { if (any_element_is_nan ()) - err_nan_to_logical_conversion (); + octave::err_nan_to_logical_conversion (); return do_mx_unary_op<bool, Complex> (*this, mx_inline_not); }
--- a/liboctave/array/CRowVector.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/liboctave/array/CRowVector.cc Wed Aug 17 03:41:42 2016 -0400 @@ -245,7 +245,7 @@ octave_idx_type a_len = a.numel (); if (len != a_len) - err_nonconformant ("operator +=", len, a_len); + octave::err_nonconformant ("operator +=", len, a_len); if (len == 0) return *this; @@ -264,7 +264,7 @@ octave_idx_type a_len = a.numel (); if (len != a_len) - err_nonconformant ("operator -=", len, a_len); + octave::err_nonconformant ("operator -=", len, a_len); if (len == 0) return *this; @@ -288,7 +288,7 @@ octave_idx_type a_nc = a.cols (); if (a_nr != len) - err_nonconformant ("operator *", 1, len, a_nr, a_nc); + octave::err_nonconformant ("operator *", 1, len, a_nr, a_nc); if (len == 0) retval.resize (a_nc, 0.0); @@ -411,7 +411,7 @@ octave_idx_type a_len = a.numel (); if (len != a_len) - err_nonconformant ("operator *", len, a_len); + octave::err_nonconformant ("operator *", len, a_len); if (len != 0) F77_FUNC (xzdotu, XZDOTU) (len, F77_CONST_DBLE_CMPLX_ARG (v.data ()), 1, F77_CONST_DBLE_CMPLX_ARG (a.data ()), 1, F77_DBLE_CMPLX_ARG (&retval));
--- a/liboctave/array/CSparse.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/liboctave/array/CSparse.cc Wed Aug 17 03:41:42 2016 -0400 @@ -1700,7 +1700,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); } volatile double rcond_plus_one = rcond + 1.0; @@ -1715,7 +1715,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); } } @@ -1982,7 +1982,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); } volatile double rcond_plus_one = rcond + 1.0; @@ -1997,7 +1997,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); } } return retval; @@ -2211,7 +2211,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); } volatile double rcond_plus_one = rcond + 1.0; @@ -2226,7 +2226,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); } } @@ -2493,7 +2493,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); } volatile double rcond_plus_one = rcond + 1.0; @@ -2508,7 +2508,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); } } @@ -2742,7 +2742,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); } volatile double rcond_plus_one = rcond + 1.0; @@ -2757,7 +2757,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); } } @@ -3043,7 +3043,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); } volatile double rcond_plus_one = rcond + 1.0; @@ -3058,7 +3058,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); } } @@ -3295,7 +3295,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); } volatile double rcond_plus_one = rcond + 1.0; @@ -3310,7 +3310,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); } } @@ -3595,7 +3595,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); } volatile double rcond_plus_one = rcond + 1.0; @@ -3610,7 +3610,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); } } @@ -3755,7 +3755,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (); + octave::warn_singular_matrix (); } else @@ -3853,7 +3853,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (); + octave::warn_singular_matrix (); } else { @@ -4056,7 +4056,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (); + octave::warn_singular_matrix (); } } else if (typ != MatrixType::Tridiagonal_Hermitian) @@ -4152,7 +4152,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (); + octave::warn_singular_matrix (); } else { @@ -4324,7 +4324,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); } } else @@ -4410,7 +4410,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (); + octave::warn_singular_matrix (); } else { @@ -4443,7 +4443,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); } } else @@ -4568,7 +4568,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); } } else @@ -4687,7 +4687,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (); + octave::warn_singular_matrix (); } else { @@ -4720,7 +4720,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); } } else @@ -4884,7 +4884,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); } } else @@ -4968,7 +4968,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (); + octave::warn_singular_matrix (); } else { @@ -5001,7 +5001,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); } } else @@ -5128,7 +5128,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); } } else @@ -5252,7 +5252,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (); + octave::warn_singular_matrix (); } else { @@ -5285,7 +5285,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); } } else @@ -5440,7 +5440,7 @@ if (sing_handler) sing_handler (rcond); else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); } else if (status < 0) { @@ -5600,7 +5600,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); return retval; } @@ -5860,7 +5860,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); return retval; } @@ -6148,7 +6148,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); return retval; } @@ -6387,7 +6387,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); return retval; } @@ -6518,7 +6518,7 @@ if (sing_handler) sing_handler (rcond); else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); } UMFPACK_ZNAME (report_info) (control, info); @@ -7060,7 +7060,7 @@ SparseComplexMatrix::operator ! (void) const { if (any_element_is_nan ()) - err_nan_to_logical_conversion (); + octave::err_nan_to_logical_conversion (); octave_idx_type nr = rows (); octave_idx_type nc = cols (); @@ -7622,7 +7622,7 @@ else if (b_nr == 0 || b_nc == 0) r.resize (b_nr, b_nc); else - err_nonconformant ("min", a_nr, a_nc, b_nr, b_nc); + octave::err_nonconformant ("min", a_nr, a_nc, b_nr, b_nc); } return r; @@ -7739,7 +7739,7 @@ else if (b_nr == 0 || b_nc == 0) r.resize (b_nr, b_nc); else - err_nonconformant ("max", a_nr, a_nc, b_nr, b_nc); + octave::err_nonconformant ("max", a_nr, a_nc, b_nr, b_nc); } return r;
--- a/liboctave/array/DiagArray2.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/liboctave/array/DiagArray2.cc Wed Aug 17 03:41:42 2016 -0400 @@ -138,10 +138,10 @@ bool ok = true; if (r < 0 || r >= dim1 ()) - err_index_out_of_range (2, 1, r+1, dim1 (), dims ()); + octave::err_index_out_of_range (2, 1, r+1, dim1 (), dims ()); if (c < 0 || c >= dim2 ()) - err_index_out_of_range (2, 2, c+1, dim2 (), dims ()); + octave::err_index_out_of_range (2, 2, c+1, dim2 (), dims ()); return ok; }
--- a/liboctave/array/MDiagArray2.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/liboctave/array/MDiagArray2.cc Wed Aug 17 03:41:42 2016 -0400 @@ -81,7 +81,7 @@ FCN (const MDiagArray2<T>& a, const MDiagArray2<T>& b) \ { \ if (a.d1 != b.d1 || a.d2 != b.d2) \ - err_nonconformant (#FCN, a.d1, a.d2, b.d1, b.d2); \ + octave::err_nonconformant (#FCN, a.d1, a.d2, b.d1, b.d2); \ \ return MDiagArray2<T> (do_mm_binary_op<T, T, T> (a, b, FN, FN, FN, #FCN), a.d1, a.d2); \ }
--- a/liboctave/array/MSparse.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/liboctave/array/MSparse.cc Wed Aug 17 03:41:42 2016 -0400 @@ -38,7 +38,7 @@ octave_idx_type b_nc = b.cols (); if (a_nr != b_nr || a_nc != b_nc) - err_nonconformant (op_name , a_nr, a_nc, b_nr, b_nc); + octave::err_nonconformant (op_name , a_nr, a_nc, b_nr, b_nc); r = MSparse<T> (a_nr, a_nc, (a.nnz () + b.nnz ())); @@ -302,7 +302,7 @@ } } else if (a_nr != b_nr || a_nc != b_nc) - err_nonconformant (op_name, a_nr, a_nc, b_nr, b_nc); + octave::err_nonconformant (op_name, a_nr, a_nc, b_nr, b_nc); else { r = MSparse<T> (a_nr, a_nc, (a.nnz () + b.nnz ())); @@ -423,7 +423,7 @@ } } else if (a_nr != b_nr || a_nc != b_nc) - err_nonconformant ("product", a_nr, a_nc, b_nr, b_nc); + octave::err_nonconformant ("product", a_nr, a_nc, b_nr, b_nc); else { r = MSparse<T> (a_nr, a_nc, (a.nnz () > b.nnz () ? a.nnz () : b.nnz ())); @@ -543,7 +543,7 @@ } } else if (a_nr != b_nr || a_nc != b_nc) - err_nonconformant ("quotient", a_nr, a_nc, b_nr, b_nc); + octave::err_nonconformant ("quotient", a_nr, a_nc, b_nr, b_nc); else { r = MSparse<T> (a_nr, a_nc, (Zero / Zero));
--- a/liboctave/array/PermMatrix.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/liboctave/array/PermMatrix.cc Wed Aug 17 03:41:42 2016 -0400 @@ -227,7 +227,7 @@ octave_idx_type n = a.columns (); if (n != b.rows ()) - err_nonconformant ("operator *", n, n, b.rows (), b.rows ()); + octave::err_nonconformant ("operator *", n, n, b.rows (), b.rows ()); r = PermMatrix (ia.index (idx_vector (ib)), true, false);
--- a/liboctave/array/Range.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/liboctave/array/Range.cc Wed Aug 17 03:41:42 2016 -0400 @@ -74,7 +74,7 @@ Range::checkelem (octave_idx_type i) const { if (i < 0 || i >= rng_numel) - err_index_out_of_range (1, 1, i+1, rng_numel); + octave::err_index_out_of_range (1, 1, i+1, rng_numel); if (i == 0) return rng_base; @@ -137,7 +137,7 @@ else { if (i.extent (n) != n) - err_index_out_of_range (1, 1, i.extent (n), n); // throws + octave::err_index_out_of_range (1, 1, i.extent (n), n); // throws dim_vector rd = i.orig_dimensions (); octave_idx_type il = i.length (n);
--- a/liboctave/array/Sparse.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/liboctave/array/Sparse.cc Wed Aug 17 03:41:42 2016 -0400 @@ -928,7 +928,7 @@ else if (nc == 1) resize (n, 1); else - err_invalid_resize (); + octave::err_invalid_resize (); } template <typename T> @@ -1158,7 +1158,7 @@ const dim_vector idx_dims = idx.orig_dimensions (); if (idx.extent (nel) > nel) - err_del_index_out_of_range (true, idx.extent (nel), nel); + octave::err_del_index_out_of_range (true, idx.extent (nel), nel); if (nc == 1) { @@ -1257,7 +1257,7 @@ // Deleting columns. octave_idx_type lb, ub; if (idx_j.extent (nc) > nc) - err_del_index_out_of_range (false, idx_j.extent (nc), nc); + octave::err_del_index_out_of_range (false, idx_j.extent (nc), nc); else if (idx_j.is_cont_range (nc, lb, ub)) { if (lb == 0 && ub == nc) @@ -1295,7 +1295,7 @@ // Deleting rows. octave_idx_type lb, ub; if (idx_i.extent (nr) > nr) - err_del_index_out_of_range (false, idx_i.extent (nr), nr); + octave::err_del_index_out_of_range (false, idx_i.extent (nr), nr); else if (idx_i.is_cont_range (nr, lb, ub)) { if (lb == 0 && ub == nr) @@ -1414,7 +1414,7 @@ else if (idx.extent (nel) > nel) { if (! resize_ok) - err_index_out_of_range (1, 1, idx.extent (nel), nel, dims ()); + octave::err_index_out_of_range (1, 1, idx.extent (nel), nel, dims ()); // resize_ok is completely handled here. octave_idx_type ext = idx.extent (nel); @@ -1602,9 +1602,9 @@ retval = tmp.index (idx_i, idx_j); } else if (idx_i.extent (nr) > nr) - err_index_out_of_range (2, 1, idx_i.extent (nr), nr, dims ()); + octave::err_index_out_of_range (2, 1, idx_i.extent (nr), nr, dims ()); else - err_index_out_of_range (2, 2, idx_j.extent (nc), nc, dims ()); + octave::err_index_out_of_range (2, 2, idx_j.extent (nc), nc, dims ()); } else if (nr == 1 && nc == 1) { @@ -1966,7 +1966,7 @@ assign (idx, Sparse<T> (rhl, 1)); } else - err_nonconformant ("=", dim_vector(idx.length (n),1), rhs.dims()); + octave::err_nonconformant ("=", dim_vector(idx.length (n),1), rhs.dims()); } template <typename T> @@ -2206,7 +2206,7 @@ assign (idx_i, idx_j, rhs.transpose ()); } else - err_nonconformant ("=", idx_i.length (nr), idx_j.length (nc), n, m); + octave::err_nonconformant ("=", idx_i.length (nr), idx_j.length (nc), n, m); } // Can't use versions of these in Array.cc due to duplication of the
--- a/liboctave/array/dColVector.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/liboctave/array/dColVector.cc Wed Aug 17 03:41:42 2016 -0400 @@ -185,7 +185,7 @@ octave_idx_type a_len = a.numel (); if (nc != a_len) - err_nonconformant ("operator *", nr, nc, a_len, 1); + octave::err_nonconformant ("operator *", nr, nc, a_len, 1); retval.clear (nr); @@ -220,7 +220,7 @@ octave_idx_type a_len = a.numel (); if (nc != a_len) - err_nonconformant ("operator *", nr, nc, a_len, 1); + octave::err_nonconformant ("operator *", nr, nc, a_len, 1); if (nr == 0 || nc == 0) retval.resize (nr, 0.0);
--- a/liboctave/array/dDiagMatrix.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/liboctave/array/dDiagMatrix.cc Wed Aug 17 03:41:42 2016 -0400 @@ -287,7 +287,7 @@ octave_idx_type b_nc = b.cols (); if (a_nc != b_nr) - err_nonconformant ("operator *", a_nr, a_nc, b_nr, b_nc); + octave::err_nonconformant ("operator *", a_nr, a_nc, b_nr, b_nc); DiagMatrix c (a_nr, b_nc);
--- a/liboctave/array/dMatrix.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/liboctave/array/dMatrix.cc Wed Aug 17 03:41:42 2016 -0400 @@ -1398,7 +1398,7 @@ if (sing_handler) sing_handler (rcon); else - warn_singular_matrix (rcon); + octave::warn_singular_matrix (rcon); } } } @@ -1487,7 +1487,7 @@ if (sing_handler) sing_handler (rcon); else - warn_singular_matrix (rcon); + octave::warn_singular_matrix (rcon); } } } @@ -1567,7 +1567,7 @@ if (sing_handler) sing_handler (rcon); else - warn_singular_matrix (rcon); + octave::warn_singular_matrix (rcon); } } @@ -1620,7 +1620,7 @@ if (sing_handler) sing_handler (rcon); else - warn_singular_matrix (); + octave::warn_singular_matrix (); mattype.mark_as_rectangular (); } @@ -1648,7 +1648,7 @@ if (sing_handler) sing_handler (rcon); else - warn_singular_matrix (rcon); + octave::warn_singular_matrix (rcon); } } @@ -2344,7 +2344,7 @@ octave_idx_type a_nc = a.cols (); if (nr != a_nr || nc != a_nc) - err_nonconformant ("operator +=", nr, nc, a_nr, a_nc); + octave::err_nonconformant ("operator +=", nr, nc, a_nr, a_nc); for (octave_idx_type i = 0; i < a.length (); i++) elem (i, i) += a.elem (i, i); @@ -2362,7 +2362,7 @@ octave_idx_type a_nc = a.cols (); if (nr != a_nr || nc != a_nc) - err_nonconformant ("operator -=", nr, nc, a_nr, a_nc); + octave::err_nonconformant ("operator -=", nr, nc, a_nr, a_nc); for (octave_idx_type i = 0; i < a.length (); i++) elem (i, i) -= a.elem (i, i); @@ -2846,7 +2846,7 @@ octave_idx_type b_nc = trb ? b.rows () : b.cols (); if (a_nc != b_nr) - err_nonconformant ("operator *", a_nr, a_nc, b_nr, b_nc); + octave::err_nonconformant ("operator *", a_nr, a_nc, b_nr, b_nc); if (a_nr == 0 || a_nc == 0 || b_nc == 0) retval = Matrix (a_nr, b_nc, 0.0);
--- a/liboctave/array/dNDArray.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/liboctave/array/dNDArray.cc Wed Aug 17 03:41:42 2016 -0400 @@ -526,7 +526,7 @@ NDArray::operator ! (void) const { if (any_element_is_nan ()) - err_nan_to_logical_conversion (); + octave::err_nan_to_logical_conversion (); return do_mx_unary_op<bool, double> (*this, mx_inline_not); }
--- a/liboctave/array/dRowVector.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/liboctave/array/dRowVector.cc Wed Aug 17 03:41:42 2016 -0400 @@ -176,7 +176,7 @@ octave_idx_type a_nc = a.cols (); if (a_nr != len) - err_nonconformant ("operator *", 1, len, a_nr, a_nc); + octave::err_nonconformant ("operator *", 1, len, a_nr, a_nc); if (len == 0) retval.resize (a_nc, 0.0); @@ -297,7 +297,7 @@ octave_idx_type a_len = a.numel (); if (len != a_len) - err_nonconformant ("operator *", len, a_len); + octave::err_nonconformant ("operator *", len, a_len); if (len != 0) F77_FUNC (xddot, XDDOT) (len, v.data (), 1, a.data (), 1, retval);
--- a/liboctave/array/dSparse.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/liboctave/array/dSparse.cc Wed Aug 17 03:41:42 2016 -0400 @@ -678,7 +678,7 @@ octave_idx_type y_nc = y.cols (); if (x_nr != y_nr || x_nc != y_nc) - err_nonconformant ("atan2", x_nr, x_nc, y_nr, y_nc); + octave::err_nonconformant ("atan2", x_nr, x_nc, y_nr, y_nc); SparseMatrix r; @@ -1769,7 +1769,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); } volatile double rcond_plus_one = rcond + 1.0; @@ -1784,7 +1784,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); } } @@ -2051,7 +2051,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); } volatile double rcond_plus_one = rcond + 1.0; @@ -2066,7 +2066,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); } } return retval; @@ -2282,7 +2282,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); } volatile double rcond_plus_one = rcond + 1.0; @@ -2297,7 +2297,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); } } @@ -2566,7 +2566,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); } volatile double rcond_plus_one = rcond + 1.0; @@ -2581,7 +2581,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); } } @@ -2819,7 +2819,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); } volatile double rcond_plus_one = rcond + 1.0; @@ -2834,7 +2834,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); } } @@ -3119,7 +3119,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); } volatile double rcond_plus_one = rcond + 1.0; @@ -3134,7 +3134,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); } } @@ -3373,7 +3373,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); } volatile double rcond_plus_one = rcond + 1.0; @@ -3388,7 +3388,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); } } @@ -3675,7 +3675,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); } volatile double rcond_plus_one = rcond + 1.0; @@ -3690,7 +3690,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); } } @@ -3835,7 +3835,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (); + octave::warn_singular_matrix (); } else rcond = 1.; @@ -3932,7 +3932,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (); + octave::warn_singular_matrix (); } else { @@ -4135,7 +4135,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (); + octave::warn_singular_matrix (); } } else if (typ != MatrixType::Tridiagonal_Hermitian) @@ -4230,7 +4230,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (); + octave::warn_singular_matrix (); } else { @@ -4423,7 +4423,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); } } else @@ -4509,7 +4509,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (); + octave::warn_singular_matrix (); } else { @@ -4542,7 +4542,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); } } else @@ -4667,7 +4667,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); } } else @@ -4786,7 +4786,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (); + octave::warn_singular_matrix (); } else { @@ -4819,7 +4819,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); } } else @@ -4983,7 +4983,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); } } else @@ -5099,7 +5099,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (); + octave::warn_singular_matrix (); } else { @@ -5132,7 +5132,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); } } else @@ -5280,7 +5280,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); } } else @@ -5426,7 +5426,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (); + octave::warn_singular_matrix (); } else { @@ -5459,7 +5459,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); } } else @@ -5623,7 +5623,7 @@ if (sing_handler) sing_handler (rcond); else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); } else if (status < 0) { @@ -5785,7 +5785,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); return retval; } @@ -6018,7 +6018,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); return retval; } @@ -6277,7 +6277,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); return retval; } @@ -6528,7 +6528,7 @@ mattype.mark_as_rectangular (); } else - warn_singular_matrix (rcond); + octave::warn_singular_matrix (rcond); return retval; } @@ -7317,7 +7317,7 @@ SparseMatrix::operator ! (void) const { if (any_element_is_nan ()) - err_nan_to_logical_conversion (); + octave::err_nan_to_logical_conversion (); octave_idx_type nr = rows (); octave_idx_type nc = cols (); @@ -7721,7 +7721,7 @@ else if (b_nr == 0 || b_nc == 0) r.resize (b_nr, b_nc); else - err_nonconformant ("min", a_nr, a_nc, b_nr, b_nc); + octave::err_nonconformant ("min", a_nr, a_nc, b_nr, b_nc); } return r; @@ -7871,7 +7871,7 @@ else if (b_nr == 0 || b_nc == 0) r.resize (b_nr, b_nc); else - err_nonconformant ("max", a_nr, a_nc, b_nr, b_nc); + octave::err_nonconformant ("max", a_nr, a_nc, b_nr, b_nc); } return r;
--- a/liboctave/array/fCColVector.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/liboctave/array/fCColVector.cc Wed Aug 17 03:41:42 2016 -0400 @@ -260,7 +260,7 @@ octave_idx_type a_len = a.numel (); if (len != a_len) - err_nonconformant ("operator +=", len, a_len); + octave::err_nonconformant ("operator +=", len, a_len); if (len == 0) return *this; @@ -279,7 +279,7 @@ octave_idx_type a_len = a.numel (); if (len != a_len) - err_nonconformant ("operator -=", len, a_len); + octave::err_nonconformant ("operator -=", len, a_len); if (len == 0) return *this; @@ -310,7 +310,7 @@ octave_idx_type a_len = a.numel (); if (nc != a_len) - err_nonconformant ("operator *", nr, nc, a_len, 1); + octave::err_nonconformant ("operator *", nr, nc, a_len, 1); retval.clear (nr); @@ -352,7 +352,7 @@ octave_idx_type a_len = a.numel (); if (nc != a_len) - err_nonconformant ("operator *", nr, nc, a_len, 1); + octave::err_nonconformant ("operator *", nr, nc, a_len, 1); if (nc == 0 || nr == 0) return FloatComplexColumnVector (0); @@ -377,7 +377,7 @@ octave_idx_type a_len = a.numel (); if (nc != a_len) - err_nonconformant ("operator *", nr, nc, a_len, 1); + octave::err_nonconformant ("operator *", nr, nc, a_len, 1); if (nc == 0 || nr == 0) return FloatComplexColumnVector (0); @@ -402,7 +402,7 @@ octave_idx_type a_len = a.numel (); if (nc != a_len) - err_nonconformant ("operator *", nr, nc, a_len, 1); + octave::err_nonconformant ("operator *", nr, nc, a_len, 1); if (nc == 0 || nr == 0) return FloatComplexColumnVector (0);
--- a/liboctave/array/fCDiagMatrix.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/liboctave/array/fCDiagMatrix.cc Wed Aug 17 03:41:42 2016 -0400 @@ -374,7 +374,7 @@ octave_idx_type a_nc = a.cols (); if (r != a_nr || c != a_nc) - err_nonconformant ("operator +=", r, c, a_nr, a_nc); + octave::err_nonconformant ("operator +=", r, c, a_nr, a_nc); if (r == 0 || c == 0) return *this; @@ -395,7 +395,7 @@ octave_idx_type b_nc = b.cols (); if (a_nc != b_nr) - err_nonconformant ("operator *", a_nr, a_nc, b_nr, b_nc); + octave::err_nonconformant ("operator *", a_nr, a_nc, b_nr, b_nc); FloatComplexDiagMatrix c (a_nr, b_nc); @@ -420,7 +420,7 @@ octave_idx_type b_nc = b.cols (); if (a_nc != b_nr) - err_nonconformant ("operator *", a_nr, a_nc, b_nr, b_nc); + octave::err_nonconformant ("operator *", a_nr, a_nc, b_nr, b_nc); if (a_nr == 0 || a_nc == 0 || b_nc == 0) return FloatComplexDiagMatrix (a_nr, a_nc, 0.0); @@ -450,7 +450,7 @@ octave_idx_type b_nc = b.cols (); if (a_nc != b_nr) - err_nonconformant ("operator *", a_nr, a_nc, b_nr, b_nc); + octave::err_nonconformant ("operator *", a_nr, a_nc, b_nr, b_nc); if (a_nr == 0 || a_nc == 0 || b_nc == 0) return FloatComplexDiagMatrix (a_nr, a_nc, 0.0);
--- a/liboctave/array/fCMatrix.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/liboctave/array/fCMatrix.cc Wed Aug 17 03:41:42 2016 -0400 @@ -1713,7 +1713,7 @@ if (sing_handler) sing_handler (rcon); else - warn_singular_matrix (rcon); + octave::warn_singular_matrix (rcon); } } } @@ -1807,7 +1807,7 @@ if (sing_handler) sing_handler (rcon); else - warn_singular_matrix (rcon); + octave::warn_singular_matrix (rcon); } } } @@ -1892,7 +1892,7 @@ if (sing_handler) sing_handler (rcon); else - warn_singular_matrix (rcon); + octave::warn_singular_matrix (rcon); } } @@ -1952,7 +1952,7 @@ if (sing_handler) sing_handler (rcon); else - warn_singular_matrix (); + octave::warn_singular_matrix (); mattype.mark_as_rectangular (); } @@ -1980,7 +1980,7 @@ if (sing_handler) sing_handler (rcon); else - warn_singular_matrix (rcon); + octave::warn_singular_matrix (rcon); } } @@ -2725,7 +2725,7 @@ octave_idx_type a_nc = cols (); if (nr != a_nr || nc != a_nc) - err_nonconformant ("operator +=", nr, nc, a_nr, a_nc); + octave::err_nonconformant ("operator +=", nr, nc, a_nr, a_nc); for (octave_idx_type i = 0; i < a.length (); i++) elem (i, i) += a.elem (i, i); @@ -2743,7 +2743,7 @@ octave_idx_type a_nc = cols (); if (nr != a_nr || nc != a_nc) - err_nonconformant ("operator -=", nr, nc, a_nr, a_nc); + octave::err_nonconformant ("operator -=", nr, nc, a_nr, a_nc); for (octave_idx_type i = 0; i < a.length (); i++) elem (i, i) -= a.elem (i, i); @@ -2761,7 +2761,7 @@ octave_idx_type a_nc = cols (); if (nr != a_nr || nc != a_nc) - err_nonconformant ("operator +=", nr, nc, a_nr, a_nc); + octave::err_nonconformant ("operator +=", nr, nc, a_nr, a_nc); for (octave_idx_type i = 0; i < a.length (); i++) elem (i, i) += a.elem (i, i); @@ -2779,7 +2779,7 @@ octave_idx_type a_nc = cols (); if (nr != a_nr || nc != a_nc) - err_nonconformant ("operator -=", nr, nc, a_nr, a_nc); + octave::err_nonconformant ("operator -=", nr, nc, a_nr, a_nc); for (octave_idx_type i = 0; i < a.length (); i++) elem (i, i) -= a.elem (i, i); @@ -2799,7 +2799,7 @@ octave_idx_type a_nc = a.cols (); if (nr != a_nr || nc != a_nc) - err_nonconformant ("operator +=", nr, nc, a_nr, a_nc); + octave::err_nonconformant ("operator +=", nr, nc, a_nr, a_nc); if (nr == 0 || nc == 0) return *this; @@ -2820,7 +2820,7 @@ octave_idx_type a_nc = a.cols (); if (nr != a_nr || nc != a_nc) - err_nonconformant ("operator -=", nr, nc, a_nr, a_nc); + octave::err_nonconformant ("operator -=", nr, nc, a_nr, a_nc); if (nr == 0 || nc == 0) return *this; @@ -3416,7 +3416,7 @@ octave_idx_type b_nc = trb ? b.rows () : b.cols (); if (a_nc != b_nr) - err_nonconformant ("operator *", a_nr, a_nc, b_nr, b_nc); + octave::err_nonconformant ("operator *", a_nr, a_nc, b_nr, b_nc); if (a_nr == 0 || a_nc == 0 || b_nc == 0) retval = FloatComplexMatrix (a_nr, b_nc, 0.0);
--- a/liboctave/array/fCNDArray.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/liboctave/array/fCNDArray.cc Wed Aug 17 03:41:42 2016 -0400 @@ -485,7 +485,7 @@ FloatComplexNDArray::operator ! (void) const { if (any_element_is_nan ()) - err_nan_to_logical_conversion (); + octave::err_nan_to_logical_conversion (); return do_mx_unary_op<bool, FloatComplex> (*this, mx_inline_not); }
--- a/liboctave/array/fCRowVector.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/liboctave/array/fCRowVector.cc Wed Aug 17 03:41:42 2016 -0400 @@ -246,7 +246,7 @@ octave_idx_type a_len = a.numel (); if (len != a_len) - err_nonconformant ("operator +=", len, a_len); + octave::err_nonconformant ("operator +=", len, a_len); if (len == 0) return *this; @@ -265,7 +265,7 @@ octave_idx_type a_len = a.numel (); if (len != a_len) - err_nonconformant ("operator -=", len, a_len); + octave::err_nonconformant ("operator -=", len, a_len); if (len == 0) return *this; @@ -289,7 +289,7 @@ octave_idx_type a_nc = a.cols (); if (a_nr != len) - err_nonconformant ("operator *", 1, len, a_nr, a_nc); + octave::err_nonconformant ("operator *", 1, len, a_nr, a_nc); if (len == 0) retval.resize (a_nc, 0.0); @@ -412,7 +412,7 @@ octave_idx_type a_len = a.numel (); if (len != a_len) - err_nonconformant ("operator *", len, a_len); + octave::err_nonconformant ("operator *", len, a_len); if (len != 0) F77_FUNC (xcdotu, XCDOTU) (len, F77_CONST_CMPLX_ARG (v.data ()), 1, F77_CONST_CMPLX_ARG (a.data ()), 1, F77_CMPLX_ARG (&retval));
--- a/liboctave/array/fColVector.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/liboctave/array/fColVector.cc Wed Aug 17 03:41:42 2016 -0400 @@ -185,7 +185,7 @@ octave_idx_type a_len = a.numel (); if (nc != a_len) - err_nonconformant ("operator *", nr, nc, a_len, 1); + octave::err_nonconformant ("operator *", nr, nc, a_len, 1); retval.clear (nr); @@ -220,7 +220,7 @@ octave_idx_type a_len = a.numel (); if (nc != a_len) - err_nonconformant ("operator *", nr, nc, a_len, 1); + octave::err_nonconformant ("operator *", nr, nc, a_len, 1); if (nr == 0 || nc == 0) retval.resize (nr, 0.0);
--- a/liboctave/array/fDiagMatrix.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/liboctave/array/fDiagMatrix.cc Wed Aug 17 03:41:42 2016 -0400 @@ -287,7 +287,7 @@ octave_idx_type b_nc = b.cols (); if (a_nc != b_nr) - err_nonconformant ("operator *", a_nr, a_nc, b_nr, b_nc); + octave::err_nonconformant ("operator *", a_nr, a_nc, b_nr, b_nc); FloatDiagMatrix c (a_nr, b_nc);
--- a/liboctave/array/fMatrix.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/liboctave/array/fMatrix.cc Wed Aug 17 03:41:42 2016 -0400 @@ -1407,7 +1407,7 @@ if (sing_handler) sing_handler (rcon); else - warn_singular_matrix (rcon); + octave::warn_singular_matrix (rcon); } } @@ -1502,7 +1502,7 @@ if (sing_handler) sing_handler (rcon); else - warn_singular_matrix (rcon); + octave::warn_singular_matrix (rcon); } } } @@ -1587,7 +1587,7 @@ if (sing_handler) sing_handler (rcon); else - warn_singular_matrix (rcon); + octave::warn_singular_matrix (rcon); } } @@ -1640,7 +1640,7 @@ if (sing_handler) sing_handler (rcon); else - warn_singular_matrix (); + octave::warn_singular_matrix (); mattype.mark_as_rectangular (); } @@ -1668,7 +1668,7 @@ if (sing_handler) sing_handler (rcon); else - warn_singular_matrix (rcon); + octave::warn_singular_matrix (rcon); } } @@ -2374,7 +2374,7 @@ octave_idx_type a_nc = a.cols (); if (nr != a_nr || nc != a_nc) - err_nonconformant ("operator +=", nr, nc, a_nr, a_nc); + octave::err_nonconformant ("operator +=", nr, nc, a_nr, a_nc); for (octave_idx_type i = 0; i < a.length (); i++) elem (i, i) += a.elem (i, i); @@ -2392,7 +2392,7 @@ octave_idx_type a_nc = a.cols (); if (nr != a_nr || nc != a_nc) - err_nonconformant ("operator -=", nr, nc, a_nr, a_nc); + octave::err_nonconformant ("operator -=", nr, nc, a_nr, a_nc); for (octave_idx_type i = 0; i < a.length (); i++) elem (i, i) -= a.elem (i, i); @@ -2856,7 +2856,7 @@ octave_idx_type b_nc = trb ? b.rows () : b.cols (); if (a_nc != b_nr) - err_nonconformant ("operator *", a_nr, a_nc, b_nr, b_nc); + octave::err_nonconformant ("operator *", a_nr, a_nc, b_nr, b_nc); if (a_nr == 0 || a_nc == 0 || b_nc == 0) retval = FloatMatrix (a_nr, b_nc, 0.0);
--- a/liboctave/array/fNDArray.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/liboctave/array/fNDArray.cc Wed Aug 17 03:41:42 2016 -0400 @@ -484,7 +484,7 @@ FloatNDArray::operator ! (void) const { if (any_element_is_nan ()) - err_nan_to_logical_conversion (); + octave::err_nan_to_logical_conversion (); return do_mx_unary_op<bool, float> (*this, mx_inline_not); }
--- a/liboctave/array/fRowVector.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/liboctave/array/fRowVector.cc Wed Aug 17 03:41:42 2016 -0400 @@ -176,7 +176,7 @@ octave_idx_type a_nc = a.cols (); if (a_nr != len) - err_nonconformant ("operator *", 1, len, a_nr, a_nc); + octave::err_nonconformant ("operator *", 1, len, a_nr, a_nc); if (len == 0) retval.resize (a_nc, 0.0); @@ -297,7 +297,7 @@ octave_idx_type a_len = a.numel (); if (len != a_len) - err_nonconformant ("operator *", len, a_len); + octave::err_nonconformant ("operator *", len, a_len); if (len != 0) F77_FUNC (xsdot, XSDOT) (len, v.data (), 1, a.data (), 1, retval);
--- a/liboctave/array/idx-vector.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/liboctave/array/idx-vector.cc Wed Aug 17 03:41:42 2016 -0400 @@ -120,9 +120,9 @@ if (len < 0) err_invalid_range (); if (start < 0) - err_invalid_index (start); + octave::err_invalid_index (start); if (step < 0 && start + (len-1)*step < 0) - err_invalid_index (start + (len-1)*step); + octave::err_invalid_index (start + (len-1)*step); } idx_vector::idx_range_rep::idx_range_rep (const Range& r) @@ -138,16 +138,16 @@ start = static_cast<octave_idx_type> (r.base ()) - 1; step = static_cast<octave_idx_type> (r.inc ()); if (start < 0) - err_invalid_index (start); + octave::err_invalid_index (start); if (step < 0 && start + (len - 1)*step < 0) - err_invalid_index (start + (len - 1)*step); + octave::err_invalid_index (start + (len - 1)*step); } else { // find first non-integer, then gripe about it double b = r.base (); double inc = r.inc (); - err_invalid_index (b != std::floor (b) ? b : b + inc); + octave::err_invalid_index (b != std::floor (b) ? b : b + inc); } } } @@ -222,7 +222,7 @@ octave_idx_type& ext) { if (i <= 0 && ! conv_error) - err_invalid_index (i-1); + octave::err_invalid_index (i-1); if (ext < i) ext = i; @@ -236,7 +236,7 @@ octave_idx_type i = static_cast<octave_idx_type> (x); if (static_cast<double> (i) != x) - err_invalid_index (x-1); + octave::err_invalid_index (x-1); return convert_index (i, conv_error, ext); } @@ -270,7 +270,7 @@ : data (i) { if (data < 0) - err_invalid_index (data); + octave::err_invalid_index (data); } octave_idx_type @@ -338,7 +338,7 @@ if (k < 0) { if (! err) - err_invalid_index (k); + octave::err_invalid_index (k); } else if (k > max) max = k; @@ -447,7 +447,7 @@ idx_vector::idx_vector_rep::checkelem (octave_idx_type n) const { if (n < 0 || n >= len) - err_invalid_index (n); + octave::err_invalid_index (n); return xelem (n); } @@ -695,7 +695,7 @@ idx_vector::idx_mask_rep::checkelem (octave_idx_type n) const { if (n < 0 || n >= len) - err_invalid_index (n); + octave::err_invalid_index (n); return xelem (n); }
--- a/liboctave/cruft/misc/quit.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/liboctave/cruft/misc/quit.cc Wed Aug 17 03:41:42 2016 -0400 @@ -53,7 +53,7 @@ { octave_exception_state = octave_quit_exception; - throw octave_exit_exception (exit_status, safe_to_return); + throw octave::exit_exception (exit_status, safe_to_return); } void @@ -62,7 +62,7 @@ if (octave_interrupt_hook) octave_interrupt_hook (); - throw octave_interrupt_exception (); + throw octave::interrupt_exception (); } void @@ -72,7 +72,7 @@ octave_exception_state = octave_exec_exception; - throw octave_execution_exception (); + throw octave::execution_exception (); } void
--- a/liboctave/cruft/misc/quit.h Wed Aug 17 02:57:50 2016 -0400 +++ b/liboctave/cruft/misc/quit.h Wed Aug 17 03:41:42 2016 -0400 @@ -60,87 +60,99 @@ #if defined (__cplusplus) -class -octave_execution_exception +namespace octave { -public: + class + execution_exception + { + public: - octave_execution_exception (void) : m_stack_trace () { } - - octave_execution_exception (const octave_execution_exception& x) - : m_stack_trace (x.m_stack_trace) { } + execution_exception (void) : m_stack_trace () { } - octave_execution_exception& operator = (const octave_execution_exception& x) - { - if (&x != this) - m_stack_trace = x.m_stack_trace; + execution_exception (const execution_exception& x) + : m_stack_trace (x.m_stack_trace) { } - return *this; - } + execution_exception& operator = (const execution_exception& x) + { + if (&x != this) + m_stack_trace = x.m_stack_trace; - ~octave_execution_exception (void) { } + return *this; + } + + ~execution_exception (void) { } - virtual void set_stack_trace (const std::string& st) - { - m_stack_trace = st; - } + virtual void set_stack_trace (const std::string& st) + { + m_stack_trace = st; + } - virtual void set_stack_trace (void) - { - m_stack_trace = ""; - } + virtual void set_stack_trace (void) + { + m_stack_trace = ""; + } - virtual std::string info (void) const - { - return m_stack_trace; - } + virtual std::string info (void) const + { + return m_stack_trace; + } + + private: -private: + std::string m_stack_trace; + }; - std::string m_stack_trace; -}; + class + exit_exception + { + public: -class -octave_exit_exception -{ -public: + exit_exception (int exit_status = 0, bool safe_to_return = false) + : m_exit_status (exit_status), m_safe_to_return (safe_to_return) + { } - octave_exit_exception (int exit_status = 0, bool safe_to_return = false) - : m_exit_status (exit_status), m_safe_to_return (safe_to_return) - { } + exit_exception (const exit_exception& ex) + : m_exit_status (ex.m_exit_status), m_safe_to_return (ex.m_safe_to_return) + { } - octave_exit_exception (const octave_exit_exception& ex) - : m_exit_status (ex.m_exit_status), m_safe_to_return (ex.m_safe_to_return) - { } + exit_exception& operator = (exit_exception& ex) + { + if (this != &ex) + { + m_exit_status = ex.m_exit_status; + m_safe_to_return = ex.m_safe_to_return; + } - octave_exit_exception& operator = (octave_exit_exception& ex) - { - if (this != &ex) - { - m_exit_status = ex.m_exit_status; - m_safe_to_return = ex.m_safe_to_return; - } + return *this; + } + + ~exit_exception (void) { } + + int exit_status (void) const { return m_exit_status; } - return *this; - } + bool safe_to_return (void) const { return m_safe_to_return; } + + private: - ~octave_exit_exception (void) { } + int m_exit_status; - int exit_status (void) const { return m_exit_status; } - - bool safe_to_return (void) const { return m_safe_to_return; } + bool m_safe_to_return; + }; -private: - - int m_exit_status; + class + interrupt_exception + { + }; +} - bool m_safe_to_return; -}; +OCTAVE_DEPRECATED ("use 'octave::execution_exception' instead") +typedef octave::exit_exception octave_execution_exception; -class -octave_interrupt_exception -{ -}; +OCTAVE_DEPRECATED ("use 'octave::exit_exception' instead") +typedef octave::exit_exception octave_exit_exception; + +OCTAVE_DEPRECATED ("use 'octave::interrupt_exception' instead") +typedef octave::interrupt_exception octave_interrupt_exception; #endif @@ -265,12 +277,12 @@ #define END_INTERRUPT_WITH_EXCEPTIONS \ } \ - catch (const octave_interrupt_exception&) \ + catch (const octave::interrupt_exception&) \ { \ octave_interrupt_immediately = saved_octave_interrupt_immediately; \ octave_jump_to_enclosing_context (); \ } \ - catch (const octave_execution_exception&) \ + catch (const octave::execution_exception&) \ { \ octave_interrupt_immediately = saved_octave_interrupt_immediately; \ octave_exception_state = octave_exec_exception; \ @@ -282,7 +294,7 @@ octave_exception_state = octave_alloc_exception; \ octave_jump_to_enclosing_context (); \ } \ - catch (const octave_exit_exception& ex) \ + catch (const octave::exit_exception& ex) \ { \ octave_interrupt_immediately = saved_octave_interrupt_immediately; \ octave_exception_state = octave_quit_exception; \
--- a/liboctave/numeric/gepbalance.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/liboctave/numeric/gepbalance.cc Wed Aug 17 03:41:42 2016 -0400 @@ -52,7 +52,7 @@ (*current_liboctave_error_handler) ("GEPBALANCE requires square matrix"); if (a.dims () != b.dims ()) - err_nonconformant ("GEPBALANCE", n, n, b.rows(), b.cols()); + octave::err_nonconformant ("GEPBALANCE", n, n, b.rows(), b.cols()); octave_idx_type info; octave_idx_type ilo; @@ -117,7 +117,7 @@ ("FloatGEPBALANCE requires square matrix"); if (a.dims () != b.dims ()) - err_nonconformant ("FloatGEPBALANCE", n, n, b.rows(), b.cols()); + octave::err_nonconformant ("FloatGEPBALANCE", n, n, b.rows(), b.cols()); octave_idx_type info; octave_idx_type ilo; @@ -183,7 +183,7 @@ ("ComplexGEPBALANCE requires square matrix"); if (a.dims () != b.dims ()) - err_nonconformant ("ComplexGEPBALANCE", n, n, b.rows(), b.cols()); + octave::err_nonconformant ("ComplexGEPBALANCE", n, n, b.rows(), b.cols()); octave_idx_type info; octave_idx_type ilo; @@ -252,7 +252,7 @@ } if (a.dims () != b.dims ()) - err_nonconformant ("FloatComplexGEPBALANCE", n, n, b.rows(), b.cols()); + octave::err_nonconformant ("FloatComplexGEPBALANCE", n, n, b.rows(), b.cols()); octave_idx_type info; octave_idx_type ilo;
--- a/liboctave/operators/Sparse-diag-op-defs.h Wed Aug 17 02:57:50 2016 -0400 +++ b/liboctave/operators/Sparse-diag-op-defs.h Wed Aug 17 03:41:42 2016 -0400 @@ -37,7 +37,7 @@ const octave_idx_type a_nc = a.cols (); if (nc != a_nr) - err_nonconformant ("operator *", nr, nc, a_nr, a_nc); + octave::err_nonconformant ("operator *", nr, nc, a_nr, a_nc); RT r (nr, a_nc, a.nnz ()); @@ -73,7 +73,7 @@ const octave_idx_type a_nc = a.cols (); if (nr != a_nc) - err_nonconformant ("operator *", a_nr, a_nc, nr, nc); + octave::err_nonconformant ("operator *", a_nr, a_nc, nr, nc); const octave_idx_type mnc = nc < a_nc ? nc: a_nc; RT r (a_nr, nc, a.cidx (mnc)); @@ -177,7 +177,7 @@ RT do_add_dm_sm (const DM& d, const SM& a) { if (a.rows () != d.rows () || a.cols () != d.cols ()) - err_nonconformant ("operator +", d.rows (), d.cols (), a.rows (), a.cols ()); + octave::err_nonconformant ("operator +", d.rows (), d.cols (), a.rows (), a.cols ()); else return do_commutative_add_dm_sm<RT> (d, a); } @@ -186,7 +186,7 @@ RT do_sub_dm_sm (const DM& d, const SM& a) { if (a.rows () != d.rows () || a.cols () != d.cols ()) - err_nonconformant ("operator -", d.rows (), d.cols (), a.rows (), a.cols ()); + octave::err_nonconformant ("operator -", d.rows (), d.cols (), a.rows (), a.cols ()); return inner_do_add_sm_dm<RT> (a, d, std::negate<typename SM::element_type> (), identity_val<typename DM::element_type> ()); @@ -196,7 +196,7 @@ RT do_add_sm_dm (const SM& a, const DM& d) { if (a.rows () != d.rows () || a.cols () != d.cols ()) - err_nonconformant ("operator +", a.rows (), a.cols (), d.rows (), d.cols ()); + octave::err_nonconformant ("operator +", a.rows (), a.cols (), d.rows (), d.cols ()); return do_commutative_add_dm_sm<RT> (d, a); } @@ -205,7 +205,7 @@ RT do_sub_sm_dm (const SM& a, const DM& d) { if (a.rows () != d.rows () || a.cols () != d.cols ()) - err_nonconformant ("operator -", a.rows (), a.cols (), d.rows (), d.cols ()); + octave::err_nonconformant ("operator -", a.rows (), a.cols (), d.rows (), d.cols ()); return inner_do_add_sm_dm<RT> (a, d, identity_val<typename SM::element_type> (),
--- a/liboctave/operators/Sparse-op-defs.h Wed Aug 17 02:57:50 2016 -0400 +++ b/liboctave/operators/Sparse-op-defs.h Wed Aug 17 03:41:42 2016 -0400 @@ -371,7 +371,7 @@ } \ } \ else if (m1_nr != m2_nr || m1_nc != m2_nc) \ - err_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \ + octave::err_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \ else \ { \ r = R (m1_nr, m1_nc, (m1.nnz () + m2.nnz ())); \ @@ -479,7 +479,7 @@ } \ } \ else if (m1_nr != m2_nr || m1_nc != m2_nc) \ - err_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \ + octave::err_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \ else \ { \ r = R (m1_nr, m1_nc, (m1.nnz () > m2.nnz () ? m1.nnz () : m2.nnz ())); \ @@ -595,7 +595,7 @@ } \ } \ else if (m1_nr != m2_nr || m1_nc != m2_nc) \ - err_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \ + octave::err_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \ else \ { \ \ @@ -818,7 +818,7 @@ else \ { \ if ((m1_nr != 0 || m1_nc != 0) && (m2_nr != 0 || m2_nc != 0)) \ - err_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \ + octave::err_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \ } \ return r; \ } @@ -966,7 +966,7 @@ else \ { \ if ((m1_nr != 0 || m1_nc != 0) && (m2_nr != 0 || m2_nc != 0)) \ - err_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \ + octave::err_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \ } \ return r; \ } @@ -995,7 +995,7 @@ if (m2_nr == 1 && m2_nc == 1) \ r = R (m1 OP m2.elem (0,0)); \ else if (m1_nr != m2_nr || m1_nc != m2_nc) \ - err_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \ + octave::err_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \ else \ { \ r = R (F (m1, m2.matrix_value ())); \ @@ -1018,7 +1018,7 @@ if (m2_nr == 1 && m2_nc == 1) \ r = R (m1 OP m2.elem (0,0)); \ else if (m1_nr != m2_nr || m1_nc != m2_nc) \ - err_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \ + octave::err_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \ else \ { \ if (do_mx_check (m1, mx_inline_all_finite<M1::element_type>)) \ @@ -1106,7 +1106,7 @@ else \ { \ if ((m1_nr != 0 || m1_nc != 0) && (m2_nr != 0 || m2_nc != 0)) \ - err_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \ + octave::err_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \ } \ return r; \ } @@ -1172,7 +1172,7 @@ else \ { \ if ((m1_nr != 0 || m1_nc != 0) && (m2_nr != 0 || m2_nc != 0)) \ - err_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \ + octave::err_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \ } \ return r; \ } @@ -1201,7 +1201,7 @@ if (m1_nr == 1 && m1_nc == 1) \ r = R (m1.elem (0,0) OP m2); \ else if (m1_nr != m2_nr || m1_nc != m2_nc) \ - err_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \ + octave::err_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \ else \ { \ r = R (m1.matrix_value () OP m2); \ @@ -1232,7 +1232,7 @@ if (m1_nr == 1 && m1_nc == 1) \ r = R (m1.elem (0,0) OP m2); \ else if (m1_nr != m2_nr || m1_nc != m2_nc) \ - err_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \ + octave::err_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \ else \ { \ if (SPARSE_SMM_BIN_OP_2_CHECK_ ## F(M2::element_type)) \ @@ -1319,7 +1319,7 @@ else \ { \ if ((m1_nr != 0 || m1_nc != 0) && (m2_nr != 0 || m2_nc != 0)) \ - err_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \ + octave::err_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \ } \ return r; \ } @@ -1385,7 +1385,7 @@ else \ { \ if ((m1_nr != 0 || m1_nc != 0) && (m2_nr != 0 || m2_nc != 0)) \ - err_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \ + octave::err_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \ } \ return r; \ } @@ -1741,7 +1741,7 @@ return r; \ } \ else if (nc != a_nr) \ - err_nonconformant ("operator *", nr, nc, a_nr, a_nc); \ + octave::err_nonconformant ("operator *", nr, nc, a_nr, a_nc); \ else \ { \ OCTAVE_LOCAL_BUFFER (octave_idx_type, w, nr); \ @@ -1870,7 +1870,7 @@ return retval; \ } \ else if (nc != a_nr) \ - err_nonconformant ("operator *", nr, nc, a_nr, a_nc); \ + octave::err_nonconformant ("operator *", nr, nc, a_nr, a_nc); \ else \ { \ RET_TYPE retval (nr, a_nc, ZERO); \ @@ -1902,7 +1902,7 @@ return retval; \ } \ else if (nr != a_nr) \ - err_nonconformant ("operator *", nc, nr, a_nr, a_nc); \ + octave::err_nonconformant ("operator *", nc, nr, a_nr, a_nc); \ else \ { \ RET_TYPE retval (nc, a_nc); \ @@ -1935,7 +1935,7 @@ return retval; \ } \ else if (nc != a_nr) \ - err_nonconformant ("operator *", nr, nc, a_nr, a_nc); \ + octave::err_nonconformant ("operator *", nr, nc, a_nr, a_nc); \ else \ { \ RET_TYPE retval (nr, a_nc, ZERO); \ @@ -1968,7 +1968,7 @@ return retval; \ } \ else if (nc != a_nc) \ - err_nonconformant ("operator *", nr, nc, a_nc, a_nr); \ + octave::err_nonconformant ("operator *", nr, nc, a_nc, a_nr); \ else \ { \ RET_TYPE retval (nr, a_nr, ZERO); \
--- a/liboctave/operators/Sparse-perm-op-defs.h Wed Aug 17 02:57:50 2016 -0400 +++ b/liboctave/operators/Sparse-perm-op-defs.h Wed Aug 17 03:41:42 2016 -0400 @@ -64,7 +64,7 @@ { const octave_idx_type nr = a.rows (); if (p.cols () != nr) - err_nonconformant ("operator *", p.rows (), p.cols (), a.rows (), a.cols ()); + octave::err_nonconformant ("operator *", p.rows (), p.cols (), a.rows (), a.cols ()); return octinternal_do_mul_colpm_sm (p.col_perm_vec ().data (), a); } @@ -147,7 +147,7 @@ { const octave_idx_type nc = a.cols (); if (p.rows () != nc) - err_nonconformant ("operator *", a.rows (), a.cols (), p.rows (), p.cols ()); + octave::err_nonconformant ("operator *", a.rows (), a.cols (), p.rows (), p.cols ()); return octinternal_do_mul_sm_colpm (a, p.col_perm_vec ().data ()); }
--- a/liboctave/operators/mx-inlines.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/liboctave/operators/mx-inlines.cc Wed Aug 17 03:41:42 2016 -0400 @@ -476,7 +476,7 @@ return do_bsxfun_op (x, y, op, op1, op2); } else - err_nonconformant (opname, dx, dy); + octave::err_nonconformant (opname, dx, dy); } template <typename R, typename X, typename Y> @@ -513,7 +513,7 @@ else if (is_valid_inplace_bsxfun (opname, dr, dx)) do_inplace_bsxfun_op (r, x, op, op1); else - err_nonconformant (opname, dr, dx); + octave::err_nonconformant (opname, dr, dx); return r; }
--- a/liboctave/operators/mx-op-defs.h Wed Aug 17 02:57:50 2016 -0400 +++ b/liboctave/operators/mx-op-defs.h Wed Aug 17 03:41:42 2016 -0400 @@ -33,11 +33,11 @@ #define SNANCHK(s) \ if (octave::math::isnan (s)) \ - err_nan_to_logical_conversion () + octave::err_nan_to_logical_conversion () #define MNANCHK(m, MT) \ if (do_mx_check (m, mx_inline_any_nan<MT>)) \ - err_nan_to_logical_conversion () + octave::err_nan_to_logical_conversion () // vector by scalar operations. @@ -404,7 +404,7 @@ octave_idx_type dm_nc = dm.cols (); \ \ if (m_nr != dm_nr || m_nc != dm_nc) \ - err_nonconformant (#OP, m_nr, m_nc, dm_nr, dm_nc); \ + octave::err_nonconformant (#OP, m_nr, m_nc, dm_nr, dm_nc); \ \ r.resize (m_nr, m_nc); \ \ @@ -434,7 +434,7 @@ octave_idx_type dm_nc = dm.cols (); \ \ if (m_nc != dm_nr) \ - err_nonconformant ("operator *", m_nr, m_nc, dm_nr, dm_nc); \ + octave::err_nonconformant ("operator *", m_nr, m_nc, dm_nr, dm_nc); \ \ r = R (m_nr, dm_nc); \ R::element_type *rd = r.fortran_vec (); \ @@ -472,7 +472,7 @@ octave_idx_type m_nc = m.cols (); \ \ if (dm_nr != m_nr || dm_nc != m_nc) \ - err_nonconformant (#OP, dm_nr, dm_nc, m_nr, m_nc); \ + octave::err_nonconformant (#OP, dm_nr, dm_nc, m_nr, m_nc); \ else \ { \ if (m_nr > 0 && m_nc > 0) \ @@ -504,7 +504,7 @@ octave_idx_type m_nc = m.cols (); \ \ if (dm_nc != m_nr) \ - err_nonconformant ("operator *", dm_nr, dm_nc, m_nr, m_nc); \ + octave::err_nonconformant ("operator *", dm_nr, dm_nc, m_nr, m_nc); \ \ r = R (dm_nr, m_nc); \ R::element_type *rd = r.fortran_vec (); \ @@ -543,7 +543,7 @@ octave_idx_type dm2_nc = dm2.cols (); \ \ if (dm1_nr != dm2_nr || dm1_nc != dm2_nc) \ - err_nonconformant (#OP, dm1_nr, dm1_nc, dm2_nr, dm2_nc); \ + octave::err_nonconformant (#OP, dm1_nr, dm1_nc, dm2_nr, dm2_nc); \ \ r.resize (dm1_nr, dm1_nc); \ \ @@ -598,7 +598,7 @@ octave_idx_type nc = x.columns (); \ M result; \ if (p.columns () != nr) \ - err_nonconformant ("operator *", p.rows (), p.columns (), nr, nc); \ + octave::err_nonconformant ("operator *", p.rows (), p.columns (), nr, nc); \ else \ { \ result = M (nr, nc); \ @@ -615,7 +615,7 @@ octave_idx_type nc = x.columns (); \ M result; \ if (p.rows () != nc) \ - err_nonconformant ("operator *", nr, nc, p.rows (), p.columns ()); \ + octave::err_nonconformant ("operator *", nr, nc, p.rows (), p.columns ()); \ \ result = x.index (idx_vector::colon, p.col_perm_vec ()); \ \
--- a/liboctave/util/cmd-edit.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/liboctave/util/cmd-edit.cc Wed Aug 17 03:41:42 2016 -0400 @@ -1797,7 +1797,7 @@ { tmpstr = octave::sys::env::get_current_directory (); } - catch (const octave_execution_exception&) + catch (const octave::execution_exception&) { tmpstr = ""; }
--- a/liboctave/util/lo-array-errwarn.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/liboctave/util/lo-array-errwarn.cc Wed Aug 17 03:41:42 2016 -0400 @@ -40,288 +40,291 @@ static const char *warning_id_singular_matrix = "Octave:singular-matrix"; -void -err_nan_to_logical_conversion (void) -{ - (*current_liboctave_error_handler) - ("invalid conversion from NaN to logical"); -} - -void -err_nan_to_character_conversion (void) +namespace octave { - (*current_liboctave_error_handler) - ("invalid conversion from NaN to character"); -} + void + err_nan_to_logical_conversion (void) + { + (*current_liboctave_error_handler) + ("invalid conversion from NaN to logical"); + } + + void + err_nan_to_character_conversion (void) + { + (*current_liboctave_error_handler) + ("invalid conversion from NaN to character"); + } + + void + err_nonconformant (const char *op, + octave_idx_type op1_len, octave_idx_type op2_len) + { + const char *err_id = error_id_nonconformant_args; -void -err_nonconformant (const char *op, - octave_idx_type op1_len, octave_idx_type op2_len) -{ - const char *err_id = error_id_nonconformant_args; + (*current_liboctave_error_with_id_handler) + (err_id, "%s: nonconformant arguments (op1 len: %d, op2 len: %d)", + op, op1_len, op2_len); + } + + void + err_nonconformant (const char *op, + octave_idx_type op1_nr, octave_idx_type op1_nc, + octave_idx_type op2_nr, octave_idx_type op2_nc) + { + const char *err_id = error_id_nonconformant_args; + + (*current_liboctave_error_with_id_handler) + (err_id, "%s: nonconformant arguments (op1 is %dx%d, op2 is %dx%d)", + op, op1_nr, op1_nc, op2_nr, op2_nc); + } + + void + err_nonconformant (const char *op, + const dim_vector& op1_dims, const dim_vector& op2_dims) + { + const char *err_id = error_id_nonconformant_args; + + std::string op1_dims_str = op1_dims.str (); + std::string op2_dims_str = op2_dims.str (); - (*current_liboctave_error_with_id_handler) - (err_id, "%s: nonconformant arguments (op1 len: %d, op2 len: %d)", - op, op1_len, op2_len); -} + (*current_liboctave_error_with_id_handler) + (err_id, "%s: nonconformant arguments (op1 is %s, op2 is %s)", + op, op1_dims_str.c_str (), op2_dims_str.c_str ()); + } -void -err_nonconformant (const char *op, - octave_idx_type op1_nr, octave_idx_type op1_nc, - octave_idx_type op2_nr, octave_idx_type op2_nc) -{ - const char *err_id = error_id_nonconformant_args; + void + err_del_index_out_of_range (bool is1d, octave_idx_type idx, + octave_idx_type ext) + { + const char *err_id = error_id_index_out_of_bounds; + + (*current_liboctave_error_with_id_handler) + (err_id, "A(%s) = []: index out of bounds: value %d out of bound %d", + is1d ? "I" : "..,I,..", idx, ext); + } + + // Common procedures of base class index_exception, thrown whenever an + // object is indexed incorrectly, such as by an index that is out of + // range, negative, fractional, complex, or of a non-numeric type. - (*current_liboctave_error_with_id_handler) - (err_id, "%s: nonconformant arguments (op1 is %dx%d, op2 is %dx%d)", - op, op1_nr, op1_nc, op2_nr, op2_nc); -} + std::string + index_exception::message (void) const + { + std::string msg = expression () + ": " + details (); + return msg.c_str (); + } + + // Show the expression that caused the error, e.g., "A(-1,_)", + // "A(0+1i)", "A(_,3)". Show how many indices come before/after the + // offending one, e.g., (<error>), (<error>,_), or (_,<error>,...[x5]...) -void -err_nonconformant (const char *op, - const dim_vector& op1_dims, const dim_vector& op2_dims) -{ - const char *err_id = error_id_nonconformant_args; + std::string + index_exception::expression (void) const + { + std::ostringstream buf; - std::string op1_dims_str = op1_dims.str (); - std::string op2_dims_str = op2_dims.str (); + if (var.empty () || var == "<unknown>") + buf << "index "; + else + buf << var; + + bool show_parens = dim > 0; + + if (show_parens) + { + if (dim < 5) + { + buf << "("; - (*current_liboctave_error_with_id_handler) - (err_id, "%s: nonconformant arguments (op1 is %s, op2 is %s)", - op, op1_dims_str.c_str (), op2_dims_str.c_str ()); -} + for (octave_idx_type i = 1; i < dim; i++) + buf << "_,"; + } + else + buf << "(...[x" << dim - 1 << "]..."; + } + + buf << idx (); + + if (show_parens) + { + if (nd - dim < 5) + { + for (octave_idx_type i = 0; i < nd - dim; i++) + buf << ",_"; + + if (nd >= dim) + buf << ")"; + } + else + buf << "...[x" << nd - dim << "]...)"; + } -void -err_del_index_out_of_range (bool is1d, octave_idx_type idx, - octave_idx_type ext) -{ - const char *err_id = error_id_index_out_of_bounds; + return buf.str (); + } + + class invalid_index : public index_exception + { + public: + + invalid_index (const std::string& value, octave_idx_type ndim, + octave_idx_type dimen) + : index_exception (value, ndim, dimen) + { } - (*current_liboctave_error_with_id_handler) - (err_id, "A(%s) = []: index out of bounds: value %d out of bound %d", - is1d ? "I" : "..,I,..", idx, ext); -} + std::string details (void) const + { +#if defined (OCTAVE_ENABLE_64) + return "subscripts must be either integers 1 to (2^63)-1 or logicals"; +#else + return "subscripts must be either integers 1 to (2^31)-1 or logicals"; +#endif + } -// Common procedures of base class index_exception, thrown whenever an -// object is indexed incorrectly, such as by an index that is out of -// range, negative, fractional, complex, or of a non-numeric type. + // ID of error to throw + const char *err_id (void) const + { + return error_id_invalid_index; + } + }; -std::string -index_exception::message (void) const -{ - std::string msg = expression () + ": " + details (); - return msg.c_str (); -} + // Complain if an index is negative, fractional, or too big. + + void + err_invalid_index (const std::string& idx, octave_idx_type nd, + octave_idx_type dim, const std::string&) + { + invalid_index e (idx, nd, dim); -// Show the expression that caused the error, e.g., "A(-1,_)", -// "A(0+1i)", "A(_,3)". Show how many indices come before/after the -// offending one, e.g., (<error>), (<error>,_), or (_,<error>,...[x5]...) + throw e; + } -std::string -index_exception::expression (void) const -{ - std::ostringstream buf; + void + err_invalid_index (octave_idx_type n, octave_idx_type nd, + octave_idx_type dim, const std::string& var) + { + std::ostringstream buf; + buf << n + 1; + err_invalid_index (buf.str (), nd, dim, var); + } - if (var.empty () || var == "<unknown>") - buf << "index "; - else - buf << var; + void + err_invalid_index (double n, octave_idx_type nd, octave_idx_type dim, + const std::string& var) + { + std::ostringstream buf; + buf << n + 1; + err_invalid_index (buf.str (), nd, dim, var); + } - bool show_parens = dim > 0; + // Complain for read access beyond the bounds of an array. + + class out_of_range : public index_exception + { + public: - if (show_parens) + out_of_range (const std::string& value, octave_idx_type nd_in, + octave_idx_type dim_in) + : index_exception (value, nd_in, dim_in), extent (0) + { } + + std::string details (void) const { - if (dim < 5) + std::string expl; + + if (nd >= size.ndims ()) // if not an index slice { - buf << "("; + if (var != "") + expl = "but " + var + " has size "; + else + expl = "but object has size "; - for (octave_idx_type i = 1; i < dim; i++) - buf << "_,"; + expl = expl + size.str ('x'); } else - buf << "(...[x" << dim - 1 << "]..."; + { + std::ostringstream buf; + buf << extent; + expl = "out of bound " + buf.str (); + } + + return expl; } - buf << idx (); - - if (show_parens) + // ID of error to throw. + const char *err_id (void) const { - if (nd - dim < 5) - { - for (octave_idx_type i = 0; i < nd - dim; i++) - buf << ",_"; - - if (nd >= dim) - buf << ")"; - } - else - buf << "...[x" << nd - dim << "]...)"; + return error_id_index_out_of_bounds; } - return buf.str (); -} + void set_size (const dim_vector& size_in) { size = size_in; } + + void set_extent (octave_idx_type ext) { extent = ext; } + + private: -class invalid_index : public index_exception -{ -public: + // Dimension of object being accessed. + dim_vector size; + + // Length of dimension being accessed. + octave_idx_type extent; + }; - invalid_index (const std::string& value, octave_idx_type ndim, - octave_idx_type dimen) - : index_exception (value, ndim, dimen) - { } + // Complain of an index that is out of range, but we don't know matrix size + void + err_index_out_of_range (int nd, int dim, octave_idx_type idx, + octave_idx_type ext) + { + std::ostringstream buf; + buf << idx; + out_of_range e (buf.str (), nd, dim); - std::string details (void) const - { -#if defined (OCTAVE_ENABLE_64) - return "subscripts must be either integers 1 to (2^63)-1 or logicals"; -#else - return "subscripts must be either integers 1 to (2^31)-1 or logicals"; -#endif + e.set_extent (ext); + // ??? Make details method give extent not size. + e.set_size (dim_vector (1, 1, 1, 1, 1, 1,1)); + + throw e; } - // ID of error to throw - const char *err_id (void) const + // Complain of an index that is out of range + void + err_index_out_of_range (int nd, int dim, octave_idx_type idx, + octave_idx_type ext, const dim_vector& d) { - return error_id_invalid_index; - } -}; - -// Complain if an index is negative, fractional, or too big. + std::ostringstream buf; + buf << idx; + out_of_range e (buf.str (), nd, dim); -void -err_invalid_index (const std::string& idx, octave_idx_type nd, - octave_idx_type dim, const std::string&) -{ - invalid_index e (idx, nd, dim); - - throw e; -} + e.set_extent (ext); + e.set_size (d); -void -err_invalid_index (octave_idx_type n, octave_idx_type nd, - octave_idx_type dim, const std::string& var) -{ - std::ostringstream buf; - buf << n + 1; - err_invalid_index (buf.str (), nd, dim, var); -} + throw e; + } -void -err_invalid_index (double n, octave_idx_type nd, octave_idx_type dim, - const std::string& var) -{ - std::ostringstream buf; - buf << n + 1; - err_invalid_index (buf.str (), nd, dim, var); -} - -// Complain for read access beyond the bounds of an array. - -class out_of_range : public index_exception -{ -public: + void + err_invalid_resize (void) + { + (*current_liboctave_error_with_id_handler) + ("Octave:invalid-resize", + "Invalid resizing operation or ambiguous assignment to an out-of-bounds array element"); + } - out_of_range (const std::string& value, octave_idx_type nd_in, - octave_idx_type dim_in) - : index_exception (value, nd_in, dim_in), extent (0) - { } - - std::string details (void) const + void + warn_singular_matrix (double rcond) { - std::string expl; - - if (nd >= size.ndims ()) // if not an index slice + if (rcond == 0.0) { - if (var != "") - expl = "but " + var + " has size "; - else - expl = "but object has size "; - - expl = expl + size.str ('x'); + (*current_liboctave_warning_with_id_handler) + (warning_id_singular_matrix, + "matrix singular to machine precision"); } else { - std::ostringstream buf; - buf << extent; - expl = "out of bound " + buf.str (); + (*current_liboctave_warning_with_id_handler) + (warning_id_nearly_singular_matrix, + "matrix singular to machine precision, rcond = %g", rcond); } - - return expl; - } - - // ID of error to throw. - const char *err_id (void) const - { - return error_id_index_out_of_bounds; } - - void set_size (const dim_vector& size_in) { size = size_in; } - - void set_extent (octave_idx_type ext) { extent = ext; } - -private: - - // Dimension of object being accessed. - dim_vector size; - - // Length of dimension being accessed. - octave_idx_type extent; -}; - -// Complain of an index that is out of range, but we don't know matrix size -void -err_index_out_of_range (int nd, int dim, octave_idx_type idx, - octave_idx_type ext) -{ - std::ostringstream buf; - buf << idx; - out_of_range e (buf.str (), nd, dim); - - e.set_extent (ext); - // ??? Make details method give extent not size. - e.set_size (dim_vector (1, 1, 1, 1, 1, 1,1)); - - throw e; -} - -// Complain of an index that is out of range -void -err_index_out_of_range (int nd, int dim, octave_idx_type idx, - octave_idx_type ext, const dim_vector& d) -{ - std::ostringstream buf; - buf << idx; - out_of_range e (buf.str (), nd, dim); - - e.set_extent (ext); - e.set_size (d); - - throw e; -} - -void -err_invalid_resize (void) -{ - (*current_liboctave_error_with_id_handler) - ("Octave:invalid-resize", - "Invalid resizing operation or ambiguous assignment to an out-of-bounds array element"); -} - -void -warn_singular_matrix (double rcond) -{ - if (rcond == 0.0) - { - (*current_liboctave_warning_with_id_handler) - (warning_id_singular_matrix, - "matrix singular to machine precision"); - } - else - { - (*current_liboctave_warning_with_id_handler) - (warning_id_nearly_singular_matrix, - "matrix singular to machine precision, rcond = %g", rcond); - } } /* Tests in test/index.tst */
--- a/liboctave/util/lo-array-errwarn.h Wed Aug 17 02:57:50 2016 -0400 +++ b/liboctave/util/lo-array-errwarn.h Wed Aug 17 03:41:42 2016 -0400 @@ -28,129 +28,240 @@ #include "dim-vector.h" #include "quit.h" -// Exception thrown by err_invalid_index -// This is thrown when the invalid index is detected, at which point nd and dim -// are usually not known. It is caught at the place they are known, where a -// new err_invalid_index is called. -// -// Typically, this should be caught after any call to -// octave_value_list::index_vector() -class index_exception : public octave_execution_exception +namespace octave { -public: - - index_exception (const std::string& index_arg, octave_idx_type nd_arg = 0, - octave_idx_type dim_arg = -1, const char *var_arg = "") - : index (index_arg), nd (nd_arg), dim (dim_arg), var (var_arg) - { } - - ~index_exception (void) { } + // Exception thrown by err_invalid_index + // This is thrown when the invalid index is detected, at which point nd and dim + // are usually not known. It is caught at the place they are known, where a + // new err_invalid_index is called. + // + // Typically, this should be caught after any call to + // octave_value_list::index_vector() - // Erroneous index value. Called in what, and by external code - // (e.g., nth_element) to make a custom error message. - std::string idx (void) const { return index; } - - // details set by subclass. - virtual std::string details (void) const = 0; - - // ID of error to throw. - virtual const char *err_id (void) const = 0; - - virtual std::string message (void) const; - - // Position of error: dimension in error, and number of dimensions. - void set_pos (octave_idx_type nd_arg, octave_idx_type dim_arg) - { - nd = nd_arg; - dim = dim_arg; - } - - void set_pos_if_unset (octave_idx_type nd_arg, octave_idx_type dim_arg) + class index_exception : public execution_exception { - if (nd == 0) - { - nd = nd_arg; - dim = dim_arg; - } - } + public: + + index_exception (const std::string& index_arg, octave_idx_type nd_arg = 0, + octave_idx_type dim_arg = -1, const char *var_arg = "") + : index (index_arg), nd (nd_arg), dim (dim_arg), var (var_arg) + { } + + ~index_exception (void) { } + + // Erroneous index value. Called in what, and by external code + // (e.g., nth_element) to make a custom error message. + std::string idx (void) const { return index; } + + // details set by subclass. + virtual std::string details (void) const = 0; + + // ID of error to throw. + virtual const char *err_id (void) const = 0; + + virtual std::string message (void) const; + + // Position of error: dimension in error, and number of dimensions. + void set_pos (octave_idx_type nd_arg, octave_idx_type dim_arg) + { + nd = nd_arg; + dim = dim_arg; + } - // Name of variable being indexed. eye(2)(1,1) gives "<unknown>". - void set_var (const std::string& var_arg = "") - { - var = var_arg; - } + void set_pos_if_unset (octave_idx_type nd_arg, octave_idx_type dim_arg) + { + if (nd == 0) + { + nd = nd_arg; + dim = dim_arg; + } + } -private: + // Name of variable being indexed. eye(2)(1,1) gives "<unknown>". + void set_var (const std::string& var_arg = "") + { + var = var_arg; + } + + private: + + // Value of invalid index. + std::string index; - // Value of invalid index. - std::string index; + protected: + + // Show what's wrong, e.g., A(-1,_), A(0+1i). + std::string expression (void) const; + + // Number of dimensions of indexed object. + octave_idx_type nd; + + // Dimension number in which invalid index occurred. + octave_idx_type dim; -protected: + // Name of variable being indexed. + std::string var; + + }; - // Show what's wrong, e.g., A(-1,_), A(0+1i). - std::string expression (void) const; + OCTAVE_NORETURN OCTAVE_API extern void + err_nan_to_logical_conversion (void); + + OCTAVE_NORETURN OCTAVE_API extern void + err_nan_to_character_conversion (void); - // Number of dimensions of indexed object. - octave_idx_type nd; + OCTAVE_NORETURN OCTAVE_API extern void + err_nonconformant (const char *op, octave_idx_type op1_len, + octave_idx_type op2_len); + + OCTAVE_NORETURN OCTAVE_API extern void + err_nonconformant (const char *op, + octave_idx_type op1_nr, octave_idx_type op1_nc, + octave_idx_type op2_nr, octave_idx_type op2_nc); + + OCTAVE_NORETURN OCTAVE_API extern void + err_nonconformant (const char *op, + const dim_vector& op1_dims, const dim_vector& op2_dims); + + OCTAVE_NORETURN OCTAVE_API extern void + err_index_out_of_range (int nd, int dim, octave_idx_type iext, + octave_idx_type ext, const dim_vector& d); - // Dimension number in which invalid index occurred. - octave_idx_type dim; + OCTAVE_NORETURN OCTAVE_API extern void + err_index_out_of_range (int nd, int dim, octave_idx_type iext, + octave_idx_type ext); + + OCTAVE_NORETURN OCTAVE_API extern void + err_del_index_out_of_range (bool is1d, octave_idx_type iext, + octave_idx_type ext); - // Name of variable being indexed. - std::string var; + OCTAVE_NORETURN OCTAVE_API extern void + err_invalid_index (double n, octave_idx_type nd = 0, + octave_idx_type dim = 0, + const std::string& var = ""); -}; + OCTAVE_NORETURN OCTAVE_API extern void + err_invalid_index (octave_idx_type n, octave_idx_type nd = 0, + octave_idx_type dim = 0, + const std::string& var = ""); -OCTAVE_NORETURN OCTAVE_API extern void -err_nan_to_logical_conversion (void); + OCTAVE_NORETURN OCTAVE_API extern void + err_invalid_index (const std::string& idx, octave_idx_type nd = 0, + octave_idx_type dim = 0, + const std::string& var = ""); -OCTAVE_NORETURN OCTAVE_API extern void -err_nan_to_character_conversion (void); + OCTAVE_NORETURN OCTAVE_API extern void + err_invalid_resize (void); + + OCTAVE_API extern void + warn_singular_matrix (double rcond = 0.0); +} + +#if defined (OCTAVE_USE_DEPRECATED_FUNCTIONS) -OCTAVE_NORETURN OCTAVE_API extern void +OCTAVE_DEPRECATED ("use 'octave::err_nan_to_logical_conversion' instead") +OCTAVE_NORETURN inline void +err_nan_to_logical_conversion (void) +{ + octave::err_nan_to_logical_conversion (); +} + +OCTAVE_DEPRECATED ("use 'octave::err_nan_to_character_conversion' instead") +OCTAVE_NORETURN inline void +err_nan_to_character_conversion (void) +{ + octave::err_nan_to_character_conversion (); +} + +OCTAVE_DEPRECATED ("use 'octave::err_nonconformant' instead") +OCTAVE_NORETURN inline void err_nonconformant (const char *op, octave_idx_type op1_len, - octave_idx_type op2_len); + octave_idx_type op2_len) +{ + octave::err_nonconformant (op, op1_len, op2_len); +} -OCTAVE_NORETURN OCTAVE_API extern void +OCTAVE_DEPRECATED ("use 'octave::err_nonconformant' instead") +OCTAVE_NORETURN inline void err_nonconformant (const char *op, octave_idx_type op1_nr, octave_idx_type op1_nc, - octave_idx_type op2_nr, octave_idx_type op2_nc); - -OCTAVE_NORETURN OCTAVE_API extern void -err_nonconformant (const char *op, - const dim_vector& op1_dims, const dim_vector& op2_dims); + octave_idx_type op2_nr, octave_idx_type op2_nc) +{ + octave::err_nonconformant (op, op1_nr, op1_nc, op2_nr, op2_nc); +} -OCTAVE_NORETURN OCTAVE_API extern void +OCTAVE_DEPRECATED ("use 'octave::err_nonconformant' instead") +OCTAVE_NORETURN inline void +err_nonconformant (const char *op, + const dim_vector& op1_dims, const dim_vector& op2_dims) +{ + octave::err_nonconformant (op, op1_dims, op2_dims); +} + +OCTAVE_DEPRECATED ("use 'octave::err_index_out_of_range' instead") +OCTAVE_NORETURN inline void err_index_out_of_range (int nd, int dim, octave_idx_type iext, - octave_idx_type ext, const dim_vector& d); + octave_idx_type ext, const dim_vector& d) +{ + octave::err_index_out_of_range (nd, dim, iext, ext, d); +} -OCTAVE_NORETURN OCTAVE_API extern void +OCTAVE_DEPRECATED ("use 'octave::err_index_out_of_range' instead") +OCTAVE_NORETURN inline void err_index_out_of_range (int nd, int dim, octave_idx_type iext, - octave_idx_type ext); - -OCTAVE_NORETURN OCTAVE_API extern void -err_del_index_out_of_range (bool is1d, octave_idx_type iext, - octave_idx_type ext); + octave_idx_type ext) +{ + octave::err_index_out_of_range (nd, dim, iext, ext); +} -OCTAVE_NORETURN OCTAVE_API extern void -err_invalid_index (double, octave_idx_type nd = 0, +OCTAVE_DEPRECATED ("use 'octave::err_del_index_out_of_range' instead") +OCTAVE_NORETURN inline void +err_del_index_out_of_range (bool is1d, octave_idx_type iext, + octave_idx_type ext) +{ + octave::err_del_index_out_of_range (is1d, iext, ext); +} + +OCTAVE_NORETURN inline void +err_invalid_index (double n, octave_idx_type nd = 0, octave_idx_type dim = 0, - const std::string& var = ""); + const std::string& var = "") +{ + octave::err_invalid_index (n, nd, dim, var); +} -OCTAVE_NORETURN OCTAVE_API extern void +OCTAVE_DEPRECATED ("use 'octave::err_invalid_index' instead") +OCTAVE_NORETURN inline void err_invalid_index (octave_idx_type n, octave_idx_type nd = 0, octave_idx_type dim = 0, - const std::string& var = ""); + const std::string& var = "") +{ + octave::err_invalid_index (n, nd, dim, var); +} -OCTAVE_NORETURN OCTAVE_API extern void +OCTAVE_DEPRECATED ("use 'octave::err_invalid_index' instead") +OCTAVE_NORETURN inline void err_invalid_index (const std::string& idx, octave_idx_type nd = 0, octave_idx_type dim = 0, - const std::string& var = ""); + const std::string& var = "") +{ + octave::err_invalid_index (idx, nd, dim, var); +} -OCTAVE_NORETURN OCTAVE_API extern void -err_invalid_resize (void); +OCTAVE_DEPRECATED ("use 'octave::err_invalid_resize' instead") +OCTAVE_NORETURN inline void +err_invalid_resize (void) +{ + octave::err_invalid_resize (); +} -OCTAVE_API extern void -warn_singular_matrix (double rcond = 0.0); +OCTAVE_DEPRECATED ("use 'octave::warn_singular_matrix' instead") +inline void +warn_singular_matrix (double rcond = 0.0) +{ + return octave::warn_singular_matrix (rcond); +} #endif + +#endif
--- a/liboctave/util/lo-array-gripes.cc Wed Aug 17 02:57:50 2016 -0400 +++ b/liboctave/util/lo-array-gripes.cc Wed Aug 17 03:41:42 2016 -0400 @@ -105,30 +105,33 @@ is1d ? "I" : "..,I,..", idx, ext); } -class invalid_index : public index_exception +namespace octave { -public: + class invalid_index : public index_exception + { + public: - invalid_index (const std::string& value, octave_idx_type ndim, - octave_idx_type dimen) - : index_exception (value, ndim, dimen) - { } + invalid_index (const std::string& value, octave_idx_type ndim, + octave_idx_type dimen) + : index_exception (value, ndim, dimen) + { } - std::string details (void) const - { + std::string details (void) const + { #if defined (OCTAVE_ENABLE_64) - return "subscripts must be either integers 1 to (2^63)-1 or logicals"; + return "subscripts must be either integers 1 to (2^63)-1 or logicals"; #else - return "subscripts must be either integers 1 to (2^31)-1 or logicals"; + return "subscripts must be either integers 1 to (2^31)-1 or logicals"; #endif - } + } - // ID of error to throw - const char *err_id (void) const - { - return error_id_invalid_index; - } -}; + // ID of error to throw + const char *err_id (void) const + { + return error_id_invalid_index; + } + }; +} // Complain if an index is negative, fractional, or too big. @@ -136,9 +139,9 @@ gripe_invalid_index (const std::string& idx, octave_idx_type nd, octave_idx_type dim, const std::string&) { - invalid_index e (idx, nd, dim); + octave::invalid_index e (idx, nd, dim); - throw e; + throw e; } void @@ -179,58 +182,61 @@ #endif } -// Gripe and exception for read access beyond the bounds of an array. - -class out_of_range : public index_exception +namespace octave { -public: + // Gripe and exception for read access beyond the bounds of an array. - out_of_range (const std::string& value, octave_idx_type nd_in, - octave_idx_type dim_in) - : index_exception (value, nd_in, dim_in), extent (0) - { } + class out_of_range : public index_exception + { + public: - std::string details (void) const - { - std::string expl; + out_of_range (const std::string& value, octave_idx_type nd_in, + octave_idx_type dim_in) + : index_exception (value, nd_in, dim_in), extent (0) + { } - if (nd >= size.ndims ()) // if not an index slice - { - if (var != "") - expl = "but " + var + " has size "; - else - expl = "but object has size "; + std::string details (void) const + { + std::string expl; + + if (nd >= size.ndims ()) // if not an index slice + { + if (var != "") + expl = "but " + var + " has size "; + else + expl = "but object has size "; - expl = expl + size.str ('x'); - } - else - { - std::ostringstream buf; - buf << extent; - expl = "out of bound " + buf.str (); - } + expl = expl + size.str ('x'); + } + else + { + std::ostringstream buf; + buf << extent; + expl = "out of bound " + buf.str (); + } - return expl; - } + return expl; + } - // ID of error to throw. - const char *err_id (void) const - { - return error_id_index_out_of_bounds; - } + // ID of error to throw. + const char *err_id (void) const + { + return error_id_index_out_of_bounds; + } - void set_size (const dim_vector& size_in) { size = size_in; } + void set_size (const dim_vector& size_in) { size = size_in; } + + void set_extent (octave_idx_type ext) { extent = ext; } - void set_extent (octave_idx_type ext) { extent = ext; } + private: -private: + // Dimension of object being accessed. + dim_vector size; - // Dimension of object being accessed. - dim_vector size; - - // Length of dimension being accessed. - octave_idx_type extent; -}; + // Length of dimension being accessed. + octave_idx_type extent; + }; +} // Complain of an index that is out of range, but we don't know matrix size void @@ -239,7 +245,7 @@ { std::ostringstream buf; buf << idx; - out_of_range e (buf.str (), nd, dim); + octave::out_of_range e (buf.str (), nd, dim); e.set_extent (ext); // ??? Make details method give extent not size. @@ -255,7 +261,7 @@ { std::ostringstream buf; buf << idx; - out_of_range e (buf.str (), nd, dim); + octave::out_of_range e (buf.str (), nd, dim); e.set_extent (ext); e.set_size (d);
--- a/liboctave/util/lo-array-gripes.h Wed Aug 17 02:57:50 2016 -0400 +++ b/liboctave/util/lo-array-gripes.h Wed Aug 17 03:41:42 2016 -0400 @@ -31,70 +31,70 @@ #include "dim-vector.h" #include "quit.h" -OCTAVE_DEPRECATED ("use 'err_nan_to_logical_conversion' instead") +OCTAVE_DEPRECATED ("use 'octave::err_nan_to_logical_conversion' instead") OCTAVE_NORETURN OCTAVE_API extern void gripe_nan_to_logical_conversion (void); -OCTAVE_DEPRECATED ("use 'err_nan_to_character_conversion' instead") +OCTAVE_DEPRECATED ("use 'octave::err_nan_to_character_conversion' instead") OCTAVE_NORETURN OCTAVE_API extern void gripe_nan_to_character_conversion (void); -OCTAVE_DEPRECATED ("use 'err_nonconformant' instead") +OCTAVE_DEPRECATED ("use 'octave::err_nonconformant' instead") OCTAVE_NORETURN OCTAVE_API extern void gripe_nonconformant (const char *op, octave_idx_type op1_len, octave_idx_type op2_len); -OCTAVE_DEPRECATED ("use 'err_nonconformant' instead") +OCTAVE_DEPRECATED ("use 'octave::err_nonconformant' instead") OCTAVE_NORETURN OCTAVE_API extern void gripe_nonconformant (const char *op, octave_idx_type op1_nr, octave_idx_type op1_nc, octave_idx_type op2_nr, octave_idx_type op2_nc); -OCTAVE_DEPRECATED ("use 'err_nonconformant' instead") +OCTAVE_DEPRECATED ("use 'octave::err_nonconformant' instead") OCTAVE_NORETURN OCTAVE_API extern void gripe_nonconformant (const char *op, const dim_vector& op1_dims, const dim_vector& op2_dims); -OCTAVE_DEPRECATED ("use 'err_index_out_of_range' instead") +OCTAVE_DEPRECATED ("use 'octave::err_index_out_of_range' instead") OCTAVE_NORETURN OCTAVE_API extern void gripe_index_out_of_range (int nd, int dim, octave_idx_type iext, octave_idx_type ext, const dim_vector& d); -OCTAVE_DEPRECATED ("use 'err_index_out_of_range' instead") +OCTAVE_DEPRECATED ("use 'octave::err_index_out_of_range' instead") OCTAVE_NORETURN OCTAVE_API extern void gripe_index_out_of_range (int nd, int dim, octave_idx_type iext, octave_idx_type ext); -OCTAVE_DEPRECATED ("use 'err_del_index_out_of_range' instead") +OCTAVE_DEPRECATED ("use 'octave::err_del_index_out_of_range' instead") OCTAVE_NORETURN OCTAVE_API extern void gripe_del_index_out_of_range (bool is1d, octave_idx_type iext, octave_idx_type ext); -OCTAVE_DEPRECATED ("use 'err_invalid_index' instead") +OCTAVE_DEPRECATED ("use 'octave::err_invalid_index' instead") OCTAVE_NORETURN OCTAVE_API extern void gripe_invalid_index (double, octave_idx_type nd = 0, octave_idx_type dim = 0, const std::string& var = ""); -OCTAVE_DEPRECATED ("use 'err_invalid_index' instead") +OCTAVE_DEPRECATED ("use 'octave::err_invalid_index' instead") OCTAVE_NORETURN OCTAVE_API extern void gripe_invalid_index (octave_idx_type n, octave_idx_type nd = 0, octave_idx_type dim = 0, const std::string& var = ""); -OCTAVE_DEPRECATED ("use 'err_invalid_index' instead") +OCTAVE_DEPRECATED ("use 'octave::err_invalid_index' instead") OCTAVE_NORETURN OCTAVE_API extern void gripe_invalid_index (const std::string& idx, octave_idx_type nd = 0, octave_idx_type dim = 0, const std::string& var = ""); -OCTAVE_DEPRECATED ("use 'err_invalid_resize' instead") +OCTAVE_DEPRECATED ("use 'octave::err_invalid_resize' instead") OCTAVE_NORETURN OCTAVE_API extern void gripe_invalid_resize (void); -OCTAVE_DEPRECATED ("use 'err_singular_matrix' instead") +OCTAVE_DEPRECATED ("use 'octave::err_singular_matrix' instead") OCTAVE_API extern void gripe_singular_matrix (double rcond = 0.0);
--- a/liboctave/util/oct-binmap.h Wed Aug 17 02:57:50 2016 -0400 +++ b/liboctave/util/oct-binmap.h Wed Aug 17 03:41:42 2016 -0400 @@ -177,7 +177,7 @@ else if (xad != yad) { if (! is_valid_bsxfun (name, xad, yad)) - err_nonconformant (name, xad, yad); + octave::err_nonconformant (name, xad, yad); bsxfun_wrapper<U, T, R, F>::set_f(fcn); return do_bsxfun_op (xa, ya, @@ -285,7 +285,7 @@ else if (ys.rows () == 1 && ys.cols () == 1) return binmap<U, T, R, F> (xs, ys(0,0), fcn); else if (xs.dims () != ys.dims ()) - err_nonconformant (name, xs.dims (), ys.dims ()); + octave::err_nonconformant (name, xs.dims (), ys.dims ()); T xzero = T (); R yzero = R ();