Mercurial > hg > octave-max
changeset 14469:29aabe9b37a2
Rename array-as-vector, array-as-scalar warning IDs to match documentation (bug #35838)
* NEWS: Note change in name of warning IDS
* ov-base-diag.cc, ov-bool-mat.cc, ov-bool-sparse.cc, ov-ch-mat.cc,
ov-cx-mat.cc, ov-cx-sparse.cc, ov-flt-cx-mat.cc, ov-flt-re-mat.cc, ov-intx.h,
ov-perm.cc, ov-range.cc, ov-re-mat.cc, ov-re-sparse.cc, ov.cc: Rename
array-as-vector, array-as-scalar warning IDs to array-to-vector, array-to-scalar
| author | Rik <octave@nomad.inbox5.com> |
|---|---|
| date | Thu, 15 Mar 2012 20:03:01 -0700 |
| parents | d16638f73691 |
| children | aad7ad0e15c1 |
| files | NEWS src/ov-base-diag.cc src/ov-bool-mat.cc src/ov-bool-sparse.cc src/ov-ch-mat.cc src/ov-cx-mat.cc src/ov-cx-sparse.cc src/ov-flt-cx-mat.cc src/ov-flt-re-mat.cc src/ov-intx.h src/ov-perm.cc src/ov-range.cc src/ov-re-mat.cc src/ov-re-sparse.cc src/ov.cc |
| diffstat | 15 files changed, 50 insertions(+), 45 deletions(-) [+] |
line wrap: on
line diff
--- a/NEWS +++ b/NEWS @@ -1,6 +1,11 @@ Summary of important user-visible changes for version 3.8: --------------------------------------------------------- + ** Warning IDs renamed: + + Octave:array-as-scalar => Octave:array-to-scalar + Octave:array-as-vector => Octave:array-to-vector + ** Other new functions added in 3.8.0: colorcube
--- a/src/ov-base-diag.cc +++ b/src/ov-base-diag.cc @@ -217,7 +217,7 @@ if (numel () > 0) { - gripe_implicit_conversion ("Octave:array-as-scalar", + gripe_implicit_conversion ("Octave:array-to-scalar", type_name (), "real scalar"); retval = helper_getreal (el_type (matrix (0, 0))); @@ -241,7 +241,7 @@ if (numel () > 0) { - gripe_implicit_conversion ("Octave:array-as-scalar", + gripe_implicit_conversion ("Octave:array-to-scalar", type_name (), "real scalar"); retval = helper_getreal (el_type (matrix (0, 0))); @@ -262,7 +262,7 @@ if (rows () > 0 && columns () > 0) { - gripe_implicit_conversion ("Octave:array-as-scalar", + gripe_implicit_conversion ("Octave:array-to-scalar", type_name (), "complex scalar"); retval = matrix (0, 0); @@ -283,7 +283,7 @@ if (rows () > 0 && columns () > 0) { - gripe_implicit_conversion ("Octave:array-as-scalar", + gripe_implicit_conversion ("Octave:array-to-scalar", type_name (), "complex scalar"); retval = matrix (0, 0);
--- a/src/ov-bool-mat.cc +++ b/src/ov-bool-mat.cc @@ -97,7 +97,7 @@ if (rows () > 0 && columns () > 0) { - gripe_implicit_conversion ("Octave:array-as-scalar", + gripe_implicit_conversion ("Octave:array-to-scalar", "bool matrix", "real scalar"); retval = matrix (0, 0); @@ -115,7 +115,7 @@ if (rows () > 0 && columns () > 0) { - gripe_implicit_conversion ("Octave:array-as-scalar", + gripe_implicit_conversion ("Octave:array-to-scalar", "bool matrix", "real scalar"); retval = matrix (0, 0); @@ -135,7 +135,7 @@ if (rows () > 0 && columns () > 0) { - gripe_implicit_conversion ("Octave:array-as-scalar", + gripe_implicit_conversion ("Octave:array-to-scalar", "bool matrix", "complex scalar"); retval = matrix (0, 0); @@ -155,7 +155,7 @@ if (rows () > 0 && columns () > 0) { - gripe_implicit_conversion ("Octave:array-as-scalar", + gripe_implicit_conversion ("Octave:array-to-scalar", "bool matrix", "complex scalar"); retval = matrix (0, 0);
--- a/src/ov-bool-sparse.cc +++ b/src/ov-bool-sparse.cc @@ -100,7 +100,7 @@ if (numel () > 0) { if (numel () > 1) - gripe_implicit_conversion ("Octave:array-as-scalar", + gripe_implicit_conversion ("Octave:array-to-scalar", "bool sparse matrix", "real scalar"); retval = matrix (0, 0); @@ -121,7 +121,7 @@ if (rows () > 0 && columns () > 0) { if (numel () > 1) - gripe_implicit_conversion ("Octave:array-as-scalar", + gripe_implicit_conversion ("Octave:array-to-scalar", "bool sparse matrix", "complex scalar"); retval = matrix (0, 0);
--- a/src/ov-ch-mat.cc +++ b/src/ov-ch-mat.cc @@ -57,7 +57,7 @@ if (rows () > 0 && columns () > 0) { - gripe_implicit_conversion ("Octave:array-as-scalar", + gripe_implicit_conversion ("Octave:array-to-scalar", "character matrix", "real scalar"); retval = static_cast<unsigned char> (matrix (0, 0)); @@ -75,7 +75,7 @@ if (rows () > 0 && columns () > 0) { - gripe_implicit_conversion ("Octave:array-as-scalar", + gripe_implicit_conversion ("Octave:array-to-scalar", "character matrix", "real scalar"); retval = static_cast<unsigned char> (matrix (0, 0)); @@ -95,7 +95,7 @@ if (rows () > 0 && columns () > 0) { - gripe_implicit_conversion ("Octave:array-as-scalar", + gripe_implicit_conversion ("Octave:array-to-scalar", "character matrix", "complex scalar"); retval = static_cast<unsigned char> (matrix (0, 0)); @@ -115,7 +115,7 @@ if (rows () > 0 && columns () > 0) { - gripe_implicit_conversion ("Octave:array-as-scalar", + gripe_implicit_conversion ("Octave:array-to-scalar", "character matrix", "complex scalar"); retval = static_cast<unsigned char> (matrix (0, 0));
--- a/src/ov-cx-mat.cc +++ b/src/ov-cx-mat.cc @@ -108,7 +108,7 @@ if (rows () > 0 && columns () > 0) { - gripe_implicit_conversion ("Octave:array-as-scalar", + gripe_implicit_conversion ("Octave:array-to-scalar", "complex matrix", "real scalar"); retval = std::real (matrix (0, 0)); @@ -130,7 +130,7 @@ if (rows () > 0 && columns () > 0) { - gripe_implicit_conversion ("Octave:array-as-scalar", + gripe_implicit_conversion ("Octave:array-to-scalar", "complex matrix", "real scalar"); retval = std::real (matrix (0, 0)); @@ -178,7 +178,7 @@ if (rows () > 0 && columns () > 0) { - gripe_implicit_conversion ("Octave:array-as-scalar", + gripe_implicit_conversion ("Octave:array-to-scalar", "complex matrix", "complex scalar"); retval = matrix (0, 0); @@ -198,7 +198,7 @@ if (rows () > 0 && columns () > 0) { - gripe_implicit_conversion ("Octave:array-as-scalar", + gripe_implicit_conversion ("Octave:array-to-scalar", "complex matrix", "complex scalar"); retval = matrix (0, 0);
--- a/src/ov-cx-sparse.cc +++ b/src/ov-cx-sparse.cc @@ -114,7 +114,7 @@ if (numel () > 0) { if (numel () > 1) - gripe_implicit_conversion ("Octave:array-as-scalar", + gripe_implicit_conversion ("Octave:array-to-scalar", "complex sparse matrix", "real scalar"); retval = std::real (matrix (0, 0)); @@ -150,7 +150,7 @@ if (numel () > 0) { if (numel () > 1) - gripe_implicit_conversion ("Octave:array-as-scalar", + gripe_implicit_conversion ("Octave:array-to-scalar", "complex sparse matrix", "real scalar"); retval = matrix (0, 0);
--- a/src/ov-flt-cx-mat.cc +++ b/src/ov-flt-cx-mat.cc @@ -97,7 +97,7 @@ if (rows () > 0 && columns () > 0) { - gripe_implicit_conversion ("Octave:array-as-scalar", + gripe_implicit_conversion ("Octave:array-to-scalar", "complex matrix", "real scalar"); retval = std::real (matrix (0, 0)); @@ -119,7 +119,7 @@ if (rows () > 0 && columns () > 0) { - gripe_implicit_conversion ("Octave:array-as-scalar", + gripe_implicit_conversion ("Octave:array-to-scalar", "complex matrix", "real scalar"); retval = std::real (matrix (0, 0)); @@ -167,7 +167,7 @@ if (rows () > 0 && columns () > 0) { - gripe_implicit_conversion ("Octave:array-as-scalar", + gripe_implicit_conversion ("Octave:array-to-scalar", "complex matrix", "complex scalar"); retval = matrix (0, 0); @@ -187,7 +187,7 @@ if (rows () > 0 && columns () > 0) { - gripe_implicit_conversion ("Octave:array-as-scalar", + gripe_implicit_conversion ("Octave:array-to-scalar", "complex matrix", "complex scalar"); retval = matrix (0, 0);
--- a/src/ov-flt-re-mat.cc +++ b/src/ov-flt-re-mat.cc @@ -96,7 +96,7 @@ if (numel () > 0) { - gripe_implicit_conversion ("Octave:array-as-scalar", + gripe_implicit_conversion ("Octave:array-to-scalar", "real matrix", "real scalar"); retval = matrix (0, 0); @@ -114,7 +114,7 @@ if (numel () > 0) { - gripe_implicit_conversion ("Octave:array-as-scalar", + gripe_implicit_conversion ("Octave:array-to-scalar", "real matrix", "real scalar"); retval = matrix (0, 0); @@ -148,7 +148,7 @@ if (rows () > 0 && columns () > 0) { - gripe_implicit_conversion ("Octave:array-as-scalar", + gripe_implicit_conversion ("Octave:array-to-scalar", "real matrix", "complex scalar"); retval = matrix (0, 0); @@ -168,7 +168,7 @@ if (rows () > 0 && columns () > 0) { - gripe_implicit_conversion ("Octave:array-as-scalar", + gripe_implicit_conversion ("Octave:array-to-scalar", "real matrix", "complex scalar"); retval = matrix (0, 0);
--- a/src/ov-intx.h +++ b/src/ov-intx.h @@ -104,7 +104,7 @@ if (numel () > 0) { - gripe_implicit_conversion ("Octave:array-as-scalar", + gripe_implicit_conversion ("Octave:array-to-scalar", type_name (), "real scalar"); retval = matrix(0).double_value (); @@ -123,7 +123,7 @@ if (numel () > 0) { - gripe_implicit_conversion ("Octave:array-as-scalar", + gripe_implicit_conversion ("Octave:array-to-scalar", type_name (), "real scalar"); retval = matrix(0).float_value ();
--- a/src/ov-perm.cc +++ b/src/ov-perm.cc @@ -135,7 +135,7 @@ if (numel () > 0) { - gripe_implicit_conversion ("Octave:array-as-scalar", + gripe_implicit_conversion ("Octave:array-to-scalar", type_name (), "real scalar"); retval = matrix (0, 0); @@ -153,7 +153,7 @@ if (numel () > 0) { - gripe_implicit_conversion ("Octave:array-as-scalar", + gripe_implicit_conversion ("Octave:array-to-scalar", type_name (), "real scalar"); retval = matrix (0, 0); @@ -173,7 +173,7 @@ if (rows () > 0 && columns () > 0) { - gripe_implicit_conversion ("Octave:array-as-scalar", + gripe_implicit_conversion ("Octave:array-to-scalar", type_name (), "complex scalar"); retval = matrix (0, 0); @@ -193,7 +193,7 @@ if (rows () > 0 && columns () > 0) { - gripe_implicit_conversion ("Octave:array-as-scalar", + gripe_implicit_conversion ("Octave:array-to-scalar", type_name (), "complex scalar"); retval = matrix (0, 0);
--- a/src/ov-range.cc +++ b/src/ov-range.cc @@ -175,7 +175,7 @@ if (nel > 0) { - gripe_implicit_conversion ("Octave:array-as-scalar", + gripe_implicit_conversion ("Octave:array-to-scalar", "range", "real scalar"); retval = range.base (); @@ -195,7 +195,7 @@ if (nel > 0) { - gripe_implicit_conversion ("Octave:array-as-scalar", + gripe_implicit_conversion ("Octave:array-to-scalar", "range", "real scalar"); retval = range.base (); @@ -277,7 +277,7 @@ if (nel > 0) { - gripe_implicit_conversion ("Octave:array-as-scalar", + gripe_implicit_conversion ("Octave:array-to-scalar", "range", "complex scalar"); retval = range.base (); @@ -299,7 +299,7 @@ if (nel > 0) { - gripe_implicit_conversion ("Octave:array-as-scalar", + gripe_implicit_conversion ("Octave:array-to-scalar", "range", "complex scalar"); retval = range.base ();
--- a/src/ov-re-mat.cc +++ b/src/ov-re-mat.cc @@ -111,7 +111,7 @@ if (numel () > 0) { - gripe_implicit_conversion ("Octave:array-as-scalar", + gripe_implicit_conversion ("Octave:array-to-scalar", "real matrix", "real scalar"); retval = matrix (0, 0); @@ -129,7 +129,7 @@ if (numel () > 0) { - gripe_implicit_conversion ("Octave:array-as-scalar", + gripe_implicit_conversion ("Octave:array-to-scalar", "real matrix", "real scalar"); retval = matrix (0, 0); @@ -163,7 +163,7 @@ if (rows () > 0 && columns () > 0) { - gripe_implicit_conversion ("Octave:array-as-scalar", + gripe_implicit_conversion ("Octave:array-to-scalar", "real matrix", "complex scalar"); retval = matrix (0, 0); @@ -183,7 +183,7 @@ if (rows () > 0 && columns () > 0) { - gripe_implicit_conversion ("Octave:array-as-scalar", + gripe_implicit_conversion ("Octave:array-to-scalar", "real matrix", "complex scalar"); retval = matrix (0, 0);
--- a/src/ov-re-sparse.cc +++ b/src/ov-re-sparse.cc @@ -100,7 +100,7 @@ if (numel () > 0) { if (numel () > 1) - gripe_implicit_conversion ("Octave:array-as-scalar", + gripe_implicit_conversion ("Octave:array-to-scalar", "real sparse matrix", "real scalar"); retval = matrix (0, 0); @@ -122,7 +122,7 @@ if (rows () > 0 && columns () > 0) { if (numel () > 1) - gripe_implicit_conversion ("Octave:array-as-scalar", + gripe_implicit_conversion ("Octave:array-to-scalar", "real sparse matrix", "complex scalar"); retval = matrix (0, 0);
--- a/src/ov.cc +++ b/src/ov.cc @@ -1531,7 +1531,7 @@ if (retval.length () > 2 || (retval(0) != 1 && retval(1) != 1)) { if (!force_vector_conversion) - gripe_implicit_conversion ("Octave:array-as-vector", + gripe_implicit_conversion ("Octave:array-to-vector", my_type.c_str (), wanted_type.c_str ()); retval = dim_vector (nel, 1); }