octave: libinterp/operators/op-m-s.cc annotate

annotate libinterp/operators/op-m-s.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

rev	line source
2928 295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	1 /*
295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	2
23219 3ac9f9ecfae5 maint: Update copyright dates. John W. Eaton <jwe@octave.org> parents: 23083 diff changeset	3 Copyright (C) 1996-2017 John W. Eaton
2928 295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	4
295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	5 This file is part of Octave.
295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	6
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 23220 diff changeset	7 Octave is free software: you can redistribute it and/or modify it
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	8 under the terms of the GNU General Public License as published by
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 23220 diff changeset	9 the Free Software Foundation, either version 3 of the License, or
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	10 (at your option) any later version.
2928 295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	11
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	12 Octave is distributed in the hope that it will be useful, but
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	13 WITHOUT ANY WARRANTY; without even the implied warranty of
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	15 GNU General Public License for more details.
2928 295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	16
295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	17 You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 5785 diff changeset	18 along with Octave; see the file COPYING. If not, see
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 23220 diff changeset	19 <https://www.gnu.org/licenses/>.
2928 295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	20
295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	21 */
295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	22
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21647 diff changeset	23 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21200 diff changeset	24 # include "config.h"
2928 295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	25 #endif
295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	26
21100 e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme. Rik <rik@octave.org> parents: 20940 diff changeset	27 #include "errwarn.h"
20940 48b2ad5ee801 maint: Rename oct-obj.[cc\|h] to ovl.[cc\|h] for clarity. Rik <rik@octave.org> parents: 19697 diff changeset	28 #include "ovl.h"
2928 295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	29 #include "ov.h"
295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	30 #include "ov-re-mat.h"
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	31 #include "ov-flt-re-mat.h"
13160 6abc581bf2c9 Define missing real double -> float complex assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 11523 diff changeset	32 #include "ov-flt-cx-mat.h"
2928 295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	33 #include "ov-scalar.h"
295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	34 #include "ov-typeinfo.h"
295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	35 #include "ops.h"
295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	36 #include "xdiv.h"
295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	37 #include "xpow.h"
295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	38
295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	39 // matrix by scalar ops.
295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	40
4543 79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4192 diff changeset	41 DEFNDBINOP_OP (add, matrix, scalar, array, scalar, +)
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4192 diff changeset	42 DEFNDBINOP_OP (sub, matrix, scalar, array, scalar, -)
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4192 diff changeset	43 DEFNDBINOP_OP (mul, matrix, scalar, array, scalar, *)
2928 295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	44
295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	45 DEFBINOP (div, matrix, scalar)
295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	46 {
21647 66cae7a6dc47 eliminate some macros for operator definitions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	47 const octave_matrix& v1 = dynamic_cast<const octave_matrix&> (a1);
66cae7a6dc47 eliminate some macros for operator definitions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	48 const octave_scalar& v2 = dynamic_cast<const octave_scalar&> (a2);
2928 295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	49
295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	50 double d = v2.double_value ();
295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	51
295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	52 if (d == 0.0)
21100 e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme. Rik <rik@octave.org> parents: 20940 diff changeset	53 warn_divide_by_zero ();
2928 295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	54
4543 79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4192 diff changeset	55 return octave_value (v1.array_value () / d);
2928 295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	56 }
295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	57
295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	58 DEFBINOP_FN (pow, matrix, scalar, xpow)
295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	59
295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	60 DEFBINOP (ldiv, matrix, scalar)
295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	61 {
21647 66cae7a6dc47 eliminate some macros for operator definitions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	62 const octave_matrix& v1 = dynamic_cast<const octave_matrix&> (a1);
66cae7a6dc47 eliminate some macros for operator definitions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	63 const octave_scalar& v2 = dynamic_cast<const octave_scalar&> (a2);
3766 df962bbf1788 [project @ 2001-01-29 14:33:07 by jwe] jwe parents: 3538 diff changeset	64
df962bbf1788 [project @ 2001-01-29 14:33:07 by jwe] jwe parents: 3538 diff changeset	65 Matrix m1 = v1.matrix_value ();
df962bbf1788 [project @ 2001-01-29 14:33:07 by jwe] jwe parents: 3538 diff changeset	66 Matrix m2 = v2.matrix_value ();
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: 5307 diff changeset	67 MatrixType typ = v1.matrix_type ();
3766 df962bbf1788 [project @ 2001-01-29 14:33:07 by jwe] jwe parents: 3538 diff changeset	68
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: 5307 diff changeset	69 Matrix ret = xleftdiv (m1, m2, typ);
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: 5307 diff changeset	70
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: 5307 diff changeset	71 v1.matrix_type (typ);
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: 5307 diff changeset	72 return ret;
2928 295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	73 }
295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	74
4543 79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4192 diff changeset	75 DEFNDBINOP_FN (lt, matrix, scalar, array, scalar, mx_el_lt)
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4192 diff changeset	76 DEFNDBINOP_FN (le, matrix, scalar, array, scalar, mx_el_le)
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4192 diff changeset	77 DEFNDBINOP_FN (eq, matrix, scalar, array, scalar, mx_el_eq)
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4192 diff changeset	78 DEFNDBINOP_FN (ge, matrix, scalar, array, scalar, mx_el_ge)
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4192 diff changeset	79 DEFNDBINOP_FN (gt, matrix, scalar, array, scalar, mx_el_gt)
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4192 diff changeset	80 DEFNDBINOP_FN (ne, matrix, scalar, array, scalar, mx_el_ne)
2928 295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	81
4543 79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4192 diff changeset	82 DEFNDBINOP_OP (el_mul, matrix, scalar, array, scalar, *)
2928 295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	83
295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	84 DEFBINOP (el_div, matrix, scalar)
295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	85 {
21647 66cae7a6dc47 eliminate some macros for operator definitions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	86 const octave_matrix& v1 = dynamic_cast<const octave_matrix&> (a1);
66cae7a6dc47 eliminate some macros for operator definitions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	87 const octave_scalar& v2 = dynamic_cast<const octave_scalar&> (a2);
2928 295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	88
295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	89 double d = v2.double_value ();
295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	90
295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	91 if (d == 0.0)
21100 e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme. Rik <rik@octave.org> parents: 20940 diff changeset	92 warn_divide_by_zero ();
2928 295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	93
4543 79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4192 diff changeset	94 return octave_value (v1.array_value () / d);
2928 295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	95 }
295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	96
4543 79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4192 diff changeset	97 DEFNDBINOP_FN (el_pow, matrix, scalar, array, scalar, elem_xpow)
2928 295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	98
295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	99 DEFBINOP (el_ldiv, matrix, scalar)
295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	100 {
21647 66cae7a6dc47 eliminate some macros for operator definitions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	101 const octave_matrix& v1 = dynamic_cast<const octave_matrix&> (a1);
66cae7a6dc47 eliminate some macros for operator definitions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	102 const octave_scalar& v2 = dynamic_cast<const octave_scalar&> (a2);
2928 295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	103
4543 79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4192 diff changeset	104 return x_el_div (v2.double_value (), v1.array_value ());
2928 295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	105 }
295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	106
4543 79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4192 diff changeset	107 DEFNDBINOP_FN (el_and, matrix, scalar, array, scalar, mx_el_and)
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4192 diff changeset	108 DEFNDBINOP_FN (el_or, matrix, scalar, array, scalar, mx_el_or)
2928 295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	109
4915 c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4686 diff changeset	110 DEFNDCATOP_FN (m_s, matrix, scalar, array, array, concat)
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4686 diff changeset	111
8679 280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	112 DEFNDASSIGNOP_FN (assign, matrix, scalar, scalar, assign)
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	113 DEFNDASSIGNOP_FN (sgl_assign, float_matrix, scalar, float_scalar, assign)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	114 DEFNDASSIGNOP_FN (clx_sgl_assign, float_complex_matrix, scalar, float_complex,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	115 assign)
2928 295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	116
9546 1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	117 DEFNDASSIGNOP_OP (assign_add, matrix, scalar, scalar, +=)
1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	118 DEFNDASSIGNOP_OP (assign_sub, matrix, scalar, scalar, -=)
1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	119 DEFNDASSIGNOP_OP (assign_mul, matrix, scalar, scalar, *=)
1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	120 DEFNDASSIGNOP_OP (assign_div, matrix, scalar, scalar, /=)
1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	121
2928 295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	122 void
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	123 install_m_s_ops (octave::type_info& ti)
2928 295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	124 {
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	125 INSTALL_BINOP_TI (ti, op_add, octave_matrix, octave_scalar, add);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	126 INSTALL_BINOP_TI (ti, op_sub, octave_matrix, octave_scalar, sub);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	127 INSTALL_BINOP_TI (ti, op_mul, octave_matrix, octave_scalar, mul);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	128 INSTALL_BINOP_TI (ti, op_div, octave_matrix, octave_scalar, div);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	129 INSTALL_BINOP_TI (ti, op_pow, octave_matrix, octave_scalar, pow);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	130 INSTALL_BINOP_TI (ti, op_ldiv, octave_matrix, octave_scalar, ldiv);
4543 79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4192 diff changeset	131
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	132 INSTALL_BINOP_TI (ti, op_lt, octave_matrix, octave_scalar, lt);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	133 INSTALL_BINOP_TI (ti, op_le, octave_matrix, octave_scalar, le);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	134 INSTALL_BINOP_TI (ti, op_eq, octave_matrix, octave_scalar, eq);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	135 INSTALL_BINOP_TI (ti, op_ge, octave_matrix, octave_scalar, ge);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	136 INSTALL_BINOP_TI (ti, op_gt, octave_matrix, octave_scalar, gt);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	137 INSTALL_BINOP_TI (ti, op_ne, octave_matrix, octave_scalar, ne);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	138 INSTALL_BINOP_TI (ti, op_el_mul, octave_matrix, octave_scalar, el_mul);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	139 INSTALL_BINOP_TI (ti, op_el_div, octave_matrix, octave_scalar, el_div);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	140 INSTALL_BINOP_TI (ti, op_el_pow, octave_matrix, octave_scalar, el_pow);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	141 INSTALL_BINOP_TI (ti, op_el_ldiv, octave_matrix, octave_scalar, el_ldiv);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	142 INSTALL_BINOP_TI (ti, op_el_and, octave_matrix, octave_scalar, el_and);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	143 INSTALL_BINOP_TI (ti, op_el_or, octave_matrix, octave_scalar, el_or);
2928 295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	144
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	145 INSTALL_CATOP_TI (ti, octave_matrix, octave_scalar, m_s);
4915 c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4686 diff changeset	146
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	147 INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_matrix, octave_scalar, assign);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	148 INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_float_matrix, octave_scalar, sgl_assign);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	149 INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_float_complex_matrix, octave_scalar,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	150 clx_sgl_assign);
9546 1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	151
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	152 INSTALL_ASSIGNOP_TI (ti, op_add_eq, octave_matrix, octave_scalar, assign_add);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	153 INSTALL_ASSIGNOP_TI (ti, op_sub_eq, octave_matrix, octave_scalar, assign_sub);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	154 INSTALL_ASSIGNOP_TI (ti, op_mul_eq, octave_matrix, octave_scalar, assign_mul);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	155 INSTALL_ASSIGNOP_TI (ti, op_div_eq, octave_matrix, octave_scalar, assign_div);
2928 295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	156 }

Mercurial > octave

annotate libinterp/operators/op-m-s.cc @ 24540:46440078d73b