Mercurial > jwe > octave

comparison libinterp/octave-value/ov.h @ 30840:2989202f92f8 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
only allow range<FLOAT> to be instantiated * Range.h, Range.cc: Limit range<T> to floating point values. * range-fwd.h: Update forward declaration of range<T>. * ov-base.h, ov-base.cc, ov-range.h, ov-range.cc, ov.h, ov.cc, pt-eval.cc: Temporarily comment out code that uses range<INT> objects.
author John W. Eaton <jwe@octave.org>
date Thu, 17 Mar 2022 02:44:19 -0400
parents 796f54d4ddbf
children 97504d2edcc7 95725e6ad9c1
comparison
equal deleted inserted replaced
30839:f1a9e55d850c 30840:2989202f92f8
314 { 314 {
315 maybe_mutate (); 315 maybe_mutate ();
316 } 316 }
317 #endif 317 #endif
318 318
319 OCTINTERP_API octave_value (const octave::range<double>& r,
320 bool force_range = false);
321
322 // For now, disable all but range<double>.
323
324 #if 0
325
326 OCTINTERP_API octave_value (const octave::range<float>& r,
327 bool force_range = false);
328
329 OCTINTERP_API octave_value (const octave::range<octave_int8>& r,
330 bool force_range = false);
331
332 OCTINTERP_API octave_value (const octave::range<octave_int16>& r,
333 bool force_range = false);
334
335 OCTINTERP_API octave_value (const octave::range<octave_int32>& r,
336 bool force_range = false);
337
338 OCTINTERP_API octave_value (const octave::range<octave_int64>& r,
339 bool force_range = false);
340
341 OCTINTERP_API octave_value (const octave::range<octave_uint8>& r,
342 bool force_range = false);
343
344 OCTINTERP_API octave_value (const octave::range<octave_uint16>& r,
345 bool force_range = false);
346
347 OCTINTERP_API octave_value (const octave::range<octave_uint32>& r,
348 bool force_range = false);
349
350 OCTINTERP_API octave_value (const octave::range<octave_uint64>& r,
351 bool force_range = false);
352
319 OCTINTERP_API octave_value (const octave::range<char>& r, char type, 353 OCTINTERP_API octave_value (const octave::range<char>& r, char type,
320 bool force_range = false); 354 bool force_range = false);
321 OCTINTERP_API octave_value (const octave::range<float>& r, 355 #endif
322 bool force_range = false); 356
323 OCTINTERP_API octave_value (const octave::range<double>& r,
324 bool force_range = false);
325 OCTINTERP_API octave_value (const octave::range<octave_int8>& r,
326 bool force_range = false);
327 OCTINTERP_API octave_value (const octave::range<octave_int16>& r,
328 bool force_range = false);
329 OCTINTERP_API octave_value (const octave::range<octave_int32>& r,
330 bool force_range = false);
331 OCTINTERP_API octave_value (const octave::range<octave_int64>& r,
332 bool force_range = false);
333 OCTINTERP_API octave_value (const octave::range<octave_uint8>& r,
334 bool force_range = false);
335 OCTINTERP_API octave_value (const octave::range<octave_uint16>& r,
336 bool force_range = false);
337 OCTINTERP_API octave_value (const octave::range<octave_uint32>& r,
338 bool force_range = false);
339 OCTINTERP_API octave_value (const octave::range<octave_uint64>& r,
340 bool force_range = false);
341 OCTINTERP_API octave_value (const octave_map& m); 357 OCTINTERP_API octave_value (const octave_map& m);
342 OCTINTERP_API octave_value (const octave_scalar_map& m); 358 OCTINTERP_API octave_value (const octave_scalar_map& m);
343 OCTINTERP_API octave_value (const std::map<std::string, octave_value>&); 359 OCTINTERP_API octave_value (const std::map<std::string, octave_value>&);
344 OCTINTERP_API octave_value (const octave_map& m, const std::string& id, 360 OCTINTERP_API octave_value (const octave_map& m, const std::string& id,
345 const std::list<std::string>& plist); 361 const std::list<std::string>& plist);
1006 Cell cell_value (void) const; 1022 Cell cell_value (void) const;
1007 1023
1008 Array<std::string> cellstr_value (void) const 1024 Array<std::string> cellstr_value (void) const
1009 { return m_rep->cellstr_value (); } 1025 { return m_rep->cellstr_value (); }
1010 1026
1027 octave::range<double> range_value (void) const
1028 { return m_rep->range_value (); }
1029
1030 // For now, disable all but range<double>.
1031
1032 #if 0
1033
1011 octave::range<float> float_range_value (void) const 1034 octave::range<float> float_range_value (void) const
1012 { return m_rep->float_range_value (); } 1035 { return m_rep->float_range_value (); }
1013 1036
1014 octave::range<double> range_value (void) const
1015 { return m_rep->range_value (); }
1016
1017 octave::range<octave_int8> int8_range_value (void) const 1037 octave::range<octave_int8> int8_range_value (void) const
1018 { return m_rep->int8_range_value (); } 1038 { return m_rep->int8_range_value (); }
1019 1039
1020 octave::range<octave_int16> int16_range_value (void) const 1040 octave::range<octave_int16> int16_range_value (void) const
1021 { return m_rep->int16_range_value (); } 1041 { return m_rep->int16_range_value (); }
1035 octave::range<octave_uint32> uint32_range_value (void) const 1055 octave::range<octave_uint32> uint32_range_value (void) const
1036 { return m_rep->uint32_range_value (); } 1056 { return m_rep->uint32_range_value (); }
1037 1057
1038 octave::range<octave_uint64> uint64_range_value (void) const 1058 octave::range<octave_uint64> uint64_range_value (void) const
1039 { return m_rep->uint64_range_value (); } 1059 { return m_rep->uint64_range_value (); }
1060
1061 #endif
1040 1062
1041 OCTINTERP_API octave_map map_value (void) const; 1063 OCTINTERP_API octave_map map_value (void) const;
1042 1064
1043 OCTINTERP_API octave_scalar_map scalar_map_value (void) const; 1065 OCTINTERP_API octave_scalar_map scalar_map_value (void) const;
1044 1066
1267 1289
1268 OCTINTERP_API Cell xcell_value (const char *fmt, ...) const; 1290 OCTINTERP_API Cell xcell_value (const char *fmt, ...) const;
1269 1291
1270 OCTINTERP_API Array<std::string> xcellstr_value (const char *fmt, ...) const; 1292 OCTINTERP_API Array<std::string> xcellstr_value (const char *fmt, ...) const;
1271 1293
1294 OCTINTERP_API octave::range<double>
1295 xrange_value (const char *fmt, ...) const;
1296
1297 // For now, disable all but range<double>.
1298
1299 #if 0
1300
1272 OCTINTERP_API octave::range<float> 1301 OCTINTERP_API octave::range<float>
1273 xfloat_range_value (const char *fmt, ...) const; 1302 xfloat_range_value (const char *fmt, ...) const;
1274 1303
1275 OCTINTERP_API octave::range<double>
1276 xrange_value (const char *fmt, ...) const;
1277
1278 OCTINTERP_API octave::range<octave_int8> 1304 OCTINTERP_API octave::range<octave_int8>
1279 xint8_range_value (const char *fmt, ...) const; 1305 xint8_range_value (const char *fmt, ...) const;
1280 1306
1281 OCTINTERP_API octave::range<octave_int16> 1307 OCTINTERP_API octave::range<octave_int16>
1282 xint16_range_value (const char *fmt, ...) const; 1308 xint16_range_value (const char *fmt, ...) const;
1296 OCTINTERP_API octave::range<octave_uint32> 1322 OCTINTERP_API octave::range<octave_uint32>
1297 xuint32_range_value (const char *fmt, ...) const; 1323 xuint32_range_value (const char *fmt, ...) const;
1298 1324
1299 OCTINTERP_API octave::range<octave_uint64> 1325 OCTINTERP_API octave::range<octave_uint64>
1300 xuint64_range_value (const char *fmt, ...) const; 1326 xuint64_range_value (const char *fmt, ...) const;
1327
1328 #endif
1301 1329
1302 OCTINTERP_API octave_map xmap_value (const char *fmt, ...) const; 1330 OCTINTERP_API octave_map xmap_value (const char *fmt, ...) const;
1303 1331
1304 OCTINTERP_API octave_scalar_map 1332 OCTINTERP_API octave_scalar_map
1305 xscalar_map_value (const char *fmt, ...) const; 1333 xscalar_map_value (const char *fmt, ...) const;