Mercurial > octave
annotate libinterp/operators/op-bm-b.cc @ 20555:f90c8372b7ba
eliminate many more simple uses of error_state
* Cell.cc, __ichol__.cc, __ilu__.cc, balance.cc, bsxfun.cc, colloc.cc,
det.cc, dlmread.cc, dynamic-ld.cc, eig.cc, fft.cc, fft2.cc, fftn.cc,
gcd.cc, getgrent.cc, getpwent.cc, givens.cc, hess.cc, input.cc,
levenshtein.cc, load-path.cc, lookup.cc, ls-mat-ascii.cc, ls-mat4.cc,
lsode.cc, lu.cc, max.cc, md5sum.cc, mex.cc, pager.cc, pinv.cc,
pr-output.cc, qz.cc, schur.cc, sparse.cc, sqrtm.cc, str2double.cc,
strfns.cc, sub2ind.cc, sysdep.cc, time.cc, toplev.cc, tril.cc,
tsearch.cc, typecast.cc, __init_gnuplot__.cc, __magick_read__.cc,
__osmesa_print__.cc, amd.cc, audiodevinfo.cc, dmperm.cc, fftw.cc,
symrcm.cc, ov-base-diag.cc, ov-base-sparse.cc, ov-base.cc,
ov-bool-sparse.cc, ov-builtin.cc, ov-complex.cc, ov-cx-diag.cc,
ov-cx-mat.cc, ov-cx-sparse.cc, ov-fcn-handle.cc, ov-fcn-inline.cc,
ov-float.cc, ov-flt-complex.cc, ov-flt-cx-diag.cc, ov-flt-cx-mat.cc,
ov-flt-re-diag.cc, ov-flt-re-mat.cc, ov-lazy-idx.cc, ov-mex-fcn.cc,
ov-perm.cc, ov-range.cc, ov-re-diag.cc, ov-re-mat.cc, ov-re-sparse.cc,
ov-scalar.cc, ov-str-mat.cc, op-bm-b.cc, op-bm-bm.cc, op-sbm-b.cc,
op-sbm-bm.cc, op-str-m.cc, op-str-s.cc, oct-parse.in.yy, pt-cbinop.cc,
pt-colon.cc, pt-decl.cc, pt-exp.cc, pt-id.cc, pt-misc.cc,
pt-select.cc, pt-unop.cc: Eliminate simple uses of error_state.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Mon, 05 Oct 2015 19:29:36 -0400 |
| parents | 4197fc428c7d |
| children | 48b2ad5ee801 |
| rev | line source |
|---|---|
| 3937 | 1 /* |
| 2 | |
|
19697
4197fc428c7d
maint: Update copyright notices for 2015.
John W. Eaton <jwe@octave.org>
parents:
17787
diff
changeset
|
3 Copyright (C) 2001-2015 Cai Jianming |
| 3937 | 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. | |
| 3937 | 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/>. | |
| 3937 | 20 |
| 21 */ | |
| 22 | |
| 23 #ifdef HAVE_CONFIG_H | |
| 24 #include <config.h> | |
| 25 #endif | |
| 26 | |
| 27 #include "gripes.h" | |
| 4055 | 28 #include "oct-obj.h" |
| 3937 | 29 #include "ov.h" |
| 30 #include "ov-bool.h" | |
| 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" |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
35 #include "ov-flt-re-mat.h" |
| 5898 | 36 #include "ov-str-mat.h" |
| 37 #include "ov-int8.h" | |
| 38 #include "ov-int16.h" | |
| 39 #include "ov-int32.h" | |
| 40 #include "ov-int64.h" | |
| 41 #include "ov-uint8.h" | |
| 42 #include "ov-uint16.h" | |
| 43 #include "ov-uint32.h" | |
| 44 #include "ov-uint64.h" | |
| 3937 | 45 #include "ov-typeinfo.h" |
| 46 #include "ops.h" | |
| 47 #include "xdiv.h" | |
| 48 #include "xpow.h" | |
| 49 | |
| 50 // bool matrix by bool ops. | |
| 51 | |
| 4669 | 52 DEFNDBINOP_FN (el_and, bool_matrix, bool, bool_array, bool, mx_el_and) |
| 53 DEFNDBINOP_FN (el_or, bool_matrix, bool, bool_array, bool, mx_el_or) | |
| 54 | |
|
8982
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
55 DEFNDBINOP_FN (el_not_and, bool_matrix, bool, bool_array, bool, mx_el_not_and) |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
56 DEFNDBINOP_FN (el_not_or, bool_matrix, bool, bool_array, bool, mx_el_not_or) |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
57 |
| 4964 | 58 DEFNDCATOP_FN (bm_b, bool_matrix, bool, bool_array, bool_array, concat) |
| 4915 | 59 DEFNDCATOP_FN (bm_s, bool_matrix, scalar, array, array, concat) |
| 60 DEFNDCATOP_FN (m_b, matrix, bool, array, array, concat) | |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
61 DEFNDCATOP_FN (bm_f, bool_matrix, float_scalar, float_array, float_array, |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
62 concat) |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
63 DEFNDCATOP_FN (fm_b, float_matrix, bool, float_array, float_array, concat) |
| 4915 | 64 |
| 4686 | 65 DEFNDASSIGNOP_FN (assign, bool_matrix, bool, bool_array, assign) |
| 3937 | 66 |
| 5898 | 67 static octave_value |
| 68 oct_assignop_conv_and_assign (octave_base_value& a1, | |
|
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
8993
diff
changeset
|
69 const octave_value_list& idx, |
|
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
8993
diff
changeset
|
70 const octave_base_value& a2) |
| 5898 | 71 { |
| 72 octave_bool_matrix& v1 = dynamic_cast<octave_bool_matrix&> (a1); | |
| 73 | |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
74 // FIXME: perhaps add a warning for this conversion |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
75 // if the values are not all 0 or 1? |
| 5898 | 76 |
| 5943 | 77 boolNDArray v2 = a2.bool_array_value (true); |
| 5898 | 78 |
|
20555
f90c8372b7ba
eliminate many more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
19697
diff
changeset
|
79 v1.assign (idx, v2); |
| 5898 | 80 |
| 81 return octave_value (); | |
| 82 } | |
| 83 | |
| 3937 | 84 void |
| 85 install_bm_b_ops (void) | |
| 86 { | |
| 4669 | 87 INSTALL_BINOP (op_el_and, octave_bool_matrix, octave_bool, el_and); |
| 88 INSTALL_BINOP (op_el_or, octave_bool_matrix, octave_bool, el_or); | |
|
8993
6769599e3458
add missing binops installs
Jaroslav Hajek <highegg@gmail.com>
parents:
8982
diff
changeset
|
89 INSTALL_BINOP (op_el_not_and, octave_bool_matrix, octave_bool, el_not_and); |
|
6769599e3458
add missing binops installs
Jaroslav Hajek <highegg@gmail.com>
parents:
8982
diff
changeset
|
90 INSTALL_BINOP (op_el_not_or, octave_bool_matrix, octave_bool, el_not_or); |
| 4669 | 91 |
| 4915 | 92 INSTALL_CATOP (octave_bool_matrix, octave_bool, bm_b); |
| 93 INSTALL_CATOP (octave_bool_matrix, octave_scalar, bm_s); | |
| 94 INSTALL_CATOP (octave_matrix, octave_bool, m_b); | |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
95 INSTALL_CATOP (octave_bool_matrix, octave_float_scalar, bm_f); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
96 INSTALL_CATOP (octave_float_matrix, octave_bool, fm_b); |
| 4915 | 97 |
| 3937 | 98 INSTALL_ASSIGNOP (op_asn_eq, octave_bool_matrix, octave_bool, assign); |
| 5898 | 99 |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
100 INSTALL_ASSIGNOP (op_asn_eq, octave_bool_matrix, octave_scalar, |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
101 conv_and_assign); |
| 5898 | 102 |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
103 INSTALL_ASSIGNOP (op_asn_eq, octave_bool_matrix, octave_int8_scalar, |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
104 conv_and_assign); |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
105 INSTALL_ASSIGNOP (op_asn_eq, octave_bool_matrix, octave_int16_scalar, |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
106 conv_and_assign); |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
107 INSTALL_ASSIGNOP (op_asn_eq, octave_bool_matrix, octave_int32_scalar, |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
108 conv_and_assign); |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
109 INSTALL_ASSIGNOP (op_asn_eq, octave_bool_matrix, octave_int64_scalar, |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
110 conv_and_assign); |
| 5898 | 111 |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
112 INSTALL_ASSIGNOP (op_asn_eq, octave_bool_matrix, octave_uint8_scalar, |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
113 conv_and_assign); |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
114 INSTALL_ASSIGNOP (op_asn_eq, octave_bool_matrix, octave_uint16_scalar, |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
115 conv_and_assign); |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
116 INSTALL_ASSIGNOP (op_asn_eq, octave_bool_matrix, octave_uint32_scalar, |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
117 conv_and_assign); |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
118 INSTALL_ASSIGNOP (op_asn_eq, octave_bool_matrix, octave_uint64_scalar, |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
119 conv_and_assign); |
| 3937 | 120 } |