Mercurial > octave
diff libinterp/operators/op-cm-scm.cc @ 24540:46440078d73b
don't use singleton for octave_value_typeinfo
* ov-typeinfo.h, ov-typeinfo.cc (type_info): New class containing the
functionaity provided by the non-static functions in the
octave_value_typeinfo class. Define in octave namespace.
(octave_value_typeinfo): Now a namespace containing global functions
instead of a class containing all static functions. Provided for
backward compatibility, so all functions are tagged as deprecated.
* ops.h (INSTALL_UNOP_TI, INSTALL_NCUNOP_TI, INSTALL_BINOP_TI,
INSTALL_CATOP_TI, INSTALL_ASSIGNOP_TI, INSTALL_ASSIGNANYOP_TI,
INSTALL_ASSIGNCONV_TI, INSTALL_WIDENOP_TI): New macros.
(install_ops): Accept reference to type_info object as
an argument.
* mk-ops.sh: Generate function decls and calls that pass reference
to type_info object as an argument.
* op-b-b.cc, op-b-bm.cc, op-b-sbm.cc, op-bm-b.cc, op-bm-bm.cc,
op-bm-sbm.cc, op-cdm-cdm.cc, op-cell.cc, op-chm.cc, op-class.cc,
op-cm-cm.cc, op-cm-cs.cc, op-cm-m.cc, op-cm-s.cc, op-cm-scm.cc,
op-cm-sm.cc, op-cs-cm.cc, op-cs-cs.cc, op-cs-m.cc, op-cs-s.cc,
op-cs-scm.cc, op-cs-sm.cc, op-dm-dm.cc, op-dm-scm.cc, op-dm-sm.cc,
op-dm-template.cc, op-dms-template.cc, op-fcdm-fcdm.cc, op-fcm-fcm.cc,
op-fcm-fcs.cc, op-fcm-fm.cc, op-fcm-fs.cc, op-fcn.cc, op-fcs-fcm.cc,
op-fcs-fcs.cc, op-fcs-fm.cc, op-fcs-fs.cc, op-fdm-fdm.cc,
op-fm-fcm.cc, op-fm-fcs.cc, op-fm-fm.cc, op-fm-fs.cc, op-fs-fcm.cc,
op-fs-fcs.cc, op-fs-fm.cc, op-fs-fs.cc, op-i16-i16.cc, op-i32-i32.cc,
op-i64-i64.cc, op-i8-i8.cc, op-int-concat.cc, op-int.h, op-m-cm.cc,
op-m-cs.cc, op-m-m.cc, op-m-s.cc, op-m-scm.cc, op-m-sm.cc,
op-pm-pm.cc, op-pm-scm.cc, op-pm-sm.cc, op-pm-template.cc,
op-range.cc, op-s-cm.cc, op-s-cs.cc, op-s-m.cc, op-s-s.cc,
op-s-scm.cc, op-s-sm.cc, op-sbm-b.cc, op-sbm-bm.cc, op-sbm-sbm.cc,
op-scm-cm.cc, op-scm-cs.cc, op-scm-m.cc, op-scm-s.cc, op-scm-scm.cc,
op-scm-sm.cc, op-sm-cm.cc, op-sm-cs.cc, op-sm-m.cc, op-sm-s.cc,
op-sm-scm.cc, op-sm-sm.cc, op-str-m.cc, op-str-s.cc, op-str-str.cc,
op-struct.cc, op-ui16-ui16.cc, op-ui32-ui32.cc, op-ui64-ui64.cc,
op-ui8-ui8.cc): Use new _T1 macros. Update install_TYPE_ops function
for each type to accept reference to type_info object as argument.
* interpreter.h, interpreter.cc (interpreter::m_type_info):
New member variable.
(interpreter::get_type_info): New function.
(interpreter::interpreter): Initialize m_type_info before
m_symbol_table. Don't call install_types or install ops. That is now
handled by the in type_info constructor. Don't call m_cdef_manager.
That is now handled by the cdef_manager constructor.
* interpreter-private.h, interpreter-private.cc (__get_type_info__):
New function. Use where necessary to get reference to
interpreter::m_type_info object.
* ov-classdef.cc, ov-classdef.h (octave_classdef::octave_classdef):
Handle all initialization here.
(octave_classdef::initialize): Delete unused function.
* ov.h, ov.cc (install_types): Accept reference to type_info object as
argument. Pass on to individual register_type functions.
* ov-base.h, ov-base.cc (DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA): Update
to define additional register_type functions that accepts reference to
type_info object.
(install_base_type_conversions): Update to use new *_TI macros.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Fri, 05 Jan 2018 18:44:53 -0500 |
parents | 194eb4bd202b |
children | 6652d3823428 |
line wrap: on
line diff
--- a/libinterp/operators/op-cm-scm.cc Sat Jan 06 14:57:23 2018 -0500 +++ b/libinterp/operators/op-cm-scm.cc Fri Jan 05 18:44:53 2018 -0500 @@ -156,57 +156,57 @@ complex_array, assign) void -install_cm_scm_ops (void) +install_cm_scm_ops (octave::type_info& ti) { - INSTALL_BINOP (op_add, octave_complex_matrix, + INSTALL_BINOP_TI (ti, op_add, octave_complex_matrix, octave_sparse_complex_matrix, add); - INSTALL_BINOP (op_sub, octave_complex_matrix, + INSTALL_BINOP_TI (ti, op_sub, octave_complex_matrix, octave_sparse_complex_matrix, sub); - INSTALL_BINOP (op_mul, octave_complex_matrix, + INSTALL_BINOP_TI (ti, op_mul, octave_complex_matrix, octave_sparse_complex_matrix, mul); - INSTALL_BINOP (op_div, octave_complex_matrix, + INSTALL_BINOP_TI (ti, op_div, octave_complex_matrix, octave_sparse_complex_matrix, div); - INSTALL_BINOP (op_pow, octave_complex_matrix, + INSTALL_BINOP_TI (ti, op_pow, octave_complex_matrix, octave_sparse_complex_matrix, pow); - INSTALL_BINOP (op_ldiv, octave_complex_matrix, + INSTALL_BINOP_TI (ti, op_ldiv, octave_complex_matrix, octave_sparse_complex_matrix, ldiv); - INSTALL_BINOP (op_mul_trans, octave_complex_matrix, + INSTALL_BINOP_TI (ti, op_mul_trans, octave_complex_matrix, octave_sparse_complex_matrix, mul_trans); - INSTALL_BINOP (op_mul_herm, octave_complex_matrix, + INSTALL_BINOP_TI (ti, op_mul_herm, octave_complex_matrix, octave_sparse_complex_matrix, mul_herm); - INSTALL_BINOP (op_lt, octave_complex_matrix, + INSTALL_BINOP_TI (ti, op_lt, octave_complex_matrix, octave_sparse_complex_matrix, lt); - INSTALL_BINOP (op_le, octave_complex_matrix, + INSTALL_BINOP_TI (ti, op_le, octave_complex_matrix, octave_sparse_complex_matrix, le); - INSTALL_BINOP (op_eq, octave_complex_matrix, + INSTALL_BINOP_TI (ti, op_eq, octave_complex_matrix, octave_sparse_complex_matrix, eq); - INSTALL_BINOP (op_ge, octave_complex_matrix, + INSTALL_BINOP_TI (ti, op_ge, octave_complex_matrix, octave_sparse_complex_matrix, ge); - INSTALL_BINOP (op_gt, octave_complex_matrix, + INSTALL_BINOP_TI (ti, op_gt, octave_complex_matrix, octave_sparse_complex_matrix, gt); - INSTALL_BINOP (op_ne, octave_complex_matrix, + INSTALL_BINOP_TI (ti, op_ne, octave_complex_matrix, octave_sparse_complex_matrix, ne); - INSTALL_BINOP (op_el_mul, octave_complex_matrix, + INSTALL_BINOP_TI (ti, op_el_mul, octave_complex_matrix, octave_sparse_complex_matrix, el_mul); - INSTALL_BINOP (op_el_div, octave_complex_matrix, + INSTALL_BINOP_TI (ti, op_el_div, octave_complex_matrix, octave_sparse_complex_matrix, el_div); - INSTALL_BINOP (op_el_pow, octave_complex_matrix, + INSTALL_BINOP_TI (ti, op_el_pow, octave_complex_matrix, octave_sparse_complex_matrix, el_pow); - INSTALL_BINOP (op_el_ldiv, octave_complex_matrix, + INSTALL_BINOP_TI (ti, op_el_ldiv, octave_complex_matrix, octave_sparse_complex_matrix, el_ldiv); - INSTALL_BINOP (op_el_and, octave_complex_matrix, + INSTALL_BINOP_TI (ti, op_el_and, octave_complex_matrix, octave_sparse_complex_matrix, el_and); - INSTALL_BINOP (op_el_or, octave_complex_matrix, + INSTALL_BINOP_TI (ti, op_el_or, octave_complex_matrix, octave_sparse_complex_matrix, el_or); - INSTALL_CATOP (octave_complex_matrix, + INSTALL_CATOP_TI (ti, octave_complex_matrix, octave_sparse_complex_matrix, cm_scm); - INSTALL_ASSIGNOP (op_asn_eq, octave_complex_matrix, + INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_complex_matrix, octave_sparse_complex_matrix, assign) - INSTALL_ASSIGNCONV (octave_complex_matrix, octave_sparse_complex_matrix, + INSTALL_ASSIGNCONV_TI (ti, octave_complex_matrix, octave_sparse_complex_matrix, octave_complex_matrix); - INSTALL_WIDENOP (octave_complex_matrix, octave_sparse_complex_matrix, + INSTALL_WIDENOP_TI (ti, octave_complex_matrix, octave_sparse_complex_matrix, sparse_complex_matrix_conv); }