Mercurial > jwe > octave
diff liboctave/array/Sparse.h @ 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 | 2e5c1f766ac9 |
| children | 623fc7d08cc6 |
line wrap: on
line diff
--- a/liboctave/array/Sparse.h Fri Jan 22 13:45:21 2016 -0500 +++ b/liboctave/array/Sparse.h Sat Jan 23 13:52:03 2016 -0800 @@ -722,28 +722,29 @@ if (itmp < 0 || itmp >= nr) { + is.setstate (std::ios::failbit); + (*current_liboctave_error_handler) ("invalid sparse matrix: row index = %d out of range", itmp + 1); - is.setstate (std::ios::failbit); - goto done; } if (jtmp < 0 || jtmp >= nc) { + is.setstate (std::ios::failbit); + (*current_liboctave_error_handler) ("invalid sparse matrix: column index = %d out of range", jtmp + 1); - is.setstate (std::ios::failbit); - goto done; } if (jtmp < jold) { + is.setstate (std::ios::failbit); + (*current_liboctave_error_handler) - ("invalid sparse matrix: column indices must appear in ascending order"); - is.setstate (std::ios::failbit); - goto done; + ("invalid sparse matrix: " + "column indices must appear in ascending order"); } else if (jtmp > jold) { @@ -752,10 +753,11 @@ } else if (itmp < iold) { + is.setstate (std::ios::failbit); + (*current_liboctave_error_handler) - ("invalid sparse matrix: row indices must appear in ascending order in each column"); - is.setstate (std::ios::failbit); - goto done; + ("invalid sparse matrix: " + "row indices must appear in ascending order in each column"); } iold = itmp; @@ -763,22 +765,16 @@ tmp = read_fcn (is); - if (is) - { - a.data (ii) = tmp; - a.ridx (ii++) = itmp; - } - else - goto done; + if (! is) + return is; // Problem, return is in error state + + a.data (ii) = tmp; + a.ridx (ii++) = itmp; } for (octave_idx_type j = jold; j < nc; j++) a.cidx (j+1) = ii; } - -done: - - return is; } #endif