diff libinterp/octave-value/ov-base.cc @ 22296:8b18f46f6427

revamp double, single, int type conversions * ov-type-conv.h: Delete. * libinterp/octave-value/module.mk: Update. * op-double-conv.cc, op-float-conv.cc, op-int-conv.cc: Delete. * libinterp/operators/module.mk: Update. * ov.h, ov.cc, ov-base.h, ov-base.cc (octave_value::as_double, octave_value::as_single, octave_value:as_int8, octave_value:as_int16, octave_value:as_int32, octave_value:as_int64, octave_value:as_uint8, octave_value:as_uint16, octave_value:as_uint32, octave_value:as_uint64): New functions. * ov.cc (Fdouble, Fsingle, Fint8, Fint16, Fint32, Fint64, Fuint8, Fuint16, Fuint32, Fuint64): Move here. Simply call as_double, as_single, etc. member functions. * ov-base-int.cc, ov-base-int.h, ov-base-scalar.cc, ov-bool-mat.cc, ov-bool-mat.h, ov-bool-sparse.cc, ov-bool-sparse.h, ov-bool.cc, ov-bool.h, ov-ch-mat.cc, ov-ch-mat.h, ov-complex.cc, ov-complex.h, ov-cx-diag.cc, ov-cx-diag.h, ov-cx-mat.cc, ov-cx-mat.h, ov-cx-sparse.cc, ov-cx-sparse.h, ov-float.cc, ov-float.h, ov-flt-complex.cc, ov-flt-complex.h, ov-flt-cx-diag.cc, ov-flt-cx-diag.h, ov-flt-cx-mat.cc, ov-flt-cx-mat.h, ov-flt-re-diag.cc, ov-flt-re-diag.h, ov-flt-re-mat.cc, ov-flt-re-mat.h, ov-int16.cc, ov-int32.cc, ov-int64.cc, ov-int8.cc, ov-perm.cc, ov-perm.h, ov-range.cc, ov-range.h, ov-re-diag.cc, ov-re-diag.h, ov-re-mat.cc, ov-re-mat.h, ov-re-sparse.cc, ov-re-sparse.h, ov-scalar.cc, ov-scalar.h, ov-uint16.cc, ov-uint32.cc, ov-uint64.cc, ov-uint8.cc: Define as_double, as_single, etc. member functions as appropriate. * ov-typeinfo.h, ov-typeinfo.cc (octave_value_typeinfo::type_conv_ops): Delete data member. Remove all uses. (octave_value_typeinfo::register_type_conv_op): Delete. (octave_value_typeinfo::do_register_type_conv_op): Delete. (octave_value_typeinfo::do_lookup_type_conv_op): Delete. * ops.h (INSTALL_CONVOP, CONVDECLX, DEFCONVFNX, DEFCONVFNX2, DEFDBLCONVFN, DEFFLTCONVFN, DEFSTRINTCONVFN, DEFSTRDBLCONVFN, DEFSTRFLTCONVFN, DEFCONVFN, DEFCONVFN2): Delete obsolete macros. * op-bm-bm.cc, op-cdm-cdm.cc, op-cm-cm.cc, op-cs-cs.cc, op-dm-dm.cc, op-fcdm-fcdm.cc, op-fcm-fcm.cc, op-fcs-fcs.cc, op-fdm-fdm.cc, op-fm-fm.cc, op-fs-fs.cc, op-m-m.cc, op-pm-pm.cc, op-s-s.cc, op-sbm-sbm.cc: Delete unused type conversion functions.
author John W. Eaton <jwe@octave.org>
date Mon, 15 Aug 2016 02:01:29 -0400
parents e43d83253e28
children bac0d6f07a3e
line wrap: on
line diff
--- a/libinterp/octave-value/ov-base.cc	Sun Aug 14 20:16:09 2016 -0700
+++ b/libinterp/octave-value/ov-base.cc	Mon Aug 15 02:01:29 2016 -0400
@@ -137,6 +137,66 @@
   err_wrong_type_arg ("full: invalid operation for %s type", type_name ());
 }
 
+octave_value
+octave_base_value::as_double (void) const
+{
+  err_invalid_conversion (type_name (), "double");
+}
+
+octave_value
+octave_base_value::as_single (void) const
+{
+  err_invalid_conversion (type_name (), "single");
+}
+
+octave_value
+octave_base_value::as_int8 (void) const
+{
+  err_invalid_conversion (type_name (), "int8");
+}
+
+octave_value
+octave_base_value::as_int16 (void) const
+{
+  err_invalid_conversion (type_name (), "int16");
+}
+
+octave_value
+octave_base_value::as_int32 (void) const
+{
+  err_invalid_conversion (type_name (), "int32");
+}
+
+octave_value
+octave_base_value::as_int64 (void) const
+{
+  err_invalid_conversion (type_name (), "int64");
+}
+
+octave_value
+octave_base_value::as_uint8 (void) const
+{
+  err_invalid_conversion (type_name (), "uint8");
+}
+
+octave_value
+octave_base_value::as_uint16 (void) const
+{
+  err_invalid_conversion (type_name (), "uint16");
+}
+
+octave_value
+octave_base_value::as_uint32 (void) const
+{
+  err_invalid_conversion (type_name (), "uint32");
+}
+
+octave_value
+octave_base_value::as_uint64 (void) const
+{
+  err_invalid_conversion (type_name (), "uint64");
+}
+
 Matrix
 octave_base_value::size (void)
 {
@@ -1352,22 +1412,26 @@
   return false;
 }
 
-CONVDECLX (matrix_conv)
+static octave_base_value *
+oct_conv_matrix_conv (const octave_base_value&)
 {
   return new octave_matrix ();
 }
 
-CONVDECLX (complex_matrix_conv)
+static octave_base_value *
+oct_conv_complex_matrix_conv (const octave_base_value&)
 {
   return new octave_complex_matrix ();
 }
 
-CONVDECLX (string_conv)
+static octave_base_value *
+oct_conv_string_conv (const octave_base_value&)
 {
   return new octave_char_matrix_str ();
 }
 
-CONVDECLX (cell_conv)
+static octave_base_value *
+oct_conv_cell_conv (const octave_base_value&)
 {
   return new octave_cell ();
 }