Mercurial > jwe > octave
comparison liboctave/array/fColVector.cc @ 21136:7cac4e7458f2
maint: clean up code around calls to current_liboctave_error_handler.
Remove statements after call to handler that are no longer reachable.
Place input validation first and immediately call handler if necessary.
Change if/error_handler/else to if/error_handler and re-indent code.
* Array-util.cc, Array.cc, CColVector.cc, CDiagMatrix.cc, CMatrix.cc,
CNDArray.cc, CRowVector.cc, CSparse.cc, DiagArray2.cc, MArray.cc,
PermMatrix.cc, Sparse.cc, Sparse.h, chMatrix.cc, chNDArray.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, CmplxAEPBAL.cc, CmplxCHOL.cc, CmplxGEPBAL.cc, CmplxHESS.cc,
CmplxLU.cc, CmplxQR.cc, CmplxSCHUR.cc, CmplxSVD.cc, DASPK.cc, EIG.cc, LSODE.cc,
Quad.cc, SparseCmplxCHOL.cc, SparseCmplxLU.cc, SparseCmplxQR.cc, SparseQR.cc,
SparsedbleCHOL.cc, SparsedbleLU.cc, base-lu.cc, bsxfun-defs.cc, dbleAEPBAL.cc,
dbleCHOL.cc, dbleGEPBAL.cc, dbleHESS.cc, dbleLU.cc, dbleQR.cc, dbleSCHUR.cc,
dbleSVD.cc, eigs-base.cc, fCmplxAEPBAL.cc, fCmplxCHOL.cc, fCmplxLU.cc,
fCmplxQR.cc, fCmplxSCHUR.cc, fEIG.cc, floatAEPBAL.cc, floatCHOL.cc,
floatGEPBAL.cc, floatHESS.cc, floatLU.cc, floatQR.cc, floatSCHUR.cc,
floatSVD.cc, lo-specfun.cc, oct-fftw.cc, oct-rand.cc, oct-spparms.cc,
sparse-base-chol.cc, sparse-dmsolve.cc, file-ops.cc, lo-sysdep.cc,
mach-info.cc, oct-env.cc, oct-syscalls.cc, cmd-edit.cc, cmd-hist.cc,
data-conv.cc, lo-ieee.cc, lo-regexp.cc, oct-base64.cc, oct-shlib.cc,
pathsearch.cc, singleton-cleanup.cc, sparse-util.cc, unwind-prot.cc:
Remove statements after call to handler that are no longer reachable.
Place input validation first and immediately call handler if necessary.
Change if/error_handler/else to if/error_handler and re-indent code.
| author | Rik <rik@octave.org> |
|---|---|
| date | Sat, 23 Jan 2016 13:52:03 -0800 |
| parents | 499b851fbfae |
| children | f7121e111991 |
comparison
equal
deleted
inserted
replaced
| 21135:95da3bc8a281 | 21136:7cac4e7458f2 |
|---|---|
| 70 FloatColumnVector::insert (const FloatColumnVector& a, octave_idx_type r) | 70 FloatColumnVector::insert (const FloatColumnVector& a, octave_idx_type r) |
| 71 { | 71 { |
| 72 octave_idx_type a_len = a.numel (); | 72 octave_idx_type a_len = a.numel (); |
| 73 | 73 |
| 74 if (r < 0 || r + a_len > numel ()) | 74 if (r < 0 || r + a_len > numel ()) |
| 75 { | 75 (*current_liboctave_error_handler) ("range error for insert"); |
| 76 (*current_liboctave_error_handler) ("range error for insert"); | |
| 77 return *this; | |
| 78 } | |
| 79 | 76 |
| 80 if (a_len > 0) | 77 if (a_len > 0) |
| 81 { | 78 { |
| 82 make_unique (); | 79 make_unique (); |
| 83 | 80 |
| 108 FloatColumnVector::fill (float val, octave_idx_type r1, octave_idx_type r2) | 105 FloatColumnVector::fill (float val, octave_idx_type r1, octave_idx_type r2) |
| 109 { | 106 { |
| 110 octave_idx_type len = numel (); | 107 octave_idx_type len = numel (); |
| 111 | 108 |
| 112 if (r1 < 0 || r2 < 0 || r1 >= len || r2 >= len) | 109 if (r1 < 0 || r2 < 0 || r1 >= len || r2 >= len) |
| 113 { | 110 (*current_liboctave_error_handler) ("range error for fill"); |
| 114 (*current_liboctave_error_handler) ("range error for fill"); | |
| 115 return *this; | |
| 116 } | |
| 117 | 111 |
| 118 if (r1 > r2) { std::swap (r1, r2); } | 112 if (r1 > r2) { std::swap (r1, r2); } |
| 119 | 113 |
| 120 if (r2 >= r1) | 114 if (r2 >= r1) |
| 121 { | 115 { |