view libinterp/operators/op-class.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 source

/*

Copyright (C) 2007-2017 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
<https://www.gnu.org/licenses/>.

*/

#if defined (HAVE_CONFIG_H)
#  include "config.h"
#endif

#include "oct-time.h"

#include "errwarn.h"
#include "interpreter-private.h"
#include "load-path.h"
#include "ovl.h"
#include "ov.h"
#include "ov-class.h"
#include "ov-typeinfo.h"
#include "ops.h"
#include "symtab.h"
#include "parse.h"

// class ops.

#define DEF_CLASS_UNOP(name)                                            \
  static octave_value                                                   \
  oct_unop_ ## name (const octave_value& a)                             \
  {                                                                     \
    octave_value retval;                                                \
                                                                        \
    std::string class_name = a.class_name ();                           \
                                                                        \
    octave::symbol_table& symtab                                        \
      = octave::__get_symbol_table__ ("oct_unop_" #name);               \
                                                                        \
    octave_value meth = symtab.find_method (#name, class_name);         \
                                                                        \
    if (meth.is_undefined ())                                           \
      error ("%s method not defined for %s class", #name,               \
             class_name.c_str ());                                      \
                                                                        \
    octave_value_list args;                                             \
                                                                        \
    args(0) = a;                                                        \
                                                                        \
    octave_value_list tmp = octave::feval (meth.function_value (), args, 1); \
                                                                        \
    if (tmp.length () > 0)                                              \
      retval = tmp(0);                                                  \
                                                                        \
    return retval;                                                      \
  }

DEF_CLASS_UNOP (not)
DEF_CLASS_UNOP (uplus)
DEF_CLASS_UNOP (uminus)
DEF_CLASS_UNOP (transpose)
DEF_CLASS_UNOP (ctranspose)

// FIXME: we need to handle precedence in the binop function.

#define DEF_CLASS_BINOP(name) \
  static octave_value                                                   \
  oct_binop_ ## name (const octave_value& a1, const octave_value& a2)   \
  {                                                                     \
    octave_value retval;                                                \
                                                                        \
    std::string dispatch_type                                           \
      = (a1.isobject () ? a1.class_name () : a2.class_name ());         \
                                                                        \
    octave::symbol_table& symtab                                        \
      = octave::__get_symbol_table__ ("oct_unop_" #name);               \
                                                                        \
    octave_value meth = symtab.find_method (#name, dispatch_type);      \
                                                                        \
    if (meth.is_undefined ())                                           \
      error ("%s method not defined for %s class", #name,               \
             dispatch_type.c_str ());                                   \
                                                                        \
    octave_value_list args;                                             \
                                                                        \
    args(1) = a2;                                                       \
    args(0) = a1;                                                       \
                                                                        \
    octave_value_list tmp = octave::feval (meth.function_value (), args, 1); \
                                                                        \
    if (tmp.length () > 0)                                              \
      retval = tmp(0);                                                  \
                                                                        \
    return retval;                                                      \
  }

DEF_CLASS_BINOP (plus)
DEF_CLASS_BINOP (minus)
DEF_CLASS_BINOP (mtimes)
DEF_CLASS_BINOP (mrdivide)
DEF_CLASS_BINOP (mpower)
DEF_CLASS_BINOP (mldivide)
DEF_CLASS_BINOP (lt)
DEF_CLASS_BINOP (le)
DEF_CLASS_BINOP (eq)
DEF_CLASS_BINOP (ge)
DEF_CLASS_BINOP (gt)
DEF_CLASS_BINOP (ne)
DEF_CLASS_BINOP (times)
DEF_CLASS_BINOP (rdivide)
DEF_CLASS_BINOP (power)
DEF_CLASS_BINOP (ldivide)
DEF_CLASS_BINOP (and)
DEF_CLASS_BINOP (or)

#define INSTALL_CLASS_UNOP_TI(ti, op, f)                        \
  ti.install_unary_class_op (octave_value::op, oct_unop_ ## f)

#define INSTALL_CLASS_BINOP_TI(ti, op, f)                       \
  ti.install_binary_class_op (octave_value::op, oct_binop_ ## f)

void
install_class_ops (octave::type_info& ti)
{
  INSTALL_CLASS_UNOP_TI (ti, op_not, not);
  INSTALL_CLASS_UNOP_TI (ti, op_uplus, uplus);
  INSTALL_CLASS_UNOP_TI (ti, op_uminus, uminus);
  INSTALL_CLASS_UNOP_TI (ti, op_transpose, transpose);
  INSTALL_CLASS_UNOP_TI (ti, op_hermitian, ctranspose);

  INSTALL_CLASS_BINOP_TI (ti, op_add, plus);
  INSTALL_CLASS_BINOP_TI (ti, op_sub, minus);
  INSTALL_CLASS_BINOP_TI (ti, op_mul, mtimes);
  INSTALL_CLASS_BINOP_TI (ti, op_div, mrdivide);
  INSTALL_CLASS_BINOP_TI (ti, op_pow, mpower);
  INSTALL_CLASS_BINOP_TI (ti, op_ldiv, mldivide);
  INSTALL_CLASS_BINOP_TI (ti, op_lt, lt);
  INSTALL_CLASS_BINOP_TI (ti, op_le, le);
  INSTALL_CLASS_BINOP_TI (ti, op_eq, eq);
  INSTALL_CLASS_BINOP_TI (ti, op_ge, ge);
  INSTALL_CLASS_BINOP_TI (ti, op_gt, gt);
  INSTALL_CLASS_BINOP_TI (ti, op_ne, ne);
  INSTALL_CLASS_BINOP_TI (ti, op_el_mul, times);
  INSTALL_CLASS_BINOP_TI (ti, op_el_div, rdivide);
  INSTALL_CLASS_BINOP_TI (ti, op_el_pow, power);
  INSTALL_CLASS_BINOP_TI (ti, op_el_ldiv, ldivide);
  INSTALL_CLASS_BINOP_TI (ti, op_el_and, and);
  INSTALL_CLASS_BINOP_TI (ti, op_el_or, or);
}