Mercurial > octave
view libinterp/octave-value/ov-typeinfo.h @ 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 | 0f9ab4f1f4b3 |
children | bac0d6f07a3e |
line wrap: on
line source
/* Copyright (C) 1996-2015 John W. Eaton This file is part of Octave. Octave is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. Octave is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Octave; see the file COPYING. If not, see <http://www.gnu.org/licenses/>. */ #if ! defined (octave_ov_typeinfo_h) #define octave_ov_typeinfo_h 1 #include "octave-config.h" #include <string> #include "Array.h" #include "oct-map.h" #include "ov.h" class string_vector; class OCTINTERP_API octave_value_typeinfo { public: typedef octave_value (*unary_class_op_fcn) (const octave_value&); typedef octave_value (*unary_op_fcn) (const octave_base_value&); typedef void (*non_const_unary_op_fcn) (octave_base_value&); typedef octave_value (*binary_class_op_fcn) (const octave_value&, const octave_value&); typedef octave_value (*binary_op_fcn) (const octave_base_value&, const octave_base_value&); typedef octave_value (*cat_op_fcn) (octave_base_value&, const octave_base_value&, const Array<octave_idx_type>& ra_idx); typedef octave_value (*assign_op_fcn) (octave_base_value&, const octave_value_list&, const octave_base_value&); typedef octave_value (*assignany_op_fcn) (octave_base_value&, const octave_value_list&, const octave_value&); static bool instance_ok (void); static int register_type (const std::string&, const std::string&, const octave_value&); static bool register_unary_class_op (octave_value::unary_op, unary_class_op_fcn); static bool register_unary_op (octave_value::unary_op, int, unary_op_fcn); static bool register_non_const_unary_op (octave_value::unary_op, int, non_const_unary_op_fcn); static bool register_binary_class_op (octave_value::binary_op, binary_class_op_fcn); static bool register_binary_op (octave_value::binary_op, int, int, binary_op_fcn); static bool register_binary_class_op (octave_value::compound_binary_op, binary_class_op_fcn); static bool register_binary_op (octave_value::compound_binary_op, int, int, binary_op_fcn); static bool register_cat_op (int, int, cat_op_fcn); static bool register_assign_op (octave_value::assign_op, int, int, assign_op_fcn); static bool register_assignany_op (octave_value::assign_op, int, assignany_op_fcn); static bool register_pref_assign_conv (int, int, int); static bool register_widening_op (int, int, octave_base_value::type_conv_fcn); static octave_value lookup_type (const std::string& nm) { return instance->do_lookup_type (nm); } static unary_class_op_fcn lookup_unary_class_op (octave_value::unary_op op) { return instance->do_lookup_unary_class_op (op); } static unary_op_fcn lookup_unary_op (octave_value::unary_op op, int t) { return instance->do_lookup_unary_op (op, t); } static non_const_unary_op_fcn lookup_non_const_unary_op (octave_value::unary_op op, int t) { return instance->do_lookup_non_const_unary_op (op, t); } static binary_class_op_fcn lookup_binary_class_op (octave_value::binary_op op) { return instance->do_lookup_binary_class_op (op); } static binary_op_fcn lookup_binary_op (octave_value::binary_op op, int t1, int t2) { return instance->do_lookup_binary_op (op, t1, t2); } static binary_class_op_fcn lookup_binary_class_op (octave_value::compound_binary_op op) { return instance->do_lookup_binary_class_op (op); } static binary_op_fcn lookup_binary_op (octave_value::compound_binary_op op, int t1, int t2) { return instance->do_lookup_binary_op (op, t1, t2); } static cat_op_fcn lookup_cat_op (int t1, int t2) { return instance->do_lookup_cat_op (t1, t2); } static assign_op_fcn lookup_assign_op (octave_value::assign_op op, int t_lhs, int t_rhs) { return instance->do_lookup_assign_op (op, t_lhs, t_rhs); } static assignany_op_fcn lookup_assignany_op (octave_value::assign_op op, int t_lhs) { return instance->do_lookup_assignany_op (op, t_lhs); } static int lookup_pref_assign_conv (int t_lhs, int t_rhs) { return instance->do_lookup_pref_assign_conv (t_lhs, t_rhs); } static octave_base_value::type_conv_fcn lookup_widening_op (int t, int t_result) { return instance->do_lookup_widening_op (t, t_result); } static string_vector installed_type_names (void) { return instance->do_installed_type_names (); } static octave_scalar_map installed_type_info (void) { return instance->do_installed_type_info (); } protected: octave_value_typeinfo (void) : num_types (0), types (dim_vector (init_tab_sz, 1), ""), vals (dim_vector (init_tab_sz, 1)), unary_class_ops (dim_vector (octave_value::num_unary_ops, 1), 0), unary_ops (dim_vector (octave_value::num_unary_ops, init_tab_sz), 0), non_const_unary_ops (dim_vector (octave_value::num_unary_ops, init_tab_sz), 0), binary_class_ops (dim_vector (octave_value::num_binary_ops, 1), 0), binary_ops (dim_vector (octave_value::num_binary_ops, init_tab_sz, init_tab_sz), 0), compound_binary_class_ops (dim_vector (octave_value::num_compound_binary_ops, 1), 0), compound_binary_ops (dim_vector (octave_value::num_compound_binary_ops, init_tab_sz, init_tab_sz), 0), cat_ops (dim_vector (init_tab_sz, init_tab_sz), 0), assign_ops (dim_vector (octave_value::num_assign_ops, init_tab_sz, init_tab_sz), 0), assignany_ops (dim_vector (octave_value::num_assign_ops, init_tab_sz), 0), pref_assign_conv (dim_vector (init_tab_sz, init_tab_sz), -1), widening_ops (dim_vector (init_tab_sz, init_tab_sz), 0) { } ~octave_value_typeinfo (void) { } private: static const int init_tab_sz; static octave_value_typeinfo *instance; static void cleanup_instance (void) { delete instance; instance = 0; } int num_types; Array<std::string> types; Array<octave_value> vals; Array<void *> unary_class_ops; Array<void *> unary_ops; Array<void *> non_const_unary_ops; Array<void *> binary_class_ops; Array<void *> binary_ops; Array<void *> compound_binary_class_ops; Array<void *> compound_binary_ops; Array<void *> cat_ops; Array<void *> assign_ops; Array<void *> assignany_ops; Array<int> pref_assign_conv; Array<void *> widening_ops; int do_register_type (const std::string&, const std::string&, const octave_value&); bool do_register_unary_class_op (octave_value::unary_op, unary_class_op_fcn); bool do_register_unary_op (octave_value::unary_op, int, unary_op_fcn); bool do_register_non_const_unary_op (octave_value::unary_op, int, non_const_unary_op_fcn); bool do_register_binary_class_op (octave_value::binary_op, binary_class_op_fcn); bool do_register_binary_op (octave_value::binary_op, int, int, binary_op_fcn); bool do_register_binary_class_op (octave_value::compound_binary_op, binary_class_op_fcn); bool do_register_binary_op (octave_value::compound_binary_op, int, int, binary_op_fcn); bool do_register_cat_op (int, int, cat_op_fcn); bool do_register_assign_op (octave_value::assign_op, int, int, assign_op_fcn); bool do_register_assignany_op (octave_value::assign_op, int, assignany_op_fcn); bool do_register_pref_assign_conv (int, int, int); bool do_register_widening_op (int, int, octave_base_value::type_conv_fcn); octave_value do_lookup_type (const std::string& nm); unary_class_op_fcn do_lookup_unary_class_op (octave_value::unary_op); unary_op_fcn do_lookup_unary_op (octave_value::unary_op, int); non_const_unary_op_fcn do_lookup_non_const_unary_op (octave_value::unary_op, int); binary_class_op_fcn do_lookup_binary_class_op (octave_value::binary_op); binary_op_fcn do_lookup_binary_op (octave_value::binary_op, int, int); binary_class_op_fcn do_lookup_binary_class_op (octave_value::compound_binary_op); binary_op_fcn do_lookup_binary_op (octave_value::compound_binary_op, int, int); cat_op_fcn do_lookup_cat_op (int, int); assign_op_fcn do_lookup_assign_op (octave_value::assign_op, int, int); assignany_op_fcn do_lookup_assignany_op (octave_value::assign_op, int); int do_lookup_pref_assign_conv (int, int); octave_base_value::type_conv_fcn do_lookup_widening_op (int, int); string_vector do_installed_type_names (void) const; octave_scalar_map do_installed_type_info (void) const; octave_scalar_map unary_ops_map (void) const; octave_scalar_map non_const_unary_ops_map (void) const; octave_scalar_map binary_ops_map (void) const; octave_scalar_map compound_binary_ops_map (void) const; octave_scalar_map assign_ops_map (void) const; octave_scalar_map assignany_ops_map (void) const; // No copying! octave_value_typeinfo (const octave_value_typeinfo&); octave_value_typeinfo& operator = (const octave_value_typeinfo&); }; #endif