Mercurial > octave
annotate libinterp/operators/op-b-b.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 |
|---|---|
| 2928 | 1 /* |
| 2 | |
|
19697
4197fc428c7d
maint: Update copyright notices for 2015.
John W. Eaton <jwe@octave.org>
parents:
18213
diff
changeset
|
3 Copyright (C) 1996-2015 John W. Eaton |
| 2928 | 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. | |
| 2928 | 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/>. | |
| 2928 | 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" |
| 2928 | 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" |
| 2928 | 29 #include "ov.h" |
| 30 #include "ov-bool.h" | |
| 4964 | 31 #include "ov-bool-mat.h" |
| 4915 | 32 #include "ov-scalar.h" |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
33 #include "ov-float.h" |
| 4915 | 34 #include "ov-re-mat.h" |
| 2928 | 35 #include "ov-typeinfo.h" |
|
18213
cda4bd2fd0c0
fix null matrix assignment to indexed integer and logical values (bug #35921)
John W. Eaton <jwe@octave.org>
parents:
17744
diff
changeset
|
36 #include "ov-null-mat.h" |
| 2928 | 37 #include "ops.h" |
| 38 #include "xdiv.h" | |
| 39 #include "xpow.h" | |
| 40 | |
| 3203 | 41 // bool unary ops. |
| 42 | |
| 43 // scalar unary ops. | |
| 44 | |
| 45 DEFUNOP_OP (not, bool, !) | |
| 4965 | 46 |
|
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
47 static octave_value |
|
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
48 oct_unop_uplus (const octave_base_value& a) |
| 4965 | 49 { |
|
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
50 const octave_bool& v = dynamic_cast<const octave_bool&> (a); |
| 4965 | 51 return octave_value (v.double_value ()); |
| 52 } | |
| 53 | |
|
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
54 static octave_value |
|
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
55 oct_unop_uminus (const octave_base_value& a) |
| 4965 | 56 { |
|
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
57 const octave_bool& v = dynamic_cast<const octave_bool&> (a); |
| 4965 | 58 return octave_value (- v.double_value ()); |
| 59 } | |
| 60 | |
| 3203 | 61 DEFUNOP_OP (transpose, bool, /* no-op */) |
| 62 DEFUNOP_OP (hermitian, bool, /* no-op */) | |
| 63 | |
| 2928 | 64 // bool by bool ops. |
| 65 | |
| 66 DEFBINOP_OP (eq, bool, bool, ==) | |
| 67 DEFBINOP_OP (ne, bool, bool, !=) | |
| 3798 | 68 DEFBINOP_OP (el_and, bool, bool, &&) |
| 69 DEFBINOP_OP (el_or, bool, bool, ||) | |
| 3797 | 70 |
| 4964 | 71 DEFNDCATOP_FN (b_b, bool, bool, bool_array, bool_array, concat) |
| 4915 | 72 DEFNDCATOP_FN (b_s, bool, scalar, array, array, concat) |
| 73 DEFNDCATOP_FN (s_b, scalar, bool, array, array, concat) | |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
74 DEFNDCATOP_FN (b_f, bool, float_scalar, float_array, float_array, concat) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
75 DEFNDCATOP_FN (f_b, float_scalar, bool, float_array, float_array, concat) |
| 4915 | 76 |
| 2928 | 77 void |
| 78 install_b_b_ops (void) | |
| 79 { | |
| 3538 | 80 INSTALL_UNOP (op_not, octave_bool, not); |
| 4965 | 81 INSTALL_UNOP (op_uplus, octave_bool, uplus); |
| 82 INSTALL_UNOP (op_uminus, octave_bool, uminus); | |
| 3538 | 83 INSTALL_UNOP (op_transpose, octave_bool, transpose); |
| 84 INSTALL_UNOP (op_hermitian, octave_bool, hermitian); | |
| 3203 | 85 |
| 3538 | 86 INSTALL_BINOP (op_eq, octave_bool, octave_bool, eq); |
| 87 INSTALL_BINOP (op_ne, octave_bool, octave_bool, ne); | |
| 3797 | 88 INSTALL_BINOP (op_el_and, octave_bool, octave_bool, el_and); |
| 89 INSTALL_BINOP (op_el_or, octave_bool, octave_bool, el_or); | |
| 4915 | 90 |
| 91 INSTALL_CATOP (octave_bool, octave_bool, b_b); | |
| 92 INSTALL_CATOP (octave_bool, octave_scalar, b_s); | |
| 93 INSTALL_CATOP (octave_scalar, octave_bool, s_b); | |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
94 INSTALL_CATOP (octave_bool, octave_float_scalar, b_f); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
95 INSTALL_CATOP (octave_float_scalar, octave_bool, f_b); |
| 4964 | 96 |
| 97 INSTALL_ASSIGNCONV (octave_bool, octave_bool, octave_bool_matrix); | |
|
18213
cda4bd2fd0c0
fix null matrix assignment to indexed integer and logical values (bug #35921)
John W. Eaton <jwe@octave.org>
parents:
17744
diff
changeset
|
98 |
|
cda4bd2fd0c0
fix null matrix assignment to indexed integer and logical values (bug #35921)
John W. Eaton <jwe@octave.org>
parents:
17744
diff
changeset
|
99 INSTALL_ASSIGNCONV (octave_bool, octave_null_matrix, octave_bool_matrix); |
|
cda4bd2fd0c0
fix null matrix assignment to indexed integer and logical values (bug #35921)
John W. Eaton <jwe@octave.org>
parents:
17744
diff
changeset
|
100 INSTALL_ASSIGNCONV (octave_bool, octave_null_str, octave_bool_matrix); |
|
cda4bd2fd0c0
fix null matrix assignment to indexed integer and logical values (bug #35921)
John W. Eaton <jwe@octave.org>
parents:
17744
diff
changeset
|
101 INSTALL_ASSIGNCONV (octave_bool, octave_null_sq_str, octave_bool_matrix); |
| 2928 | 102 } |