Mercurial > octave
diff liboctave/util/lo-regexp.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 | 77f5591878bf |
| children | f7121e111991 |
line wrap: on
line diff
--- a/liboctave/util/lo-regexp.cc Fri Jan 22 13:45:21 2016 -0500 +++ b/liboctave/util/lo-regexp.cc Sat Jan 23 13:52:03 2016 -0800 @@ -95,11 +95,8 @@ size_t tmp_pos = pattern.find_first_of ('>', new_pos); if (tmp_pos == std::string::npos) - { - (*current_liboctave_error_handler) - ("regexp: syntax error in pattern"); - return; - } + (*current_liboctave_error_handler) + ("regexp: syntax error in pattern"); std::string tmp_name = pattern.substr (new_pos+3, tmp_pos-new_pos-3); @@ -235,8 +232,7 @@ if (! data) (*current_liboctave_error_handler) - ("%s: %s at position %d of expression", who.c_str (), - err, erroffset); + ("%s: %s at position %d of expression", who.c_str (), err, erroffset); } regexp::match_data @@ -309,13 +305,11 @@ } if (matches < 0 && matches != PCRE_ERROR_NOMATCH) - { - (*current_liboctave_error_handler) - ("%s: internal error calling pcre_exec; error code from pcre_exec is %i", - who.c_str (), matches); - return retval; - } - else if (matches == PCRE_ERROR_NOMATCH) + (*current_liboctave_error_handler) + ("%s: internal error calling pcre_exec; " + "error code from pcre_exec is %i", who.c_str (), matches); + + if (matches == PCRE_ERROR_NOMATCH) break; else if (ovector[1] <= ovector[0] && ! options.emptymatch ()) { @@ -352,12 +346,9 @@ matches, &listptr); if (status == PCRE_ERROR_NOMEMORY) - { - (*current_liboctave_error_handler) - ("%s: cannot allocate memory in pcre_get_substring_list", - who.c_str ()); - return retval; - } + (*current_liboctave_error_handler) + ("%s: cannot allocate memory in pcre_get_substring_list", + who.c_str ()); string_vector tokens (pos_match); string_vector named_tokens (nnames);