annotate libinterp/operators/ops.h @ 29989:b260322f6730

move xdiv, xnorm, and xpow inside octave namespace * xdiv.h, xdiv.cc (elem_xdiv): Rename from x_el_div. (elem_xdiv, xdiv): Move inside octave namespace. Change all uses. Provide deprecated wrapper functions to preserve old names. * xnorm.h, xnorm.cc (xnorm, xcolnorms, xrownorms, xfrobnorm): Move inside octave namespace. Change all uses. Provide deprecated wrapper functions to preserve old names. * xpow.h, xpow.cc (elem_xpow, xpow): Move inside octave namespace. Change all uses. Provide deprecated wrapper functions to preserve old names. * ov-base.cc (install_base_type_conversions): Move inside octave namespace. * ops.h: Don't declare install_ops function here. * ov-typeinfo.cc: Declare install_ops in source file instead of including ops.h. * mk-ops.sh: Move generated code inside octave namespace. * 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-m-cm.cc, op-m-cs.cc, op-m-m.cc, op-m-s.cc, op-m-scm.cc, op-m-sm.cc, op-mi.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: Move operator functions inside octave namespace.
author John W. Eaton <jwe@octave.org>
date Mon, 16 Aug 2021 21:38:22 -0400
parents 7854d5752dd2
children 796f54d4ddbf
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
27923
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
1 ////////////////////////////////////////////////////////////////////////
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
2 //
29358
0a5b15007766 update Octave Project Developers copyright for the new year
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
3 // Copyright (C) 1996-2021 The Octave Project Developers
27923
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
4 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
5 // See the file COPYRIGHT.md in the top-level directory of this
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
6 // distribution or <https://octave.org/copyright/>.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
7 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
8 // This file is part of Octave.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
9 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
10 // Octave is free software: you can redistribute it and/or modify it
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
11 // under the terms of the GNU General Public License as published by
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
12 // the Free Software Foundation, either version 3 of the License, or
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
13 // (at your option) any later version.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
14 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
15 // Octave is distributed in the hope that it will be useful, but
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
16 // WITHOUT ANY WARRANTY; without even the implied warranty of
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
18 // GNU General Public License for more details.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
19 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
20 // You should have received a copy of the GNU General Public License
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
21 // along with Octave; see the file COPYING. If not, see
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
22 // <https://www.gnu.org/licenses/>.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
23 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
24 ////////////////////////////////////////////////////////////////////////
2376
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe]
jwe
parents:
diff changeset
25
20791
f7084eae3318 maint: Use Octave coding conventions for #if statements.
Rik <rik@octave.org>
parents: 19697
diff changeset
26 #if ! defined (octave_ops_h)
2376
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe]
jwe
parents:
diff changeset
27 #define octave_ops_h 1
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe]
jwe
parents:
diff changeset
28
21244
1473547f50f5 include octave-config.h in public header files
John W. Eaton <jwe@octave.org>
parents: 21129
diff changeset
29 #include "octave-config.h"
1473547f50f5 include octave-config.h in public header files
John W. Eaton <jwe@octave.org>
parents: 21129
diff changeset
30
4669
334a27c8f453 [project @ 2003-11-26 07:02:42 by jwe]
jwe
parents: 4550
diff changeset
31 #include "Array-util.h"
334a27c8f453 [project @ 2003-11-26 07:02:42 by jwe]
jwe
parents: 4550
diff changeset
32
24540
46440078d73b don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
33 namespace octave
46440078d73b don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
34 {
46440078d73b don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
35 class type_info;
46440078d73b don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
36 }
46440078d73b don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
37
8366
8b1a2555c4e2 implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents: 8150
diff changeset
38 // Concatenation macros that enforce argument prescan
21649
0822917dfcf5 * ops.h, op-int.h: Style fixes.
John W. Eaton <jwe@octave.org>
parents: 21648
diff changeset
39 #define CONCAT2X(x, y) x ## y
0822917dfcf5 * ops.h, op-int.h: Style fixes.
John W. Eaton <jwe@octave.org>
parents: 21648
diff changeset
40 #define CONCAT2(x, y) CONCAT2X (x, y)
8366
8b1a2555c4e2 implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents: 8150
diff changeset
41
21649
0822917dfcf5 * ops.h, op-int.h: Style fixes.
John W. Eaton <jwe@octave.org>
parents: 21648
diff changeset
42 #define CONCAT3X(x, y, z) x ## y ## z
0822917dfcf5 * ops.h, op-int.h: Style fixes.
John W. Eaton <jwe@octave.org>
parents: 21648
diff changeset
43 #define CONCAT3(x, y, z) CONCAT3X (x, y, z)
8366
8b1a2555c4e2 implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents: 8150
diff changeset
44
24540
46440078d73b don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
45 #define INSTALL_UNOP_TI(ti, op, t, f) \
46440078d73b don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
46 ti.install_unary_op \
46440078d73b don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
47 (octave_value::op, t::static_type_id (), CONCAT2 (oct_unop_, f));
46440078d73b don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
48
46440078d73b don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
49 #define INSTALL_NCUNOP_TI(ti, op, t, f) \
46440078d73b don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
50 ti.install_non_const_unary_op \
46440078d73b don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
51 (octave_value::op, t::static_type_id (), CONCAT2 (oct_unop_, f));
46440078d73b don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
52
46440078d73b don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
53 #define INSTALL_BINOP_TI(ti, op, t1, t2, f) \
46440078d73b don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
54 ti.install_binary_op \
46440078d73b don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
55 (octave_value::op, t1::static_type_id (), t2::static_type_id (), \
46440078d73b don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
56 CONCAT2 (oct_binop_, f));
46440078d73b don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
57
46440078d73b don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
58 #define INSTALL_CATOP_TI(ti, t1, t2, f) \
46440078d73b don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
59 ti.install_cat_op \
46440078d73b don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
60 (t1::static_type_id (), t2::static_type_id (), CONCAT2 (oct_catop_, f));
46440078d73b don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
61
46440078d73b don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
62 #define INSTALL_ASSIGNOP_TI(ti, op, t1, t2, f) \
46440078d73b don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
63 ti.install_assign_op \
46440078d73b don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
64 (octave_value::op, t1::static_type_id (), t2::static_type_id (), \
46440078d73b don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
65 CONCAT2 (oct_assignop_, f));
46440078d73b don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
66
46440078d73b don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
67 #define INSTALL_ASSIGNANYOP_TI(ti, op, t1, f) \
46440078d73b don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
68 ti.install_assignany_op \
46440078d73b don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
69 (octave_value::op, t1::static_type_id (), CONCAT2 (oct_assignop_, f));
46440078d73b don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
70
46440078d73b don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
71 #define INSTALL_ASSIGNCONV_TI(ti, t1, t2, tr) \
46440078d73b don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
72 ti.install_pref_assign_conv \
46440078d73b don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
73 (t1::static_type_id (), t2::static_type_id (), tr::static_type_id ());
46440078d73b don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
74
46440078d73b don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
75 #define INSTALL_WIDENOP_TI(ti, t1, t2, f) \
46440078d73b don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
76 ti.install_widening_op \
46440078d73b don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
77 (t1::static_type_id (), t2::static_type_id (), CONCAT2 (oct_conv_, f));
46440078d73b don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
78
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
79 #define DEFASSIGNOP(name, t1, t2) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
80 static octave_value \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
81 CONCAT2 (oct_assignop_, name) (octave_base_value& a1, \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
82 const octave_value_list& idx, \
21649
0822917dfcf5 * ops.h, op-int.h: Style fixes.
John W. Eaton <jwe@octave.org>
parents: 21648
diff changeset
83 const octave_base_value& a2)
5759
ce79d238f142 [project @ 2006-04-13 13:04:32 by jwe]
jwe
parents: 5533
diff changeset
84
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
85 #define DEFASSIGNOP_FN(name, t1, t2, f) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
86 static octave_value \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
87 CONCAT2 (oct_assignop_, name) (octave_base_value& a1, \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
88 const octave_value_list& idx, \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
89 const octave_base_value& a2) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
90 { \
21649
0822917dfcf5 * ops.h, op-int.h: Style fixes.
John W. Eaton <jwe@octave.org>
parents: 21648
diff changeset
91 CONCAT2 (octave_, t1)& v1 = dynamic_cast<CONCAT2 (octave_, t1)&> (a1); \
0822917dfcf5 * ops.h, op-int.h: Style fixes.
John W. Eaton <jwe@octave.org>
parents: 21648
diff changeset
92 const CONCAT2 (octave_, t2)& v2 = dynamic_cast<const CONCAT2 (octave_, t2)&> (a2); \
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
93 \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
94 v1.f (idx, v2.CONCAT2 (t1, _value) ()); \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
95 return octave_value (); \
2914
d6a3e3723736 [project @ 1997-04-30 20:43:31 by jwe]
jwe
parents: 2879
diff changeset
96 }
d6a3e3723736 [project @ 1997-04-30 20:43:31 by jwe]
jwe
parents: 2879
diff changeset
97
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
98 #define DEFNULLASSIGNOP_FN(name, t, f) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
99 static octave_value \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
100 CONCAT2 (oct_assignop_, name) (octave_base_value& a, \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
101 const octave_value_list& idx, \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
102 const octave_base_value&) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
103 { \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
104 CONCAT2 (octave_, t)& v = dynamic_cast<CONCAT2 (octave_, t)&> (a); \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
105 \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
106 v.f (idx); \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
107 return octave_value (); \
8150
283989f2da9b make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 7997
diff changeset
108 }
283989f2da9b make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 7997
diff changeset
109
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
110 #define DEFNDASSIGNOP_FN(name, t1, t2, e, f) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
111 static octave_value \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
112 CONCAT2 (oct_assignop_, name) (octave_base_value& a1, \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
113 const octave_value_list& idx, \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
114 const octave_base_value& a2) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
115 { \
21649
0822917dfcf5 * ops.h, op-int.h: Style fixes.
John W. Eaton <jwe@octave.org>
parents: 21648
diff changeset
116 CONCAT2 (octave_, t1)& v1 = dynamic_cast<CONCAT2 (octave_, t1)&> (a1); \
0822917dfcf5 * ops.h, op-int.h: Style fixes.
John W. Eaton <jwe@octave.org>
parents: 21648
diff changeset
117 const CONCAT2 (octave_, t2)& v2 = dynamic_cast<const CONCAT2 (octave_, t2)&> (a2); \
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
118 \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
119 v1.f (idx, v2.CONCAT2 (e, _value) ()); \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
120 return octave_value (); \
4686
c7ae43dfdea4 [project @ 2004-01-06 19:29:23 by jwe]
jwe
parents: 4669
diff changeset
121 }
c7ae43dfdea4 [project @ 2004-01-06 19:29:23 by jwe]
jwe
parents: 4669
diff changeset
122
9548
e5f7aee2ab8c optimize &=, |= operators
Jaroslav Hajek <highegg@gmail.com>
parents: 9546
diff changeset
123 // FIXME: the following currently don't handle index.
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
124 #define DEFNDASSIGNOP_OP(name, t1, t2, f, op) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
125 static octave_value \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
126 CONCAT2 (oct_assignop_, name) (octave_base_value& a1, \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
127 const octave_value_list& idx, \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
128 const octave_base_value& a2) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
129 { \
21649
0822917dfcf5 * ops.h, op-int.h: Style fixes.
John W. Eaton <jwe@octave.org>
parents: 21648
diff changeset
130 CONCAT2 (octave_, t1)& v1 = dynamic_cast<CONCAT2 (octave_, t1)&> (a1); \
0822917dfcf5 * ops.h, op-int.h: Style fixes.
John W. Eaton <jwe@octave.org>
parents: 21648
diff changeset
131 const CONCAT2 (octave_, t2)& v2 = dynamic_cast<const CONCAT2 (octave_, t2)&> (a2); \
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
132 \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
133 assert (idx.empty ()); \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
134 v1.matrix_ref () op v2.CONCAT2 (f, _value) (); \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
135 \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
136 return octave_value (); \
9546
1beb23d2b892 optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents: 8920
diff changeset
137 }
1beb23d2b892 optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents: 8920
diff changeset
138
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
139 #define DEFNDASSIGNOP_FNOP(name, t1, t2, f, fnop) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
140 static octave_value \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
141 CONCAT2 (oct_assignop_, name) (octave_base_value& a1, \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
142 const octave_value_list& idx, \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
143 const octave_base_value& a2) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
144 { \
21649
0822917dfcf5 * ops.h, op-int.h: Style fixes.
John W. Eaton <jwe@octave.org>
parents: 21648
diff changeset
145 CONCAT2 (octave_, t1)& v1 = dynamic_cast<CONCAT2 (octave_, t1)&> (a1); \
0822917dfcf5 * ops.h, op-int.h: Style fixes.
John W. Eaton <jwe@octave.org>
parents: 21648
diff changeset
146 const CONCAT2 (octave_, t2)& v2 = dynamic_cast<const CONCAT2 (octave_, t2)&> (a2); \
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
147 \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
148 assert (idx.empty ()); \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
149 fnop (v1.matrix_ref (), v2.CONCAT2 (f, _value) ()); \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
150 \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
151 return octave_value (); \
9548
e5f7aee2ab8c optimize &=, |= operators
Jaroslav Hajek <highegg@gmail.com>
parents: 9546
diff changeset
152 }
e5f7aee2ab8c optimize &=, |= operators
Jaroslav Hajek <highegg@gmail.com>
parents: 9546
diff changeset
153
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
154 #define DEFASSIGNANYOP_FN(name, t1, f) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
155 static octave_value \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
156 CONCAT2 (oct_assignop_, name) (octave_base_value& a1, \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
157 const octave_value_list& idx, \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
158 const octave_value& a2) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
159 { \
21649
0822917dfcf5 * ops.h, op-int.h: Style fixes.
John W. Eaton <jwe@octave.org>
parents: 21648
diff changeset
160 CONCAT2 (octave_, t1)& v1 = dynamic_cast<CONCAT2 (octave_, t1)&> (a1); \
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
161 \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
162 v1.f (idx, a2); \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
163 return octave_value (); \
3195
7a5a5da64756 [project @ 1998-10-28 22:54:04 by jwe]
jwe
parents: 2914
diff changeset
164 }
7a5a5da64756 [project @ 1998-10-28 22:54:04 by jwe]
jwe
parents: 2914
diff changeset
165
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
166 #define CONVDECL(name) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
167 static octave_base_value * \
21649
0822917dfcf5 * ops.h, op-int.h: Style fixes.
John W. Eaton <jwe@octave.org>
parents: 21648
diff changeset
168 CONCAT2 (oct_conv_, name) (const octave_base_value& a)
3203
bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe]
jwe
parents: 3195
diff changeset
169
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
170 #define DEFCONV(name, a_dummy, b_dummy) \
2914
d6a3e3723736 [project @ 1997-04-30 20:43:31 by jwe]
jwe
parents: 2879
diff changeset
171 CONVDECL (name)
d6a3e3723736 [project @ 1997-04-30 20:43:31 by jwe]
jwe
parents: 2879
diff changeset
172
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
173 #define DEFUNOPX(name, t) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
174 static octave_value \
21649
0822917dfcf5 * ops.h, op-int.h: Style fixes.
John W. Eaton <jwe@octave.org>
parents: 21648
diff changeset
175 CONCAT2 (oct_unop_, name) (const octave_base_value&)
21647
66cae7a6dc47 eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents: 21244
diff changeset
176
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
177 #define DEFUNOP(name, t) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
178 static octave_value \
21649
0822917dfcf5 * ops.h, op-int.h: Style fixes.
John W. Eaton <jwe@octave.org>
parents: 21648
diff changeset
179 CONCAT2 (oct_unop_, name) (const octave_base_value& a)
3203
bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe]
jwe
parents: 3195
diff changeset
180
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
181 #define DEFUNOP_OP(name, t, op) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
182 static octave_value \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
183 CONCAT2 (oct_unop_, name) (const octave_base_value& a) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
184 { \
21649
0822917dfcf5 * ops.h, op-int.h: Style fixes.
John W. Eaton <jwe@octave.org>
parents: 21648
diff changeset
185 const CONCAT2 (octave_, t)& v = dynamic_cast<const CONCAT2 (octave_, t)&> (a); \
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
186 return octave_value (op v.CONCAT2 (t, _value) ()); \
3203
bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe]
jwe
parents: 3195
diff changeset
187 }
bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe]
jwe
parents: 3195
diff changeset
188
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
189 #define DEFNDUNOP_OP(name, t, e, op) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
190 static octave_value \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
191 CONCAT2 (oct_unop_, name) (const octave_base_value& a) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
192 { \
21649
0822917dfcf5 * ops.h, op-int.h: Style fixes.
John W. Eaton <jwe@octave.org>
parents: 21648
diff changeset
193 const CONCAT2 (octave_, t)& v = dynamic_cast<const CONCAT2 (octave_, t)&> (a); \
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
194 return octave_value (op v.CONCAT2 (e, _value) ()); \
4543
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe]
jwe
parents: 3203
diff changeset
195 }
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe]
jwe
parents: 3203
diff changeset
196
17787
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
197 // FIXME: in some cases, the constructor isn't necessary.
3203
bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe]
jwe
parents: 3195
diff changeset
198
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
199 #define DEFUNOP_FN(name, t, f) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
200 static octave_value \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
201 CONCAT2 (oct_unop_, name) (const octave_base_value& a) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
202 { \
21649
0822917dfcf5 * ops.h, op-int.h: Style fixes.
John W. Eaton <jwe@octave.org>
parents: 21648
diff changeset
203 const CONCAT2 (octave_, t)& v = dynamic_cast<const CONCAT2 (octave_, t)&> (a); \
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
204 return octave_value (f (v.CONCAT2 (t, _value) ())); \
3203
bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe]
jwe
parents: 3195
diff changeset
205 }
bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe]
jwe
parents: 3195
diff changeset
206
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
207 #define DEFNDUNOP_FN(name, t, e, f) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
208 static octave_value \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
209 CONCAT2 (oct_unop_, name) (const octave_base_value& a) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
210 { \
21649
0822917dfcf5 * ops.h, op-int.h: Style fixes.
John W. Eaton <jwe@octave.org>
parents: 21648
diff changeset
211 const CONCAT2 (octave_, t)& v = dynamic_cast<const CONCAT2 (octave_, t)&> (a); \
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
212 return octave_value (f (v.CONCAT2 (e, _value) ())); \
4543
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe]
jwe
parents: 3203
diff changeset
213 }
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe]
jwe
parents: 3203
diff changeset
214
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
215 #define DEFNCUNOP_METHOD(name, t, method) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
216 static void \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
217 CONCAT2 (oct_unop_, name) (octave_base_value& a) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
218 { \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
219 CONCAT2 (octave_, t)& v = dynamic_cast<CONCAT2 (octave_, t)&> (a); \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
220 v.method (); \
3203
bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe]
jwe
parents: 3195
diff changeset
221 }
bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe]
jwe
parents: 3195
diff changeset
222
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
223 #define DEFBINOPX(name, t1, t2) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
224 static octave_value \
21649
0822917dfcf5 * ops.h, op-int.h: Style fixes.
John W. Eaton <jwe@octave.org>
parents: 21648
diff changeset
225 CONCAT2 (oct_binop_, name) (const octave_base_value&, \
0822917dfcf5 * ops.h, op-int.h: Style fixes.
John W. Eaton <jwe@octave.org>
parents: 21648
diff changeset
226 const octave_base_value&)
21647
66cae7a6dc47 eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents: 21244
diff changeset
227
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
228 #define DEFBINOP(name, t1, t2) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
229 static octave_value \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
230 CONCAT2 (oct_binop_, name) (const octave_base_value& a1, \
21649
0822917dfcf5 * ops.h, op-int.h: Style fixes.
John W. Eaton <jwe@octave.org>
parents: 21648
diff changeset
231 const octave_base_value& a2)
2914
d6a3e3723736 [project @ 1997-04-30 20:43:31 by jwe]
jwe
parents: 2879
diff changeset
232
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
233 #define DEFBINOP_OP(name, t1, t2, op) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
234 static octave_value \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
235 CONCAT2 (oct_binop_, name) (const octave_base_value& a1, \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
236 const octave_base_value& a2) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
237 { \
21649
0822917dfcf5 * ops.h, op-int.h: Style fixes.
John W. Eaton <jwe@octave.org>
parents: 21648
diff changeset
238 const CONCAT2 (octave_, t1)& v1 = dynamic_cast<const CONCAT2 (octave_, t1)&> (a1); \
0822917dfcf5 * ops.h, op-int.h: Style fixes.
John W. Eaton <jwe@octave.org>
parents: 21648
diff changeset
239 const CONCAT2 (octave_, t2)& v2 = dynamic_cast<const CONCAT2 (octave_, t2)&> (a2); \
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
240 \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
241 return octave_value \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
242 (v1.CONCAT2 (t1, _value) () op v2.CONCAT2 (t2, _value) ()); \
2914
d6a3e3723736 [project @ 1997-04-30 20:43:31 by jwe]
jwe
parents: 2879
diff changeset
243 }
d6a3e3723736 [project @ 1997-04-30 20:43:31 by jwe]
jwe
parents: 2879
diff changeset
244
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
245 #define DEFCMPLXCMPOP_OP(name, t1, t2, op) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
246 static octave_value \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
247 CONCAT2 (oct_binop_, name) (const octave_base_value& a1, \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
248 const octave_base_value& a2) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
249 { \
21649
0822917dfcf5 * ops.h, op-int.h: Style fixes.
John W. Eaton <jwe@octave.org>
parents: 21648
diff changeset
250 const CONCAT2 (octave_, t1)& v1 = dynamic_cast<const CONCAT2 (octave_, t1)&> (a1); \
0822917dfcf5 * ops.h, op-int.h: Style fixes.
John W. Eaton <jwe@octave.org>
parents: 21648
diff changeset
251 const CONCAT2 (octave_, t2)& v2 = dynamic_cast<const CONCAT2 (octave_, t2)&> (a2); \
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
252 \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
253 warn_complex_cmp (); \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
254 \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
255 return octave_value \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
256 (v1.CONCAT2 (t1, _value) () op v2.CONCAT2 (t2, _value) ()); \
9588
319e2ab9b8ae warn about the complex comparison ops
Jaroslav Hajek <highegg@gmail.com>
parents: 9587
diff changeset
257 }
319e2ab9b8ae warn about the complex comparison ops
Jaroslav Hajek <highegg@gmail.com>
parents: 9587
diff changeset
258
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
259 #define DEFSCALARBOOLOP_OP(name, t1, t2, op) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
260 static octave_value \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
261 CONCAT2 (oct_binop_, name) (const octave_base_value& a1, \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
262 const octave_base_value& a2) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
263 { \
21649
0822917dfcf5 * ops.h, op-int.h: Style fixes.
John W. Eaton <jwe@octave.org>
parents: 21648
diff changeset
264 const CONCAT2 (octave_, t1)& v1 = dynamic_cast<const CONCAT2 (octave_, t1)&> (a1); \
0822917dfcf5 * ops.h, op-int.h: Style fixes.
John W. Eaton <jwe@octave.org>
parents: 21648
diff changeset
265 const CONCAT2 (octave_, t2)& v2 = dynamic_cast<const CONCAT2 (octave_, t2)&> (a2); \
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
266 \
21782
2aef506f3fec use namespace for lo-mappers.h functions
John W. Eaton <jwe@octave.org>
parents: 21649
diff changeset
267 if (octave::math::isnan (v1.CONCAT2 (t1, _value) ()) || octave::math::isnan (v2.CONCAT2 (t2, _value) ())) \
22327
d0562b3159c7 move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22323
diff changeset
268 octave::err_nan_to_logical_conversion (); \
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
269 \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
270 return octave_value \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
271 (v1.CONCAT2 (t1, _value) () op v2.CONCAT2 (t2, _value) ()); \
7922
935be827eaf8 error for NaN values in & and | expressions
John W. Eaton <jwe@octave.org>
parents: 7017
diff changeset
272 }
935be827eaf8 error for NaN values in & and | expressions
John W. Eaton <jwe@octave.org>
parents: 7017
diff changeset
273
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
274 #define DEFNDBINOP_OP(name, t1, t2, e1, e2, op) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
275 static octave_value \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
276 CONCAT2 (oct_binop_, name) (const octave_base_value& a1, \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
277 const octave_base_value& a2) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
278 { \
21649
0822917dfcf5 * ops.h, op-int.h: Style fixes.
John W. Eaton <jwe@octave.org>
parents: 21648
diff changeset
279 const CONCAT2 (octave_, t1)& v1 = dynamic_cast<const CONCAT2 (octave_, t1)&> (a1); \
0822917dfcf5 * ops.h, op-int.h: Style fixes.
John W. Eaton <jwe@octave.org>
parents: 21648
diff changeset
280 const CONCAT2 (octave_, t2)& v2 = dynamic_cast<const CONCAT2 (octave_, t2)&> (a2); \
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
281 \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
282 return octave_value \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
283 (v1.CONCAT2 (e1, _value) () op v2.CONCAT2 (e2, _value) ()); \
4543
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe]
jwe
parents: 3203
diff changeset
284 }
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe]
jwe
parents: 3203
diff changeset
285
17787
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
286 // FIXME: in some cases, the constructor isn't necessary.
2914
d6a3e3723736 [project @ 1997-04-30 20:43:31 by jwe]
jwe
parents: 2879
diff changeset
287
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
288 #define DEFBINOP_FN(name, t1, t2, f) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
289 static octave_value \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
290 CONCAT2 (oct_binop_, name) (const octave_base_value& a1, \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
291 const octave_base_value& a2) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
292 { \
21649
0822917dfcf5 * ops.h, op-int.h: Style fixes.
John W. Eaton <jwe@octave.org>
parents: 21648
diff changeset
293 const CONCAT2 (octave_, t1)& v1 = dynamic_cast<const CONCAT2 (octave_, t1)&> (a1); \
0822917dfcf5 * ops.h, op-int.h: Style fixes.
John W. Eaton <jwe@octave.org>
parents: 21648
diff changeset
294 const CONCAT2 (octave_, t2)& v2 = dynamic_cast<const CONCAT2 (octave_, t2)&> (a2); \
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
295 \
21649
0822917dfcf5 * ops.h, op-int.h: Style fixes.
John W. Eaton <jwe@octave.org>
parents: 21648
diff changeset
296 return octave_value (f (v1.CONCAT2 (t1, _value) (), v2.CONCAT2 (t2, _value) ())); \
2914
d6a3e3723736 [project @ 1997-04-30 20:43:31 by jwe]
jwe
parents: 2879
diff changeset
297 }
d6a3e3723736 [project @ 1997-04-30 20:43:31 by jwe]
jwe
parents: 2879
diff changeset
298
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
299 #define DEFNDBINOP_FN(name, t1, t2, e1, e2, f) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
300 static octave_value \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
301 CONCAT2 (oct_binop_, name) (const octave_base_value& a1, \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
302 const octave_base_value& a2) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
303 { \
21649
0822917dfcf5 * ops.h, op-int.h: Style fixes.
John W. Eaton <jwe@octave.org>
parents: 21648
diff changeset
304 const CONCAT2 (octave_, t1)& v1 = dynamic_cast<const CONCAT2 (octave_, t1)&> (a1); \
0822917dfcf5 * ops.h, op-int.h: Style fixes.
John W. Eaton <jwe@octave.org>
parents: 21648
diff changeset
305 const CONCAT2 (octave_, t2)& v2 = dynamic_cast<const CONCAT2 (octave_, t2)&> (a2); \
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
306 \
21649
0822917dfcf5 * ops.h, op-int.h: Style fixes.
John W. Eaton <jwe@octave.org>
parents: 21648
diff changeset
307 return octave_value (f (v1.CONCAT2 (e1, _value) (), v2.CONCAT2 (e2, _value) ())); \
4543
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe]
jwe
parents: 3203
diff changeset
308 }
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe]
jwe
parents: 3203
diff changeset
309
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
310 #define DEFNDCMPLXCMPOP_FN(name, t1, t2, e1, e2, f) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
311 static octave_value \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
312 CONCAT2 (oct_binop_, name) (const octave_base_value& a1, \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
313 const octave_base_value& a2) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
314 { \
21649
0822917dfcf5 * ops.h, op-int.h: Style fixes.
John W. Eaton <jwe@octave.org>
parents: 21648
diff changeset
315 const CONCAT2 (octave_, t1)& v1 = dynamic_cast<const CONCAT2 (octave_, t1)&> (a1); \
0822917dfcf5 * ops.h, op-int.h: Style fixes.
John W. Eaton <jwe@octave.org>
parents: 21648
diff changeset
316 const CONCAT2 (octave_, t2)& v2 = dynamic_cast<const CONCAT2 (octave_, t2)&> (a2); \
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
317 \
21649
0822917dfcf5 * ops.h, op-int.h: Style fixes.
John W. Eaton <jwe@octave.org>
parents: 21648
diff changeset
318 return octave_value (f (v1.CONCAT2 (e1, _value) (), v2.CONCAT2 (e2, _value) ())); \
9588
319e2ab9b8ae warn about the complex comparison ops
Jaroslav Hajek <highegg@gmail.com>
parents: 9587
diff changeset
319 }
319e2ab9b8ae warn about the complex comparison ops
Jaroslav Hajek <highegg@gmail.com>
parents: 9587
diff changeset
320
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
321 #define DEFCATOPX(name, t1, t2) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
322 static octave_value \
28630
35f974bab4c8 fix constness of cat op args
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
323 CONCAT2 (oct_catop_, name) (const octave_base_value&, \
35f974bab4c8 fix constness of cat op args
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
324 const octave_base_value&, \
21649
0822917dfcf5 * ops.h, op-int.h: Style fixes.
John W. Eaton <jwe@octave.org>
parents: 21648
diff changeset
325 const Array<octave_idx_type>& ra_idx)
21647
66cae7a6dc47 eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents: 21244
diff changeset
326
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
327 #define DEFCATOP(name, t1, t2) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
328 static octave_value \
28630
35f974bab4c8 fix constness of cat op args
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
329 CONCAT2 (oct_catop_, name) (const octave_base_value& a1, \
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
330 const octave_base_value& a2, \
21649
0822917dfcf5 * ops.h, op-int.h: Style fixes.
John W. Eaton <jwe@octave.org>
parents: 21648
diff changeset
331 const Array<octave_idx_type>& ra_idx)
4915
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe]
jwe
parents: 4901
diff changeset
332
17787
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
333 // FIXME: in some cases, the constructor isn't necessary.
4915
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe]
jwe
parents: 4901
diff changeset
334
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
335 #define DEFCATOP_FN(name, t1, t2, f) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
336 static octave_value \
28630
35f974bab4c8 fix constness of cat op args
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
337 CONCAT2 (oct_catop_, name) (const octave_base_value& a1, \
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
338 const octave_base_value& a2, \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
339 const Array<octave_idx_type>& ra_idx) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
340 { \
28630
35f974bab4c8 fix constness of cat op args
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
341 const CONCAT2 (octave_, t1)& v1 = dynamic_cast<const CONCAT2 (octave_, t1)&> (a1); \
21649
0822917dfcf5 * ops.h, op-int.h: Style fixes.
John W. Eaton <jwe@octave.org>
parents: 21648
diff changeset
342 const CONCAT2 (octave_, t2)& v2 = dynamic_cast<const CONCAT2 (octave_, t2)&> (a2); \
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
343 \
21649
0822917dfcf5 * ops.h, op-int.h: Style fixes.
John W. Eaton <jwe@octave.org>
parents: 21648
diff changeset
344 return octave_value (v1.CONCAT2 (t1, _value) () . f (v2.CONCAT2 (t2, _value) (), ra_idx)); \
4915
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe]
jwe
parents: 4901
diff changeset
345 }
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe]
jwe
parents: 4901
diff changeset
346
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
347 #define DEFNDCATOP_FN(name, t1, t2, e1, e2, f) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
348 static octave_value \
28630
35f974bab4c8 fix constness of cat op args
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
349 CONCAT2 (oct_catop_, name) (const octave_base_value& a1, \
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
350 const octave_base_value& a2, \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
351 const Array<octave_idx_type>& ra_idx) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
352 { \
28630
35f974bab4c8 fix constness of cat op args
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
353 const CONCAT2 (octave_, t1)& v1 = dynamic_cast<const CONCAT2 (octave_, t1)&> (a1); \
21649
0822917dfcf5 * ops.h, op-int.h: Style fixes.
John W. Eaton <jwe@octave.org>
parents: 21648
diff changeset
354 const CONCAT2 (octave_, t2)& v2 = dynamic_cast<const CONCAT2 (octave_, t2)&> (a2); \
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
355 \
21649
0822917dfcf5 * ops.h, op-int.h: Style fixes.
John W. Eaton <jwe@octave.org>
parents: 21648
diff changeset
356 return octave_value (v1.CONCAT2 (e1, _value) () . f (v2.CONCAT2 (e2, _value) (), ra_idx)); \
5533
667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe]
jwe
parents: 5307
diff changeset
357 }
667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe]
jwe
parents: 5307
diff changeset
358
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
359 #define DEFNDCHARCATOP_FN(name, t1, t2, f) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
360 static octave_value \
28630
35f974bab4c8 fix constness of cat op args
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
361 CONCAT2 (oct_catop_, name) (const octave_base_value& a1, \
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
362 const octave_base_value& a2, \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
363 const Array<octave_idx_type>& ra_idx) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
364 { \
28630
35f974bab4c8 fix constness of cat op args
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
365 const CONCAT2 (octave_, t1)& v1 = dynamic_cast<const CONCAT2 (octave_, t1)&> (a1); \
21649
0822917dfcf5 * ops.h, op-int.h: Style fixes.
John W. Eaton <jwe@octave.org>
parents: 21648
diff changeset
366 const CONCAT2 (octave_, t2)& v2 = dynamic_cast<const CONCAT2 (octave_, t2)&> (a2); \
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
367 \
5533
667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe]
jwe
parents: 5307
diff changeset
368 return octave_value (v1.char_array_value () . f (v2.char_array_value (), ra_idx), \
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
369 ((a1.is_sq_string () || a2.is_sq_string ()) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
370 ? '\'' : '"')); \
4915
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe]
jwe
parents: 4901
diff changeset
371 }
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe]
jwe
parents: 4901
diff changeset
372
5075
b6a9f78f60e9 [project @ 2004-11-10 03:13:26 by jwe]
jwe
parents: 5073
diff changeset
373 // For compatibility, the second arg is always converted to the type
b6a9f78f60e9 [project @ 2004-11-10 03:13:26 by jwe]
jwe
parents: 5073
diff changeset
374 // of the first. Hmm.
b6a9f78f60e9 [project @ 2004-11-10 03:13:26 by jwe]
jwe
parents: 5073
diff changeset
375
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
376 #define DEFNDCATOP_FN2(name, t1, t2, tc1, tc2, e1, e2, f) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
377 static octave_value \
28630
35f974bab4c8 fix constness of cat op args
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
378 CONCAT2 (oct_catop_, name) (const octave_base_value& a1, \
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
379 const octave_base_value& a2, \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
380 const Array<octave_idx_type>& ra_idx) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
381 { \
28630
35f974bab4c8 fix constness of cat op args
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
382 const CONCAT2 (octave_, t1)& v1 = dynamic_cast<const CONCAT2 (octave_, t1)&> (a1); \
21649
0822917dfcf5 * ops.h, op-int.h: Style fixes.
John W. Eaton <jwe@octave.org>
parents: 21648
diff changeset
383 const CONCAT2 (octave_, t2)& v2 = dynamic_cast<const CONCAT2 (octave_, t2)&> (a2); \
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
384 \
21649
0822917dfcf5 * ops.h, op-int.h: Style fixes.
John W. Eaton <jwe@octave.org>
parents: 21648
diff changeset
385 return octave_value (tc1 (v1.CONCAT2 (e1, _value) ()) . f (tc2 (v2.CONCAT2 (e2, _value) ()), ra_idx)); \
5075
b6a9f78f60e9 [project @ 2004-11-10 03:13:26 by jwe]
jwe
parents: 5073
diff changeset
386 }
b6a9f78f60e9 [project @ 2004-11-10 03:13:26 by jwe]
jwe
parents: 5073
diff changeset
387
2376
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe]
jwe
parents:
diff changeset
388 #endif