Mercurial > octave
diff liboctave/numeric/bsxfun-defs.cc @ 22197:e43d83253e28
refill multi-line macro definitions
Use the Emacs C++ mode style for line continuation markers in
multi-line macro definitions.
* make_int.cc, __dsearchn__.cc, __magick_read__.cc, besselj.cc,
bitfcns.cc, bsxfun.cc, cellfun.cc, data.cc, defun-dld.h, defun-int.h,
defun.h, det.cc, error.h, find.cc, gcd.cc, graphics.cc, interpreter.h,
jit-ir.h, jit-typeinfo.h, lookup.cc, ls-mat5.cc, max.cc, mexproto.h,
mxarray.in.h, oct-stream.cc, ordschur.cc, pr-output.cc, profiler.h,
psi.cc, regexp.cc, sparse-xdiv.cc, sparse-xpow.cc, tril.cc, txt-eng.h,
utils.cc, variables.cc, variables.h, xdiv.cc, xpow.cc, __glpk__.cc,
ov-base.cc, ov-base.h, ov-cell.cc, ov-ch-mat.cc, ov-classdef.cc,
ov-complex.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-float.cc, ov-float.h,
ov-flt-complex.cc, ov-flt-cx-mat.cc, ov-flt-re-mat.cc,
ov-int-traits.h, ov-lazy-idx.h, ov-perm.cc, ov-re-mat.cc,
ov-re-sparse.cc, ov-scalar.cc, ov-scalar.h, ov-str-mat.cc,
ov-type-conv.h, ov.cc, ov.h, op-class.cc, op-int-conv.cc, op-int.h,
op-str-str.cc, ops.h, lex.ll, Array.cc, CMatrix.cc, CSparse.cc,
MArray.cc, MArray.h, MDiagArray2.cc, MDiagArray2.h, MSparse.h,
Sparse.cc, dMatrix.cc, dSparse.cc, fCMatrix.cc, fMatrix.cc,
idx-vector.cc, f77-fcn.h, quit.h, bsxfun-decl.h, bsxfun-defs.cc,
lo-specfun.cc, oct-convn.cc, oct-convn.h, oct-norm.cc, oct-norm.h,
oct-rand.cc, Sparse-op-decls.h, Sparse-op-defs.h, mx-inlines.cc,
mx-op-decl.h, mx-op-defs.h, mach-info.cc, oct-group.cc, oct-passwd.cc,
oct-syscalls.cc, oct-time.cc, data-conv.cc, kpse.cc, lo-ieee.h,
lo-macros.h, oct-cmplx.h, oct-glob.cc, oct-inttypes.cc,
oct-inttypes.h, oct-locbuf.h, oct-sparse.h, url-transfer.cc,
oct-conf-post.in.h, shared-fcns.h: Refill macro definitions.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Mon, 01 Aug 2016 12:40:18 -0400 |
parents | b6a686543080 |
children | bac0d6f07a3e |
line wrap: on
line diff
--- a/liboctave/numeric/bsxfun-defs.cc Tue Jul 12 14:28:07 2016 -0400 +++ b/liboctave/numeric/bsxfun-defs.cc Mon Aug 01 12:40:18 2016 -0400 @@ -210,50 +210,50 @@ } } -#define BSXFUN_OP_DEF(OP, ARRAY) \ -ARRAY bsxfun_ ## OP (const ARRAY& x, const ARRAY& y) +#define BSXFUN_OP_DEF(OP, ARRAY) \ + ARRAY bsxfun_ ## OP (const ARRAY& x, const ARRAY& y) -#define BSXFUN_OP2_DEF(OP, ARRAY, ARRAY1, ARRAY2) \ -ARRAY bsxfun_ ## OP (const ARRAY1& x, const ARRAY2& y) +#define BSXFUN_OP2_DEF(OP, ARRAY, ARRAY1, ARRAY2) \ + ARRAY bsxfun_ ## OP (const ARRAY1& x, const ARRAY2& y) -#define BSXFUN_REL_DEF(OP, ARRAY) \ -boolNDArray bsxfun_ ## OP (const ARRAY& x, const ARRAY& y) +#define BSXFUN_REL_DEF(OP, ARRAY) \ + boolNDArray bsxfun_ ## OP (const ARRAY& x, const ARRAY& y) -#define BSXFUN_OP_DEF_MXLOOP(OP, ARRAY, LOOP) \ - BSXFUN_OP_DEF(OP, ARRAY) \ +#define BSXFUN_OP_DEF_MXLOOP(OP, ARRAY, LOOP) \ + BSXFUN_OP_DEF(OP, ARRAY) \ { return do_bsxfun_op<ARRAY::element_type, ARRAY::element_type, ARRAY::element_type> \ - (x, y, LOOP, LOOP, LOOP); } + (x, y, LOOP, LOOP, LOOP); } -#define BSXFUN_OP2_DEF_MXLOOP(OP, ARRAY, ARRAY1, ARRAY2, LOOP) \ - BSXFUN_OP2_DEF(OP, ARRAY, ARRAY1, ARRAY2) \ +#define BSXFUN_OP2_DEF_MXLOOP(OP, ARRAY, ARRAY1, ARRAY2, LOOP) \ + BSXFUN_OP2_DEF(OP, ARRAY, ARRAY1, ARRAY2) \ { return do_bsxfun_op<ARRAY::element_type, ARRAY1::element_type, ARRAY2::element_type> \ - (x, y, LOOP, LOOP, LOOP); } + (x, y, LOOP, LOOP, LOOP); } -#define BSXFUN_REL_DEF_MXLOOP(OP, ARRAY, LOOP) \ - BSXFUN_REL_DEF(OP, ARRAY) \ +#define BSXFUN_REL_DEF_MXLOOP(OP, ARRAY, LOOP) \ + BSXFUN_REL_DEF(OP, ARRAY) \ { return do_bsxfun_op<bool, ARRAY::element_type, ARRAY::element_type> \ - (x, y, LOOP, LOOP, LOOP); } + (x, y, LOOP, LOOP, LOOP); } -#define BSXFUN_STDOP_DEFS_MXLOOP(ARRAY) \ - BSXFUN_OP_DEF_MXLOOP (add, ARRAY, mx_inline_add) \ - BSXFUN_OP_DEF_MXLOOP (sub, ARRAY, mx_inline_sub) \ - BSXFUN_OP_DEF_MXLOOP (mul, ARRAY, mx_inline_mul) \ - BSXFUN_OP_DEF_MXLOOP (div, ARRAY, mx_inline_div) \ - BSXFUN_OP_DEF_MXLOOP (min, ARRAY, mx_inline_xmin) \ +#define BSXFUN_STDOP_DEFS_MXLOOP(ARRAY) \ + BSXFUN_OP_DEF_MXLOOP (add, ARRAY, mx_inline_add) \ + BSXFUN_OP_DEF_MXLOOP (sub, ARRAY, mx_inline_sub) \ + BSXFUN_OP_DEF_MXLOOP (mul, ARRAY, mx_inline_mul) \ + BSXFUN_OP_DEF_MXLOOP (div, ARRAY, mx_inline_div) \ + BSXFUN_OP_DEF_MXLOOP (min, ARRAY, mx_inline_xmin) \ BSXFUN_OP_DEF_MXLOOP (max, ARRAY, mx_inline_xmax) -#define BSXFUN_STDREL_DEFS_MXLOOP(ARRAY) \ - BSXFUN_REL_DEF_MXLOOP (eq, ARRAY, mx_inline_eq) \ - BSXFUN_REL_DEF_MXLOOP (ne, ARRAY, mx_inline_ne) \ - BSXFUN_REL_DEF_MXLOOP (lt, ARRAY, mx_inline_lt) \ - BSXFUN_REL_DEF_MXLOOP (le, ARRAY, mx_inline_le) \ - BSXFUN_REL_DEF_MXLOOP (gt, ARRAY, mx_inline_gt) \ +#define BSXFUN_STDREL_DEFS_MXLOOP(ARRAY) \ + BSXFUN_REL_DEF_MXLOOP (eq, ARRAY, mx_inline_eq) \ + BSXFUN_REL_DEF_MXLOOP (ne, ARRAY, mx_inline_ne) \ + BSXFUN_REL_DEF_MXLOOP (lt, ARRAY, mx_inline_lt) \ + BSXFUN_REL_DEF_MXLOOP (le, ARRAY, mx_inline_le) \ + BSXFUN_REL_DEF_MXLOOP (gt, ARRAY, mx_inline_gt) \ BSXFUN_REL_DEF_MXLOOP (ge, ARRAY, mx_inline_ge) //For bsxfun power with mixed integer/float types -#define BSXFUN_POW_MIXED_MXLOOP(INT_TYPE) \ +#define BSXFUN_POW_MIXED_MXLOOP(INT_TYPE) \ BSXFUN_OP2_DEF_MXLOOP (pow, INT_TYPE, INT_TYPE, NDArray, mx_inline_pow) \ - BSXFUN_OP2_DEF_MXLOOP (pow, INT_TYPE, INT_TYPE, FloatNDArray, mx_inline_pow)\ + BSXFUN_OP2_DEF_MXLOOP (pow, INT_TYPE, INT_TYPE, FloatNDArray, mx_inline_pow) \ BSXFUN_OP2_DEF_MXLOOP (pow, INT_TYPE, NDArray, INT_TYPE, mx_inline_pow) \ BSXFUN_OP2_DEF_MXLOOP (pow, INT_TYPE, FloatNDArray, INT_TYPE, mx_inline_pow)