Mercurial > octave

comparison libinterp/parse-tree/pt-binop.cc @ 31607:aac27ad79be6 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Re-indent code after switch to using namespace macros. * build-env.h, build-env.in.cc, Cell.h, __betainc__.cc, __eigs__.cc, __ftp__.cc, __ichol__.cc, __ilu__.cc, __isprimelarge__.cc, __magick_read__.cc, __pchip_deriv__.cc, amd.cc, base-text-renderer.cc, base-text-renderer.h, besselj.cc, bitfcns.cc, bsxfun.cc, c-file-ptr-stream.h, call-stack.cc, call-stack.h, ccolamd.cc, cellfun.cc, chol.cc, colamd.cc, dasrt.cc, data.cc, debug.cc, defaults.cc, defaults.h, det.cc, display.cc, display.h, dlmread.cc, dynamic-ld.cc, dynamic-ld.h, ellipj.cc, environment.cc, environment.h, error.cc, error.h, errwarn.h, event-manager.cc, event-manager.h, event-queue.cc, event-queue.h, fcn-info.cc, fcn-info.h, fft.cc, fft2.cc, file-io.cc, filter.cc, find.cc, ft-text-renderer.cc, ft-text-renderer.h, gcd.cc, gl-render.cc, gl-render.h, gl2ps-print.cc, gl2ps-print.h, graphics-toolkit.cc, graphics-toolkit.h, graphics.cc, gsvd.cc, gtk-manager.cc, gtk-manager.h, help.cc, help.h, hook-fcn.cc, hook-fcn.h, input.cc, input.h, interpreter-private.cc, interpreter-private.h, interpreter.cc, interpreter.h, inv.cc, jsondecode.cc, jsonencode.cc, latex-text-renderer.cc, latex-text-renderer.h, load-path.cc, load-path.h, load-save.cc, load-save.h, lookup.cc, ls-hdf5.cc, ls-mat4.cc, ls-mat5.cc, lsode.cc, lu.cc, mappers.cc, matrix_type.cc, max.cc, mex.cc, mexproto.h, mxarray.h, mxtypes.in.h, oct-errno.in.cc, oct-hdf5-types.cc, oct-hist.cc, oct-hist.h, oct-map.cc, oct-map.h, oct-opengl.h, oct-prcstrm.h, oct-process.cc, oct-process.h, oct-stdstrm.h, oct-stream.cc, oct-stream.h, oct-strstrm.h, octave-default-image.h, ordqz.cc, ordschur.cc, pager.cc, pager.h, pinv.cc, pow2.cc, pr-output.cc, psi.cc, qr.cc, quadcc.cc, rand.cc, regexp.cc, settings.cc, settings.h, sighandlers.cc, sighandlers.h, sparse-xpow.cc, sqrtm.cc, stack-frame.cc, stack-frame.h, stream-euler.cc, strfns.cc, svd.cc, syminfo.cc, syminfo.h, symrcm.cc, symrec.cc, symrec.h, symscope.cc, symscope.h, symtab.cc, symtab.h, sysdep.cc, sysdep.h, text-engine.cc, text-engine.h, text-renderer.cc, text-renderer.h, time.cc, toplev.cc, typecast.cc, url-handle-manager.cc, url-handle-manager.h, urlwrite.cc, utils.cc, utils.h, variables.cc, variables.h, xdiv.cc, __delaunayn__.cc, __init_fltk__.cc, __init_gnuplot__.cc, __ode15__.cc, __voronoi__.cc, audioread.cc, convhulln.cc, gzip.cc, cdef-class.cc, cdef-class.h, cdef-fwd.h, cdef-manager.cc, cdef-manager.h, cdef-method.cc, cdef-method.h, cdef-object.cc, cdef-object.h, cdef-package.cc, cdef-package.h, cdef-property.cc, cdef-property.h, cdef-utils.cc, cdef-utils.h, ov-base-diag.cc, ov-base-int.cc, ov-base-mat.cc, ov-base-mat.h, ov-base-scalar.cc, ov-base.cc, ov-base.h, ov-bool-mat.cc, ov-bool-mat.h, ov-bool-sparse.cc, ov-bool.cc, ov-builtin.h, ov-cell.cc, ov-ch-mat.cc, ov-class.cc, ov-class.h, ov-classdef.cc, ov-classdef.h, ov-complex.cc, ov-cx-diag.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-dld-fcn.cc, ov-dld-fcn.h, ov-fcn-handle.cc, ov-fcn-handle.h, ov-fcn.h, ov-float.cc, ov-flt-complex.cc, ov-flt-cx-diag.cc, ov-flt-cx-mat.cc, ov-flt-re-diag.cc, ov-flt-re-mat.cc, ov-flt-re-mat.h, ov-intx.h, ov-java.cc, ov-lazy-idx.cc, ov-legacy-range.cc, ov-magic-int.cc, ov-mex-fcn.cc, ov-mex-fcn.h, ov-null-mat.cc, ov-perm.cc, ov-range.cc, ov-re-diag.cc, ov-re-mat.cc, ov-re-mat.h, ov-re-sparse.cc, ov-scalar.cc, ov-str-mat.cc, ov-struct.cc, ov-typeinfo.cc, ov-typeinfo.h, ov-usr-fcn.cc, ov-usr-fcn.h, ov.cc, ov.h, ovl.h, octave.cc, octave.h, op-b-sbm.cc, op-bm-sbm.cc, op-cs-scm.cc, op-fm-fcm.cc, op-fs-fcm.cc, op-s-scm.cc, op-scm-cs.cc, op-scm-s.cc, op-sm-cs.cc, ops.h, anon-fcn-validator.cc, anon-fcn-validator.h, bp-table.cc, bp-table.h, comment-list.cc, comment-list.h, filepos.h, lex.h, oct-lvalue.cc, oct-lvalue.h, parse.h, profiler.cc, profiler.h, pt-anon-scopes.cc, pt-anon-scopes.h, pt-arg-list.cc, pt-arg-list.h, pt-args-block.cc, pt-args-block.h, pt-array-list.cc, pt-array-list.h, pt-assign.cc, pt-assign.h, pt-binop.cc, pt-binop.h, pt-bp.cc, pt-bp.h, pt-cbinop.cc, pt-cbinop.h, pt-cell.cc, pt-cell.h, pt-check.cc, pt-check.h, pt-classdef.cc, pt-classdef.h, pt-cmd.h, pt-colon.cc, pt-colon.h, pt-const.cc, pt-const.h, pt-decl.cc, pt-decl.h, pt-eval.cc, pt-eval.h, pt-except.cc, pt-except.h, pt-exp.cc, pt-exp.h, pt-fcn-handle.cc, pt-fcn-handle.h, pt-id.cc, pt-id.h, pt-idx.cc, pt-idx.h, pt-jump.h, pt-loop.cc, pt-loop.h, pt-mat.cc, pt-mat.h, pt-misc.cc, pt-misc.h, pt-pr-code.cc, pt-pr-code.h, pt-select.cc, pt-select.h, pt-spmd.cc, pt-spmd.h, pt-stmt.cc, pt-stmt.h, pt-tm-const.cc, pt-tm-const.h, pt-unop.cc, pt-unop.h, pt-walk.cc, pt-walk.h, pt.cc, pt.h, token.cc, token.h, Range.cc, Range.h, idx-vector.cc, idx-vector.h, range-fwd.h, CollocWt.cc, CollocWt.h, aepbalance.cc, aepbalance.h, chol.cc, chol.h, gepbalance.cc, gepbalance.h, gsvd.cc, gsvd.h, hess.cc, hess.h, lo-mappers.cc, lo-mappers.h, lo-specfun.cc, lo-specfun.h, lu.cc, lu.h, oct-convn.cc, oct-convn.h, oct-fftw.cc, oct-fftw.h, oct-norm.cc, oct-norm.h, oct-rand.cc, oct-rand.h, oct-spparms.cc, oct-spparms.h, qr.cc, qr.h, qrp.cc, qrp.h, randgamma.cc, randgamma.h, randmtzig.cc, randmtzig.h, randpoisson.cc, randpoisson.h, schur.cc, schur.h, sparse-chol.cc, sparse-chol.h, sparse-lu.cc, sparse-lu.h, sparse-qr.cc, sparse-qr.h, svd.cc, svd.h, child-list.cc, child-list.h, dir-ops.cc, dir-ops.h, file-ops.cc, file-ops.h, file-stat.cc, file-stat.h, lo-sysdep.cc, lo-sysdep.h, lo-sysinfo.cc, lo-sysinfo.h, mach-info.cc, mach-info.h, oct-env.cc, oct-env.h, oct-group.cc, oct-group.h, oct-password.cc, oct-password.h, oct-syscalls.cc, oct-syscalls.h, oct-time.cc, oct-time.h, oct-uname.cc, oct-uname.h, action-container.cc, action-container.h, base-list.h, cmd-edit.cc, cmd-edit.h, cmd-hist.cc, cmd-hist.h, f77-fcn.h, file-info.cc, file-info.h, lo-array-errwarn.cc, lo-array-errwarn.h, lo-hash.cc, lo-hash.h, lo-ieee.h, lo-regexp.cc, lo-regexp.h, lo-utils.cc, lo-utils.h, oct-base64.cc, oct-base64.h, oct-glob.cc, oct-glob.h, oct-inttypes.h, oct-mutex.cc, oct-mutex.h, oct-refcount.h, oct-shlib.cc, oct-shlib.h, oct-sparse.cc, oct-sparse.h, oct-string.h, octave-preserve-stream-state.h, pathsearch.cc, pathsearch.h, quit.cc, quit.h, unwind-prot.cc, unwind-prot.h, url-transfer.cc, url-transfer.h: Re-indent code after switch to using namespace macros.
author Rik <rik@octave.org>
date Thu, 01 Dec 2022 18:02:15 -0800
parents e88a07dec498
children 597f3ee61a48
comparison
equal deleted inserted replaced
31605:e88a07dec498 31607:aac27ad79be6
35 #include "pt-eval.h" 35 #include "pt-eval.h"
36 #include "variables.h" 36 #include "variables.h"
37 37
38 OCTAVE_BEGIN_NAMESPACE(octave) 38 OCTAVE_BEGIN_NAMESPACE(octave)
39 39
40 // Binary expressions. 40 // Binary expressions.
41 41
42 void 42 void
43 tree_binary_expression::matlab_style_short_circuit_warning (const char *op) 43 tree_binary_expression::matlab_style_short_circuit_warning (const char *op)
44 { 44 {
45 warning_with_id ("Octave:possible-matlab-short-circuit-operator", 45 warning_with_id ("Octave:possible-matlab-short-circuit-operator",
46 "Matlab-style short-circuit operation performed for operator %s", 46 "Matlab-style short-circuit operation performed for operator %s",
47 op); 47 op);
48 } 48 }
49 49
50 std::string 50 std::string
51 tree_binary_expression::oper (void) const 51 tree_binary_expression::oper (void) const
52 { 52 {
53 return octave_value::binary_op_as_string (m_etype); 53 return octave_value::binary_op_as_string (m_etype);
54 } 54 }
55 55
56 tree_expression * 56 tree_expression *
57 tree_binary_expression::dup (symbol_scope& scope) const 57 tree_binary_expression::dup (symbol_scope& scope) const
58 { 58 {
59 tree_binary_expression *new_be 59 tree_binary_expression *new_be
60 = new tree_binary_expression (m_lhs ? m_lhs->dup (scope) : nullptr, 60 = new tree_binary_expression (m_lhs ? m_lhs->dup (scope) : nullptr,
61 m_rhs ? m_rhs->dup (scope) : nullptr, 61 m_rhs ? m_rhs->dup (scope) : nullptr,
62 line (), column (), m_etype); 62 line (), column (), m_etype);
63 63
64 new_be->copy_base (*this); 64 new_be->copy_base (*this);
65 65
66 return new_be; 66 return new_be;
67 } 67 }
68 68
69 octave_value 69 octave_value
70 tree_binary_expression::evaluate (tree_evaluator& tw, int) 70 tree_binary_expression::evaluate (tree_evaluator& tw, int)
71 { 71 {
72 if (m_lhs) 72 if (m_lhs)
73 { 73 {
74 octave_value a = m_lhs->evaluate (tw); 74 octave_value a = m_lhs->evaluate (tw);
75 75
76 if (a.is_defined () && m_rhs) 76 if (a.is_defined () && m_rhs)
77 { 77 {
78 octave_value b = m_rhs->evaluate (tw); 78 octave_value b = m_rhs->evaluate (tw);
79 79
80 if (b.is_defined ()) 80 if (b.is_defined ())
81 { 81 {
82 profiler::enter<tree_binary_expression> 82 profiler::enter<tree_binary_expression>
83 block (tw.get_profiler (), *this); 83 block (tw.get_profiler (), *this);
84 84
85 // Note: The profiler does not catch the braindead 85 // Note: The profiler does not catch the braindead
86 // short-circuit evaluation code above, but that should be 86 // short-circuit evaluation code above, but that should be
87 // ok. The evaluation of operands and the operator itself 87 // ok. The evaluation of operands and the operator itself
88 // is entangled and it's not clear where to start/stop 88 // is entangled and it's not clear where to start/stop
89 // timing the operator to make it reasonable. 89 // timing the operator to make it reasonable.
90 90
91 interpreter& interp = tw.get_interpreter (); 91 interpreter& interp = tw.get_interpreter ();
92 92
93 type_info& ti = interp.get_type_info (); 93 type_info& ti = interp.get_type_info ();
94 94
95 return binary_op (ti, m_etype, a, b); 95 return binary_op (ti, m_etype, a, b);
96 } 96 }
97 } 97 }
98 } 98 }
99 99
100 return octave_value (); 100 return octave_value ();
101 } 101 }
102 102
103 tree_expression * 103 tree_expression *
104 tree_braindead_shortcircuit_binary_expression::dup (symbol_scope& scope) const 104 tree_braindead_shortcircuit_binary_expression::dup (symbol_scope& scope) const
105 { 105 {
106 tree_braindead_shortcircuit_binary_expression *new_be 106 tree_braindead_shortcircuit_binary_expression *new_be
107 = new tree_braindead_shortcircuit_binary_expression 107 = new tree_braindead_shortcircuit_binary_expression
108 (m_lhs ? m_lhs->dup (scope) : nullptr, 108 (m_lhs ? m_lhs->dup (scope) : nullptr,
109 m_rhs ? m_rhs->dup (scope) : nullptr, 109 m_rhs ? m_rhs->dup (scope) : nullptr,
110 line (), column (), op_type ()); 110 line (), column (), op_type ());
111 111
112 new_be->copy_base (*this); 112 new_be->copy_base (*this);
113 113
114 return new_be; 114 return new_be;
115 } 115 }
116 116
117 octave_value 117 octave_value
118 tree_braindead_shortcircuit_binary_expression::evaluate (tree_evaluator& tw, 118 tree_braindead_shortcircuit_binary_expression::evaluate (tree_evaluator& tw,
119 int) 119 int)
120 { 120 {
121 if (m_lhs) 121 if (m_lhs)
122 { 122 {
123 octave_value a = m_lhs->evaluate (tw); 123 octave_value a = m_lhs->evaluate (tw);
124 124
125 if (a.ndims () == 2 && a.rows () == 1 && a.columns () == 1) 125 if (a.ndims () == 2 && a.rows () == 1 && a.columns () == 1)
126 { 126 {
127 bool result = false; 127 bool result = false;
128 128
129 bool a_true = a.is_true (); 129 bool a_true = a.is_true ();
130 130
131 octave_value::binary_op oper_type = op_type (); 131 octave_value::binary_op oper_type = op_type ();
132 132
133 if (a_true) 133 if (a_true)
134 { 134 {
135 if (oper_type == octave_value::op_el_or) 135 if (oper_type == octave_value::op_el_or)
136 { 136 {
137 matlab_style_short_circuit_warning ("|"); 137 matlab_style_short_circuit_warning ("|");
138 return octave_value (true); 138 return octave_value (true);
139 } 139 }
140 } 140 }
141 else 141 else
142 { 142 {
143 if (oper_type == octave_value::op_el_and) 143 if (oper_type == octave_value::op_el_and)
144 { 144 {
145 matlab_style_short_circuit_warning ("&"); 145 matlab_style_short_circuit_warning ("&");
146 return octave_value (false); 146 return octave_value (false);
147 } 147 }
148 } 148 }
149 149
150 if (m_rhs) 150 if (m_rhs)
151 { 151 {
152 octave_value b = m_rhs->evaluate (tw); 152 octave_value b = m_rhs->evaluate (tw);
153 153
154 result = b.is_true (); 154 result = b.is_true ();
155 } 155 }
156 156
157 return octave_value (result); 157 return octave_value (result);
158 } 158 }
159 } 159 }
160 160
161 return octave_value (); 161 return octave_value ();
162 } 162 }
163 163
164 // Boolean expressions. 164 // Boolean expressions.
165 165
166 std::string 166 std::string
167 tree_boolean_expression::oper (void) const 167 tree_boolean_expression::oper (void) const
168 { 168 {
169 std::string retval = "<unknown>"; 169 std::string retval = "<unknown>";
170 170
171 switch (m_etype) 171 switch (m_etype)
172 { 172 {
173 case bool_and: 173 case bool_and:
174 retval = "&&"; 174 retval = "&&";
175 break; 175 break;
176 176
177 case bool_or: 177 case bool_or:
178 retval = "||"; 178 retval = "||";
179 break; 179 break;
180 180
181 default: 181 default:
182 break; 182 break;
183 } 183 }
184 184
185 return retval; 185 return retval;
186 } 186 }
187 187
188 tree_expression * 188 tree_expression *
189 tree_boolean_expression::dup (symbol_scope& scope) const 189 tree_boolean_expression::dup (symbol_scope& scope) const
190 { 190 {
191 tree_boolean_expression *new_be 191 tree_boolean_expression *new_be
192 = new tree_boolean_expression (m_lhs ? m_lhs->dup (scope) : nullptr, 192 = new tree_boolean_expression (m_lhs ? m_lhs->dup (scope) : nullptr,
193 m_rhs ? m_rhs->dup (scope) : nullptr, 193 m_rhs ? m_rhs->dup (scope) : nullptr,
194 line (), column (), m_etype); 194 line (), column (), m_etype);
195 195
196 new_be->copy_base (*this); 196 new_be->copy_base (*this);
197 197
198 return new_be; 198 return new_be;
199 } 199 }
200 200
201 octave_value 201 octave_value
202 tree_boolean_expression::evaluate (tree_evaluator& tw, int) 202 tree_boolean_expression::evaluate (tree_evaluator& tw, int)
203 { 203 {
204 octave_value val; 204 octave_value val;
205 205
206 bool result = false; 206 bool result = false;
207 207
208 // This evaluation is not caught by the profiler, since we can't find 208 // This evaluation is not caught by the profiler, since we can't find
209 // a reasonable place where to time. Note that we don't want to 209 // a reasonable place where to time. Note that we don't want to
210 // include evaluation of LHS or RHS into the timing, but this is 210 // include evaluation of LHS or RHS into the timing, but this is
211 // entangled together with short-circuit evaluation here. 211 // entangled together with short-circuit evaluation here.
212 212
213 if (m_lhs) 213 if (m_lhs)
214 { 214 {
215 octave_value a = m_lhs->evaluate (tw); 215 octave_value a = m_lhs->evaluate (tw);
216 216
217 bool a_true = a.is_true (); 217 bool a_true = a.is_true ();
218 218
219 if (a_true) 219 if (a_true)
220 { 220 {
221 if (m_etype == tree_boolean_expression::bool_or) 221 if (m_etype == tree_boolean_expression::bool_or)
222 return octave_value (true); 222 return octave_value (true);
223 } 223 }
224 else 224 else
225 { 225 {
226 if (m_etype == tree_boolean_expression::bool_and) 226 if (m_etype == tree_boolean_expression::bool_and)
227 return octave_value (false); 227 return octave_value (false);
228 } 228 }
229 229
230 if (m_rhs) 230 if (m_rhs)
231 { 231 {
232 octave_value b = m_rhs->evaluate (tw); 232 octave_value b = m_rhs->evaluate (tw);
233 233
234 result = b.is_true (); 234 result = b.is_true ();
235 } 235 }
236 236
237 val = octave_value (result); 237 val = octave_value (result);
238 } 238 }
239 239
240 return val; 240 return val;
241 } 241 }
242 242
243 OCTAVE_END_NAMESPACE(octave) 243 OCTAVE_END_NAMESPACE(octave)