Mercurial > octave
annotate libinterp/operators/op-s-s.cc @ 21024:6176560b03d9
maint: Remove return stmts after gripe function calls.
* gripes.h: Mark gripe functions which call error() wwith GCC_ATTR_NORETURN.
* jit-typeinfo.cc (gripe_bad_result): Mark function with GCC_ATTR_NORETURN.
* load-save.cc (gripe_file_open): Mark function with GCC_ATTR_NORETURN.
* ov-base.cc (gripe_indexed_assignment, gripe_assign_conversion_failed,
gripe_no_conversion): Mark functions with GCC_ATTR_NORETURN.
* ov-class.cc (gripe_invalid_index1, gripe_invalid_index_for_assignment,
gripe_invalid_index_type): Mark functions with GCC_ATTR_NORETURN.
* ov-classdef.h (gripe_invalid_object): Mark function with GCC_ATTR_NORETURN.
* ov.cc (gripe_cat_op, gripe_cat_op_conv): Mark functions with
GCC_ATTR_NORETURN.
* balance.cc, det.cc, eig.cc, hess.cc, inv.cc, jit-typeinfo.cc, load-save.cc,
qz.cc, schur.cc, sparse-xdiv.cc, sparse-xpow.cc, sylvester.cc, xdiv.cc,
xpow.cc, symrcm.cc, ov-base.cc, ov-classdef.h, ov-cs-list.cc, ov-flt-re-mat.cc,
ov-re-mat.cc, ov-re-sparse.cc, ov.cc, op-int.h, op-fs-fs.cc, ops.h:
Remove statements that occur after a gripe function which does not return.
* op-cs-cs.cc, op-dms-template.cc, op-fcs-fcs.cc, op-s-s.cc : Add newline
between gripe and return statement for readability.
author | Rik <rik@octave.org> |
---|---|
date | Fri, 01 Jan 2016 13:58:45 -0800 |
parents | 48b2ad5ee801 |
children | e39e05d90788 |
rev | line source |
---|---|
2928 | 1 /* |
2 | |
19697
4197fc428c7d
maint: Update copyright notices for 2015.
John W. Eaton <jwe@octave.org>
parents:
17744
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 | |
24 #include <config.h> | |
25 #endif | |
26 | |
9551
19d298e6f7e5
make ! operator check for NaNs, simplify implementations in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
27 #include "Array-util.h" |
19d298e6f7e5
make ! operator check for NaNs, simplify implementations in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
28 |
2928 | 29 #include "gripes.h" |
20940
48b2ad5ee801
maint: Rename oct-obj.[cc|h] to ovl.[cc|h] for clarity.
Rik <rik@octave.org>
parents:
19697
diff
changeset
|
30 #include "ovl.h" |
2928 | 31 #include "ov.h" |
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" |
2928 | 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" |
2928 | 36 #include "ov-typeinfo.h" |
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
7922
diff
changeset
|
37 #include "ov-null-mat.h" |
2928 | 38 #include "ops.h" |
39 #include "xdiv.h" | |
40 #include "xpow.h" | |
41 | |
3203 | 42 // scalar unary ops. |
43 | |
9551
19d298e6f7e5
make ! operator check for NaNs, simplify implementations in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
44 DEFUNOP (not, scalar) |
19d298e6f7e5
make ! operator check for NaNs, simplify implementations in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
45 { |
19d298e6f7e5
make ! operator check for NaNs, simplify implementations in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
46 CAST_UNOP_ARG (const octave_scalar&); |
19d298e6f7e5
make ! operator check for NaNs, simplify implementations in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
47 double x = v.scalar_value (); |
19d298e6f7e5
make ! operator check for NaNs, simplify implementations in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
48 if (xisnan (x)) |
19d298e6f7e5
make ! operator check for NaNs, simplify implementations in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
49 gripe_nan_to_logical_conversion (); |
21024
6176560b03d9
maint: Remove return stmts after gripe function calls.
Rik <rik@octave.org>
parents:
20940
diff
changeset
|
50 |
9551
19d298e6f7e5
make ! operator check for NaNs, simplify implementations in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
51 return octave_value (x == 0.0); |
19d298e6f7e5
make ! operator check for NaNs, simplify implementations in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
52 } |
19d298e6f7e5
make ! operator check for NaNs, simplify implementations in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
53 |
4965 | 54 DEFUNOP_OP (uplus, scalar, /* no-op */) |
3203 | 55 DEFUNOP_OP (uminus, scalar, -) |
56 DEFUNOP_OP (transpose, scalar, /* no-op */) | |
57 DEFUNOP_OP (hermitian, scalar, /* no-op */) | |
58 | |
59 DEFNCUNOP_METHOD (incr, scalar, increment) | |
60 DEFNCUNOP_METHOD (decr, scalar, decrement) | |
61 | |
2928 | 62 // scalar by scalar ops. |
63 | |
64 DEFBINOP_OP (add, scalar, scalar, +) | |
65 DEFBINOP_OP (sub, scalar, scalar, -) | |
66 DEFBINOP_OP (mul, scalar, scalar, *) | |
67 | |
68 DEFBINOP (div, scalar, scalar) | |
69 { | |
70 CAST_BINOP_ARGS (const octave_scalar&, const octave_scalar&); | |
71 | |
72 double d = v2.double_value (); | |
73 | |
74 if (d == 0.0) | |
75 gripe_divide_by_zero (); | |
76 | |
77 return octave_value (v1.double_value () / d); | |
78 } | |
79 | |
80 DEFBINOP_FN (pow, scalar, scalar, xpow) | |
81 | |
82 DEFBINOP (ldiv, scalar, scalar) | |
83 { | |
84 CAST_BINOP_ARGS (const octave_scalar&, const octave_scalar&); | |
85 | |
86 double d = v1.double_value (); | |
87 | |
88 if (d == 0.0) | |
89 gripe_divide_by_zero (); | |
90 | |
91 return octave_value (v2.double_value () / d); | |
92 } | |
93 | |
94 DEFBINOP_OP (lt, scalar, scalar, <) | |
95 DEFBINOP_OP (le, scalar, scalar, <=) | |
96 DEFBINOP_OP (eq, scalar, scalar, ==) | |
97 DEFBINOP_OP (ge, scalar, scalar, >=) | |
98 DEFBINOP_OP (gt, scalar, scalar, >) | |
99 DEFBINOP_OP (ne, scalar, scalar, !=) | |
100 | |
101 DEFBINOP_OP (el_mul, scalar, scalar, *) | |
102 | |
103 DEFBINOP (el_div, scalar, scalar) | |
104 { | |
105 CAST_BINOP_ARGS (const octave_scalar&, const octave_scalar&); | |
106 | |
107 double d = v2.double_value (); | |
108 | |
109 if (d == 0.0) | |
110 gripe_divide_by_zero (); | |
111 | |
112 return octave_value (v1.double_value () / d); | |
113 } | |
114 | |
115 DEFBINOP_FN (el_pow, scalar, scalar, xpow) | |
116 | |
117 DEFBINOP (el_ldiv, scalar, scalar) | |
118 { | |
119 CAST_BINOP_ARGS (const octave_scalar&, const octave_scalar&); | |
120 | |
121 double d = v1.double_value (); | |
122 | |
123 if (d == 0.0) | |
124 gripe_divide_by_zero (); | |
125 | |
126 return octave_value (v2.double_value () / d); | |
127 } | |
128 | |
7922
935be827eaf8
error for NaN values in & and | expressions
John W. Eaton <jwe@octave.org>
parents:
7789
diff
changeset
|
129 DEFSCALARBOOLOP_OP (el_and, scalar, scalar, &&) |
935be827eaf8
error for NaN values in & and | expressions
John W. Eaton <jwe@octave.org>
parents:
7789
diff
changeset
|
130 DEFSCALARBOOLOP_OP (el_or, scalar, scalar, ||) |
2928 | 131 |
4915 | 132 DEFNDCATOP_FN (s_s, scalar, scalar, array, array, concat) |
133 | |
2928 | 134 void |
135 install_s_s_ops (void) | |
136 { | |
3538 | 137 INSTALL_UNOP (op_not, octave_scalar, not); |
4977 | 138 INSTALL_UNOP (op_uplus, octave_scalar, uplus); |
3538 | 139 INSTALL_UNOP (op_uminus, octave_scalar, uminus); |
140 INSTALL_UNOP (op_transpose, octave_scalar, transpose); | |
141 INSTALL_UNOP (op_hermitian, octave_scalar, hermitian); | |
3203 | 142 |
3538 | 143 INSTALL_NCUNOP (op_incr, octave_scalar, incr); |
144 INSTALL_NCUNOP (op_decr, octave_scalar, decr); | |
3203 | 145 |
3538 | 146 INSTALL_BINOP (op_add, octave_scalar, octave_scalar, add); |
147 INSTALL_BINOP (op_sub, octave_scalar, octave_scalar, sub); | |
148 INSTALL_BINOP (op_mul, octave_scalar, octave_scalar, mul); | |
149 INSTALL_BINOP (op_div, octave_scalar, octave_scalar, div); | |
150 INSTALL_BINOP (op_pow, octave_scalar, octave_scalar, pow); | |
151 INSTALL_BINOP (op_ldiv, octave_scalar, octave_scalar, ldiv); | |
152 INSTALL_BINOP (op_lt, octave_scalar, octave_scalar, lt); | |
153 INSTALL_BINOP (op_le, octave_scalar, octave_scalar, le); | |
154 INSTALL_BINOP (op_eq, octave_scalar, octave_scalar, eq); | |
155 INSTALL_BINOP (op_ge, octave_scalar, octave_scalar, ge); | |
156 INSTALL_BINOP (op_gt, octave_scalar, octave_scalar, gt); | |
157 INSTALL_BINOP (op_ne, octave_scalar, octave_scalar, ne); | |
158 INSTALL_BINOP (op_el_mul, octave_scalar, octave_scalar, el_mul); | |
159 INSTALL_BINOP (op_el_div, octave_scalar, octave_scalar, el_div); | |
160 INSTALL_BINOP (op_el_pow, octave_scalar, octave_scalar, el_pow); | |
161 INSTALL_BINOP (op_el_ldiv, octave_scalar, octave_scalar, el_ldiv); | |
162 INSTALL_BINOP (op_el_and, octave_scalar, octave_scalar, el_and); | |
163 INSTALL_BINOP (op_el_or, octave_scalar, octave_scalar, el_or); | |
2928 | 164 |
4915 | 165 INSTALL_CATOP (octave_scalar, octave_scalar, s_s); |
166 | |
2928 | 167 INSTALL_ASSIGNCONV (octave_scalar, octave_scalar, octave_matrix); |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
168 INSTALL_ASSIGNCONV (octave_float_scalar, octave_scalar, octave_float_matrix); |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
169 |
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
7922
diff
changeset
|
170 INSTALL_ASSIGNCONV (octave_scalar, octave_null_matrix, octave_matrix); |
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
7922
diff
changeset
|
171 INSTALL_ASSIGNCONV (octave_scalar, octave_null_str, octave_matrix); |
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
7922
diff
changeset
|
172 INSTALL_ASSIGNCONV (octave_scalar, octave_null_sq_str, octave_matrix); |
2928 | 173 } |