Mercurial > octave
view libinterp/operators/module.mk @ 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 | 492472927079 |
| children | 8308417aff1c |
line wrap: on
line source
LIBINTERP_OPERATORS_SRC = \ libinterp/operators/op-b-b.cc \ libinterp/operators/op-b-bm.cc \ libinterp/operators/op-b-sbm.cc \ libinterp/operators/op-bm-b.cc \ libinterp/operators/op-bm-bm.cc \ libinterp/operators/op-bm-sbm.cc \ libinterp/operators/op-cdm-cdm.cc \ libinterp/operators/op-cdm-cm.cc \ libinterp/operators/op-cdm-cs.cc \ libinterp/operators/op-cdm-dm.cc \ libinterp/operators/op-cdm-m.cc \ libinterp/operators/op-cdm-s.cc \ libinterp/operators/op-cell.cc \ libinterp/operators/op-chm.cc \ libinterp/operators/op-class.cc \ libinterp/operators/op-cm-cdm.cc \ libinterp/operators/op-cm-cm.cc \ libinterp/operators/op-cm-cs.cc \ libinterp/operators/op-cm-dm.cc \ libinterp/operators/op-cm-m.cc \ libinterp/operators/op-cm-pm.cc \ libinterp/operators/op-cm-s.cc \ libinterp/operators/op-cm-scm.cc \ libinterp/operators/op-cm-sm.cc \ libinterp/operators/op-cs-cm.cc \ libinterp/operators/op-cs-cs.cc \ libinterp/operators/op-cs-m.cc \ libinterp/operators/op-cs-s.cc \ libinterp/operators/op-cs-scm.cc \ libinterp/operators/op-cs-sm.cc \ libinterp/operators/op-dm-cdm.cc \ libinterp/operators/op-dm-cm.cc \ libinterp/operators/op-dm-cs.cc \ libinterp/operators/op-dm-dm.cc \ libinterp/operators/op-dm-m.cc \ libinterp/operators/op-dm-s.cc \ libinterp/operators/op-dm-scm.cc \ libinterp/operators/op-dm-sm.cc \ libinterp/operators/op-fcdm-fcdm.cc \ libinterp/operators/op-fcdm-fcm.cc \ libinterp/operators/op-fcdm-fcs.cc \ libinterp/operators/op-fcdm-fdm.cc \ libinterp/operators/op-fcdm-fm.cc \ libinterp/operators/op-fcdm-fs.cc \ libinterp/operators/op-fcm-fcdm.cc \ libinterp/operators/op-fcm-fcm.cc \ libinterp/operators/op-fcm-fcs.cc \ libinterp/operators/op-fcm-fdm.cc \ libinterp/operators/op-fcm-fm.cc \ libinterp/operators/op-fcm-fs.cc \ libinterp/operators/op-fcm-pm.cc \ libinterp/operators/op-fcn.cc \ libinterp/operators/op-fcs-fcm.cc \ libinterp/operators/op-fcs-fcs.cc \ libinterp/operators/op-fcs-fm.cc \ libinterp/operators/op-fcs-fs.cc \ libinterp/operators/op-fdm-fcdm.cc \ libinterp/operators/op-fdm-fcm.cc \ libinterp/operators/op-fdm-fcs.cc \ libinterp/operators/op-fdm-fdm.cc \ libinterp/operators/op-fdm-fm.cc \ libinterp/operators/op-fdm-fs.cc \ libinterp/operators/op-fm-fcdm.cc \ libinterp/operators/op-fm-fcm.cc \ libinterp/operators/op-fm-fcs.cc \ libinterp/operators/op-fm-fdm.cc \ libinterp/operators/op-fm-fm.cc \ libinterp/operators/op-fm-fs.cc \ libinterp/operators/op-fm-pm.cc \ libinterp/operators/op-fs-fcm.cc \ libinterp/operators/op-fs-fcs.cc \ libinterp/operators/op-fs-fm.cc \ libinterp/operators/op-fs-fs.cc \ libinterp/operators/op-i16-i16.cc \ libinterp/operators/op-i32-i32.cc \ libinterp/operators/op-i64-i64.cc \ libinterp/operators/op-i8-i8.cc \ libinterp/operators/op-int-concat.cc \ libinterp/operators/op-m-cdm.cc \ libinterp/operators/op-m-cm.cc \ libinterp/operators/op-m-cs.cc \ libinterp/operators/op-m-dm.cc \ libinterp/operators/op-m-m.cc \ libinterp/operators/op-m-pm.cc \ libinterp/operators/op-m-s.cc \ libinterp/operators/op-m-scm.cc \ libinterp/operators/op-m-sm.cc \ libinterp/operators/op-pm-cm.cc \ libinterp/operators/op-pm-fcm.cc \ libinterp/operators/op-pm-fm.cc \ libinterp/operators/op-pm-m.cc \ libinterp/operators/op-pm-pm.cc \ libinterp/operators/op-pm-scm.cc \ libinterp/operators/op-pm-sm.cc \ libinterp/operators/op-range.cc \ libinterp/operators/op-s-cm.cc \ libinterp/operators/op-s-cs.cc \ libinterp/operators/op-s-m.cc \ libinterp/operators/op-s-s.cc \ libinterp/operators/op-s-scm.cc \ libinterp/operators/op-s-sm.cc \ libinterp/operators/op-sbm-b.cc \ libinterp/operators/op-sbm-bm.cc \ libinterp/operators/op-sbm-sbm.cc \ libinterp/operators/op-scm-cm.cc \ libinterp/operators/op-scm-cs.cc \ libinterp/operators/op-scm-m.cc \ libinterp/operators/op-scm-s.cc \ libinterp/operators/op-scm-scm.cc \ libinterp/operators/op-scm-sm.cc \ libinterp/operators/op-sm-cm.cc \ libinterp/operators/op-sm-cs.cc \ libinterp/operators/op-sm-m.cc \ libinterp/operators/op-sm-s.cc \ libinterp/operators/op-sm-scm.cc \ libinterp/operators/op-sm-sm.cc \ libinterp/operators/op-str-m.cc \ libinterp/operators/op-str-s.cc \ libinterp/operators/op-str-str.cc \ libinterp/operators/op-struct.cc \ libinterp/operators/op-ui16-ui16.cc \ libinterp/operators/op-ui32-ui32.cc \ libinterp/operators/op-ui64-ui64.cc \ libinterp/operators/op-ui8-ui8.cc LIBINTERP_OPERATORS_INC = \ libinterp/operators/ops.h ## These look like included header files to Autotools build process NOINSTALL_LIBINTERP_OPERATORS_INC = \ libinterp/operators/op-dm-template.cc \ libinterp/operators/op-dms-template.cc \ libinterp/operators/op-int.h \ libinterp/operators/op-pm-template.cc ## Special rules for sources which must be built before rest of compilation. libinterp/operators/ops.cc: $(LIBINTERP_OPERATORS_SRC) libinterp/mkops $(AM_V_GEN)rm -f $@-t $@ && \ $(SHELL) $(srcdir)/libinterp/mkops $(LIBINTERP_OPERATORS_SRC) > $@-t && \ mv $@-t $@