Mercurial > octave
comparison liboctave/array/chNDArray.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 | 1edf15793cac |
children | f7121e111991 |
comparison
equal
deleted
inserted
replaced
21135:95da3bc8a281 | 21136:7cac4e7458f2 |
---|---|
118 for (octave_idx_type i = 0; i < nel; i++) | 118 for (octave_idx_type i = 0; i < nel; i++) |
119 { | 119 { |
120 double d = rb.elem (i); | 120 double d = rb.elem (i); |
121 | 121 |
122 if (xisnan (d)) | 122 if (xisnan (d)) |
123 { | 123 (*current_liboctave_error_handler) |
124 (*current_liboctave_error_handler) | 124 ("invalid conversion from NaN to character"); |
125 ("invalid conversion from NaN to character"); | 125 |
126 return *this; | 126 octave_idx_type ival = NINTbig (d); |
127 } | 127 |
128 else | 128 if (ival < 0 || ival > std::numeric_limits<unsigned char>::max ()) |
129 { | 129 // FIXME: is there something better to do? Should we warn the user? |
130 octave_idx_type ival = NINTbig (d); | 130 ival = 0; |
131 | 131 |
132 if (ival < 0 || ival > std::numeric_limits<unsigned char>::max ()) | 132 tmp.elem (i) = static_cast<char>(ival); |
133 // FIXME: is there something better to do? Should we warn the user? | |
134 ival = 0; | |
135 | |
136 tmp.elem (i) = static_cast<char>(ival); | |
137 } | |
138 } | 133 } |
139 | 134 |
140 insert (tmp, ra_idx); | 135 insert (tmp, ra_idx); |
141 return *this; | 136 return *this; |
142 } | 137 } |