Mercurial > octave

comparison libinterp/octave-value/ov-base.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 8b18f46f6427
comparison
equal deleted inserted replaced
22196:dd992fd74fce 22197:e43d83253e28
116 struct class_to_btyp 116 struct class_to_btyp
117 { 117 {
118 static const builtin_type_t btyp = btyp_unknown; 118 static const builtin_type_t btyp = btyp_unknown;
119 }; 119 };
120 120
121 #define DEF_CLASS_TO_BTYP(CLASS,BTYP) \ 121 #define DEF_CLASS_TO_BTYP(CLASS,BTYP) \
122 template <> \ 122 template <> \
123 struct class_to_btyp<CLASS> \ 123 struct class_to_btyp<CLASS> \
124 { static const builtin_type_t btyp = BTYP; } 124 { \
125 static const builtin_type_t btyp = BTYP; \
126 }
125 127
126 DEF_CLASS_TO_BTYP (double, btyp_double); 128 DEF_CLASS_TO_BTYP (double, btyp_double);
127 DEF_CLASS_TO_BTYP (float, btyp_float); 129 DEF_CLASS_TO_BTYP (float, btyp_float);
128 DEF_CLASS_TO_BTYP (Complex, btyp_complex); 130 DEF_CLASS_TO_BTYP (Complex, btyp_complex);
129 DEF_CLASS_TO_BTYP (FloatComplex, btyp_float_complex); 131 DEF_CLASS_TO_BTYP (FloatComplex, btyp_float_complex);
141 // T_ID is the type id of struct objects, set by register_type(). 143 // T_ID is the type id of struct objects, set by register_type().
142 // T_NAME is the type name of struct objects. 144 // T_NAME is the type name of struct objects.
143 145
144 #define OCTAVE_EMPTY_CPP_ARG /* empty */ 146 #define OCTAVE_EMPTY_CPP_ARG /* empty */
145 147
146 #define DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA \ 148 #define DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA \
147 DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA2 (OCTAVE_EMPTY_CPP_ARG) 149 DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA2 (OCTAVE_EMPTY_CPP_ARG)
148 150
149 #define DECLARE_OV_BASE_TYPEID_FUNCTIONS_AND_DATA \ 151 #define DECLARE_OV_BASE_TYPEID_FUNCTIONS_AND_DATA \
150 DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA2(virtual) 152 DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA2(virtual)
151 153
152 #define DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA2(VIRTUAL) \ 154 #define DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA2(VIRTUAL) \
153 public: \ 155 public: \
154 VIRTUAL int type_id (void) const { return t_id; } \ 156 VIRTUAL int type_id (void) const { return t_id; } \
155 VIRTUAL std::string type_name (void) const { return t_name; } \ 157 VIRTUAL std::string type_name (void) const { return t_name; } \
156 VIRTUAL std::string class_name (void) const { return c_name; } \ 158 VIRTUAL std::string class_name (void) const { return c_name; } \
157 static int static_type_id (void) { return t_id; } \ 159 static int static_type_id (void) { return t_id; } \
158 static std::string static_type_name (void) { return t_name; } \ 160 static std::string static_type_name (void) { return t_name; } \
159 static std::string static_class_name (void) { return c_name; } \ 161 static std::string static_class_name (void) { return c_name; } \
160 static void register_type (void); \ 162 static void register_type (void); \
161 \ 163 \
162 private: \ 164 private: \
163 static int t_id; \ 165 static int t_id; \
164 static const std::string t_name; \ 166 static const std::string t_name; \
165 static const std::string c_name; 167 static const std::string c_name;
166 168
167 #define DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA(t, n, c) \ 169 #define DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA(t, n, c) \
168 int t::t_id (-1); \ 170 int t::t_id (-1); \
169 const std::string t::t_name (n); \ 171 const std::string t::t_name (n); \
170 const std::string t::c_name (c); \ 172 const std::string t::c_name (c); \
171 void t::register_type (void) \ 173 void t::register_type (void) \
172 { \ 174 { \
173 static t exemplar; \ 175 static t exemplar; \
174 octave_value v (&exemplar, true); \ 176 octave_value v (&exemplar, true); \
175 t_id = octave_value_typeinfo::register_type (t::t_name, t::c_name, v); \ 177 t_id = octave_value_typeinfo::register_type (t::t_name, t::c_name, v); \
176 } 178 }
177 179
178 // A base value type, so that derived types only have to redefine what 180 // A base value type, so that derived types only have to redefine what
179 // they need (if they are derived from octave_base_value instead of 181 // they need (if they are derived from octave_base_value instead of
180 // octave_value). 182 // octave_value).
181 183