octave: libinterp/parse-tree/pt-binop.cc annotate

annotate libinterp/parse-tree/pt-binop.cc @ 21170:1edaf1ee65eb

maint: Replace some uses of goto in libinterp. * ls-mat4.cc (read_mat_file_header): Replace "goto data_read_error" with "return -1". * ls-mat4.cc (read_mat_binary_data): Replace "goto data_read_error" with direct call to error. Move variable declarations to point of usage. * ls-mat5.cc (read_mat5_tag, write_mat5_tag): Replace "goto data_read_error" with "return 1". * ls-mat5.cc (save_mat5_binary_element): Replace "goto skip_to_next" with "return true". * ls-oct-binary.cc (read_binary_data): Replace "goto data_read_error" with direct call to error. * mex.cc (valid_key): Replace "goto done" with "return retval". * rand.cc (do_rand): Clarify comment. * pt-binop.cc (tree_binary_expression::rvalue1): Replace "goto done" with "return octave_value (xxx)" * pt-binop.cc (tree_boolean_expression::rvalue1): Replace "goto done" with "return octave_value (xxx)"

author	Rik <rik@octave.org>
date	Mon, 01 Feb 2016 21:16:19 -0800
parents	5e00ed38a58b
children	fcac5dbbf9ed

rev	line source
2980 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	1 /*
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	2
19697 4197fc428c7d maint: Update copyright notices for 2015. John W. Eaton <jwe@octave.org> parents: 19327 diff changeset	3 Copyright (C) 1996-2015 John W. Eaton
2980 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	4
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	5 This file is part of Octave.
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	6
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	7 Octave is free software; you can redistribute it and/or modify it
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	8 under the terms of the GNU General Public License as published by the
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 5861 diff changeset	9 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 5861 diff changeset	10 option) any later version.
2980 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	11
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	12 Octave is distributed in the hope that it will be useful, but WITHOUT
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	15 for more details.
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	16
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	17 You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 5861 diff changeset	18 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 5861 diff changeset	19 <http://www.gnu.org/licenses/>.
2980 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	20
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	21 */
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	22
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	23 #ifdef HAVE_CONFIG_H
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	24 #include <config.h>
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	25 #endif
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	26
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	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"
20940 48b2ad5ee801 maint: Rename oct-obj.[cc\|h] to ovl.[cc\|h] for clarity. Rik <rik@octave.org> parents: 20853 diff changeset	29 #include "ovl.h"
2980 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	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 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	32 #include "pt-binop.h"
3770 bf6116ca10eb [project @ 2001-02-02 02:21:40 by jwe] jwe parents: 3536 diff changeset	33 #include "pt-bp.h"
2980 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	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.
18127 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 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	40
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	41 // Binary expressions.
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	42
2980 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	43 octave_value_list
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	44 tree_binary_expression::rvalue (int nargout)
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	45 {
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	46 octave_value_list retval;
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	47
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	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",
21055 5e00ed38a58b maint: Replace if/error/else paradigm with just if/error. Rik <rik@octave.org> parents: 20940 diff changeset	50 oper ().c_str ());
5e00ed38a58b maint: Replace if/error/else paradigm with just if/error. Rik <rik@octave.org> parents: 20940 diff changeset	51
5e00ed38a58b maint: Replace if/error/else paradigm with just if/error. Rik <rik@octave.org> parents: 20940 diff changeset	52 retval = rvalue1 (nargout);
2980 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	53
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	54 return retval;
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	55 }
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	56
18127 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 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	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 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	69 {
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	70 octave_value retval;
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	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
20557 b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20163 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 {
20557 b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20163 diff changeset	81 bool result = false;
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20163 diff changeset	82
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20163 diff changeset	83 bool a_true = a.is_true ();
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20163 diff changeset	84
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20163 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 {
20557 b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20163 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 {
20557 b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20163 diff changeset	89 matlab_style_short_circuit_warning ("\|");
21170 1edaf1ee65eb maint: Replace some uses of goto in libinterp. Rik <rik@octave.org> parents: 21055 diff changeset	90 return octave_value (true);
11091 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 }
20557 b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20163 diff changeset	93 else
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20163 diff changeset	94 {
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20163 diff changeset	95 if (etype == octave_value::op_el_and)
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20163 diff changeset	96 {
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20163 diff changeset	97 matlab_style_short_circuit_warning ("&");
21170 1edaf1ee65eb maint: Replace some uses of goto in libinterp. Rik <rik@octave.org> parents: 21055 diff changeset	98 return octave_value (false);
20557 b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20163 diff changeset	99 }
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20163 diff changeset	100 }
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20163 diff changeset	101
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20163 diff changeset	102 if (op_rhs)
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20163 diff changeset	103 {
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20163 diff changeset	104 octave_value b = op_rhs->rvalue1 ();
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20163 diff changeset	105
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20163 diff changeset	106 result = b.is_true ();
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20163 diff changeset	107 }
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20163 diff changeset	108
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20163 diff changeset	109 return octave_value (result);
11091 5677f3f7b5fa Matlab compatible short-circuit behavior for & and \| operators John W. Eaton <jwe@octave.org> parents: 10315 diff changeset	110 }
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 }
5677f3f7b5fa Matlab compatible short-circuit behavior for & and \| operators John W. Eaton <jwe@octave.org> parents: 10315 diff changeset	113
2980 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	114 if (op_lhs)
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	115 {
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8011 diff changeset	116 octave_value a = op_lhs->rvalue1 ();
2980 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	117
20557 b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20163 diff changeset	118 if (a.is_defined () && op_rhs)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	119 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	120 octave_value b = op_rhs->rvalue1 ();
2980 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	121
20557 b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20163 diff changeset	122 if (b.is_defined ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	123 {
19327 91cd85a75705 Reduce profiling overhead using inlining and templates. Julien Bect <julien.bect@supelec.fr> parents: 18131 diff changeset	124 BEGIN_PROFILER_BLOCK (tree_binary_expression)
12920 5d18231eee00 Extend profiling support to operators. Daniel Kraft <d@domob.eu> parents: 12822 diff changeset	125
12921 7820a12baadd Style fixes on comments about profiling operators Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12920 diff changeset	126 // 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	127 // 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	128 // 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	129 // 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	130 // timing the operator to make it reasonable.
12920 5d18231eee00 Extend profiling support to operators. Daniel Kraft <d@domob.eu> parents: 12822 diff changeset	131
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	132 retval = ::do_binary_op (etype, a, b);
2980 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	133
12960 43d78e103984 Use macro to start profiler blocks. Daniel Kraft <d@domob.eu> parents: 12921 diff changeset	134 END_PROFILER_BLOCK
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	135 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	136 }
2980 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	137 }
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	138
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	139 return retval;
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	140 }
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	141
3536 e8fbc8c3d6d9 [project @ 2000-02-02 12:01:00 by jwe] jwe parents: 3534 diff changeset	142 std::string
2980 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	143 tree_binary_expression::oper (void) const
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	144 {
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	145 return octave_value::binary_op_as_string (etype);
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	146 }
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	147
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	148 tree_expression *
7767 71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7336 diff changeset	149 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	150 symbol_table::context_id context) const
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	151 {
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	152 tree_binary_expression *new_be
7767 71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7336 diff changeset	153 = 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	154 op_rhs ? op_rhs->dup (scope, context) : 0,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	155 line (), column (), etype);
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	156
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	157 new_be->copy_base (*this);
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	158
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	159 return new_be;
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	160 }
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	161
2980 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	162 void
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	163 tree_binary_expression::accept (tree_walker& tw)
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	164 {
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	165 tw.visit_binary_expression (*this);
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	166 }
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	167
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	168 // Boolean expressions.
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	169
2980 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	170 octave_value_list
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	171 tree_boolean_expression::rvalue (int nargout)
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	172 {
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	173 octave_value_list retval;
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	174
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	175 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	176 error ("binary operator '%s': invalid number of output arguments",
21055 5e00ed38a58b maint: Replace if/error/else paradigm with just if/error. Rik <rik@octave.org> parents: 20940 diff changeset	177 oper ().c_str ());
5e00ed38a58b maint: Replace if/error/else paradigm with just if/error. Rik <rik@octave.org> parents: 20940 diff changeset	178
5e00ed38a58b maint: Replace if/error/else paradigm with just if/error. Rik <rik@octave.org> parents: 20940 diff changeset	179 retval = rvalue1 (nargout);
2980 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	180
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	181 return retval;
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	182 }
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	183
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	184 octave_value
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8011 diff changeset	185 tree_boolean_expression::rvalue1 (int)
2980 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	186 {
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	187 octave_value retval;
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	188
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	189 bool result = false;
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	190
12921 7820a12baadd Style fixes on comments about profiling operators Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12920 diff changeset	191 // 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	192 // 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	193 // 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	194 // entangled together with short-circuit evaluation here.
12920 5d18231eee00 Extend profiling support to operators. Daniel Kraft <d@domob.eu> parents: 12822 diff changeset	195
2980 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	196 if (op_lhs)
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	197 {
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8011 diff changeset	198 octave_value a = op_lhs->rvalue1 ();
2980 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	199
20557 b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20163 diff changeset	200 bool a_true = a.is_true ();
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20163 diff changeset	201
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20163 diff changeset	202 if (a_true)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	203 {
20557 b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20163 diff changeset	204 if (etype == bool_or)
21170 1edaf1ee65eb maint: Replace some uses of goto in libinterp. Rik <rik@octave.org> parents: 21055 diff changeset	205 return octave_value (true);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	206 }
20557 b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20163 diff changeset	207 else
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20163 diff changeset	208 {
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20163 diff changeset	209 if (etype == bool_and)
21170 1edaf1ee65eb maint: Replace some uses of goto in libinterp. Rik <rik@octave.org> parents: 21055 diff changeset	210 return octave_value (false);
20557 b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20163 diff changeset	211 }
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20163 diff changeset	212
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20163 diff changeset	213 if (op_rhs)
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20163 diff changeset	214 {
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20163 diff changeset	215 octave_value b = op_rhs->rvalue1 ();
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20163 diff changeset	216
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20163 diff changeset	217 result = b.is_true ();
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20163 diff changeset	218 }
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20163 diff changeset	219
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20163 diff changeset	220 retval = octave_value (result);
2980 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	221 }
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	222
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	223 return retval;
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	224 }
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	225
3536 e8fbc8c3d6d9 [project @ 2000-02-02 12:01:00 by jwe] jwe parents: 3534 diff changeset	226 std::string
2980 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	227 tree_boolean_expression::oper (void) const
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	228 {
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 2982 diff changeset	229 std::string retval = "<unknown>";
2980 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	230
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	231 switch (etype)
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	232 {
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	233 case bool_and:
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	234 retval = "&&";
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	235 break;
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	236
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	237 case bool_or:
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	238 retval = "\|\|";
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	239 break;
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	240
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	241 default:
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	242 break;
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	243 }
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	244
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	245 return retval;
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	246 }
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	247
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	248 tree_expression *
7767 71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7336 diff changeset	249 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	250 symbol_table::context_id context) const
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	251 {
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	252 tree_boolean_expression *new_be
7767 71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7336 diff changeset	253 = 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	254 op_rhs ? op_rhs->dup (scope, context) : 0,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	255 line (), column (), etype);
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	256
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	257 new_be->copy_base (*this);
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	258
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	259 return new_be;
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	260 }
11091 5677f3f7b5fa Matlab compatible short-circuit behavior for & and \| operators John W. Eaton <jwe@octave.org> parents: 10315 diff changeset	261
5677f3f7b5fa Matlab compatible short-circuit behavior for & and \| operators John W. Eaton <jwe@octave.org> parents: 10315 diff changeset	262 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	263 "-- texinfo --\n\
20853 1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20557 diff changeset	264 @deftypefn {} {@var{val} =} do_braindead_shortcircuit_evaluation ()\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20557 diff changeset	265 @deftypefnx {} {@var{old_val} =} do_braindead_shortcircuit_evaluation (@var{new_val})\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20557 diff changeset	266 @deftypefnx {} {} 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	267 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	268 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	269 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	270 \n\
11572 7d6d8c1e471f Grammarcheck Texinfo for files in src directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	271 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	272 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	273 \n\
5677f3f7b5fa Matlab compatible short-circuit behavior for & and \| operators John W. Eaton <jwe@octave.org> parents: 10315 diff changeset	274 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	275 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	276 \n\
17281 bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted. Rik <rik@octave.org> parents: 15467 diff changeset	277 When called from inside a function with the @qcode{\"local\"} option, the\n\
20163 075a5e2e1ba5 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19697 diff changeset	278 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	279 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	280 @end deftypefn")
5677f3f7b5fa Matlab compatible short-circuit behavior for & and \| operators John W. Eaton <jwe@octave.org> parents: 10315 diff changeset	281 {
18127 d76f790b4eec enable do_braindead_shortcircuit_evaluation by default and deprecate John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	282 static bool warned = false;
d76f790b4eec enable do_braindead_shortcircuit_evaluation by default and deprecate John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	283 if (! warned)
d76f790b4eec enable do_braindead_shortcircuit_evaluation by default and deprecate John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	284 {
d76f790b4eec enable do_braindead_shortcircuit_evaluation by default and deprecate John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	285 warned = true;
d76f790b4eec enable do_braindead_shortcircuit_evaluation by default and deprecate John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	286 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	287 "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	288 }
d76f790b4eec enable do_braindead_shortcircuit_evaluation by default and deprecate John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	289
11091 5677f3f7b5fa Matlab compatible short-circuit behavior for & and \| operators John W. Eaton <jwe@octave.org> parents: 10315 diff changeset	290 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	291 }
18131 701e91ea0fe6 restore tests removed in changeset d76f790b4eec John W. Eaton <jwe@octave.org> parents: 18127 diff changeset	292
701e91ea0fe6 restore tests removed in changeset d76f790b4eec John W. Eaton <jwe@octave.org> parents: 18127 diff changeset	293 /*
701e91ea0fe6 restore tests removed in changeset d76f790b4eec John W. Eaton <jwe@octave.org> parents: 18127 diff changeset	294 %!test
701e91ea0fe6 restore tests removed in changeset d76f790b4eec John W. Eaton <jwe@octave.org> parents: 18127 diff changeset	295 %! x = 0;
701e91ea0fe6 restore tests removed in changeset d76f790b4eec John W. Eaton <jwe@octave.org> parents: 18127 diff changeset	296 %! do_braindead_shortcircuit_evaluation (0);
701e91ea0fe6 restore tests removed in changeset d76f790b4eec John W. Eaton <jwe@octave.org> parents: 18127 diff changeset	297 %! if (1 \| (x = 1))
701e91ea0fe6 restore tests removed in changeset d76f790b4eec John W. Eaton <jwe@octave.org> parents: 18127 diff changeset	298 %! endif
701e91ea0fe6 restore tests removed in changeset d76f790b4eec John W. Eaton <jwe@octave.org> parents: 18127 diff changeset	299 %! assert (x, 1);
701e91ea0fe6 restore tests removed in changeset d76f790b4eec John W. Eaton <jwe@octave.org> parents: 18127 diff changeset	300 %! do_braindead_shortcircuit_evaluation (1);
701e91ea0fe6 restore tests removed in changeset d76f790b4eec John W. Eaton <jwe@octave.org> parents: 18127 diff changeset	301 %! if (1 \| (x = 0))
701e91ea0fe6 restore tests removed in changeset d76f790b4eec John W. Eaton <jwe@octave.org> parents: 18127 diff changeset	302 %! endif
701e91ea0fe6 restore tests removed in changeset d76f790b4eec John W. Eaton <jwe@octave.org> parents: 18127 diff changeset	303 %! assert (x, 1);
701e91ea0fe6 restore tests removed in changeset d76f790b4eec John W. Eaton <jwe@octave.org> parents: 18127 diff changeset	304 */

Mercurial > octave

annotate libinterp/parse-tree/pt-binop.cc @ 21170:1edaf1ee65eb