Mercurial > octave

comparison libinterp/octave-value/ov-type-conv.h @ 22197:e43d83253e28

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
22196:dd992fd74fce 22197:e43d83253e28
73 } 73 }
74 74
75 return retval; 75 return retval;
76 } 76 }
77 77
78 #define OCTAVE_TYPE_CONV_BODY3(NAME, MATRIX_RESULT_T, SCALAR_RESULT_T) \ 78 #define OCTAVE_TYPE_CONV_BODY3(NAME, MATRIX_RESULT_T, SCALAR_RESULT_T) \
79 \ 79 \
80 if (args.length () != 1) \ 80 if (args.length () != 1) \
81 print_usage (); \ 81 print_usage (); \
82 \ 82 \
83 octave_value retval; \ 83 octave_value retval; \
84 \ 84 \
85 const octave_value arg = args(0); \ 85 const octave_value arg = args(0); \
86 \ 86 \
87 int t_result = MATRIX_RESULT_T::static_type_id (); \ 87 int t_result = MATRIX_RESULT_T::static_type_id (); \
88 \ 88 \
89 retval = octave_type_conv_body (arg, #NAME, t_result); \ 89 retval = octave_type_conv_body (arg, #NAME, t_result); \
90 if (retval.is_undefined ()) \ 90 if (retval.is_undefined ()) \
91 { \ 91 { \
92 std::string arg_tname = arg.type_name (); \ 92 std::string arg_tname = arg.type_name (); \
93 \ 93 \
94 std::string result_tname = arg.numel () == 1 \ 94 std::string result_tname = arg.numel () == 1 \
95 ? SCALAR_RESULT_T::static_type_name () \ 95 ? SCALAR_RESULT_T::static_type_name () \
96 : MATRIX_RESULT_T::static_type_name (); \ 96 : MATRIX_RESULT_T::static_type_name (); \
97 \ 97 \
98 err_invalid_conversion (arg_tname, result_tname); \ 98 err_invalid_conversion (arg_tname, result_tname); \
99 } \ 99 } \
100 \ 100 \
101 return retval; 101 return retval;
102 102
103 #define OCTAVE_TYPE_CONV_BODY(NAME) \ 103 #define OCTAVE_TYPE_CONV_BODY(NAME) \
104 OCTAVE_TYPE_CONV_BODY3 (NAME, octave_ ## NAME ## _matrix, \ 104 OCTAVE_TYPE_CONV_BODY3 (NAME, octave_ ## NAME ## _matrix, \
105 octave_ ## NAME ## _scalar) 105 octave_ ## NAME ## _scalar)
106 106
107 #endif 107 #endif