Mercurial > octave
diff liboctave/util/data-conv.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 | c4ab2e54f100 |
| children | bac0d6f07a3e |
line wrap: on
line diff
--- a/liboctave/util/data-conv.cc Tue Jul 12 14:28:07 2016 -0400 +++ b/liboctave/util/data-conv.cc Mon Aug 01 12:40:18 2016 -0400 @@ -38,54 +38,54 @@ #include "oct-locbuf.h" #if defined (OCTAVE_HAVE_LONG_LONG_INT) -# define FIND_SIZED_INT_TYPE(VAL, BITS, TQ, Q) \ - do \ - { \ - int sz = BITS / std::numeric_limits<unsigned char>::digits; \ - if (sizeof (TQ char) == sz) \ - VAL = oct_data_conv::dt_ ## Q ## char; \ - else if (sizeof (TQ short) == sz) \ - VAL = oct_data_conv::dt_ ## Q ## short; \ - else if (sizeof (TQ int) == sz) \ - VAL = oct_data_conv::dt_ ## Q ## int; \ - else if (sizeof (TQ long) == sz) \ - VAL = oct_data_conv::dt_ ## Q ## long; \ - else if (sizeof (TQ long long) == sz) \ - VAL = oct_data_conv::dt_ ## Q ## longlong; \ - else \ - VAL = oct_data_conv::dt_unknown; \ - } \ - while (0) +# define FIND_SIZED_INT_TYPE(VAL, BITS, TQ, Q) \ + do \ + { \ + int sz = BITS / std::numeric_limits<unsigned char>::digits; \ + if (sizeof (TQ char) == sz) \ + VAL = oct_data_conv::dt_ ## Q ## char; \ + else if (sizeof (TQ short) == sz) \ + VAL = oct_data_conv::dt_ ## Q ## short; \ + else if (sizeof (TQ int) == sz) \ + VAL = oct_data_conv::dt_ ## Q ## int; \ + else if (sizeof (TQ long) == sz) \ + VAL = oct_data_conv::dt_ ## Q ## long; \ + else if (sizeof (TQ long long) == sz) \ + VAL = oct_data_conv::dt_ ## Q ## longlong; \ + else \ + VAL = oct_data_conv::dt_unknown; \ + } \ + while (0) #else -# define FIND_SIZED_INT_TYPE(VAL, BITS, TQ, Q) \ - do \ - { \ - int sz = BITS / std::numeric_limits<unsigned char>::digits; \ - if (sizeof (TQ char) == sz) \ - VAL = oct_data_conv::dt_ ## Q ## char; \ - else if (sizeof (TQ short) == sz) \ - VAL = oct_data_conv::dt_ ## Q ## short; \ - else if (sizeof (TQ int) == sz) \ - VAL = oct_data_conv::dt_ ## Q ## int; \ - else if (sizeof (TQ long) == sz) \ - VAL = oct_data_conv::dt_ ## Q ## long; \ - else \ - VAL = oct_data_conv::dt_unknown; \ - } \ - while (0) +# define FIND_SIZED_INT_TYPE(VAL, BITS, TQ, Q) \ + do \ + { \ + int sz = BITS / std::numeric_limits<unsigned char>::digits; \ + if (sizeof (TQ char) == sz) \ + VAL = oct_data_conv::dt_ ## Q ## char; \ + else if (sizeof (TQ short) == sz) \ + VAL = oct_data_conv::dt_ ## Q ## short; \ + else if (sizeof (TQ int) == sz) \ + VAL = oct_data_conv::dt_ ## Q ## int; \ + else if (sizeof (TQ long) == sz) \ + VAL = oct_data_conv::dt_ ## Q ## long; \ + else \ + VAL = oct_data_conv::dt_unknown; \ + } \ + while (0) #endif -#define FIND_SIZED_FLOAT_TYPE(VAL, BITS) \ - do \ - { \ - int sz = BITS / std::numeric_limits<unsigned char>::digits; \ - if (sizeof (float) == sz) \ - VAL = oct_data_conv::dt_float; \ - else if (sizeof (double) == sz) \ - VAL = oct_data_conv::dt_double; \ - else \ - VAL = oct_data_conv::dt_unknown; \ - } \ +#define FIND_SIZED_FLOAT_TYPE(VAL, BITS) \ + do \ + { \ + int sz = BITS / std::numeric_limits<unsigned char>::digits; \ + if (sizeof (float) == sz) \ + VAL = oct_data_conv::dt_float; \ + else if (sizeof (double) == sz) \ + VAL = oct_data_conv::dt_double; \ + else \ + VAL = oct_data_conv::dt_unknown; \ + } \ while (0) // I'm not sure it is worth the trouble, but let's use a lookup table @@ -146,32 +146,32 @@ return s; } -#define GET_SIZED_INT_TYPE(T, U) \ - do \ - { \ - switch (sizeof (T)) \ - { \ - case 1: \ - retval = dt_ ## U ## int8; \ - break; \ - \ - case 2: \ - retval = dt_ ## U ## int16; \ - break; \ - \ - case 4: \ - retval = dt_ ## U ## int32; \ - break; \ - \ - case 8: \ - retval = dt_ ## U ## int64; \ - break; \ - \ - default: \ - retval = dt_unknown; \ - break; \ - } \ - } \ +#define GET_SIZED_INT_TYPE(T, U) \ + do \ + { \ + switch (sizeof (T)) \ + { \ + case 1: \ + retval = dt_ ## U ## int8; \ + break; \ + \ + case 2: \ + retval = dt_ ## U ## int16; \ + break; \ + \ + case 4: \ + retval = dt_ ## U ## int32; \ + break; \ + \ + case 8: \ + retval = dt_ ## U ## int64; \ + break; \ + \ + default: \ + retval = dt_unknown; \ + break; \ + } \ + } \ while (0) size_t @@ -572,39 +572,39 @@ return retval; } -#define LS_DO_READ(TYPE, swap, data, size, len, stream) \ - do \ - { \ - if (len > 0) \ - { \ - OCTAVE_LOCAL_BUFFER (TYPE, ptr, len); \ +#define LS_DO_READ(TYPE, swap, data, size, len, stream) \ + do \ + { \ + if (len > 0) \ + { \ + OCTAVE_LOCAL_BUFFER (TYPE, ptr, len); \ std::streamsize n_bytes = size * static_cast<std::streamsize> (len); \ - stream.read (reinterpret_cast<char *> (ptr), n_bytes); \ - if (swap) \ - swap_bytes< size > (ptr, len); \ - for (octave_idx_type i = 0; i < len; i++) \ - data[i] = ptr[i]; \ - } \ - } \ + stream.read (reinterpret_cast<char *> (ptr), n_bytes); \ + if (swap) \ + swap_bytes< size > (ptr, len); \ + for (octave_idx_type i = 0; i < len; i++) \ + data[i] = ptr[i]; \ + } \ + } \ while (0) // Have to use copy here to avoid writing over data accessed via // Matrix::data (). -#define LS_DO_WRITE(TYPE, data, size, len, stream) \ - do \ - { \ - if (len > 0) \ - { \ - char tmp_type = type; \ - stream.write (&tmp_type, 1); \ - OCTAVE_LOCAL_BUFFER (TYPE, ptr, len); \ - for (octave_idx_type i = 0; i < len; i++) \ - ptr[i] = static_cast<TYPE> (data[i]); \ - std::streamsize n_bytes = size * static_cast<std::streamsize> (len); \ - stream.write (reinterpret_cast<char *> (ptr), n_bytes); \ - } \ - } \ +#define LS_DO_WRITE(TYPE, data, size, len, stream) \ + do \ + { \ + if (len > 0) \ + { \ + char tmp_type = type; \ + stream.write (&tmp_type, 1); \ + OCTAVE_LOCAL_BUFFER (TYPE, ptr, len); \ + for (octave_idx_type i = 0; i < len; i++) \ + ptr[i] = static_cast<TYPE> (data[i]); \ + std::streamsize n_bytes = size * static_cast<std::streamsize> (len); \ + stream.write (reinterpret_cast<char *> (ptr), n_bytes); \ + } \ + } \ while (0) // Loading variables from files.