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

annotate libinterp/parse-tree/pt-binop.cc @ 24270:bc3819b7cca1

don't use symbol_table:: nesting for symbol_record, symbol_scope, or fcn_info Change all uses of symbol_table::symbol_record to symbol_record. Change all uses of symbol_table::scope to symbol_scope. Change all uses of symbol_table::fcn_info to fcn_info.

author	John W. Eaton <jwe@octave.org>
date	Thu, 16 Nov 2017 21:43:47 -0500
parents	980f39c3ab90
children	194eb4bd202b

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
23219 3ac9f9ecfae5 maint: Update copyright dates. John W. Eaton <jwe@octave.org> parents: 23083 diff changeset	3 Copyright (C) 1996-2017 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
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22613 diff changeset	8 under the terms of the GNU General Public License as published by
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22613 diff changeset	9 the Free Software Foundation; either version 3 of the License, or
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22613 diff changeset	10 (at your option) any later version.
2980 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	11
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22613 diff changeset	12 Octave is distributed in the hope that it will be useful, but
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22613 diff changeset	13 WITHOUT ANY WARRANTY; without even the implied warranty of
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22613 diff changeset	14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22613 diff changeset	15 GNU General Public License for more details.
2980 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
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	23 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21200 diff changeset	24 # include "config.h"
2980 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"
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	28 #include "ov.h"
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	29 #include "pt-binop.h"
11091 5677f3f7b5fa Matlab compatible short-circuit behavior for & and \| operators John W. Eaton <jwe@octave.org> parents: 10315 diff changeset	30 #include "variables.h"
5677f3f7b5fa Matlab compatible short-circuit behavior for & and \| operators John W. Eaton <jwe@octave.org> parents: 10315 diff changeset	31
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	32 namespace octave
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	33 {
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	34 // Binary expressions.
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	35
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	36 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	37 tree_binary_expression::matlab_style_short_circuit_warning (const char *op)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	38 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	39 warning_with_id ("Octave:possible-matlab-short-circuit-operator",
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	40 "Matlab-style short-circuit operation performed for operator %s",
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	41 op);
2980 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	42
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	43 braindead_shortcircuit_warning_issued = true;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	44 }
20557 b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20163 diff changeset	45
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	46 std::string
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	47 tree_binary_expression::oper (void) const
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	48 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	49 return octave_value::binary_op_as_string (etype);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	50 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	51
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	52 tree_expression *
24270 bc3819b7cca1 don't use symbol_table:: nesting for symbol_record, symbol_scope, or fcn_info John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	53 tree_binary_expression::dup (symbol_scope& scope) const
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	54 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	55 tree_binary_expression *new_be
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23656 diff changeset	56 = new tree_binary_expression (op_lhs ? op_lhs->dup (scope) : nullptr,
980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23656 diff changeset	57 op_rhs ? op_rhs->dup (scope) : nullptr,
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	58 line (), column (), etype);
2980 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	59
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	60 new_be->copy_base (*this);
2980 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	61
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	62 return new_be;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	63 }
2980 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	64
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	65 // Boolean expressions.
2980 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	66
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	67 std::string
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	68 tree_boolean_expression::oper (void) const
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	69 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	70 std::string retval = "<unknown>";
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	71
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	72 switch (etype)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	73 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	74 case bool_and:
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	75 retval = "&&";
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	76 break;
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	77
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	78 case bool_or:
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	79 retval = "\|\|";
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	80 break;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	81
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	82 default:
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	83 break;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	84 }
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	85
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	86 return retval;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	87 }
18127 d76f790b4eec enable do_braindead_shortcircuit_evaluation by default and deprecate John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	88
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	89 tree_expression *
24270 bc3819b7cca1 don't use symbol_table:: nesting for symbol_record, symbol_scope, or fcn_info John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	90 tree_boolean_expression::dup (symbol_scope& scope) const
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	91 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	92 tree_boolean_expression *new_be
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23656 diff changeset	93 = new tree_boolean_expression (op_lhs ? op_lhs->dup (scope) : nullptr,
980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23656 diff changeset	94 op_rhs ? op_rhs->dup (scope) : nullptr,
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	95 line (), column (), etype);
18131 701e91ea0fe6 restore tests removed in changeset d76f790b4eec John W. Eaton <jwe@octave.org> parents: 18127 diff changeset	96
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	97 new_be->copy_base (*this);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	98
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	99 return new_be;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	100 }
2980 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	101 }

Mercurial > octave

annotate libinterp/parse-tree/pt-binop.cc @ 24270:bc3819b7cca1