Mercurial > octave
diff libinterp/corefcn/psi.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 | 112b20240c87 |
| children | bac0d6f07a3e |
line wrap: on
line diff
--- a/libinterp/corefcn/psi.cc Tue Jul 12 14:28:07 2016 -0400 +++ b/libinterp/corefcn/psi.cc Mon Aug 01 12:40:18 2016 -0400 @@ -81,19 +81,19 @@ if (k == 0) { -#define FLOAT_BRANCH(T, A, M, E) \ - if (oct_z.is_ ## T ##_type ()) \ - { \ - const A ## NDArray z = oct_z.M ## array_value (); \ - A ## NDArray psi_z (z.dims ()); \ - \ - const E* zv = z.data (); \ - E* psi_zv = psi_z.fortran_vec (); \ - const octave_idx_type n = z.numel (); \ - for (octave_idx_type i = 0; i < n; i++) \ - *psi_zv++ = octave::math::psi (*zv++); \ - \ - retval = psi_z; \ +#define FLOAT_BRANCH(T, A, M, E) \ + if (oct_z.is_ ## T ##_type ()) \ + { \ + const A ## NDArray z = oct_z.M ## array_value (); \ + A ## NDArray psi_z (z.dims ()); \ + \ + const E* zv = z.data (); \ + E* psi_zv = psi_z.fortran_vec (); \ + const octave_idx_type n = z.numel (); \ + for (octave_idx_type i = 0; i < n; i++) \ + *psi_zv++ = octave::math::psi (*zv++); \ + \ + retval = psi_z; \ } if (oct_z.is_complex_type ()) @@ -118,23 +118,23 @@ if (! oct_z.is_real_type ()) error ("psi: Z must be real value for polygamma (K > 0)"); -#define FLOAT_BRANCH(T, A, M, E) \ - if (oct_z.is_ ## T ##_type ()) \ - { \ - const A ## NDArray z = oct_z.M ## array_value (); \ - A ## NDArray psi_z (z.dims ()); \ - \ - const E* zv = z.data (); \ - E* psi_zv = psi_z.fortran_vec (); \ - const octave_idx_type n = z.numel (); \ - for (octave_idx_type i = 0; i < n; i++) \ - { \ - if (*zv < 0) \ +#define FLOAT_BRANCH(T, A, M, E) \ + if (oct_z.is_ ## T ##_type ()) \ + { \ + const A ## NDArray z = oct_z.M ## array_value (); \ + A ## NDArray psi_z (z.dims ()); \ + \ + const E* zv = z.data (); \ + E* psi_zv = psi_z.fortran_vec (); \ + const octave_idx_type n = z.numel (); \ + for (octave_idx_type i = 0; i < n; i++) \ + { \ + if (*zv < 0) \ error ("psi: Z must be non-negative for polygamma (K > 0)"); \ - \ - *psi_zv++ = octave::math::psi (k, *zv++); \ - } \ - retval = psi_z; \ + \ + *psi_zv++ = octave::math::psi (k, *zv++); \ + } \ + retval = psi_z; \ } FLOAT_BRANCH(double, , , double)