Mercurial > octave
diff liboctave/array/idx-vector.cc @ 21129:228b65504557
maint: Eliminate useless statements after err_XXX.
* Cell.cc, data.cc, eig.cc, hess.cc, oct-hist.cc, oct-stream.cc, rand.cc,
audioread.cc, ov-base.cc, ov-class.cc, ov.cc, op-int.h, ops.h, CColVector.cc,
CDiagMatrix.cc, CMatrix.cc, CRowVector.cc, DiagArray2.cc, MDiagArray2.cc,
PermMatrix.cc, dMatrix.cc, fCColVector.cc, fCDiagMatrix.cc, fCMatrix.cc,
fCRowVector.cc, fMatrix.cc, idx-vector.cc, CmplxGEPBAL.cc, dbleGEPBAL.cc,
fCmplxGEPBAL.cc, floatGEPBAL.cc, Sparse-diag-op-defs.h, Sparse-op-defs.h,
Sparse-perm-op-defs.h, mx-inlines.cc, mx-op-defs.h:
maint: Eliminate useless statements after err_XXX.
| author | Rik <rik@octave.org> |
|---|---|
| date | Thu, 21 Jan 2016 12:54:17 -0800 |
| parents | dfcb9d74b253 |
| children | 7cac4e7458f2 |
line wrap: on
line diff
--- a/liboctave/array/idx-vector.cc Thu Jan 21 13:03:27 2016 -0500 +++ b/liboctave/array/idx-vector.cc Thu Jan 21 12:54:17 2016 -0800 @@ -78,12 +78,9 @@ idx_vector::idx_colon_rep::checkelem (octave_idx_type i) const { if (i < 0) - { - err_index_out_of_range (); - return 0; - } - else - return i; + err_index_out_of_range (); + + return i; } idx_vector::idx_base_rep * @@ -109,20 +106,11 @@ : start(_start), len (_step ? std::max ((_limit - _start) / _step, static_cast<octave_idx_type> (0)) : -1), step (_step) { if (len < 0) - { - err_invalid_range (); - err = true; - } - else if (start < 0) - { - err_invalid_index (start); - err = true; - } - else if (step < 0 && start + (len-1)*step < 0) - { - err_invalid_index (start + (len-1)*step); - err = true; - } + err_invalid_range (); + if (start < 0) + err_invalid_index (start); + if (step < 0 && start + (len-1)*step < 0) + err_invalid_index (start + (len-1)*step); } idx_vector::idx_range_rep::idx_range_rep (const Range& r) @@ -138,15 +126,9 @@ start = static_cast<octave_idx_type> (r.base ()) - 1; step = static_cast<octave_idx_type> (r.inc ()); if (start < 0) - { - err_invalid_index (start); - err = true; - } - else if (step < 0 && start + (len - 1)*step < 0) - { - err_invalid_index (start + (len - 1)*step); - err = true; - } + err_invalid_index (start); + if (step < 0 && start + (len - 1)*step < 0) + err_invalid_index (start + (len - 1)*step); } else { @@ -154,7 +136,6 @@ double b = r.base (); double inc = r.inc (); err_invalid_index (b != gnulib::floor (b) ? b : b + inc); - err = true; } } } @@ -163,12 +144,9 @@ idx_vector::idx_range_rep::checkelem (octave_idx_type i) const { if (i < 0 || i >= len) - { - err_index_out_of_range (); - return 0; - } - else - return start + i*step; + err_index_out_of_range (); + + return start + i*step; } idx_vector::idx_base_rep * @@ -246,10 +224,7 @@ octave_idx_type i = static_cast<octave_idx_type> (x); if (static_cast<double> (i) != x) - { - err_invalid_index (x-1); - conv_error = true; - } + err_invalid_index (x-1); return convert_index (i, conv_error, ext); } @@ -284,10 +259,7 @@ : data (i) { if (data < 0) - { - err_invalid_index (data); - err = true; - } + err_invalid_index (data); } octave_idx_type @@ -356,9 +328,8 @@ octave_idx_type k = inda.xelem (i); if (k < 0) { - if (! err) // only report first error, in case 1000s. + if (! err) err_invalid_index (k); - err = true; } else if (k > max) max = k; @@ -467,10 +438,7 @@ idx_vector::idx_vector_rep::checkelem (octave_idx_type n) const { if (n < 0 || n >= len) - { - err_invalid_index (n); - return 0; - } + err_invalid_index (n); return xelem (n); } @@ -717,10 +685,7 @@ idx_vector::idx_mask_rep::checkelem (octave_idx_type n) const { if (n < 0 || n >= len) - { - err_invalid_index (n); - return 0; - } + err_invalid_index (n); return xelem (n); }