Mercurial > octave
diff libinterp/octave-value/ov-cx-mat.cc @ 21118:3ac9f47fb04b
Invert pattern if/code/else/err_XXX to if !/err_XXX/code.
* daspk.cc, dasrt.cc, dassl.cc, data.cc, debug.cc, load-save.cc, lsode.cc,
quad.cc, xnorm.cc, xpow.cc, ov-base-diag.cc, ov-base-mat.cc, ov-base-scalar.cc,
ov-base.cc, ov-bool-mat.cc, ov-bool-sparse.cc, ov-cell.cc, ov-ch-mat.cc,
ov-class.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-float.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-scalar.cc, ov-struct.cc, ov.cc, pt-idx.cc, Array-util.cc,
Array.cc, Sparse.cc, lo-specfun.cc, mx-inlines.cc, oct-binmap.h:
Invert pattern if/code/else/err_XXX to if !/err_XXX/code.
| author | Rik <rik@octave.org> |
|---|---|
| date | Wed, 20 Jan 2016 16:08:30 -0800 |
| parents | dfcb9d74b253 |
| children | 499b851fbfae |
line wrap: on
line diff
--- a/libinterp/octave-value/ov-cx-mat.cc Wed Jan 20 15:45:58 2016 -0800 +++ b/libinterp/octave-value/ov-cx-mat.cc Wed Jan 20 16:08:30 2016 -0800 @@ -108,15 +108,13 @@ warn_implicit_conversion ("Octave:imag-to-real", "complex matrix", "real scalar"); - if (rows () > 0 && columns () > 0) - { - warn_implicit_conversion ("Octave:array-to-scalar", - "complex matrix", "real scalar"); + if (rows () == 0 || columns () == 0) + err_invalid_conversion ("complex matrix", "real scalar"); - retval = std::real (matrix (0, 0)); - } - else - err_invalid_conversion ("complex matrix", "real scalar"); + warn_implicit_conversion ("Octave:array-to-scalar", + "complex matrix", "real scalar"); + + retval = std::real (matrix(0, 0)); return retval; } @@ -130,15 +128,13 @@ warn_implicit_conversion ("Octave:imag-to-real", "complex matrix", "real scalar"); - if (rows () > 0 && columns () > 0) - { - warn_implicit_conversion ("Octave:array-to-scalar", - "complex matrix", "real scalar"); + if (rows () == 0 || columns () == 0) + err_invalid_conversion ("complex matrix", "real scalar"); - retval = std::real (matrix (0, 0)); - } - else - err_invalid_conversion ("complex matrix", "real scalar"); + warn_implicit_conversion ("Octave:array-to-scalar", + "complex matrix", "real scalar"); + + retval = std::real (matrix(0, 0)); return retval; } @@ -192,15 +188,13 @@ Complex retval (tmp, tmp); - if (rows () > 0 && columns () > 0) - { - warn_implicit_conversion ("Octave:array-to-scalar", - "complex matrix", "complex scalar"); + if (rows () == 0 || columns () == 0) + err_invalid_conversion ("complex matrix", "complex scalar"); - retval = matrix (0, 0); - } - else - err_invalid_conversion ("complex matrix", "complex scalar"); + warn_implicit_conversion ("Octave:array-to-scalar", + "complex matrix", "complex scalar"); + + retval = matrix(0, 0); return retval; } @@ -212,15 +206,13 @@ FloatComplex retval (tmp, tmp); - if (rows () > 0 && columns () > 0) - { - warn_implicit_conversion ("Octave:array-to-scalar", - "complex matrix", "complex scalar"); + if (rows () == 0 || columns () == 0) + err_invalid_conversion ("complex matrix", "complex scalar"); - retval = matrix (0, 0); - } - else - err_invalid_conversion ("complex matrix", "complex scalar"); + warn_implicit_conversion ("Octave:array-to-scalar", + "complex matrix", "complex scalar"); + + retval = matrix(0, 0); return retval; }