Mercurial > octave
diff liboctave/array/MArray.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 | 1473547f50f5 |
children | bac0d6f07a3e |
line wrap: on
line diff
--- a/liboctave/array/MArray.h Tue Jul 12 14:28:07 2016 -0400 +++ b/liboctave/array/MArray.h Mon Aug 01 12:40:18 2016 -0400 @@ -123,97 +123,141 @@ // Define all the MArray forwarding functions for return type R and // MArray element type T -#define MARRAY_FORWARD_DEFS(B, R, T) \ - inline R operator += (R& x, const T& y) \ - { return R (operator += (dynamic_cast<B<T>&> (x), (y))); } \ - inline R operator -= (R& x, const T& y) \ - { return R (operator -= (dynamic_cast<B<T>&> (x), (y))); } \ - inline R operator *= (R& x, const T& y) \ - { return R (operator *= (dynamic_cast<B<T>&> (x), (y))); } \ - inline R operator /= (R& x, const T& y) \ - { return R (operator /= (dynamic_cast<B<T>&> (x), (y))); } \ - inline R operator += (R& x, const R& y) \ - { return R (operator += (dynamic_cast<B<T>&> (x), \ - dynamic_cast<const B<T>&> (y))); } \ - inline R operator -= (R& x, const R& y) \ - { return R (operator -= (dynamic_cast<B<T>&> (x), \ - dynamic_cast<const B<T>&> (y))); } \ - inline R product_eq (R& x, const R& y) \ - { return R (product_eq (dynamic_cast<B<T>&> (x), \ - dynamic_cast<const B<T>&> (y))); } \ - inline R quotient_eq (R& x, const R& y) \ - { return R (quotient_eq (dynamic_cast<B<T>&> (x), \ - dynamic_cast<const B<T>&> (y))); } \ - inline R operator + (const R& x) \ - { return R (operator + (dynamic_cast<const B<T>&> (x))); } \ - inline R operator - (const R& x) \ - { return R (operator - (dynamic_cast<const B<T>&> (x))); } \ - inline R operator + (const R& x, const T& y) \ - { return R (operator + (dynamic_cast<const B<T>&> (x), (y))); } \ - inline R operator - (const R& x, const T& y) \ - { return R (operator - (dynamic_cast<const B<T>&> (x), (y))); } \ - inline R operator * (const R& x, const T& y) \ - { return R (operator * (dynamic_cast<const B<T>&> (x), (y))); } \ - inline R operator / (const R& x, const T& y) \ - { return R (operator / (dynamic_cast<const B<T>&> (x), (y))); } \ - inline R operator + (const T& x, const R& y) \ - { return R (operator + ( (x), dynamic_cast<const B<T>&> (y))); } \ - inline R operator - (const T& x, const R& y) \ - { return R (operator - ( (x), dynamic_cast<const B<T>&> (y))); } \ - inline R operator * (const T& x, const R& y) \ - { return R (operator * ( (x), dynamic_cast<const B<T>&> (y))); } \ - inline R operator / (const T& x, const R& y) \ - { return R (operator / ( (x), dynamic_cast<const B<T>&> (y))); } \ - inline R operator + (const R& x, const R& y) \ - { return R (operator + (dynamic_cast<const B<T>&> (x), \ - dynamic_cast<const B<T>&> (y))); } \ - inline R operator - (const R& x, const R& y) \ - { return R (operator - (dynamic_cast<const B<T>&> (x), \ - dynamic_cast<const B<T>&> (y))); } \ - inline R product (const R& x, const R& y) \ - { return R (product (dynamic_cast<const B<T>&> (x), \ - dynamic_cast<const B<T>&> (y))); } \ - inline R quotient (const R& x, const R& y) \ - { return R (quotient (dynamic_cast<const B<T>&> (x), \ - dynamic_cast<const B<T>&> (y))); } +#define MARRAY_FORWARD_DEFS(B, R, T) \ + inline R operator += (R& x, const T& y) \ + { \ + return R (operator += (dynamic_cast<B<T>&> (x), (y))); \ + } \ + inline R operator -= (R& x, const T& y) \ + { \ + return R (operator -= (dynamic_cast<B<T>&> (x), (y))); \ + } \ + inline R operator *= (R& x, const T& y) \ + { \ + return R (operator *= (dynamic_cast<B<T>&> (x), (y))); \ + } \ + inline R operator /= (R& x, const T& y) \ + { \ + return R (operator /= (dynamic_cast<B<T>&> (x), (y))); \ + } \ + inline R operator += (R& x, const R& y) \ + { \ + return R (operator += (dynamic_cast<B<T>&> (x), \ + dynamic_cast<const B<T>&> (y))); \ + } \ + inline R operator -= (R& x, const R& y) \ + { \ + return R (operator -= (dynamic_cast<B<T>&> (x), \ + dynamic_cast<const B<T>&> (y))); \ + } \ + inline R product_eq (R& x, const R& y) \ + { \ + return R (product_eq (dynamic_cast<B<T>&> (x), \ + dynamic_cast<const B<T>&> (y))); \ + } \ + inline R quotient_eq (R& x, const R& y) \ + { \ + return R (quotient_eq (dynamic_cast<B<T>&> (x), \ + dynamic_cast<const B<T>&> (y))); \ + } \ + inline R operator + (const R& x) \ + { \ + return R (operator + (dynamic_cast<const B<T>&> (x))); \ + } \ + inline R operator - (const R& x) \ + { \ + return R (operator - (dynamic_cast<const B<T>&> (x))); \ + } \ + inline R operator + (const R& x, const T& y) \ + { \ + return R (operator + (dynamic_cast<const B<T>&> (x), (y))); \ + } \ + inline R operator - (const R& x, const T& y) \ + { \ + return R (operator - (dynamic_cast<const B<T>&> (x), (y))); \ + } \ + inline R operator * (const R& x, const T& y) \ + { \ + return R (operator * (dynamic_cast<const B<T>&> (x), (y))); \ + } \ + inline R operator / (const R& x, const T& y) \ + { \ + return R (operator / (dynamic_cast<const B<T>&> (x), (y))); \ + } \ + inline R operator + (const T& x, const R& y) \ + { \ + return R (operator + ( (x), dynamic_cast<const B<T>&> (y))); \ + } \ + inline R operator - (const T& x, const R& y) \ + { \ + return R (operator - ( (x), dynamic_cast<const B<T>&> (y))); \ + } \ + inline R operator * (const T& x, const R& y) \ + { \ + return R (operator * ( (x), dynamic_cast<const B<T>&> (y))); \ + } \ + inline R operator / (const T& x, const R& y) \ + { \ + return R (operator / ( (x), dynamic_cast<const B<T>&> (y))); \ + } \ + inline R operator + (const R& x, const R& y) \ + { \ + return R (operator + (dynamic_cast<const B<T>&> (x), \ + dynamic_cast<const B<T>&> (y))); \ + } \ + inline R operator - (const R& x, const R& y) \ + { \ + return R (operator - (dynamic_cast<const B<T>&> (x), \ + dynamic_cast<const B<T>&> (y))); \ + } \ + inline R product (const R& x, const R& y) \ + { \ + return R (product (dynamic_cast<const B<T>&> (x), \ + dynamic_cast<const B<T>&> (y))); \ + } \ + inline R quotient (const R& x, const R& y) \ + { \ + return R (quotient (dynamic_cast<const B<T>&> (x), \ + dynamic_cast<const B<T>&> (y))); \ + } // Instantiate all the MArray friends for MArray element type T. -#define INSTANTIATE_MARRAY_FRIENDS(T, API) \ - template API MArray<T>& operator += (MArray<T>&, const T&); \ - template API MArray<T>& operator -= (MArray<T>&, const T&); \ - template API MArray<T>& operator *= (MArray<T>&, const T&); \ - template API MArray<T>& operator /= (MArray<T>&, const T&); \ - template API MArray<T>& operator += (MArray<T>&, const MArray<T>&); \ - template API MArray<T>& operator -= (MArray<T>&, const MArray<T>&); \ - template API MArray<T>& product_eq (MArray<T>&, const MArray<T>&); \ - template API MArray<T>& quotient_eq (MArray<T>&, const MArray<T>&); \ - template API MArray<T> operator + (const MArray<T>&); \ - template API MArray<T> operator - (const MArray<T>&); \ - template API MArray<T> operator + (const MArray<T>&, const T&); \ - template API MArray<T> operator - (const MArray<T>&, const T&); \ - template API MArray<T> operator * (const MArray<T>&, const T&); \ - template API MArray<T> operator / (const MArray<T>&, const T&); \ - template API MArray<T> operator + (const T&, const MArray<T>&); \ - template API MArray<T> operator - (const T&, const MArray<T>&); \ - template API MArray<T> operator * (const T&, const MArray<T>&); \ - template API MArray<T> operator / (const T&, const MArray<T>&); \ +#define INSTANTIATE_MARRAY_FRIENDS(T, API) \ + template API MArray<T>& operator += (MArray<T>&, const T&); \ + template API MArray<T>& operator -= (MArray<T>&, const T&); \ + template API MArray<T>& operator *= (MArray<T>&, const T&); \ + template API MArray<T>& operator /= (MArray<T>&, const T&); \ + template API MArray<T>& operator += (MArray<T>&, const MArray<T>&); \ + template API MArray<T>& operator -= (MArray<T>&, const MArray<T>&); \ + template API MArray<T>& product_eq (MArray<T>&, const MArray<T>&); \ + template API MArray<T>& quotient_eq (MArray<T>&, const MArray<T>&); \ + template API MArray<T> operator + (const MArray<T>&); \ + template API MArray<T> operator - (const MArray<T>&); \ + template API MArray<T> operator + (const MArray<T>&, const T&); \ + template API MArray<T> operator - (const MArray<T>&, const T&); \ + template API MArray<T> operator * (const MArray<T>&, const T&); \ + template API MArray<T> operator / (const MArray<T>&, const T&); \ + template API MArray<T> operator + (const T&, const MArray<T>&); \ + template API MArray<T> operator - (const T&, const MArray<T>&); \ + template API MArray<T> operator * (const T&, const MArray<T>&); \ + template API MArray<T> operator / (const T&, const MArray<T>&); \ template API MArray<T> operator + (const MArray<T>&, const MArray<T>&); \ template API MArray<T> operator - (const MArray<T>&, const MArray<T>&); \ template API MArray<T> quotient (const MArray<T>&, const MArray<T>&); \ template API MArray<T> product (const MArray<T>&, const MArray<T>&); // Instantiate all the MDiagArray2 friends for MDiagArray2 element type T. -#define INSTANTIATE_MDIAGARRAY2_FRIENDS(T, API) \ - template API MDiagArray2<T> operator + (const MDiagArray2<T>&); \ - template API MDiagArray2<T> operator - (const MDiagArray2<T>&); \ +#define INSTANTIATE_MDIAGARRAY2_FRIENDS(T, API) \ + template API MDiagArray2<T> operator + (const MDiagArray2<T>&); \ + template API MDiagArray2<T> operator - (const MDiagArray2<T>&); \ template API MDiagArray2<T> operator * (const MDiagArray2<T>&, const T&); \ template API MDiagArray2<T> operator / (const MDiagArray2<T>&, const T&); \ template API MDiagArray2<T> operator * (const T&, const MDiagArray2<T>&); \ - template API MDiagArray2<T> operator + (const MDiagArray2<T>&, \ - const MDiagArray2<T>&); \ - template API MDiagArray2<T> operator - (const MDiagArray2<T>&, \ - const MDiagArray2<T>&); \ - template API MDiagArray2<T> product (const MDiagArray2<T>&, \ + template API MDiagArray2<T> operator + (const MDiagArray2<T>&, \ + const MDiagArray2<T>&); \ + template API MDiagArray2<T> operator - (const MDiagArray2<T>&, \ + const MDiagArray2<T>&); \ + template API MDiagArray2<T> product (const MDiagArray2<T>&, \ const MDiagArray2<T>&); #endif