Mercurial > octave

comparison libinterp/octave-value/ov-lazy-idx.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 bac0d6f07a3e
comparison
equal deleted inserted replaced
22196:dd992fd74fce 22197:e43d83253e28
136 { make_value ().print (os, pr_as_read_syntax); } 136 { make_value ().print (os, pr_as_read_syntax); }
137 137
138 void print_info (std::ostream& os, const std::string& prefix) const 138 void print_info (std::ostream& os, const std::string& prefix) const
139 { make_value ().print_info (os, prefix); } 139 { make_value ().print_info (os, prefix); }
140 140
141 #define FORWARD_VALUE_QUERY(TYPE,NAME) \ 141 #define FORWARD_VALUE_QUERY(TYPE, NAME) \
142 TYPE \ 142 TYPE NAME (void) const \
143 NAME (void) const { return make_value ().NAME (); } 143 { \
144 return make_value ().NAME (); \
145 }
144 146
145 FORWARD_VALUE_QUERY (int8NDArray, int8_array_value) 147 FORWARD_VALUE_QUERY (int8NDArray, int8_array_value)
146 FORWARD_VALUE_QUERY (int16NDArray, int16_array_value) 148 FORWARD_VALUE_QUERY (int16NDArray, int16_array_value)
147 FORWARD_VALUE_QUERY (int32NDArray, int32_array_value) 149 FORWARD_VALUE_QUERY (int32NDArray, int32_array_value)
148 FORWARD_VALUE_QUERY (int64NDArray, int64_array_value) 150 FORWARD_VALUE_QUERY (int64NDArray, int64_array_value)
149 FORWARD_VALUE_QUERY (uint8NDArray, uint8_array_value) 151 FORWARD_VALUE_QUERY (uint8NDArray, uint8_array_value)
150 FORWARD_VALUE_QUERY (uint16NDArray, uint16_array_value) 152 FORWARD_VALUE_QUERY (uint16NDArray, uint16_array_value)
151 FORWARD_VALUE_QUERY (uint32NDArray, uint32_array_value) 153 FORWARD_VALUE_QUERY (uint32NDArray, uint32_array_value)
152 FORWARD_VALUE_QUERY (uint64NDArray, uint64_array_value) 154 FORWARD_VALUE_QUERY (uint64NDArray, uint64_array_value)
153 155
154 #define FORWARD_VALUE_QUERY1(TYPE,NAME) \ 156 #define FORWARD_VALUE_QUERY1(TYPE, NAME) \
155 TYPE \ 157 TYPE NAME (bool flag = false) const \
156 NAME (bool flag = false) const { return make_value ().NAME (flag); } 158 { \
159 return make_value ().NAME (flag); \
160 }
157 161
158 FORWARD_VALUE_QUERY1 (double, double_value) 162 FORWARD_VALUE_QUERY1 (double, double_value)
159
160 FORWARD_VALUE_QUERY1 (float, float_value) 163 FORWARD_VALUE_QUERY1 (float, float_value)
161
162 FORWARD_VALUE_QUERY1 (double, scalar_value) 164 FORWARD_VALUE_QUERY1 (double, scalar_value)
163
164 FORWARD_VALUE_QUERY1 (Matrix, matrix_value) 165 FORWARD_VALUE_QUERY1 (Matrix, matrix_value)
165
166 FORWARD_VALUE_QUERY1 (FloatMatrix, float_matrix_value) 166 FORWARD_VALUE_QUERY1 (FloatMatrix, float_matrix_value)
167
168 FORWARD_VALUE_QUERY1 (Complex, complex_value) 167 FORWARD_VALUE_QUERY1 (Complex, complex_value)
169
170 FORWARD_VALUE_QUERY1 (FloatComplex, float_complex_value) 168 FORWARD_VALUE_QUERY1 (FloatComplex, float_complex_value)
171
172 FORWARD_VALUE_QUERY1 (ComplexMatrix, complex_matrix_value) 169 FORWARD_VALUE_QUERY1 (ComplexMatrix, complex_matrix_value)
173
174 FORWARD_VALUE_QUERY1 (FloatComplexMatrix, float_complex_matrix_value) 170 FORWARD_VALUE_QUERY1 (FloatComplexMatrix, float_complex_matrix_value)
175
176 FORWARD_VALUE_QUERY1 (ComplexNDArray, complex_array_value) 171 FORWARD_VALUE_QUERY1 (ComplexNDArray, complex_array_value)
177
178 FORWARD_VALUE_QUERY1 (FloatComplexNDArray, float_complex_array_value) 172 FORWARD_VALUE_QUERY1 (FloatComplexNDArray, float_complex_array_value)
179
180 FORWARD_VALUE_QUERY1 (boolNDArray, bool_array_value) 173 FORWARD_VALUE_QUERY1 (boolNDArray, bool_array_value)
181
182 FORWARD_VALUE_QUERY1 (charNDArray, char_array_value) 174 FORWARD_VALUE_QUERY1 (charNDArray, char_array_value)
183
184 FORWARD_VALUE_QUERY1 (NDArray, array_value) 175 FORWARD_VALUE_QUERY1 (NDArray, array_value)
185
186 FORWARD_VALUE_QUERY1 (FloatNDArray, float_array_value) 176 FORWARD_VALUE_QUERY1 (FloatNDArray, float_array_value)
187
188 FORWARD_VALUE_QUERY1 (SparseMatrix, sparse_matrix_value) 177 FORWARD_VALUE_QUERY1 (SparseMatrix, sparse_matrix_value)
189
190 FORWARD_VALUE_QUERY1 (SparseComplexMatrix, sparse_complex_matrix_value) 178 FORWARD_VALUE_QUERY1 (SparseComplexMatrix, sparse_complex_matrix_value)
191 179
192 octave_value diag (octave_idx_type k = 0) const 180 octave_value diag (octave_idx_type k = 0) const
193 { return make_value ().diag (k); } 181 {
182 return make_value ().diag (k);
183 }
194 184
195 octave_value convert_to_str_internal (bool pad, bool force, char type) const 185 octave_value convert_to_str_internal (bool pad, bool force, char type) const
196 { return make_value ().convert_to_str_internal (pad, force, type); } 186 {
187 return make_value ().convert_to_str_internal (pad, force, type);
188 }
197 189
198 void print_raw (std::ostream& os, bool pr_as_read_syntax = false) const 190 void print_raw (std::ostream& os, bool pr_as_read_syntax = false) const
199 { return make_value ().print_raw (os, pr_as_read_syntax); } 191 {
192 return make_value ().print_raw (os, pr_as_read_syntax);
193 }
200 194
201 bool save_ascii (std::ostream& os); 195 bool save_ascii (std::ostream& os);
202 196
203 bool load_ascii (std::istream& is); 197 bool load_ascii (std::istream& is);
204 198
208 octave::mach_info::float_format fmt); 202 octave::mach_info::float_format fmt);
209 203
210 int write (octave_stream& os, int block_size, 204 int write (octave_stream& os, int block_size,
211 oct_data_conv::data_type output_type, int skip, 205 oct_data_conv::data_type output_type, int skip,
212 octave::mach_info::float_format flt_fmt) const 206 octave::mach_info::float_format flt_fmt) const
213 { return make_value ().write (os, block_size, output_type, skip, flt_fmt); } 207 {
208 return make_value ().write (os, block_size, output_type, skip, flt_fmt);
209 }
214 210
215 // Unsafe. This function exists to support the MEX interface. 211 // Unsafe. This function exists to support the MEX interface.
216 // You should not use it anywhere else. 212 // You should not use it anywhere else.
217 void *mex_get_data (void) const 213 void *mex_get_data (void) const
218 { return make_value ().mex_get_data (); } 214 {
215 return make_value ().mex_get_data ();
216 }
219 217
220 mxArray *as_mxArray (void) const 218 mxArray *as_mxArray (void) const
221 { return make_value ().as_mxArray (); } 219 {
220 return make_value ().as_mxArray ();
221 }
222 222
223 octave_value map (unary_mapper_t umap) const 223 octave_value map (unary_mapper_t umap) const
224 { return make_value ().map (umap); } 224 {
225 return make_value ().map (umap);
226 }
225 227
226 private: 228 private:
229
227 const octave_value& make_value (void) const 230 const octave_value& make_value (void) const
228 { 231 {
229 if (value.is_undefined ()) 232 if (value.is_undefined ())
230 value = octave_value (index, false); 233 value = octave_value (index, false);
231 234