Mercurial > octave
diff libinterp/corefcn/regexp.cc @ 23450:855122b993da
maint: Wrap tertiary operator in parentheses "(COND ? x : y)".
* Canvas.cc, color-picker.cc, dialog.cc, marker.cc, main-window.cc, Cell.cc,
__magick_read__.cc, __pchip_deriv__.cc, __qp__.cc, bsxfun.cc, call-stack.cc,
cellfun.cc, data.cc, defaults.cc, det.cc, eig.cc, error.cc, file-io.cc,
filter.cc, find.cc, gammainc.cc, gcd.cc, gl-render.cc, graphics.cc,
graphics.in.h, help.cc, hex2num.cc, inv.cc, load-save.cc, lookup.cc,
ls-mat4.cc, ls-mat5.cc, ls-oct-binary.cc, ls-oct-text.cc, lu.cc, max.cc,
mex.cc, oct-hist.cc, oct-map.cc, oct-procbuf.cc, oct-stream.cc, pr-output.cc,
rand.cc, regexp.cc, schur.cc, str2double.cc, strfns.cc, symtab.cc, sysdep.cc,
tril.cc, variables.cc, xdiv.cc, audiodevinfo.cc, audioread.cc, colamd.cc,
gzip.cc, ov-base-diag.cc, ov-base-mat.h, ov-base-scalar.h, ov-class.cc,
ov-classdef.cc, ov-fcn-handle.cc, ov-range.cc, ov-range.h, ov-struct.cc,
ov-usr-fcn.cc, ov.cc, octave.cc, op-class.cc, pt-eval.cc, pt-funcall.cc,
pt-idx.cc, pt-jit.cc, pt-stmt.cc, version.cc, Array-util.cc, Array.cc,
CDiagMatrix.cc, CMatrix.cc, CNDArray.cc, CSparse.cc, Range.cc, Sparse.cc,
chNDArray.cc, dDiagMatrix.cc, dMatrix.cc, dNDArray.cc, dSparse.cc,
dim-vector.cc, fCDiagMatrix.cc, fCMatrix.cc, fCNDArray.cc, fDiagMatrix.cc,
fMatrix.cc, fNDArray.cc, idx-vector.cc, idx-vector.h, Faddeeva.cc, DASPK.cc,
DASRT.cc, DASSL.cc, EIG.cc, fEIG.cc, gsvd.cc, lo-specfun.cc, oct-rand.cc,
qr.cc, qrp.cc, randgamma.cc, schur.cc, svd.cc, Sparse-diag-op-defs.h,
mx-inlines.cc, oct-env.cc, cmd-edit.cc, kpse.cc, oct-inttypes.h, oct-sort.cc:
Wrap tertiary operator in parentheses "(COND ? x : y)".
author | Rik <rik@octave.org> |
---|---|
date | Thu, 27 Apr 2017 17:33:10 -0700 |
parents | c9fab0bc983e |
children | b6144e6dda9e |
line wrap: on
line diff
--- a/libinterp/corefcn/regexp.cc Thu Apr 27 15:18:20 2017 -0700 +++ b/libinterp/corefcn/regexp.cc Thu Apr 27 17:33:10 2017 -0700 @@ -386,9 +386,9 @@ { octave::regexp::match_data::const_iterator p = rx_lst.begin (); - retval(4) = sz ? p->tokens () : Cell (); - retval(3) = sz ? p->match_string () : ""; - retval(2) = sz ? p->token_extents () : Matrix (); + retval(4) = (sz ? p->tokens () : Cell ()); + retval(3) = (sz ? p->match_string () : ""); + retval(2) = (sz ? p->token_extents () : Matrix ()); if (sz) { @@ -848,7 +848,7 @@ octave_value_list retval; if (args(0).is_cell () || args(1).is_cell ()) - retval = octcellregexp (args, (nargout > 0 ? nargout : 1), "regexp"); + retval = (octcellregexp (args, (nargout > 0 ? nargout : 1), "regexp")); else retval = octregexp (args, nargout, "regexp"); @@ -1422,8 +1422,7 @@ ret(i) = new_args(0); } - retval = args(0).is_cell () ? ovl (ret) - : ovl (ret(0)); + retval = (args(0).is_cell () ? ovl (ret) : ovl (ret(0))); } else retval = octregexprep (args, "regexprep");