Mercurial > octave
diff libinterp/octave-value/ov.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 | 278fc29b69ca |
| children | 564203123065 |
line wrap: on
line diff
--- a/libinterp/octave-value/ov.h Tue Jul 12 14:28:07 2016 -0400 +++ b/libinterp/octave-value/ov.h Mon Aug 01 12:40:18 2016 -0400 @@ -1323,7 +1323,10 @@ void dump (std::ostream& os) const { rep->dump (os); } #define MAPPER_FORWARD(F) \ - octave_value F (void) const { return rep->map (octave_base_value::umap_ ## F); } + octave_value F (void) const \ + { \ + return rep->map (octave_base_value::umap_ ## F); \ + } MAPPER_FORWARD (abs) MAPPER_FORWARD (acos) @@ -1445,22 +1448,22 @@ do_binary_op (octave_value::compound_binary_op op, const octave_value& a, const octave_value& b); -#define OV_UNOP_FN(name) \ - inline octave_value \ - name (const octave_value& a) \ - { \ +#define OV_UNOP_FN(name) \ + inline octave_value \ + name (const octave_value& a) \ + { \ return do_unary_op (octave_value::name, a); \ } -#define OV_UNOP_OP(name, op) \ - inline octave_value \ - operator op (const octave_value& a) \ - { \ - return name (a); \ +#define OV_UNOP_OP(name, op) \ + inline octave_value \ + operator op (const octave_value& a) \ + { \ + return name (a); \ } -#define OV_UNOP_FN_OP(name, op) \ - OV_UNOP_FN (name) \ +#define OV_UNOP_FN_OP(name, op) \ + OV_UNOP_FN (name) \ OV_UNOP_OP (name, op) OV_UNOP_FN_OP (op_not, !) @@ -1475,22 +1478,22 @@ // incr // decr -#define OV_BINOP_FN(name) \ - inline octave_value \ +#define OV_BINOP_FN(name) \ + inline octave_value \ name (const octave_value& a1, const octave_value& a2) \ - { \ - return do_binary_op (octave_value::name, a1, a2); \ + { \ + return do_binary_op (octave_value::name, a1, a2); \ } -#define OV_BINOP_OP(name, op) \ - inline octave_value \ - operator op (const octave_value& a1, const octave_value& a2) \ - { \ - return name (a1, a2); \ +#define OV_BINOP_OP(name, op) \ + inline octave_value \ + operator op (const octave_value& a1, const octave_value& a2) \ + { \ + return name (a1, a2); \ } -#define OV_BINOP_FN_OP(name, op) \ - OV_BINOP_FN (name) \ +#define OV_BINOP_FN_OP(name, op) \ + OV_BINOP_FN (name) \ OV_BINOP_OP (name, op) OV_BINOP_FN_OP (op_add, +) @@ -1517,11 +1520,11 @@ OV_BINOP_FN (op_struct_ref) -#define OV_COMP_BINOP_FN(name) \ - inline octave_value \ +#define OV_COMP_BINOP_FN(name) \ + inline octave_value \ name (const octave_value& a1, const octave_value& a2) \ - { \ - return do_binary_op (octave_value::name, a1, a2); \ + { \ + return do_binary_op (octave_value::name, a1, a2); \ } OV_COMP_BINOP_FN (op_trans_mul) @@ -1536,10 +1539,12 @@ inline Value octave_value_extract (const octave_value&) { assert (false); } -#define DEF_VALUE_EXTRACTOR(VALUE,MPREFIX) \ -template <> \ -inline VALUE octave_value_extract<VALUE> (const octave_value& v) \ - { return v.MPREFIX ## _value (); } +#define DEF_VALUE_EXTRACTOR(VALUE,MPREFIX) \ + template <> \ + inline VALUE octave_value_extract<VALUE> (const octave_value& v) \ + { \ + return v.MPREFIX ## _value (); \ + } DEF_VALUE_EXTRACTOR (double, scalar) DEF_VALUE_EXTRACTOR (float, float_scalar) @@ -1599,10 +1604,13 @@ DEF_VALUE_EXTRACTOR (SparseBoolMatrix, sparse_bool_matrix) #undef DEF_VALUE_EXTRACTOR -#define DEF_DUMMY_VALUE_EXTRACTOR(VALUE,DEFVAL) \ -template <> \ -inline VALUE octave_value_extract<VALUE> (const octave_value&) \ - { assert (false); return DEFVAL; } +#define DEF_DUMMY_VALUE_EXTRACTOR(VALUE,DEFVAL) \ + template <> \ + inline VALUE octave_value_extract<VALUE> (const octave_value&) \ + { \ + assert (false); \ + return DEFVAL; \ + } DEF_DUMMY_VALUE_EXTRACTOR (char, 0) DEF_DUMMY_VALUE_EXTRACTOR (octave_value, octave_value ())