Mercurial > octave
annotate libinterp/operators/op-range.cc @ 21647:66cae7a6dc47
eliminate some macros for operator definitions
* ops.h (CAST_UNOP_ARG, CAST_BINOP_ARGS, CAST_CONV_ARG, ASSIGNOPDECL,
NULLASSIGNOPDECL, ASSIGNANYOPDECL, DEFASSIGNOP, DEFASSIGNOP_FN,
UNOPDECL, BINOPDECL, CATOPDECL): Delete macros.
* make_int.cc, ov-bool-mat.cc, ov-bool-sparse.cc, ov-bool.cc,
ov-complex.cc, ov-cx-diag.cc, ov-cx-mat.cc, ov-flt-cx-diag.cc,
ov-flt-re-diag.cc, ov-lazy-idx.cc, ov-null-mat.cc, ov-perm.cc,
ov-range.cc, ov-re-diag.cc, ov-re-mat.cc, ov-scalar.cc, ov-str-mat.cc,
op-b-b.cc, op-b-bm.cc, op-b-sbm.cc, op-bm-bm.cc, op-bm-sbm.cc,
op-cdm-cdm.cc, op-cell.cc, op-chm.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-int-conv.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, ops.h:
Expand eliminated macros in place.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 27 Apr 2016 16:13:40 -0400 |
parents | 40de9f8f23a6 |
children | aba2e6293dd8 |
rev | line source |
---|---|
3207 | 1 /* |
2 | |
19697
4197fc428c7d
maint: Update copyright notices for 2015.
John W. Eaton <jwe@octave.org>
parents:
17787
diff
changeset
|
3 Copyright (C) 1996-2015 John W. Eaton |
3207 | 4 |
5 This file is part of Octave. | |
6 | |
7 Octave is free software; you can redistribute it and/or modify it | |
8 under the terms of the GNU General Public License as published by the | |
7016 | 9 Free Software Foundation; either version 3 of the License, or (at your |
10 option) any later version. | |
3207 | 11 |
12 Octave is distributed in the hope that it will be useful, but WITHOUT | |
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
15 for more details. | |
16 | |
17 You should have received a copy of the GNU General Public License | |
7016 | 18 along with Octave; see the file COPYING. If not, see |
19 <http://www.gnu.org/licenses/>. | |
3207 | 20 |
21 */ | |
22 | |
23 #ifdef 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" |
3207 | 25 #endif |
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" |
3207 | 29 #include "ov.h" |
30 #include "ov-range.h" | |
4915 | 31 #include "ov-ch-mat.h" |
32 #include "ov-scalar.h" | |
33 #include "ov-re-mat.h" | |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
34 #include "ov-flt-re-mat.h" |
4915 | 35 #include "ov-complex.h" |
36 #include "ov-cx-mat.h" | |
37 #include "ov-bool.h" | |
38 #include "ov-bool-mat.h" | |
3207 | 39 #include "ov-typeinfo.h" |
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
40 #include "ov-null-mat.h" |
3207 | 41 #include "ops.h" |
9103
10bed8fbec99
optimize scalar .^ range operation
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
42 #include "xpow.h" |
3207 | 43 |
44 // range unary ops. | |
45 | |
46 DEFUNOP (not, range) | |
47 { | |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
48 const octave_range& v = dynamic_cast<const octave_range&> (a); |
3207 | 49 |
14846
460a3c6d8bf1
maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
50 return octave_value (! v.matrix_value ()); |
3207 | 51 } |
52 | |
4965 | 53 DEFUNOP_OP (uplus, range, /* no-op */) |
3207 | 54 DEFUNOP_OP (uminus, range, -) |
55 | |
56 DEFUNOP (transpose, range) | |
57 { | |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
58 const octave_range& v = dynamic_cast<const octave_range&> (a); |
3207 | 59 |
14846
460a3c6d8bf1
maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
60 return octave_value (v.matrix_value ().transpose ()); |
3207 | 61 } |
62 | |
8553
c7ff200e45f5
optimize range-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8333
diff
changeset
|
63 DEFBINOP_OP (addrs, range, scalar, +) |
c7ff200e45f5
optimize range-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8333
diff
changeset
|
64 DEFBINOP_OP (addsr, scalar, range, +) |
c7ff200e45f5
optimize range-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8333
diff
changeset
|
65 DEFBINOP_OP (subrs, range, scalar, -) |
c7ff200e45f5
optimize range-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8333
diff
changeset
|
66 DEFBINOP_OP (subsr, scalar, range, -) |
c7ff200e45f5
optimize range-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8333
diff
changeset
|
67 DEFBINOP_OP (mulrs, range, scalar, *) |
c7ff200e45f5
optimize range-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8333
diff
changeset
|
68 DEFBINOP_OP (mulsr, scalar, range, *) |
c7ff200e45f5
optimize range-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8333
diff
changeset
|
69 |
9103
10bed8fbec99
optimize scalar .^ range operation
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
70 DEFBINOP_FN (el_powsr, scalar, range, elem_xpow) |
10bed8fbec99
optimize scalar .^ range operation
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
71 DEFBINOP_FN (el_powcsr, complex, range, elem_xpow) |
10bed8fbec99
optimize scalar .^ range operation
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
72 |
4915 | 73 DEFNDCATOP_FN (r_r, range, range, array, array, concat) |
74 DEFNDCATOP_FN (r_s, range, scalar, array, array, concat) | |
75 DEFNDCATOP_FN (r_m, range, matrix, array, array, concat) | |
76 DEFNDCATOP_FN (r_cs, range, complex, array, complex_array, concat) | |
77 DEFNDCATOP_FN (r_cm, range, complex_matrix, array, complex_array, concat) | |
78 DEFNDCATOP_FN (r_b, range, bool, array, array, concat) | |
79 DEFNDCATOP_FN (r_bm, range, bool_matrix, array, array, concat) | |
80 DEFNDCATOP_FN (r_chm, range, char_matrix, array, char_array, concat) | |
81 DEFNDCATOP_FN (s_r, scalar, range, array, array, concat) | |
82 DEFNDCATOP_FN (m_r, matrix, range, array, array, concat) | |
83 DEFNDCATOP_FN (cs_r, complex, range, complex_array, array, concat) | |
84 DEFNDCATOP_FN (cm_r, complex_matrix, range, complex_array, array, concat) | |
85 DEFNDCATOP_FN (b_r, bool, range, array, array, concat) | |
86 DEFNDCATOP_FN (bm_r, bool_matrix, range, array, array, concat) | |
87 DEFNDCATOP_FN (chm_r, char_matrix, range, char_array, array, concat) | |
88 | |
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
89 CONVDECL (range_to_matrix) |
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
90 { |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
91 const octave_range& v = dynamic_cast<const octave_range&> (a); |
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
92 |
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
93 return new octave_matrix (v.array_value ()); |
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
94 } |
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
95 |
3207 | 96 void |
97 install_range_ops (void) | |
98 { | |
3538 | 99 INSTALL_UNOP (op_not, octave_range, not); |
4965 | 100 INSTALL_UNOP (op_uplus, octave_range, uplus); |
3538 | 101 INSTALL_UNOP (op_uminus, octave_range, uminus); |
102 INSTALL_UNOP (op_transpose, octave_range, transpose); | |
103 INSTALL_UNOP (op_hermitian, octave_range, transpose); | |
4915 | 104 |
8553
c7ff200e45f5
optimize range-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8333
diff
changeset
|
105 INSTALL_BINOP (op_add, octave_range, octave_scalar, addrs); |
c7ff200e45f5
optimize range-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8333
diff
changeset
|
106 INSTALL_BINOP (op_add, octave_scalar, octave_range, addsr); |
c7ff200e45f5
optimize range-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8333
diff
changeset
|
107 INSTALL_BINOP (op_sub, octave_range, octave_scalar, subrs); |
c7ff200e45f5
optimize range-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8333
diff
changeset
|
108 INSTALL_BINOP (op_sub, octave_scalar, octave_range, subsr); |
c7ff200e45f5
optimize range-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8333
diff
changeset
|
109 INSTALL_BINOP (op_mul, octave_range, octave_scalar, mulrs); |
c7ff200e45f5
optimize range-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8333
diff
changeset
|
110 INSTALL_BINOP (op_mul, octave_scalar, octave_range, mulsr); |
c7ff200e45f5
optimize range-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8333
diff
changeset
|
111 |
9103
10bed8fbec99
optimize scalar .^ range operation
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
112 INSTALL_BINOP (op_el_pow, octave_scalar, octave_range, el_powsr); |
10bed8fbec99
optimize scalar .^ range operation
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
113 INSTALL_BINOP (op_el_pow, octave_complex, octave_range, el_powcsr); |
10bed8fbec99
optimize scalar .^ range operation
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
114 |
4915 | 115 INSTALL_CATOP (octave_range, octave_range, r_r); |
116 INSTALL_CATOP (octave_range, octave_scalar, r_s); | |
117 INSTALL_CATOP (octave_range, octave_matrix, r_m); | |
118 INSTALL_CATOP (octave_range, octave_complex, r_cs); | |
119 INSTALL_CATOP (octave_range, octave_complex_matrix, r_cm); | |
120 INSTALL_CATOP (octave_range, octave_bool, r_b); | |
121 INSTALL_CATOP (octave_range, octave_bool_matrix, r_bm); | |
122 INSTALL_CATOP (octave_range, octave_char_matrix, r_chm); | |
123 INSTALL_CATOP (octave_scalar, octave_range, s_r); | |
124 INSTALL_CATOP (octave_matrix, octave_range, m_r); | |
125 INSTALL_CATOP (octave_complex, octave_range, cs_r); | |
126 INSTALL_CATOP (octave_complex_matrix, octave_range, cm_r); | |
127 INSTALL_CATOP (octave_bool, octave_range, b_r); | |
128 INSTALL_CATOP (octave_bool_matrix, octave_range, bm_r); | |
129 INSTALL_CATOP (octave_char_matrix, octave_range, chm_r); | |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
130 |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
131 // FIXME: this would be unneccessary if |
8333 | 132 // octave_base_value::numeric_assign always tried converting lhs |
133 // before rhs. | |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
134 |
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
135 INSTALL_ASSIGNCONV (octave_range, octave_null_matrix, octave_matrix); |
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
136 INSTALL_ASSIGNCONV (octave_range, octave_null_str, octave_matrix); |
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
137 INSTALL_ASSIGNCONV (octave_range, octave_null_sq_str, octave_matrix); |
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
138 |
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
139 // However, this should probably be here just in case we need it. |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
140 |
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
141 INSTALL_WIDENOP (octave_range, octave_matrix, range_to_matrix); |
3207 | 142 } |