Mercurial > hg > octave-nkf
annotate libinterp/parse-tree/pt-binop.cc @ 20441:83792dd9bcc1
Use in-place operators in m-files where possible.
* scripts/audio/@audioplayer/set.m, scripts/audio/@audiorecorder/set.m,
scripts/audio/mu2lin.m, scripts/elfun/cosd.m, scripts/general/del2.m,
scripts/general/profexplore.m, scripts/general/quadl.m, scripts/general/rat.m,
scripts/general/rotdim.m, scripts/help/get_first_help_sentence.m,
scripts/help/private/__strip_html_tags__.m, scripts/image/cubehelix.m,
scripts/io/textread.m, scripts/linear-algebra/duplication_matrix.m,
scripts/linear-algebra/housh.m, scripts/linear-algebra/krylov.m,
scripts/linear-algebra/logm.m, scripts/linear-algebra/normest.m,
scripts/linear-algebra/onenormest.m, scripts/optimization/fminsearch.m,
scripts/optimization/lsqnonneg.m, scripts/optimization/qp.m,
scripts/plot/appearance/annotation.m, scripts/plot/appearance/axis.m,
scripts/plot/appearance/legend.m, scripts/plot/appearance/specular.m,
scripts/plot/draw/colorbar.m, scripts/plot/draw/hist.m,
scripts/plot/draw/plotmatrix.m, scripts/plot/draw/private/__stem__.m,
scripts/plot/util/__actual_axis_position__.m,
scripts/plot/util/__gnuplot_drawnow__.m, scripts/plot/util/findobj.m,
scripts/plot/util/print.m, scripts/plot/util/private/__go_draw_axes__.m,
scripts/plot/util/private/__print_parse_opts__.m, scripts/plot/util/rotate.m,
scripts/polynomial/pchip.m, scripts/polynomial/polyaffine.m,
scripts/polynomial/polyder.m, scripts/polynomial/private/__splinefit__.m,
scripts/polynomial/residue.m, scripts/signal/arch_fit.m,
scripts/signal/arch_rnd.m, scripts/signal/bartlett.m,
scripts/signal/blackman.m, scripts/signal/freqz.m, scripts/signal/hamming.m,
scripts/signal/hanning.m, scripts/signal/spectral_adf.m,
scripts/signal/spectral_xdf.m, scripts/signal/stft.m,
scripts/sparse/bicgstab.m, scripts/sparse/cgs.m,
scripts/sparse/private/__sprand_impl__.m, scripts/sparse/qmr.m,
scripts/sparse/sprandsym.m, scripts/sparse/svds.m, scripts/specfun/legendre.m,
scripts/special-matrix/gallery.m, scripts/statistics/base/gls.m,
scripts/statistics/models/logistic_regression.m,
scripts/statistics/tests/kruskal_wallis_test.m,
scripts/statistics/tests/manova.m, scripts/statistics/tests/wilcoxon_test.m,
scripts/time/datevec.m:
Use in-place operators in m-files where possible.
author | Rik <rik@octave.org> |
---|---|
date | Tue, 26 May 2015 21:07:42 -0700 |
parents | 075a5e2e1ba5 |
children | b10432a40432 |
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 | |
72 if (error_state) | |
73 return retval; | |
74 | |
11091
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
75 if (Vdo_braindead_shortcircuit_evaluation |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
76 && eligible_for_braindead_shortcircuit) |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
77 { |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
78 if (op_lhs) |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
79 { |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
80 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
|
81 |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
82 if (! error_state) |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
83 { |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
84 if (a.ndims () == 2 && a.rows () == 1 && a.columns () == 1) |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
85 { |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
86 bool result = false; |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
87 |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
88 bool a_true = a.is_true (); |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
89 |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
90 if (! error_state) |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
91 { |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
92 if (a_true) |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
93 { |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
94 if (etype == octave_value::op_el_or) |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
95 { |
18126
d76f790b4eec
enable do_braindead_shortcircuit_evaluation by default and deprecate
John W. Eaton <jwe@octave.org>
parents:
17787
diff
changeset
|
96 matlab_style_short_circuit_warning ("|"); |
11091
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
97 result = true; |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
98 goto done; |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
99 } |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
100 } |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
101 else |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
102 { |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
103 if (etype == octave_value::op_el_and) |
18126
d76f790b4eec
enable do_braindead_shortcircuit_evaluation by default and deprecate
John W. Eaton <jwe@octave.org>
parents:
17787
diff
changeset
|
104 { |
d76f790b4eec
enable do_braindead_shortcircuit_evaluation by default and deprecate
John W. Eaton <jwe@octave.org>
parents:
17787
diff
changeset
|
105 matlab_style_short_circuit_warning ("&"); |
d76f790b4eec
enable do_braindead_shortcircuit_evaluation by default and deprecate
John W. Eaton <jwe@octave.org>
parents:
17787
diff
changeset
|
106 goto done; |
d76f790b4eec
enable do_braindead_shortcircuit_evaluation by default and deprecate
John W. Eaton <jwe@octave.org>
parents:
17787
diff
changeset
|
107 } |
11091
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
108 } |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
109 |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
110 if (op_rhs) |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
111 { |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
112 octave_value b = op_rhs->rvalue1 (); |
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 if (! error_state) |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
115 result = b.is_true (); |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
116 } |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
117 |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
118 done: |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
119 |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
120 if (! error_state) |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
121 return octave_value (result); |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
122 } |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
123 } |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
124 } |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
125 } |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
126 } |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
127 |
2980 | 128 if (op_lhs) |
129 { | |
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8011
diff
changeset
|
130 octave_value a = op_lhs->rvalue1 (); |
2980 | 131 |
8011
3100283874d7
improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents:
7767
diff
changeset
|
132 if (! error_state && a.is_defined () && op_rhs) |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
133 { |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
134 octave_value b = op_rhs->rvalue1 (); |
2980 | 135 |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
136 if (! error_state && b.is_defined ()) |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
137 { |
19520
91cd85a75705
Reduce profiling overhead using inlining and templates.
Julien Bect <julien.bect@supelec.fr>
parents:
18130
diff
changeset
|
138 BEGIN_PROFILER_BLOCK (tree_binary_expression) |
12920
5d18231eee00
Extend profiling support to operators.
Daniel Kraft <d@domob.eu>
parents:
12822
diff
changeset
|
139 |
12921
7820a12baadd
Style fixes on comments about profiling operators
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
12920
diff
changeset
|
140 // 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
|
141 // 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
|
142 // 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
|
143 // 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
|
144 // timing the operator to make it reasonable. |
12920
5d18231eee00
Extend profiling support to operators.
Daniel Kraft <d@domob.eu>
parents:
12822
diff
changeset
|
145 |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
146 retval = ::do_binary_op (etype, a, b); |
2980 | 147 |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
148 if (error_state) |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
149 retval = octave_value (); |
12960
43d78e103984
Use macro to start profiler blocks.
Daniel Kraft <d@domob.eu>
parents:
12921
diff
changeset
|
150 |
43d78e103984
Use macro to start profiler blocks.
Daniel Kraft <d@domob.eu>
parents:
12921
diff
changeset
|
151 END_PROFILER_BLOCK |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
152 } |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
153 } |
2980 | 154 } |
155 | |
156 return retval; | |
157 } | |
158 | |
3536 | 159 std::string |
2980 | 160 tree_binary_expression::oper (void) const |
161 { | |
162 return octave_value::binary_op_as_string (etype); | |
163 } | |
164 | |
5861 | 165 tree_expression * |
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
166 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
|
167 symbol_table::context_id context) const |
5861 | 168 { |
169 tree_binary_expression *new_be | |
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
170 = 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
|
171 op_rhs ? op_rhs->dup (scope, context) : 0, |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
172 line (), column (), etype); |
5861 | 173 |
174 new_be->copy_base (*this); | |
175 | |
176 return new_be; | |
177 } | |
178 | |
2980 | 179 void |
180 tree_binary_expression::accept (tree_walker& tw) | |
181 { | |
182 tw.visit_binary_expression (*this); | |
183 } | |
184 | |
185 // Boolean expressions. | |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11572
diff
changeset
|
186 |
2980 | 187 octave_value_list |
188 tree_boolean_expression::rvalue (int nargout) | |
189 { | |
190 octave_value_list retval; | |
191 | |
192 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
|
193 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
|
194 oper () . c_str ()); |
2980 | 195 else |
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8011
diff
changeset
|
196 retval = rvalue1 (nargout); |
2980 | 197 |
198 return retval; | |
199 } | |
200 | |
201 octave_value | |
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8011
diff
changeset
|
202 tree_boolean_expression::rvalue1 (int) |
2980 | 203 { |
204 octave_value retval; | |
205 | |
206 if (error_state) | |
207 return retval; | |
208 | |
209 bool result = false; | |
210 | |
12921
7820a12baadd
Style fixes on comments about profiling operators
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
12920
diff
changeset
|
211 // 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
|
212 // 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
|
213 // 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
|
214 // entangled together with short-circuit evaluation here. |
12920
5d18231eee00
Extend profiling support to operators.
Daniel Kraft <d@domob.eu>
parents:
12822
diff
changeset
|
215 |
2980 | 216 if (op_lhs) |
217 { | |
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8011
diff
changeset
|
218 octave_value a = op_lhs->rvalue1 (); |
2980 | 219 |
8011
3100283874d7
improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents:
7767
diff
changeset
|
220 if (! error_state) |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
221 { |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
222 bool a_true = a.is_true (); |
2980 | 223 |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
224 if (! error_state) |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
225 { |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
226 if (a_true) |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
227 { |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
228 if (etype == bool_or) |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
229 { |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
230 result = true; |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
231 goto done; |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
232 } |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
233 } |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
234 else |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
235 { |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
236 if (etype == bool_and) |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
237 goto done; |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
238 } |
2980 | 239 |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
240 if (op_rhs) |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
241 { |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
242 octave_value b = op_rhs->rvalue1 (); |
2980 | 243 |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
244 if (! error_state) |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
245 result = b.is_true (); |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
246 } |
2980 | 247 |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
248 done: |
2980 | 249 |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
250 if (! error_state) |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
251 retval = octave_value (result); |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
252 } |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
253 } |
2980 | 254 } |
255 | |
256 return retval; | |
257 } | |
258 | |
3536 | 259 std::string |
2980 | 260 tree_boolean_expression::oper (void) const |
261 { | |
3523 | 262 std::string retval = "<unknown>"; |
2980 | 263 |
264 switch (etype) | |
265 { | |
266 case bool_and: | |
267 retval = "&&"; | |
268 break; | |
269 | |
270 case bool_or: | |
271 retval = "||"; | |
272 break; | |
273 | |
274 default: | |
275 break; | |
276 } | |
277 | |
278 return retval; | |
279 } | |
280 | |
5861 | 281 tree_expression * |
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
282 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
|
283 symbol_table::context_id context) const |
5861 | 284 { |
285 tree_boolean_expression *new_be | |
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
286 = 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
|
287 op_rhs ? op_rhs->dup (scope, context) : 0, |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
288 line (), column (), etype); |
5861 | 289 |
290 new_be->copy_base (*this); | |
291 | |
292 return new_be; | |
293 } | |
11091
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
294 |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
295 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
|
296 "-*- texinfo -*-\n\ |
11091
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
297 @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
|
298 @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
|
299 @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
|
300 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
|
301 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
|
302 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
|
303 \n\ |
11572
7d6d8c1e471f
Grammarcheck Texinfo for files in src directory.
Rik <octave@nomad.inbox5.com>
parents:
11523
diff
changeset
|
304 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
|
305 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
|
306 \n\ |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
307 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
|
308 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
|
309 \n\ |
17281
bc924baa2c4e
doc: Add new @qcode macro for code samples which are quoted.
Rik <rik@octave.org>
parents:
15467
diff
changeset
|
310 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
|
311 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
|
312 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
|
313 @end deftypefn") |
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
314 { |
18126
d76f790b4eec
enable do_braindead_shortcircuit_evaluation by default and deprecate
John W. Eaton <jwe@octave.org>
parents:
17787
diff
changeset
|
315 static bool warned = false; |
d76f790b4eec
enable do_braindead_shortcircuit_evaluation by default and deprecate
John W. Eaton <jwe@octave.org>
parents:
17787
diff
changeset
|
316 if (! warned) |
d76f790b4eec
enable do_braindead_shortcircuit_evaluation by default and deprecate
John W. Eaton <jwe@octave.org>
parents:
17787
diff
changeset
|
317 { |
d76f790b4eec
enable do_braindead_shortcircuit_evaluation by default and deprecate
John W. Eaton <jwe@octave.org>
parents:
17787
diff
changeset
|
318 warned = true; |
d76f790b4eec
enable do_braindead_shortcircuit_evaluation by default and deprecate
John W. Eaton <jwe@octave.org>
parents:
17787
diff
changeset
|
319 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
|
320 "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
|
321 } |
d76f790b4eec
enable do_braindead_shortcircuit_evaluation by default and deprecate
John W. Eaton <jwe@octave.org>
parents:
17787
diff
changeset
|
322 |
11091
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
323 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
|
324 } |
18130
701e91ea0fe6
restore tests removed in changeset d76f790b4eec
John W. Eaton <jwe@octave.org>
parents:
18126
diff
changeset
|
325 |
701e91ea0fe6
restore tests removed in changeset d76f790b4eec
John W. Eaton <jwe@octave.org>
parents:
18126
diff
changeset
|
326 /* |
701e91ea0fe6
restore tests removed in changeset d76f790b4eec
John W. Eaton <jwe@octave.org>
parents:
18126
diff
changeset
|
327 %!test |
701e91ea0fe6
restore tests removed in changeset d76f790b4eec
John W. Eaton <jwe@octave.org>
parents:
18126
diff
changeset
|
328 %! x = 0; |
701e91ea0fe6
restore tests removed in changeset d76f790b4eec
John W. Eaton <jwe@octave.org>
parents:
18126
diff
changeset
|
329 %! do_braindead_shortcircuit_evaluation (0); |
701e91ea0fe6
restore tests removed in changeset d76f790b4eec
John W. Eaton <jwe@octave.org>
parents:
18126
diff
changeset
|
330 %! if (1 | (x = 1)) |
701e91ea0fe6
restore tests removed in changeset d76f790b4eec
John W. Eaton <jwe@octave.org>
parents:
18126
diff
changeset
|
331 %! endif |
701e91ea0fe6
restore tests removed in changeset d76f790b4eec
John W. Eaton <jwe@octave.org>
parents:
18126
diff
changeset
|
332 %! assert (x, 1); |
701e91ea0fe6
restore tests removed in changeset d76f790b4eec
John W. Eaton <jwe@octave.org>
parents:
18126
diff
changeset
|
333 %! do_braindead_shortcircuit_evaluation (1); |
701e91ea0fe6
restore tests removed in changeset d76f790b4eec
John W. Eaton <jwe@octave.org>
parents:
18126
diff
changeset
|
334 %! if (1 | (x = 0)) |
701e91ea0fe6
restore tests removed in changeset d76f790b4eec
John W. Eaton <jwe@octave.org>
parents:
18126
diff
changeset
|
335 %! endif |
701e91ea0fe6
restore tests removed in changeset d76f790b4eec
John W. Eaton <jwe@octave.org>
parents:
18126
diff
changeset
|
336 %! assert (x, 1); |
701e91ea0fe6
restore tests removed in changeset d76f790b4eec
John W. Eaton <jwe@octave.org>
parents:
18126
diff
changeset
|
337 */ |