Mercurial > hg > octave-nkf
annotate libinterp/parse-tree/pt-binop.h @ 18126:d76f790b4eec gui-release
enable do_braindead_shortcircuit_evaluation by default and deprecate
* octave.cc (maximum_braindamage): Don't call
Fdo_brainded_shortcircuit_evaluation.
* pt-exp.h (tree_expression::mark_braindead_shortcircuit): Eliminate
file name argument.
* pt-binop.h, pt-binop.cc
(tree_binary_expression::mark_braindead_shortcircuit): Likewise.
* oct-parse.in.yy (if_cmd_list1, elseif_clause, loop_command):
Eliminate argument from call to mark_braindead_shortcircuit.
* pt-binop.h, pt-binop.cc (Vdo_braindead_shortcircuit_evaluation):
Initialize to true.
(tree_binary_expression::matlab_style_short_circuit_warning): New function.
(tree_binary_expression::rvalue1): Call
matlab_style_short_circuit_warning if short circuit evaluation occurs.
(Fdo_braindead_shortcircuit_evaluation): Display deprecated warning.
Delete tests for do_braindead_shortcircuit_evaluation.
(tree_binary_expression::braindead_shortcircuit_warning_issued): New
member variable.
* NEWS: Mention change in default value and deprecated function.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 11 Dec 2013 20:51:22 -0500 |
| parents | ebb3ef964372 |
| children | 91cd85a75705 |
| rev | line source |
|---|---|
| 2980 | 1 /* |
| 2 | |
|
17744
d63878346099
maint: Update copyright notices for release.
John W. Eaton <jwe@octave.org>
parents:
15195
diff
changeset
|
3 Copyright (C) 1996-2013 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 | |
|
17822
ebb3ef964372
maint: Use common #define syntax "octave_filename_h" in h_files.
Rik <rik@octave.org>
parents:
17787
diff
changeset
|
23 #if !defined (octave_pt_binop_h) |
|
ebb3ef964372
maint: Use common #define syntax "octave_filename_h" in h_files.
Rik <rik@octave.org>
parents:
17787
diff
changeset
|
24 #define octave_pt_binop_h 1 |
| 2980 | 25 |
| 26 #include <string> | |
| 27 | |
| 28 class tree_walker; | |
| 29 | |
| 30 class octave_value; | |
| 31 class octave_value_list; | |
| 32 class octave_lvalue; | |
| 33 | |
| 34 #include "ov.h" | |
| 35 #include "pt-exp.h" | |
| 7336 | 36 #include "symtab.h" |
| 2980 | 37 |
| 38 // Binary expressions. | |
| 39 | |
| 40 class | |
| 41 tree_binary_expression : public tree_expression | |
| 42 { | |
| 43 public: | |
| 44 | |
| 45 tree_binary_expression (int l = -1, int c = -1, | |
| 10313 | 46 octave_value::binary_op t |
| 47 = octave_value::unknown_binary_op) | |
|
11091
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10313
diff
changeset
|
48 : tree_expression (l, c), op_lhs (0), op_rhs (0), etype (t), |
|
18126
d76f790b4eec
enable do_braindead_shortcircuit_evaluation by default and deprecate
John W. Eaton <jwe@octave.org>
parents:
17822
diff
changeset
|
49 eligible_for_braindead_shortcircuit (false), |
|
d76f790b4eec
enable do_braindead_shortcircuit_evaluation by default and deprecate
John W. Eaton <jwe@octave.org>
parents:
17822
diff
changeset
|
50 braindead_shortcircuit_warning_issued (false) { } |
| 2980 | 51 |
| 52 tree_binary_expression (tree_expression *a, tree_expression *b, | |
| 10313 | 53 int l = -1, int c = -1, |
| 54 octave_value::binary_op t | |
| 55 = octave_value::unknown_binary_op) | |
|
11091
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10313
diff
changeset
|
56 : tree_expression (l, c), op_lhs (a), op_rhs (b), etype (t), |
|
18126
d76f790b4eec
enable do_braindead_shortcircuit_evaluation by default and deprecate
John W. Eaton <jwe@octave.org>
parents:
17822
diff
changeset
|
57 eligible_for_braindead_shortcircuit (false), |
|
d76f790b4eec
enable do_braindead_shortcircuit_evaluation by default and deprecate
John W. Eaton <jwe@octave.org>
parents:
17822
diff
changeset
|
58 braindead_shortcircuit_warning_issued (false) { } |
| 2980 | 59 |
| 60 ~tree_binary_expression (void) | |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
61 { |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
62 delete op_lhs; |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
63 delete op_rhs; |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
64 } |
| 2980 | 65 |
|
18126
d76f790b4eec
enable do_braindead_shortcircuit_evaluation by default and deprecate
John W. Eaton <jwe@octave.org>
parents:
17822
diff
changeset
|
66 void mark_braindead_shortcircuit (void) |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
67 { |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
68 if (etype == octave_value::op_el_and || etype == octave_value::op_el_or) |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
69 { |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
70 eligible_for_braindead_shortcircuit = true; |
|
11091
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10313
diff
changeset
|
71 |
|
18126
d76f790b4eec
enable do_braindead_shortcircuit_evaluation by default and deprecate
John W. Eaton <jwe@octave.org>
parents:
17822
diff
changeset
|
72 op_lhs->mark_braindead_shortcircuit (); |
|
d76f790b4eec
enable do_braindead_shortcircuit_evaluation by default and deprecate
John W. Eaton <jwe@octave.org>
parents:
17822
diff
changeset
|
73 op_rhs->mark_braindead_shortcircuit (); |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
74 } |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
75 } |
|
11091
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10313
diff
changeset
|
76 |
| 4267 | 77 bool has_magic_end (void) const |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
78 { |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
79 return ((op_lhs && op_lhs->has_magic_end ()) |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
80 || (op_rhs && op_rhs->has_magic_end ())); |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
81 } |
| 4267 | 82 |
| 4023 | 83 bool is_binary_expression (void) const { return true; } |
| 84 | |
| 3933 | 85 bool rvalue_ok (void) const { return true; } |
| 2980 | 86 |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8011
diff
changeset
|
87 octave_value rvalue1 (int nargout = 1); |
| 2980 | 88 |
| 3010 | 89 octave_value_list rvalue (int nargout); |
| 2980 | 90 |
| 3523 | 91 std::string oper (void) const; |
| 2980 | 92 |
| 4023 | 93 octave_value::binary_op op_type (void) const { return etype; } |
| 94 | |
| 2980 | 95 tree_expression *lhs (void) { return op_lhs; } |
| 96 tree_expression *rhs (void) { return op_rhs; } | |
| 97 | |
|
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
98 tree_expression *dup (symbol_table::scope_id scope, |
| 10313 | 99 symbol_table::context_id context) const; |
| 5861 | 100 |
| 2980 | 101 void accept (tree_walker& tw); |
| 102 | |
| 103 protected: | |
| 104 | |
| 105 // The operands for the expression. | |
| 106 tree_expression *op_lhs; | |
| 107 tree_expression *op_rhs; | |
| 108 | |
| 109 private: | |
| 110 | |
| 111 // The type of the expression. | |
| 112 octave_value::binary_op etype; | |
| 2988 | 113 |
|
11091
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10313
diff
changeset
|
114 // TRUE if this is an | or & expression in the condition of an IF |
|
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10313
diff
changeset
|
115 // or WHILE statement. |
|
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10313
diff
changeset
|
116 bool eligible_for_braindead_shortcircuit; |
|
5677f3f7b5fa
Matlab compatible short-circuit behavior for & and | operators
John W. Eaton <jwe@octave.org>
parents:
10313
diff
changeset
|
117 |
|
18126
d76f790b4eec
enable do_braindead_shortcircuit_evaluation by default and deprecate
John W. Eaton <jwe@octave.org>
parents:
17822
diff
changeset
|
118 // TRUE if we have already issued a warning about short circuiting |
|
d76f790b4eec
enable do_braindead_shortcircuit_evaluation by default and deprecate
John W. Eaton <jwe@octave.org>
parents:
17822
diff
changeset
|
119 // for this operator. |
|
d76f790b4eec
enable do_braindead_shortcircuit_evaluation by default and deprecate
John W. Eaton <jwe@octave.org>
parents:
17822
diff
changeset
|
120 bool braindead_shortcircuit_warning_issued; |
|
d76f790b4eec
enable do_braindead_shortcircuit_evaluation by default and deprecate
John W. Eaton <jwe@octave.org>
parents:
17822
diff
changeset
|
121 |
|
d76f790b4eec
enable do_braindead_shortcircuit_evaluation by default and deprecate
John W. Eaton <jwe@octave.org>
parents:
17822
diff
changeset
|
122 void 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:
17822
diff
changeset
|
123 |
| 2988 | 124 // No copying! |
| 125 | |
| 126 tree_binary_expression (const tree_binary_expression&); | |
| 127 | |
| 128 tree_binary_expression& operator = (const tree_binary_expression&); | |
| 2980 | 129 }; |
| 130 | |
| 131 // Boolean expressions. | |
| 132 | |
| 133 class | |
| 134 tree_boolean_expression : public tree_binary_expression | |
| 135 { | |
| 136 public: | |
| 137 | |
| 138 enum type | |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
139 { |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
140 unknown, |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
141 bool_and, |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
142 bool_or |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
143 }; |
| 2980 | 144 |
| 145 tree_boolean_expression (int l = -1, int c = -1, type t = unknown) | |
| 146 : tree_binary_expression (l, c), etype (t) { } | |
| 147 | |
| 148 tree_boolean_expression (tree_expression *a, tree_expression *b, | |
| 10313 | 149 int l = -1, int c = -1, type t = unknown) |
| 2980 | 150 : tree_binary_expression (a, b, l, c), etype (t) { } |
| 151 | |
| 152 ~tree_boolean_expression (void) { } | |
| 153 | |
| 4023 | 154 bool is_boolean_expression (void) const { return true; } |
| 155 | |
| 3933 | 156 bool rvalue_ok (void) const { return true; } |
| 2980 | 157 |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8011
diff
changeset
|
158 octave_value rvalue1 (int nargout = 1); |
| 2980 | 159 |
| 160 octave_value_list rvalue (int nargout); | |
| 161 | |
| 3523 | 162 std::string oper (void) const; |
| 2980 | 163 |
| 4023 | 164 type op_type (void) const { return etype; } |
| 165 | |
|
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
166 tree_expression *dup (symbol_table::scope_id scope, |
| 10313 | 167 symbol_table::context_id context) const; |
| 5861 | 168 |
| 2980 | 169 private: |
| 170 | |
| 171 // The type of the expression. | |
| 172 type etype; | |
| 2988 | 173 |
| 174 // No copying! | |
| 175 | |
| 176 tree_boolean_expression (const tree_boolean_expression&); | |
| 177 | |
| 178 tree_boolean_expression& operator = (const tree_boolean_expression&); | |
| 2980 | 179 }; |
| 180 | |
| 181 #endif |