Mercurial > octave

comparison liboctave/numeric/bsxfun-defs.cc @ 22197:e43d83253e28

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
22196:dd992fd74fce 22197:e43d83253e28
208 dvr.increment_index (idx + start, start); 208 dvr.increment_index (idx + start, start);
209 } 209 }
210 } 210 }
211 } 211 }
212 212
213 #define BSXFUN_OP_DEF(OP, ARRAY) \ 213 #define BSXFUN_OP_DEF(OP, ARRAY) \
214 ARRAY bsxfun_ ## OP (const ARRAY& x, const ARRAY& y) 214 ARRAY bsxfun_ ## OP (const ARRAY& x, const ARRAY& y)
215 215
216 #define BSXFUN_OP2_DEF(OP, ARRAY, ARRAY1, ARRAY2) \ 216 #define BSXFUN_OP2_DEF(OP, ARRAY, ARRAY1, ARRAY2) \
217 ARRAY bsxfun_ ## OP (const ARRAY1& x, const ARRAY2& y) 217 ARRAY bsxfun_ ## OP (const ARRAY1& x, const ARRAY2& y)
218 218
219 #define BSXFUN_REL_DEF(OP, ARRAY) \ 219 #define BSXFUN_REL_DEF(OP, ARRAY) \
220 boolNDArray bsxfun_ ## OP (const ARRAY& x, const ARRAY& y) 220 boolNDArray bsxfun_ ## OP (const ARRAY& x, const ARRAY& y)
221 221
222 #define BSXFUN_OP_DEF_MXLOOP(OP, ARRAY, LOOP) \ 222 #define BSXFUN_OP_DEF_MXLOOP(OP, ARRAY, LOOP) \
223 BSXFUN_OP_DEF(OP, ARRAY) \ 223 BSXFUN_OP_DEF(OP, ARRAY) \
224 { return do_bsxfun_op<ARRAY::element_type, ARRAY::element_type, ARRAY::element_type> \ 224 { return do_bsxfun_op<ARRAY::element_type, ARRAY::element_type, ARRAY::element_type> \
225 (x, y, LOOP, LOOP, LOOP); } 225 (x, y, LOOP, LOOP, LOOP); }
226 226
227 #define BSXFUN_OP2_DEF_MXLOOP(OP, ARRAY, ARRAY1, ARRAY2, LOOP) \ 227 #define BSXFUN_OP2_DEF_MXLOOP(OP, ARRAY, ARRAY1, ARRAY2, LOOP) \
228 BSXFUN_OP2_DEF(OP, ARRAY, ARRAY1, ARRAY2) \ 228 BSXFUN_OP2_DEF(OP, ARRAY, ARRAY1, ARRAY2) \
229 { return do_bsxfun_op<ARRAY::element_type, ARRAY1::element_type, ARRAY2::element_type> \ 229 { return do_bsxfun_op<ARRAY::element_type, ARRAY1::element_type, ARRAY2::element_type> \
230 (x, y, LOOP, LOOP, LOOP); } 230 (x, y, LOOP, LOOP, LOOP); }
231 231
232 #define BSXFUN_REL_DEF_MXLOOP(OP, ARRAY, LOOP) \ 232 #define BSXFUN_REL_DEF_MXLOOP(OP, ARRAY, LOOP) \
233 BSXFUN_REL_DEF(OP, ARRAY) \ 233 BSXFUN_REL_DEF(OP, ARRAY) \
234 { return do_bsxfun_op<bool, ARRAY::element_type, ARRAY::element_type> \ 234 { return do_bsxfun_op<bool, ARRAY::element_type, ARRAY::element_type> \
235 (x, y, LOOP, LOOP, LOOP); } 235 (x, y, LOOP, LOOP, LOOP); }
236 236
237 #define BSXFUN_STDOP_DEFS_MXLOOP(ARRAY) \ 237 #define BSXFUN_STDOP_DEFS_MXLOOP(ARRAY) \
238 BSXFUN_OP_DEF_MXLOOP (add, ARRAY, mx_inline_add) \ 238 BSXFUN_OP_DEF_MXLOOP (add, ARRAY, mx_inline_add) \
239 BSXFUN_OP_DEF_MXLOOP (sub, ARRAY, mx_inline_sub) \ 239 BSXFUN_OP_DEF_MXLOOP (sub, ARRAY, mx_inline_sub) \
240 BSXFUN_OP_DEF_MXLOOP (mul, ARRAY, mx_inline_mul) \ 240 BSXFUN_OP_DEF_MXLOOP (mul, ARRAY, mx_inline_mul) \
241 BSXFUN_OP_DEF_MXLOOP (div, ARRAY, mx_inline_div) \ 241 BSXFUN_OP_DEF_MXLOOP (div, ARRAY, mx_inline_div) \
242 BSXFUN_OP_DEF_MXLOOP (min, ARRAY, mx_inline_xmin) \ 242 BSXFUN_OP_DEF_MXLOOP (min, ARRAY, mx_inline_xmin) \
243 BSXFUN_OP_DEF_MXLOOP (max, ARRAY, mx_inline_xmax) 243 BSXFUN_OP_DEF_MXLOOP (max, ARRAY, mx_inline_xmax)
244 244
245 #define BSXFUN_STDREL_DEFS_MXLOOP(ARRAY) \ 245 #define BSXFUN_STDREL_DEFS_MXLOOP(ARRAY) \
246 BSXFUN_REL_DEF_MXLOOP (eq, ARRAY, mx_inline_eq) \ 246 BSXFUN_REL_DEF_MXLOOP (eq, ARRAY, mx_inline_eq) \
247 BSXFUN_REL_DEF_MXLOOP (ne, ARRAY, mx_inline_ne) \ 247 BSXFUN_REL_DEF_MXLOOP (ne, ARRAY, mx_inline_ne) \
248 BSXFUN_REL_DEF_MXLOOP (lt, ARRAY, mx_inline_lt) \ 248 BSXFUN_REL_DEF_MXLOOP (lt, ARRAY, mx_inline_lt) \
249 BSXFUN_REL_DEF_MXLOOP (le, ARRAY, mx_inline_le) \ 249 BSXFUN_REL_DEF_MXLOOP (le, ARRAY, mx_inline_le) \
250 BSXFUN_REL_DEF_MXLOOP (gt, ARRAY, mx_inline_gt) \ 250 BSXFUN_REL_DEF_MXLOOP (gt, ARRAY, mx_inline_gt) \
251 BSXFUN_REL_DEF_MXLOOP (ge, ARRAY, mx_inline_ge) 251 BSXFUN_REL_DEF_MXLOOP (ge, ARRAY, mx_inline_ge)
252 252
253 //For bsxfun power with mixed integer/float types 253 //For bsxfun power with mixed integer/float types
254 #define BSXFUN_POW_MIXED_MXLOOP(INT_TYPE) \ 254 #define BSXFUN_POW_MIXED_MXLOOP(INT_TYPE) \
255 BSXFUN_OP2_DEF_MXLOOP (pow, INT_TYPE, INT_TYPE, NDArray, mx_inline_pow) \ 255 BSXFUN_OP2_DEF_MXLOOP (pow, INT_TYPE, INT_TYPE, NDArray, mx_inline_pow) \
256 BSXFUN_OP2_DEF_MXLOOP (pow, INT_TYPE, INT_TYPE, FloatNDArray, mx_inline_pow)\ 256 BSXFUN_OP2_DEF_MXLOOP (pow, INT_TYPE, INT_TYPE, FloatNDArray, mx_inline_pow) \
257 BSXFUN_OP2_DEF_MXLOOP (pow, INT_TYPE, NDArray, INT_TYPE, mx_inline_pow) \ 257 BSXFUN_OP2_DEF_MXLOOP (pow, INT_TYPE, NDArray, INT_TYPE, mx_inline_pow) \
258 BSXFUN_OP2_DEF_MXLOOP (pow, INT_TYPE, FloatNDArray, INT_TYPE, mx_inline_pow) 258 BSXFUN_OP2_DEF_MXLOOP (pow, INT_TYPE, FloatNDArray, INT_TYPE, mx_inline_pow)
259 259
260 #endif 260 #endif