comparison liboctave/util/lo-macros.h @ 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 b571fc85953f
children bac0d6f07a3e
comparison
equal deleted inserted replaced
22196:dd992fd74fce 22197:e43d83253e28
26 #include "octave-config.h" 26 #include "octave-config.h"
27 27
28 // Core macros. Iteration is supported up to count 10. 28 // Core macros. Iteration is supported up to count 10.
29 29
30 #define OCT_ITERATE_PARAM_MACRO0(MACRO, PARAM) 30 #define OCT_ITERATE_PARAM_MACRO0(MACRO, PARAM)
31 #define OCT_ITERATE_PARAM_MACRO1(MACRO, PARAM) \ 31 #define OCT_ITERATE_PARAM_MACRO1(MACRO, PARAM) \
32 MACRO(0, PARAM) 32 MACRO(0, PARAM)
33 #define OCT_ITERATE_PARAM_MACRO2(MACRO, PARAM) \ 33 #define OCT_ITERATE_PARAM_MACRO2(MACRO, PARAM) \
34 MACRO(0, PARAM) MACRO(1, PARAM) 34 MACRO(0, PARAM) MACRO(1, PARAM)
35 #define OCT_ITERATE_PARAM_MACRO3(MACRO, PARAM) \ 35 #define OCT_ITERATE_PARAM_MACRO3(MACRO, PARAM) \
36 MACRO(0, PARAM) MACRO(1, PARAM) MACRO(2, PARAM) 36 MACRO(0, PARAM) MACRO(1, PARAM) MACRO(2, PARAM)
37 #define OCT_ITERATE_PARAM_MACRO4(MACRO, PARAM) \ 37 #define OCT_ITERATE_PARAM_MACRO4(MACRO, PARAM) \
38 MACRO(0, PARAM) MACRO(1, PARAM) MACRO(2, PARAM) MACRO(3, PARAM) 38 MACRO(0, PARAM) MACRO(1, PARAM) MACRO(2, PARAM) MACRO(3, PARAM)
39 #define OCT_ITERATE_PARAM_MACRO5(MACRO, PARAM) \ 39 #define OCT_ITERATE_PARAM_MACRO5(MACRO, PARAM) \
40 MACRO(0, PARAM) MACRO(1, PARAM) MACRO(2, PARAM) MACRO(3, PARAM) MACRO(4, PARAM) 40 MACRO(0, PARAM) MACRO(1, PARAM) MACRO(2, PARAM) MACRO(3, PARAM) MACRO(4, PARAM)
41 #define OCT_ITERATE_PARAM_MACRO6(MACRO, PARAM) \ 41 #define OCT_ITERATE_PARAM_MACRO6(MACRO, PARAM) \
42 OCT_ITERATE_PARAM_MACRO5(MACRO, PARAM) MACRO(5, PARAM) 42 OCT_ITERATE_PARAM_MACRO5(MACRO, PARAM) MACRO(5, PARAM)
43 #define OCT_ITERATE_PARAM_MACRO7(MACRO, PARAM) \ 43 #define OCT_ITERATE_PARAM_MACRO7(MACRO, PARAM) \
44 OCT_ITERATE_PARAM_MACRO5(MACRO, PARAM) MACRO(5, PARAM) MACRO(6, PARAM) 44 OCT_ITERATE_PARAM_MACRO5(MACRO, PARAM) MACRO(5, PARAM) MACRO(6, PARAM)
45 #define OCT_ITERATE_PARAM_MACRO8(MACRO, PARAM) \ 45 #define OCT_ITERATE_PARAM_MACRO8(MACRO, PARAM) \
46 OCT_ITERATE_PARAM_MACRO5(MACRO, PARAM) MACRO(5, PARAM) MACRO(6, PARAM) MACRO(7, PARAM) 46 OCT_ITERATE_PARAM_MACRO5(MACRO, PARAM) MACRO(5, PARAM) MACRO(6, PARAM) MACRO(7, PARAM)
47 #define OCT_ITERATE_PARAM_MACRO9(MACRO, PARAM) \ 47 #define OCT_ITERATE_PARAM_MACRO9(MACRO, PARAM) \
48 OCT_ITERATE_PARAM_MACRO8(MACRO, PARAM) MACRO(8, PARAM) 48 OCT_ITERATE_PARAM_MACRO8(MACRO, PARAM) MACRO(8, PARAM)
49 #define OCT_ITERATE_PARAM_MACRO10(MACRO, PARAM) \ 49 #define OCT_ITERATE_PARAM_MACRO10(MACRO, PARAM) \
50 OCT_ITERATE_PARAM_MACRO8(MACRO, PARAM) MACRO(8, PARAM) MACRO(9, PARAM) 50 OCT_ITERATE_PARAM_MACRO8(MACRO, PARAM) MACRO(8, PARAM) MACRO(9, PARAM)
51 51
52 // expands to MACRO(0, PARAM) MACRO(1, PARAM) ... MACRO(NUM-1, PARAM) 52 // expands to MACRO(0, PARAM) MACRO(1, PARAM) ... MACRO(NUM-1, PARAM)
53 #define OCT_ITERATE_PARAM_MACRO(MACRO, PARAM, NUM) OCT_ITERATE_PARAM_MACRO##NUM(MACRO,PARAM) 53 #define OCT_ITERATE_PARAM_MACRO(MACRO, PARAM, NUM) \
54 OCT_ITERATE_PARAM_MACRO##NUM(MACRO,PARAM)
54 55
55 #define OCT_IF_PARAM0(MACRO, PARAM) 56 #define OCT_IF_PARAM0(MACRO, PARAM)
56 #define OCT_IF_PARAM1(MACRO, PARAM) MACRO(PARAM) 57 #define OCT_IF_PARAM1(MACRO, PARAM) MACRO(PARAM)
57 #define OCT_IF_PARAM2(MACRO, PARAM) MACRO(PARAM) 58 #define OCT_IF_PARAM2(MACRO, PARAM) MACRO(PARAM)
58 #define OCT_IF_PARAM3(MACRO, PARAM) MACRO(PARAM) 59 #define OCT_IF_PARAM3(MACRO, PARAM) MACRO(PARAM)
85 // expands to MACRO(0), MACRO(1), ..., MACRO(NUM-1) 86 // expands to MACRO(0), MACRO(1), ..., MACRO(NUM-1)
86 #define OCT_MAKE_LIST_HELPER(NUM, MACRO) OCT_IF_PARAM(NUM,OCT_MAKE_LIST_HELPER1,) MACRO(NUM) 87 #define OCT_MAKE_LIST_HELPER(NUM, MACRO) OCT_IF_PARAM(NUM,OCT_MAKE_LIST_HELPER1,) MACRO(NUM)
87 88
88 #define OCT_MAKE_LIST(MACRO, NUM) OCT_ITERATE_PARAM_MACRO(OCT_MAKE_LIST_HELPER, MACRO, NUM) 89 #define OCT_MAKE_LIST(MACRO, NUM) OCT_ITERATE_PARAM_MACRO(OCT_MAKE_LIST_HELPER, MACRO, NUM)
89 90
90 #define OCT_MAKE_DECL_LIST_HELPER(NUM, PREFIX) \ 91 #define OCT_MAKE_DECL_LIST_HELPER(NUM, PREFIX) \
91 OCT_IF_PARAM(NUM,OCT_MAKE_LIST_HELPER1,) OCT_CONCAT2(PREFIX, NUM) 92 OCT_IF_PARAM(NUM,OCT_MAKE_LIST_HELPER1,) OCT_CONCAT2(PREFIX, NUM)
92 93
93 // expands to TYPE PREFIX0, TYPE PREFIX1, ..., TYPE PREFIX ## (NUM-1) 94 // expands to TYPE PREFIX0, TYPE PREFIX1, ..., TYPE PREFIX ## (NUM-1)
94 #define OCT_MAKE_DECL_LIST(TYPE, PREFIX, NUM) \ 95 #define OCT_MAKE_DECL_LIST(TYPE, PREFIX, NUM) \
95 OCT_ITERATE_PARAM_MACRO(OCT_MAKE_DECL_LIST_HELPER, TYPE PREFIX, NUM) 96 OCT_ITERATE_PARAM_MACRO(OCT_MAKE_DECL_LIST_HELPER, TYPE PREFIX, NUM)
96 97
97 // expands to PREFIX0, PREFIX1, ..., PREFIX ## (NUM-1) 98 // expands to PREFIX0, PREFIX1, ..., PREFIX ## (NUM-1)
98 #define OCT_MAKE_ARG_LIST(PREFIX, NUM) \ 99 #define OCT_MAKE_ARG_LIST(PREFIX, NUM) \
99 OCT_ITERATE_PARAM_MACRO(OCT_MAKE_DECL_LIST_HELPER, PREFIX, NUM) 100 OCT_ITERATE_PARAM_MACRO(OCT_MAKE_DECL_LIST_HELPER, PREFIX, NUM)
100 101
101 #endif 102 #endif