Mercurial > hg > octave-nkf
annotate libinterp/parse-tree/pt-binop.cc @ 20770:c1a6c31ac29a
eliminate more simple uses of error_state
* ov-classdef.cc: Eliminate simple uses of error_state.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 06 Oct 2015 00:20:02 -0400 |
parents | b10432a40432 |
children |
rev | line source |
---|---|
2980 | 1 /* |
2 | |
19898
4197fc428c7d
maint: Update copyright notices for 2015.
John W. Eaton <jwe@octave.org>
parents:
19520
diff
changeset
|
3 Copyright (C) 1996-2015 John W. Eaton |
2980 | 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. | |
2980 | 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/>. | |
2980 | 20 |
21 */ | |
22 | |
23 #ifdef HAVE_CONFIG_H | |
24 #include <config.h> | |
25 #endif | |
26 | |
27 #include "error.h" | |
11091
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
28 #include "defun.h" |
2980 | 29 #include "oct-obj.h" |
30 #include "ov.h" | |
12920
5d18231eee00
Extend profiling support to operators.
Daniel Kraft <d@domob.eu>
parents:
12822
diff
changeset
|
31 #include "profiler.h" |
2980 | 32 #include "pt-binop.h" |
3770 | 33 #include "pt-bp.h" |
2980 | 34 #include "pt-walk.h" |
11091
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
35 #include "variables.h" |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
36 |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
37 // TRUE means we mark | and & expressions for braindead short-circuit |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
38 // behavior. |
18126
d76f790b4eec
enable do_braindead_shortcircuit_evaluation by default and deprecate
John W. Eaton <jwe@octave.org>
parents:
17787
diff
changeset
|
39 static bool Vdo_braindead_shortcircuit_evaluation = true; |
2980 | 40 |
41 // Binary expressions. | |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11572
diff
changeset
|
42 |
2980 | 43 octave_value_list |
44 tree_binary_expression::rvalue (int nargout) | |
45 { | |
46 octave_value_list retval; | |
47 | |
48 if (nargout > 1) | |
15466
d174210ce1ec
use ' instead of ` in error messages, warnings and most comments
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
49 error ("binary operator '%s': invalid number of output arguments", |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
50 oper () . c_str ()); |
2980 | 51 else |
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8011
diff
changeset
|
52 retval = rvalue1 (nargout); |
2980 | 53 |
54 return retval; | |
55 } | |
56 | |
18126
d76f790b4eec
enable do_braindead_shortcircuit_evaluation by default and deprecate
John W. Eaton <jwe@octave.org>
parents:
17787
diff
changeset
|
57 void |
d76f790b4eec
enable do_braindead_shortcircuit_evaluation by default and deprecate
John W. Eaton <jwe@octave.org>
parents:
17787
diff
changeset
|
58 tree_binary_expression::matlab_style_short_circuit_warning (const char *op) |
d76f790b4eec
enable do_braindead_shortcircuit_evaluation by default and deprecate
John W. Eaton <jwe@octave.org>
parents:
17787
diff
changeset
|
59 { |
d76f790b4eec
enable do_braindead_shortcircuit_evaluation by default and deprecate
John W. Eaton <jwe@octave.org>
parents:
17787
diff
changeset
|
60 warning_with_id ("Octave:possible-matlab-short-circuit-operator", |
d76f790b4eec
enable do_braindead_shortcircuit_evaluation by default and deprecate
John W. Eaton <jwe@octave.org>
parents:
17787
diff
changeset
|
61 "Matlab-style short-circuit operation performed for operator %s", |
d76f790b4eec
enable do_braindead_shortcircuit_evaluation by default and deprecate
John W. Eaton <jwe@octave.org>
parents:
17787
diff
changeset
|
62 op); |
d76f790b4eec
enable do_braindead_shortcircuit_evaluation by default and deprecate
John W. Eaton <jwe@octave.org>
parents:
17787
diff
changeset
|
63 |
d76f790b4eec
enable do_braindead_shortcircuit_evaluation by default and deprecate
John W. Eaton <jwe@octave.org>
parents:
17787
diff
changeset
|
64 braindead_shortcircuit_warning_issued = true; |
d76f790b4eec
enable do_braindead_shortcircuit_evaluation by default and deprecate
John W. Eaton <jwe@octave.org>
parents:
17787
diff
changeset
|
65 } |
d76f790b4eec
enable do_braindead_shortcircuit_evaluation by default and deprecate
John W. Eaton <jwe@octave.org>
parents:
17787
diff
changeset
|
66 |
2980 | 67 octave_value |
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8011
diff
changeset
|
68 tree_binary_expression::rvalue1 (int) |
2980 | 69 { |
70 octave_value retval; | |
71 | |
11091
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
72 if (Vdo_braindead_shortcircuit_evaluation |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
73 && eligible_for_braindead_shortcircuit) |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
74 { |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
75 if (op_lhs) |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
76 { |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
77 octave_value a = op_lhs->rvalue1 (); |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
78 |
20764
b10432a40432
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20373
diff
changeset
|
79 if (a.ndims () == 2 && a.rows () == 1 && a.columns () == 1) |
11091
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
80 { |
20764
b10432a40432
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20373
diff
changeset
|
81 bool result = false; |
b10432a40432
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20373
diff
changeset
|
82 |
b10432a40432
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20373
diff
changeset
|
83 bool a_true = a.is_true (); |
b10432a40432
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20373
diff
changeset
|
84 |
b10432a40432
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20373
diff
changeset
|
85 if (a_true) |
11091
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
86 { |
20764
b10432a40432
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20373
diff
changeset
|
87 if (etype == octave_value::op_el_or) |
11091
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
88 { |
20764
b10432a40432
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20373
diff
changeset
|
89 matlab_style_short_circuit_warning ("|"); |
b10432a40432
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20373
diff
changeset
|
90 result = true; |
b10432a40432
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20373
diff
changeset
|
91 goto done; |
11091
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
92 } |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
93 } |
20764
b10432a40432
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20373
diff
changeset
|
94 else |
b10432a40432
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20373
diff
changeset
|
95 { |
b10432a40432
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20373
diff
changeset
|
96 if (etype == octave_value::op_el_and) |
b10432a40432
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20373
diff
changeset
|
97 { |
b10432a40432
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20373
diff
changeset
|
98 matlab_style_short_circuit_warning ("&"); |
b10432a40432
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20373
diff
changeset
|
99 goto done; |
b10432a40432
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20373
diff
changeset
|
100 } |
b10432a40432
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20373
diff
changeset
|
101 } |
b10432a40432
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20373
diff
changeset
|
102 |
b10432a40432
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20373
diff
changeset
|
103 if (op_rhs) |
b10432a40432
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20373
diff
changeset
|
104 { |
b10432a40432
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20373
diff
changeset
|
105 octave_value b = op_rhs->rvalue1 (); |
b10432a40432
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20373
diff
changeset
|
106 |
b10432a40432
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20373
diff
changeset
|
107 result = b.is_true (); |
b10432a40432
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20373
diff
changeset
|
108 } |
b10432a40432
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20373
diff
changeset
|
109 |
b10432a40432
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20373
diff
changeset
|
110 done: |
b10432a40432
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20373
diff
changeset
|
111 |
b10432a40432
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20373
diff
changeset
|
112 return octave_value (result); |
11091
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
113 } |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
114 } |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
115 } |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
116 |
2980 | 117 if (op_lhs) |
118 { | |
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8011
diff
changeset
|
119 octave_value a = op_lhs->rvalue1 (); |
2980 | 120 |
20764
b10432a40432
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20373
diff
changeset
|
121 if (a.is_defined () && op_rhs) |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
122 { |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
123 octave_value b = op_rhs->rvalue1 (); |
2980 | 124 |
20764
b10432a40432
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20373
diff
changeset
|
125 if (b.is_defined ()) |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
126 { |
19520
91cd85a75705
Reduce profiling overhead using inlining and templates.
Julien Bect <julien.bect@supelec.fr>
parents:
18130
diff
changeset
|
127 BEGIN_PROFILER_BLOCK (tree_binary_expression) |
12920
5d18231eee00
Extend profiling support to operators.
Daniel Kraft <d@domob.eu>
parents:
12822
diff
changeset
|
128 |
12921
7820a12baadd
Style fixes on comments about profiling operators
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
12920
diff
changeset
|
129 // Note: The profiler does not catch the braindead |
7820a12baadd
Style fixes on comments about profiling operators
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
12920
diff
changeset
|
130 // short-circuit evaluation code above, but that should be |
7820a12baadd
Style fixes on comments about profiling operators
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
12920
diff
changeset
|
131 // ok. The evaluation of operands and the operator itself |
7820a12baadd
Style fixes on comments about profiling operators
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
12920
diff
changeset
|
132 // is entangled and it's not clear where to start/stop |
7820a12baadd
Style fixes on comments about profiling operators
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
12920
diff
changeset
|
133 // timing the operator to make it reasonable. |
12920
5d18231eee00
Extend profiling support to operators.
Daniel Kraft <d@domob.eu>
parents:
12822
diff
changeset
|
134 |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
135 retval = ::do_binary_op (etype, a, b); |
2980 | 136 |
12960
43d78e103984
Use macro to start profiler blocks.
Daniel Kraft <d@domob.eu>
parents:
12921
diff
changeset
|
137 END_PROFILER_BLOCK |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
138 } |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
139 } |
2980 | 140 } |
141 | |
142 return retval; | |
143 } | |
144 | |
3536 | 145 std::string |
2980 | 146 tree_binary_expression::oper (void) const |
147 { | |
148 return octave_value::binary_op_as_string (etype); | |
149 } | |
150 | |
5861 | 151 tree_expression * |
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
152 tree_binary_expression::dup (symbol_table::scope_id scope, |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
153 symbol_table::context_id context) const |
5861 | 154 { |
155 tree_binary_expression *new_be | |
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
156 = new tree_binary_expression (op_lhs ? op_lhs->dup (scope, context) : 0, |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
157 op_rhs ? op_rhs->dup (scope, context) : 0, |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
158 line (), column (), etype); |
5861 | 159 |
160 new_be->copy_base (*this); | |
161 | |
162 return new_be; | |
163 } | |
164 | |
2980 | 165 void |
166 tree_binary_expression::accept (tree_walker& tw) | |
167 { | |
168 tw.visit_binary_expression (*this); | |
169 } | |
170 | |
171 // Boolean expressions. | |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11572
diff
changeset
|
172 |
2980 | 173 octave_value_list |
174 tree_boolean_expression::rvalue (int nargout) | |
175 { | |
176 octave_value_list retval; | |
177 | |
178 if (nargout > 1) | |
15466
d174210ce1ec
use ' instead of ` in error messages, warnings and most comments
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
179 error ("binary operator '%s': invalid number of output arguments", |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
180 oper () . c_str ()); |
2980 | 181 else |
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8011
diff
changeset
|
182 retval = rvalue1 (nargout); |
2980 | 183 |
184 return retval; | |
185 } | |
186 | |
187 octave_value | |
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8011
diff
changeset
|
188 tree_boolean_expression::rvalue1 (int) |
2980 | 189 { |
190 octave_value retval; | |
191 | |
192 bool result = false; | |
193 | |
12921
7820a12baadd
Style fixes on comments about profiling operators
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
12920
diff
changeset
|
194 // This evaluation is not caught by the profiler, since we can't find |
7820a12baadd
Style fixes on comments about profiling operators
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
12920
diff
changeset
|
195 // a reasonable place where to time. Note that we don't want to |
7820a12baadd
Style fixes on comments about profiling operators
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
12920
diff
changeset
|
196 // include evaluation of LHS or RHS into the timing, but this is |
7820a12baadd
Style fixes on comments about profiling operators
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
12920
diff
changeset
|
197 // entangled together with short-circuit evaluation here. |
12920
5d18231eee00
Extend profiling support to operators.
Daniel Kraft <d@domob.eu>
parents:
12822
diff
changeset
|
198 |
2980 | 199 if (op_lhs) |
200 { | |
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8011
diff
changeset
|
201 octave_value a = op_lhs->rvalue1 (); |
2980 | 202 |
20764
b10432a40432
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20373
diff
changeset
|
203 bool a_true = a.is_true (); |
b10432a40432
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20373
diff
changeset
|
204 |
b10432a40432
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20373
diff
changeset
|
205 if (a_true) |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
206 { |
20764
b10432a40432
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20373
diff
changeset
|
207 if (etype == bool_or) |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
208 { |
20764
b10432a40432
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20373
diff
changeset
|
209 result = true; |
b10432a40432
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20373
diff
changeset
|
210 goto done; |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
211 } |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
212 } |
20764
b10432a40432
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20373
diff
changeset
|
213 else |
b10432a40432
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20373
diff
changeset
|
214 { |
b10432a40432
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20373
diff
changeset
|
215 if (etype == bool_and) |
b10432a40432
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20373
diff
changeset
|
216 goto done; |
b10432a40432
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20373
diff
changeset
|
217 } |
b10432a40432
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20373
diff
changeset
|
218 |
b10432a40432
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20373
diff
changeset
|
219 if (op_rhs) |
b10432a40432
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20373
diff
changeset
|
220 { |
b10432a40432
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20373
diff
changeset
|
221 octave_value b = op_rhs->rvalue1 (); |
b10432a40432
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20373
diff
changeset
|
222 |
b10432a40432
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20373
diff
changeset
|
223 result = b.is_true (); |
b10432a40432
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20373
diff
changeset
|
224 } |
b10432a40432
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20373
diff
changeset
|
225 |
b10432a40432
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20373
diff
changeset
|
226 done: |
b10432a40432
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20373
diff
changeset
|
227 |
b10432a40432
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20373
diff
changeset
|
228 retval = octave_value (result); |
2980 | 229 } |
230 | |
231 return retval; | |
232 } | |
233 | |
3536 | 234 std::string |
2980 | 235 tree_boolean_expression::oper (void) const |
236 { | |
3523 | 237 std::string retval = "<unknown>"; |
2980 | 238 |
239 switch (etype) | |
240 { | |
241 case bool_and: | |
242 retval = "&&"; | |
243 break; | |
244 | |
245 case bool_or: | |
246 retval = "||"; | |
247 break; | |
248 | |
249 default: | |
250 break; | |
251 } | |
252 | |
253 return retval; | |
254 } | |
255 | |
5861 | 256 tree_expression * |
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
257 tree_boolean_expression::dup (symbol_table::scope_id scope, |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
258 symbol_table::context_id context) const |
5861 | 259 { |
260 tree_boolean_expression *new_be | |
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
261 = new tree_boolean_expression (op_lhs ? op_lhs->dup (scope, context) : 0, |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
262 op_rhs ? op_rhs->dup (scope, context) : 0, |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
263 line (), column (), etype); |
5861 | 264 |
265 new_be->copy_base (*this); | |
266 | |
267 return new_be; | |
268 } | |
11091
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
269 |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
270 DEFUN (do_braindead_shortcircuit_evaluation, args, nargout, |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
271 "-*- texinfo -*-\n\ |
11091
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
272 @deftypefn {Built-in Function} {@var{val} =} do_braindead_shortcircuit_evaluation ()\n\ |
11572
7d6d8c1e471f
Grammarcheck Texinfo for files in src directory.
Rik <octave@nomad.inbox5.com>
parents:
11523
diff
changeset
|
273 @deftypefnx {Built-in Function} {@var{old_val} =} do_braindead_shortcircuit_evaluation (@var{new_val})\n\ |
13951
79aa00a94e9e
doc: Document "local" option for configuration variables.
Rik <octave@nomad.inbox5.com>
parents:
13141
diff
changeset
|
274 @deftypefnx {Built-in Function} {} do_braindead_shortcircuit_evaluation (@var{new_val}, \"local\")\n\ |
11091
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
275 Query or set the internal variable that controls whether Octave will\n\ |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
276 do short-circuit evaluation of @samp{|} and @samp{&} operators inside the\n\ |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
277 conditions of if or while statements.\n\ |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
278 \n\ |
11572
7d6d8c1e471f
Grammarcheck Texinfo for files in src directory.
Rik <octave@nomad.inbox5.com>
parents:
11523
diff
changeset
|
279 This feature is only provided for compatibility with @sc{matlab} and should\n\ |
11091
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
280 not be used unless you are porting old code that relies on this feature.\n\ |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
281 \n\ |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
282 To obtain short-circuit behavior for logical expressions in new programs,\n\ |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
283 you should always use the @samp{&&} and @samp{||} operators.\n\ |
13951
79aa00a94e9e
doc: Document "local" option for configuration variables.
Rik <octave@nomad.inbox5.com>
parents:
13141
diff
changeset
|
284 \n\ |
17281
bc924baa2c4e
doc: Add new @qcode macro for code samples which are quoted.
Rik <rik@octave.org>
parents:
15467
diff
changeset
|
285 When called from inside a function with the @qcode{\"local\"} option, the\n\ |
20373
075a5e2e1ba5
doc: Update more docstrings to have one sentence summary as first line.
Rik <rik@octave.org>
parents:
19898
diff
changeset
|
286 variable is changed locally for the function and any subroutines it calls.\n\ |
17281
bc924baa2c4e
doc: Add new @qcode macro for code samples which are quoted.
Rik <rik@octave.org>
parents:
15467
diff
changeset
|
287 The original variable value is restored when exiting the function.\n\ |
11091
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
288 @end deftypefn") |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
289 { |
18126
d76f790b4eec
enable do_braindead_shortcircuit_evaluation by default and deprecate
John W. Eaton <jwe@octave.org>
parents:
17787
diff
changeset
|
290 static bool warned = false; |
d76f790b4eec
enable do_braindead_shortcircuit_evaluation by default and deprecate
John W. Eaton <jwe@octave.org>
parents:
17787
diff
changeset
|
291 if (! warned) |
d76f790b4eec
enable do_braindead_shortcircuit_evaluation by default and deprecate
John W. Eaton <jwe@octave.org>
parents:
17787
diff
changeset
|
292 { |
d76f790b4eec
enable do_braindead_shortcircuit_evaluation by default and deprecate
John W. Eaton <jwe@octave.org>
parents:
17787
diff
changeset
|
293 warned = true; |
d76f790b4eec
enable do_braindead_shortcircuit_evaluation by default and deprecate
John W. Eaton <jwe@octave.org>
parents:
17787
diff
changeset
|
294 warning_with_id ("Octave:deprecated-function", |
d76f790b4eec
enable do_braindead_shortcircuit_evaluation by default and deprecate
John W. Eaton <jwe@octave.org>
parents:
17787
diff
changeset
|
295 "do_braindead_shortcircuit_evaluation is obsolete and will be removed from a future version of Octave"); |
d76f790b4eec
enable do_braindead_shortcircuit_evaluation by default and deprecate
John W. Eaton <jwe@octave.org>
parents:
17787
diff
changeset
|
296 } |
d76f790b4eec
enable do_braindead_shortcircuit_evaluation by default and deprecate
John W. Eaton <jwe@octave.org>
parents:
17787
diff
changeset
|
297 |
11091
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
298 return SET_INTERNAL_VARIABLE (do_braindead_shortcircuit_evaluation); |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
299 } |
18130
701e91ea0fe6
restore tests removed in changeset d76f790b4eec
John W. Eaton <jwe@octave.org>
parents:
18126
diff
changeset
|
300 |
701e91ea0fe6
restore tests removed in changeset d76f790b4eec
John W. Eaton <jwe@octave.org>
parents:
18126
diff
changeset
|
301 /* |
701e91ea0fe6
restore tests removed in changeset d76f790b4eec
John W. Eaton <jwe@octave.org>
parents:
18126
diff
changeset
|
302 %!test |
701e91ea0fe6
restore tests removed in changeset d76f790b4eec
John W. Eaton <jwe@octave.org>
parents:
18126
diff
changeset
|
303 %! x = 0; |
701e91ea0fe6
restore tests removed in changeset d76f790b4eec
John W. Eaton <jwe@octave.org>
parents:
18126
diff
changeset
|
304 %! do_braindead_shortcircuit_evaluation (0); |
701e91ea0fe6
restore tests removed in changeset d76f790b4eec
John W. Eaton <jwe@octave.org>
parents:
18126
diff
changeset
|
305 %! if (1 | (x = 1)) |
701e91ea0fe6
restore tests removed in changeset d76f790b4eec
John W. Eaton <jwe@octave.org>
parents:
18126
diff
changeset
|
306 %! endif |
701e91ea0fe6
restore tests removed in changeset d76f790b4eec
John W. Eaton <jwe@octave.org>
parents:
18126
diff
changeset
|
307 %! assert (x, 1); |
701e91ea0fe6
restore tests removed in changeset d76f790b4eec
John W. Eaton <jwe@octave.org>
parents:
18126
diff
changeset
|
308 %! do_braindead_shortcircuit_evaluation (1); |
701e91ea0fe6
restore tests removed in changeset d76f790b4eec
John W. Eaton <jwe@octave.org>
parents:
18126
diff
changeset
|
309 %! if (1 | (x = 0)) |
701e91ea0fe6
restore tests removed in changeset d76f790b4eec
John W. Eaton <jwe@octave.org>
parents:
18126
diff
changeset
|
310 %! endif |
701e91ea0fe6
restore tests removed in changeset d76f790b4eec
John W. Eaton <jwe@octave.org>
parents:
18126
diff
changeset
|
311 %! assert (x, 1); |
701e91ea0fe6
restore tests removed in changeset d76f790b4eec
John W. Eaton <jwe@octave.org>
parents:
18126
diff
changeset
|
312 */ |