Mercurial > octave
diff libinterp/corefcn/ellipj.cc @ 20711:7b608fadc663
Make error messages more specific about the variable and problem encountered.
* besselj.cc, bitfcns.cc, colloc.cc, daspk.cc, dasrt.cc, dassl.cc, data.cc,
dirfns.cc, ellipj.cc, error.cc, gl-render.cc, graphics.cc, graphics.in.h,
load-path.cc, lsode.cc, lu.cc, luinc.cc, oct-hist.cc, oct-obj.cc,
octave-link.cc, quad.cc, rand.cc, symtab.cc, sysdep.cc, toplev.cc, utils.cc,
variables.cc, __init_fltk__.cc, chol.cc, fftw.cc, ov-cell.cc, ov-ch-mat.cc,
ov-class.cc, ov-classdef.cc, ov-cx-mat.cc, ov-fcn-inline.cc, ov-struct.cc,
ov-usr-fcn.cc, CMatrix.cc, dMatrix.cc, fCMatrix.cc, fMatrix.cc, lo-specfun.cc,
curl.m, divergence.m, __fltk_file_filter__.m, __uiobject_split_args__.m,
uigetfile.m, doc.m, imshow.m, rref.m, subspace.m, edit.m, fileattrib.m, open.m,
substruct.m, annotation.m, axis.m, caxis.m, datetick.m, hidden.m, legend.m,
whitebg.m, colorbar.m, __add_datasource__.m, __ezplot__.m, __pie__.m,
__plt_get_axis_arg__.m, pan.m, __print_parse_opts__.m, rotate3d.m, subplot.m,
zoom.m, compan.m, addpref.m, getpref.m, setpref.m, powerset.m, bicg.m,
bicgstab.m, cgs.m, qmr.m, spaugment.m, pascal.m, moment.m, cstrcat.m,
system.tst:
Make error messages more specific about the variable and problem encountered.
| author | Rik <rik@octave.org> |
|---|---|
| date | Wed, 18 Nov 2015 10:40:26 -0800 |
| parents | 571508c1ed06 |
| children | 8bb38ba1bad6 |
line wrap: on
line diff
--- a/libinterp/corefcn/ellipj.cc Tue Nov 17 22:04:42 2015 +0100 +++ b/libinterp/corefcn/ellipj.cc Wed Nov 18 10:40:26 2015 -0800 @@ -83,14 +83,14 @@ if (m_arg.is_scalar_type ()) { - double m = args(1).xdouble_value ("ellipj: expecting scalar or matrix as second argument"); + double m = args(1).xdouble_value ("ellipj: M must be a scalar or matrix"); if (u_arg.is_scalar_type ()) { if (u_arg.is_real_type ()) { // u real, m scalar - double u = args(0).xdouble_value ("ellipj: expecting scalar or matrix as first argument"); + double u = args(0).xdouble_value ("ellipj: U must be a scalar or matrix"); double sn, cn, dn; double err = 0; @@ -106,7 +106,7 @@ else { // u complex, m scalar - Complex u = u_arg.xcomplex_value ("ellipj: expecting scalar or matrix as first argument"); + Complex u = u_arg.xcomplex_value ("ellipj: U must be a scalar or matrix"); Complex sn, cn, dn; double err = 0; @@ -123,7 +123,7 @@ else { // u is matrix, m is scalar - ComplexNDArray u = u_arg.xcomplex_array_value ("ellipj: expecting scalar or matrix as first argument"); + ComplexNDArray u = u_arg.xcomplex_array_value ("ellipj: U must be a scalar or matrix"); dim_vector sz_u = u.dims (); @@ -149,7 +149,7 @@ } else { - NDArray m = args(1).xarray_value ("ellipj: expecting scalar or matrix as second argument"); + NDArray m = args(1).xarray_value ("ellipj: M must be a scalar or matrix"); dim_vector sz_m = m.dims (); @@ -159,7 +159,7 @@ if (u_arg.is_real_type ()) { // u is real scalar, m is array - double u = u_arg.xdouble_value ("ellipj: expecting scalar or matrix as first argument"); + double u = u_arg.xdouble_value ("ellipj: U must be a scalar or matrix"); NDArray sn (sz_m), cn (sz_m), dn (sz_m); NDArray err (sz_m); @@ -183,7 +183,7 @@ else { // u is complex scalar, m is array - Complex u = u_arg.xcomplex_value ("ellipj: expecting scalar or matrix as first argument"); + Complex u = u_arg.xcomplex_value ("ellipj: U must be a scalar or matrix"); ComplexNDArray sn (sz_m), cn (sz_m), dn (sz_m); NDArray err (sz_m); @@ -211,7 +211,7 @@ if (u_arg.is_real_type ()) { // u is real array, m is array - NDArray u = u_arg.xarray_value ("ellipj: expecting scalar or matrix as first argument"); + NDArray u = u_arg.xarray_value ("ellipj: U must be a scalar or matrix"); dim_vector sz_u = u.dims (); @@ -268,7 +268,7 @@ else { // u is complex array, m is array - ComplexNDArray u = u_arg.xcomplex_array_value ("ellipj: expecting scalar or matrix as second argument"); + ComplexNDArray u = u_arg.xcomplex_array_value ("ellipj: U must be a scalar or matrix"); dim_vector sz_u = u.dims (); @@ -871,18 +871,18 @@ %!error ellipj () %!error ellipj (1) %!error ellipj (1,2,3,4) -%!warning <expecting 0 <= M <= 1> ellipj (1,2); +%!warning <required value 0 <= M <= 1> ellipj (1,2); ## FIXME: errors commented out untill lasterr() truly returns the last error. -%!#error <expecting scalar or matrix as second argument> ellipj (1, "1") -%!#error <expecting scalar or matrix as first argument> ellipj ("1", 1) -%!#error <expecting scalar or matrix as first argument> ellipj ({1}, 1) -%!#error <expecting scalar or matrix as first argument> ellipj ({1, 2}, 1) -%!#error <expecting scalar or matrix as second argument> ellipj (1, {1, 2}) -%!#error <expecting scalar or matrix as first argument> ellipj ("1", [1, 2]) -%!#error <expecting scalar or matrix as first argument> ellipj ({1}, [1, 2]) -%!#error <expecting scalar or matrix as first argument> ellipj ({1}, [1, 2]) -%!#error <expecting scalar or matrix as first argument> ellipj ("1,2", [1, 2]) -%!#error <expecting scalar or matrix as first argument> ellipj ({1, 2}, [1, 2]) +%!#error <M must be a scalar or matrix> ellipj (1, "1") +%!#error <U must be a scalar or matrix> ellipj ("1", 1) +%!#error <U must be a scalar or matrix> ellipj ({1}, 1) +%!#error <U must be a scalar or matrix> ellipj ({1, 2}, 1) +%!#error <M must be a scalar or matrix> ellipj (1, {1, 2}) +%!#error <U must be a scalar or matrix> ellipj ("1", [1, 2]) +%!#error <U must be a scalar or matrix> ellipj ({1}, [1, 2]) +%!#error <U must be a scalar or matrix> ellipj ({1}, [1, 2]) +%!#error <U must be a scalar or matrix> ellipj ("1,2", [1, 2]) +%!#error <U must be a scalar or matrix> ellipj ({1, 2}, [1, 2]) %!error <Invalid size combination for U and M> ellipj ([1:4], [1:3]) %!error <Invalid size combination for U and M> ellipj (complex (1:4,1:4), [1:3])