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

annotate libinterp/parse-tree/pt-eval.cc @ 23563:614d71cdf614

maint: Strip trailing whitespace from files.

author	John W. Eaton <jwe@octave.org>
date	Thu, 08 Jun 2017 18:21:07 -0400
parents	14723784b9f2
children	00e518162fda

rev	line source
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	1 /*
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2
23219 3ac9f9ecfae5 maint: Update copyright dates. John W. Eaton <jwe@octave.org> parents: 23083 diff changeset	3 Copyright (C) 2009-2017 John W. Eaton
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	4
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	5 This file is part of Octave.
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	6
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> 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: 22703 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: 22703 diff changeset	9 the Free Software Foundation; either version 3 of the License, or
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22703 diff changeset	10 (at your option) any later version.
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	11
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22703 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: 22703 diff changeset	13 WITHOUT ANY WARRANTY; without even the implied warranty of
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22703 diff changeset	14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22703 diff changeset	15 GNU General Public License for more details.
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	16
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	17 You should have received a copy of the GNU General Public License
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	18 along with Octave; see the file COPYING. If not, see
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	19 <http://www.gnu.org/licenses/>.
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	20
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	21 */
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	22
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21542 diff changeset	23 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21211 diff changeset	24 # include "config.h"
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	25 #endif
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	26
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	27 #include <cctype>
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	28
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	29 #include <iostream>
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	30
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	31 #include <fstream>
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	32 #include <typeinfo>
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	33
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	34 #include "bp-table.h"
22091 0f6fc2ec3b1a move call_stack class to a separate file John W. Eaton <jwe@octave.org> parents: 21966 diff changeset	35 #include "call-stack.h"
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	36 #include "defun.h"
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	37 #include "error.h"
21100 e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme. Rik <rik@octave.org> parents: 20962 diff changeset	38 #include "errwarn.h"
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	39 #include "input.h"
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: 22091 diff changeset	40 #include "interpreter.h"
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	41 #include "ov-fcn-handle.h"
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	42 #include "ov-usr-fcn.h"
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	43 #include "ov-re-sparse.h"
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	44 #include "ov-cx-sparse.h"
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	45 #include "profiler.h"
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	46 #include "pt-all.h"
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	47 #include "pt-eval.h"
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	48 #include "pt-tm-const.h"
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	49 #include "symtab.h"
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	50 #include "unwind-prot.h"
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	51 #include "variables.h"
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	52
14899 f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: 14429 diff changeset	53 //FIXME: This should be part of tree_evaluator
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: 14429 diff changeset	54 #include "pt-jit.h"
15310 b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15244 diff changeset	55
10578 cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10315 diff changeset	56 // Maximum nesting level for functions, scripts, or sourced files called
cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10315 diff changeset	57 // recursively.
cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10315 diff changeset	58 int Vmax_recursion_depth = 256;
cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10315 diff changeset	59
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	60 // If TRUE, turn off printing of results in functions (as if a
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	61 // semicolon has been appended to each statement).
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	62 static bool Vsilent_functions = false;
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	63
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	64 namespace octave
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	65 {
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	66 int tree_evaluator::dbstep_flag = 0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	67
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	68 size_t tree_evaluator::current_frame = 0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	69
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	70 bool tree_evaluator::debug_mode = false;
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	71
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	72 bool tree_evaluator::quiet_breakpoint_flag = false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	73
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	74 tree_evaluator::stmt_list_type tree_evaluator::statement_context
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	75 = tree_evaluator::other;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	76
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	77 bool tree_evaluator::in_loop_command = false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	78
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	79 // Normal evaluator.
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	80
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	81 void
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	82 tree_evaluator::reset (void)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	83 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	84 m_value_stack.clear ();
23481 73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	85 m_lvalue_list_stack.clear ();
73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	86 m_nargout_stack.clear ();
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	87 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	88
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	89 void
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	90 tree_evaluator::visit_anon_fcn_handle (tree_anon_fcn_handle& expr)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	91 {
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	92 // FIXME: should CMD_LIST be limited to a single expression?
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	93 // I think that is what Matlab does.
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	94
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	95 tree_parameter_list *param_list = expr.parameter_list ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	96 tree_parameter_list *ret_list = expr.return_list ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	97 tree_statement_list *cmd_list = expr.body ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	98 symbol_table::scope_id this_scope = expr.scope ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	99
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	100 symbol_table::scope_id new_scope = symbol_table::dup_scope (this_scope);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	101
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	102 if (new_scope > 0)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	103 symbol_table::inherit (new_scope, symbol_table::current_scope (),
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	104 symbol_table::current_context ());
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	105
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	106 octave_user_function *uf
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	107 = new octave_user_function (new_scope,
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	108 param_list ? param_list->dup (new_scope, 0) : 0,
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	109 ret_list ? ret_list->dup (new_scope, 0) : 0,
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	110 cmd_list ? cmd_list->dup (new_scope, 0) : 0);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	111
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	112 octave_function *curr_fcn = m_call_stack.current ();
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	113
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	114 if (curr_fcn)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	115 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	116 // FIXME: maybe it would be better to just stash curr_fcn
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	117 // instead of individual bits of info about it?
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	118
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	119 uf->stash_parent_fcn_name (curr_fcn->name ());
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	120 uf->stash_dir_name (curr_fcn->dir_name ());
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	121
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	122 symbol_table::scope_id parent_scope = curr_fcn->parent_fcn_scope ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	123
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	124 if (parent_scope < 0)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	125 parent_scope = curr_fcn->scope ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	126
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	127 uf->stash_parent_fcn_scope (parent_scope);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	128
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	129 if (curr_fcn->is_class_method () \|\| curr_fcn->is_class_constructor ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	130 uf->stash_dispatch_class (curr_fcn->dispatch_class ());
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	131 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	132
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	133 uf->mark_as_anonymous_function ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	134 uf->stash_fcn_file_name (expr.file_name ());
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	135 uf->stash_fcn_location (expr.line (), expr.column ());
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	136
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	137 octave_value ov_fcn (uf);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	138
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	139 octave_value fh (octave_fcn_binder::maybe_binder (ov_fcn, this));
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	140
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	141 m_value_stack.push (ovl (fh));
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	142 }
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	143
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	144 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	145 tree_evaluator::visit_argument_list (tree_argument_list&)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	146 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	147 panic_impossible ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	148 }
8845 5a6db6bd1a02 eigs.cc (Feigs): fix handling of sigma arg John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	149
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	150 void
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	151 tree_evaluator::visit_binary_expression (tree_binary_expression& expr)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	152 {
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	153 octave_value val;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	154
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	155 tree_expression *op_lhs = expr.lhs ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	156 tree_expression *op_rhs = expr.rhs ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	157 octave_value::binary_op etype = expr.op_type ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	158
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	159 if (expr.is_eligible_for_braindead_shortcircuit ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	160 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	161 if (op_lhs)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	162 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	163 octave_value a = evaluate (op_lhs);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	164
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	165 if (a.ndims () == 2 && a.rows () == 1 && a.columns () == 1)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	166 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	167 bool result = false;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	168
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	169 bool a_true = a.is_true ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	170
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	171 if (a_true)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	172 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	173 if (etype == octave_value::op_el_or)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	174 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	175 expr.matlab_style_short_circuit_warning ("\|");
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	176 m_value_stack.push (ovl (octave_value (true)));
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	177 return;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	178 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	179 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	180 else
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	181 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	182 if (etype == octave_value::op_el_and)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	183 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	184 expr.matlab_style_short_circuit_warning ("&");
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	185 m_value_stack.push (ovl (octave_value (false)));
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	186 return;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	187 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	188 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	189
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	190 if (op_rhs)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	191 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	192 octave_value b = evaluate (op_rhs);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	193
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	194 result = b.is_true ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	195 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	196
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	197 m_value_stack.push (ovl (octave_value (result)));
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	198 return;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	199 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	200 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	201 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	202
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	203 if (op_lhs)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	204 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	205 octave_value a = evaluate (op_lhs);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	206
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	207 if (a.is_defined () && op_rhs)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	208 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	209 octave_value b = evaluate (op_rhs);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	210
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	211 if (b.is_defined ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	212 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	213 profile_data_accumulator::enter<tree_binary_expression>
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	214 block (profiler, expr);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	215
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	216 // Note: The profiler does not catch the braindead
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	217 // short-circuit evaluation code above, but that should be
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	218 // ok. The evaluation of operands and the operator itself
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	219 // is entangled and it's not clear where to start/stop
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	220 // timing the operator to make it reasonable.
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	221
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	222 val = ::do_binary_op (etype, a, b);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	223 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	224 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	225 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	226
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	227 m_value_stack.push (ovl (val));
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	228 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	229
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	230 void
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	231 tree_evaluator::visit_boolean_expression (tree_boolean_expression& expr)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	232 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	233 octave_value val;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	234
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	235 bool result = false;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	236
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	237 // This evaluation is not caught by the profiler, since we can't find
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	238 // a reasonable place where to time. Note that we don't want to
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	239 // include evaluation of LHS or RHS into the timing, but this is
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	240 // entangled together with short-circuit evaluation here.
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	241
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	242 tree_expression *op_lhs = expr.lhs ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	243
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	244 if (op_lhs)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	245 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	246 octave_value a = evaluate (op_lhs);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	247
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	248 bool a_true = a.is_true ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	249
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	250 tree_boolean_expression::type etype = expr.op_type ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	251
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	252 if (a_true)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	253 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	254 if (etype == tree_boolean_expression::bool_or)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	255 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	256 m_value_stack.push (ovl (octave_value (true)));
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	257 return;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	258 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	259 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	260 else
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	261 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	262 if (etype == tree_boolean_expression::bool_and)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	263 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	264 m_value_stack.push (ovl (octave_value (false)));
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	265 return;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	266 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	267 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	268
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	269 tree_expression *op_rhs = expr.rhs ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	270
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	271 if (op_rhs)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	272 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	273 octave_value b = evaluate (op_rhs);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	274
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	275 result = b.is_true ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	276 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	277
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	278 val = octave_value (result);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	279 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	280
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	281 m_value_stack.push (ovl (val));
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	282 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	283
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	284 void
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	285 tree_evaluator::visit_compound_binary_expression (tree_compound_binary_expression& expr)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	286 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	287 octave_value val;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	288
23523 d2748870db4e undo part of previous change John W. Eaton <jwe@octave.org> parents: 23522 diff changeset	289 tree_expression *op_lhs = expr.clhs ();
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	290
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	291 if (op_lhs)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	292 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	293 octave_value a = evaluate (op_lhs);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	294
23523 d2748870db4e undo part of previous change John W. Eaton <jwe@octave.org> parents: 23522 diff changeset	295 tree_expression *op_rhs = expr.crhs ();
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	296
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	297 if (a.is_defined () && op_rhs)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	298 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	299 octave_value b = evaluate (op_rhs);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	300
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	301 if (b.is_defined ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	302 {
23522 d2e300f7700c fix compound binary op error introduced in c452180ab672 John W. Eaton <jwe@octave.org> parents: 23521 diff changeset	303 octave_value::compound_binary_op etype = expr.cop_type ();
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	304
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	305 val = ::do_binary_op (etype, a, b);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	306 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	307 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	308 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	309
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	310 m_value_stack.push (ovl (val));
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	311 }
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	312
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	313 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	314 tree_evaluator::visit_break_command (tree_break_command& cmd)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	315 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	316 if (debug_mode)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	317 do_breakpoint (cmd.is_breakpoint (true));
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	318
22785 9c6661004167 error if break statement is in script file separate from loop (bug #39168) John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	319 if (in_loop_command)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	320 tree_break_command::breaking = 1;
22785 9c6661004167 error if break statement is in script file separate from loop (bug #39168) John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	321 else
9c6661004167 error if break statement is in script file separate from loop (bug #39168) John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	322 error ("break must appear in a loop in the same file as loop command");
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	323 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	324
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	325 void
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	326 tree_evaluator::visit_colon_expression (tree_colon_expression& expr)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	327 {
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	328 octave_value val;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	329
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	330 tree_expression *op_base = expr.base ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	331 tree_expression *op_limit = expr.limit ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	332
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	333 if (! op_base \|\| ! op_limit)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	334 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	335 m_value_stack.push (ovl (octave_value (val)));
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	336 return;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	337 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	338
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	339 octave_value ov_base = evaluate (op_base);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	340
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	341 octave_value ov_limit = evaluate (op_limit);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	342
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	343 tree_expression *op_increment = expr.increment ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	344
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	345 if (ov_base.is_object () \|\| ov_limit.is_object ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	346 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	347 octave_value_list tmp1;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	348
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	349 if (op_increment)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	350 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	351 octave_value ov_increment = evaluate (op_increment);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	352
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	353 tmp1(2) = ov_limit;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	354 tmp1(1) = ov_increment;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	355 tmp1(0) = ov_base;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	356 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	357 else
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	358 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	359 tmp1(1) = ov_limit;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	360 tmp1(0) = ov_base;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	361 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	362
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	363 octave_value fcn = symbol_table::find_function ("colon", tmp1);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	364
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	365 if (! fcn.is_defined ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	366 error ("can not find overloaded colon function");
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	367
23501 1ee4b394a687 use feval instead of do_multi_index_op John W. Eaton <jwe@octave.org> parents: 23482 diff changeset	368 octave_value_list tmp2 = octave::feval (fcn, tmp1, 1);
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	369
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	370 val = tmp2 (0);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	371 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	372 else
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	373 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	374 octave_value ov_increment = 1.0;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	375
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	376 if (op_increment)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	377 ov_increment = evaluate (op_increment);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	378
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	379 val = do_colon_op (ov_base, ov_increment, ov_limit,
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	380 expr.is_for_cmd_expr ());
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	381 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	382
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	383 m_value_stack.push (ovl (val));
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	384 }
10188 97ae300aa73a improve implementation of break, continue, and return commands John W. Eaton <jwe@octave.org> parents: 10186 diff changeset	385
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	386 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	387 tree_evaluator::visit_continue_command (tree_continue_command& cmd)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	388 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	389 if (debug_mode)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	390 do_breakpoint (cmd.is_breakpoint (true));
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	391
22703 d43094e91ba7 Ignore continue statement when used outside of a loop (bug #48665) Mike Miller <mtmiller@octave.org> parents: 22407 diff changeset	392 if (in_loop_command)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	393 tree_continue_command::continuing = 1;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	394 }
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	395
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	396 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	397 tree_evaluator::reset_debug_state (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	398 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	399 debug_mode = bp_table::have_breakpoints () \|\| Vdebugging;
10186 095a1e670e68 make dbstep work with keyboard function John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	400
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	401 dbstep_flag = 0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	402 }
10186 095a1e670e68 make dbstep work with keyboard function John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	403
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	404 bool
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	405 tree_evaluator::statement_printing_enabled (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	406 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	407 return ! (Vsilent_functions && (statement_context == function
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	408 \|\| statement_context == script));
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	409 }
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	410
23481 73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	411 Matrix
73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	412 tree_evaluator::ignored_fcn_outputs (void) const
73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	413 {
73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	414 Matrix retval;
73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	415
73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	416 if (m_lvalue_list_stack.empty ())
73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	417 return retval;
73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	418
73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	419 const std::list<octave_lvalue> *lvalue_list = m_lvalue_list_stack.top ();
73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	420
23482 c9937e865768 make isargout work again for nested function calls John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	421 if (! lvalue_list)
c9937e865768 make isargout work again for nested function calls John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	422 return retval;
c9937e865768 make isargout work again for nested function calls John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	423
23481 73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	424 octave_idx_type nbh = 0;
73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	425
73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	426 for (const auto& lval : *lvalue_list)
73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	427 nbh += lval.is_black_hole ();
73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	428
73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	429 if (nbh > 0)
73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	430 {
73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	431 retval.resize (1, nbh);
73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	432
73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	433 octave_idx_type k = 0;
73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	434 octave_idx_type l = 0;
73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	435
73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	436 for (const auto& lval : *lvalue_list)
73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	437 {
73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	438 if (lval.is_black_hole ())
73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	439 retval(l++) = k+1;
73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	440
73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	441 k += lval.numel ();
73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	442 }
73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	443 }
73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	444
73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	445 return retval;
73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	446 }
73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	447
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	448 octave_value
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	449 tree_evaluator::evaluate (tree_decl_elt *elt)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	450 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	451 // Do not allow functions to return null values.
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	452
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	453 tree_identifier *id = elt->ident ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	454
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	455 return id ? evaluate (id).storable_value () : octave_value ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	456 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	457
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	458 void
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	459 tree_evaluator::initialize_undefined_parameter_list_elements
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	460 (tree_parameter_list *param_list, const std::string& warnfor,
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	461 int nargout, const octave_value& val)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	462 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	463 bool warned = false;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	464
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	465 int count = 0;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	466
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	467 octave_value tmp = symbol_table::varval (".ignored.");
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23449 diff changeset	468 const Matrix ignored = (tmp.is_defined () ? tmp.matrix_value () : Matrix ());
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	469
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	470 octave_idx_type k = 0;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	471
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23435 diff changeset	472 for (tree_decl_elt elt : param_list)
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	473 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	474 if (++count > nargout)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	475 break;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	476
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	477 if (! elt->is_variable ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	478 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	479 if (! warned)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	480 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	481 warned = true;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	482
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	483 while (k < ignored.numel ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	484 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	485 octave_idx_type l = ignored (k);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	486 if (l == count)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	487 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	488 warned = false;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	489 break;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	490 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	491 else if (l > count)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	492 break;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	493 else
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	494 k++;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	495 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	496
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	497 if (warned)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	498 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	499 warning_with_id
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	500 ("Octave:undefined-return-values",
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	501 "%s: some elements in list of return values are undefined",
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	502 warnfor.c_str ());
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	503 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	504 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	505
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	506 octave_lvalue lval = elt->lvalue (this);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	507
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	508 lval.assign (octave_value::op_asn_eq, val);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	509 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	510 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	511 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	512
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	513 void
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	514 tree_evaluator::define_parameter_list_from_arg_vector
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	515 (tree_parameter_list *param_list, const octave_value_list& args)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	516 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	517 int i = -1;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	518
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23435 diff changeset	519 for (tree_decl_elt elt : param_list)
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	520 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	521 i++;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	522
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	523 octave_lvalue ref = elt->lvalue (this);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	524
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	525 if (i < args.length ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	526 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	527 if (args(i).is_defined () && args(i).is_magic_colon ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	528 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	529 if (! eval_decl_elt (elt))
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	530 error ("no default value for argument %d", i+1);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	531 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	532 else
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	533 ref.define (args(i));
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	534 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	535 else
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	536 eval_decl_elt (elt);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	537 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	538 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	539
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	540 void
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	541 tree_evaluator::undefine_parameter_list (tree_parameter_list *param_list)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	542 {
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23435 diff changeset	543 for (tree_decl_elt elt : param_list)
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	544 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	545 octave_lvalue ref = elt->lvalue (this);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	546
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	547 ref.assign (octave_value::op_asn_eq, octave_value ());
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	548 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	549 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	550
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	551 octave_value_list
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	552 tree_evaluator::convert_parameter_list_to_const_vector
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	553 (tree_parameter_list *param_list, int nargout, const Cell& varargout)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	554 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	555 octave_idx_type vlen = varargout.numel ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	556 int len = param_list->length ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	557
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	558 // Special case. Will do a shallow copy.
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	559 if (len == 0)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	560 return varargout;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	561 else if (nargout <= len)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	562 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	563 octave_value_list retval (nargout);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	564
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	565 int i = 0;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	566
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23435 diff changeset	567 for (tree_decl_elt elt : param_list)
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	568 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	569 if (elt->is_defined ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	570 retval(i++) = evaluate (elt);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	571 else
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	572 break;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	573 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	574
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	575 return retval;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	576 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	577 else
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	578 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	579 octave_value_list retval (len + vlen);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	580
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	581 int i = 0;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	582
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23435 diff changeset	583 for (tree_decl_elt elt : param_list)
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	584 retval(i++) = evaluate (elt);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	585
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	586 for (octave_idx_type j = 0; j < vlen; j++)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	587 retval(i++) = varargout(j);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	588
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	589 return retval;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	590 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	591 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	592
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	593 bool
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	594 tree_evaluator::eval_decl_elt (tree_decl_elt *elt)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	595 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	596 bool retval = false;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	597
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	598 tree_identifier *id = elt->ident ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	599 tree_expression *expr = elt->expression ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	600
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	601 if (id && expr)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	602 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	603 octave_lvalue ult = id->lvalue (this);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	604
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	605 octave_value init_val = evaluate (expr);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	606
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	607 ult.assign (octave_value::op_asn_eq, init_val);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	608
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	609 retval = true;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	610 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	611
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	612 return retval;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	613 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	614
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	615 bool
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	616 tree_evaluator::switch_case_label_matches (tree_switch_case *expr,
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	617 const octave_value& val)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	618 {
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	619 tree_expression *label = expr->case_label ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	620
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	621 octave_value label_value = evaluate (label);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	622
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	623 if (label_value.is_defined ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	624 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	625 if (label_value.is_cell ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	626 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	627 Cell cell (label_value.cell_value ());
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	628
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	629 for (octave_idx_type i = 0; i < cell.rows (); i++)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	630 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	631 for (octave_idx_type j = 0; j < cell.columns (); j++)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	632 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	633 bool match = val.is_equal (cell(i,j));
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	634
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	635 if (match)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	636 return true;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	637 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	638 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	639 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	640 else
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	641 return val.is_equal (label_value);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	642 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	643
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	644 return false;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	645 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	646
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	647 void
23469 2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23458 diff changeset	648 tree_evaluator::visit_decl_command (tree_decl_command& cmd)
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23458 diff changeset	649 {
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23458 diff changeset	650 if (debug_mode)
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23458 diff changeset	651 do_breakpoint (cmd.is_breakpoint (true));
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23458 diff changeset	652
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23458 diff changeset	653 tree_decl_init_list *init_list = cmd.initializer_list ();
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23458 diff changeset	654
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23458 diff changeset	655 if (init_list)
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23458 diff changeset	656 init_list->accept (*this);
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23458 diff changeset	657 }
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23458 diff changeset	658
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23458 diff changeset	659 void
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23458 diff changeset	660 tree_evaluator::visit_decl_init_list (tree_decl_init_list& lst)
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23458 diff changeset	661 {
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23458 diff changeset	662 for (tree_decl_elt *elt : lst)
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23458 diff changeset	663 elt->accept (*this);
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23458 diff changeset	664 }
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23458 diff changeset	665
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23458 diff changeset	666 void
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23458 diff changeset	667 tree_evaluator::visit_decl_elt (tree_decl_elt& elt)
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	668 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	669 octave::tree_identifier *id = elt.ident ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	670
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	671 if (id)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	672 {
23469 2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23458 diff changeset	673 if (elt.is_global ())
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23458 diff changeset	674 id->mark_global ();
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23458 diff changeset	675 else if (elt.is_persistent ())
23470 a41fdb801db6 use mark_global and mark_persistent consistently John W. Eaton <jwe@octave.org> parents: 23469 diff changeset	676 id->mark_persistent ();
23469 2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23458 diff changeset	677 else
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23458 diff changeset	678 error ("declaration list element not global or persistent");
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	679
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	680 octave_lvalue ult = id->lvalue (this);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	681
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	682 if (ult.is_undefined ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	683 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	684 octave::tree_expression *expr = elt.expression ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	685
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	686 octave_value init_val;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	687
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	688 if (expr)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	689 init_val = evaluate (expr);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	690 else
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	691 init_val = Matrix ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	692
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	693 ult.assign (octave_value::op_asn_eq, init_val);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	694 }
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	695 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	696 }
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	697 }
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	698
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	699 // Decide if it's time to quit a for or while loop.
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	700 static inline bool
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	701 quit_loop_now (void)
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	702 {
10142 829e69ec3110 make OCTAVE_QUIT a function Jaroslav Hajek <highegg@gmail.com> parents: 10066 diff changeset	703 octave_quit ();
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	704
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	705 // Maybe handle 'continue N' someday...
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	706
23369 2a6246cc4a68 * pt-eval.cc (quit_loop_now): Avoid deprecated variable warnings. John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	707 if (octave::tree_continue_command::continuing)
2a6246cc4a68 * pt-eval.cc (quit_loop_now): Avoid deprecated variable warnings. John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	708 octave::tree_continue_command::continuing--;
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	709
23369 2a6246cc4a68 * pt-eval.cc (quit_loop_now): Avoid deprecated variable warnings. John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	710 bool quit = (octave::tree_return_command::returning
2a6246cc4a68 * pt-eval.cc (quit_loop_now): Avoid deprecated variable warnings. John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	711 \|\| octave::tree_break_command::breaking
2a6246cc4a68 * pt-eval.cc (quit_loop_now): Avoid deprecated variable warnings. John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	712 \|\| octave::tree_continue_command::continuing);
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	713
23398 d4ef04757ead eliminate some compiler warnings John W. Eaton <jwe@octave.org> parents: 23369 diff changeset	714 if (octave::tree_break_command::breaking)
23369 2a6246cc4a68 * pt-eval.cc (quit_loop_now): Avoid deprecated variable warnings. John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	715 octave::tree_break_command::breaking--;
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	716
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	717 return quit;
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	718 }
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	719
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	720 namespace octave
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	721 {
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	722 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	723 tree_evaluator::visit_simple_for_command (tree_simple_for_command& cmd)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	724 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	725 if (debug_mode)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	726 do_breakpoint (cmd.is_breakpoint (true));
13245 027a2186cd90 parfor keyword and infrastructure, but handle parfor as normal for loop for now John W. Eaton <jwe@octave.org> parents: 13226 diff changeset	727
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	728 // FIXME: need to handle PARFOR loops here using cmd.in_parallel ()
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	729 // and cmd.maxproc_expr ();
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	730
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	731 octave::unwind_protect frame;
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	732
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	733 frame.protect_var (in_loop_command);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	734
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	735 in_loop_command = true;
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	736
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	737 tree_expression *expr = cmd.control_expr ();
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	738
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	739 octave_value rhs = evaluate (expr);
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	740
21211 2cf8bc5c7017 use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	741 #if defined (HAVE_LLVM)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	742 if (tree_jit::execute (cmd, rhs))
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	743 return;
15027 741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	744 #endif
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	745
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	746 if (rhs.is_undefined ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	747 return;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	748
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	749 tree_expression *lhs = cmd.left_hand_side ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	750
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	751 octave_lvalue ult = lhs->lvalue (this);
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	752
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	753 tree_statement_list *loop_body = cmd.body ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	754
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	755 if (rhs.is_range ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	756 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	757 Range rng = rhs.range_value ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	758
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	759 octave_idx_type steps = rng.numel ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	760
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	761 for (octave_idx_type i = 0; i < steps; i++)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	762 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	763 octave_value val (rng.elem (i));
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	764
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	765 ult.assign (octave_value::op_asn_eq, val);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	766
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	767 if (loop_body)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	768 loop_body->accept (*this);
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	769
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	770 if (quit_loop_now ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	771 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	772 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	773 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	774 else if (rhs.is_scalar_type ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	775 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	776 ult.assign (octave_value::op_asn_eq, rhs);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	777
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	778 if (loop_body)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	779 loop_body->accept (*this);
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	780
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	781 // Maybe decrement break and continue states.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	782 quit_loop_now ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	783 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	784 else if (rhs.is_matrix_type () \|\| rhs.is_cell () \|\| rhs.is_string ()
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	785 \|\| rhs.is_map ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	786 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	787 // A matrix or cell is reshaped to 2 dimensions and iterated by
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	788 // columns.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	789
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	790 dim_vector dv = rhs.dims ().redim (2);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	791
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	792 octave_idx_type nrows = dv(0);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	793 octave_idx_type steps = dv(1);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	794
23514 fd7a16594614 Don't iterate over empty for loop expressions (bug #50893). Rik <rik@octave.org> parents: 23503 diff changeset	795 octave_value arg = rhs;
fd7a16594614 Don't iterate over empty for loop expressions (bug #50893). Rik <rik@octave.org> parents: 23503 diff changeset	796 if (rhs.ndims () > 2)
fd7a16594614 Don't iterate over empty for loop expressions (bug #50893). Rik <rik@octave.org> parents: 23503 diff changeset	797 arg = arg.reshape (dv);
fd7a16594614 Don't iterate over empty for loop expressions (bug #50893). Rik <rik@octave.org> parents: 23503 diff changeset	798
fd7a16594614 Don't iterate over empty for loop expressions (bug #50893). Rik <rik@octave.org> parents: 23503 diff changeset	799 if (nrows > 0 && steps > 0)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	800 {
23514 fd7a16594614 Don't iterate over empty for loop expressions (bug #50893). Rik <rik@octave.org> parents: 23503 diff changeset	801 octave_value_list idx;
fd7a16594614 Don't iterate over empty for loop expressions (bug #50893). Rik <rik@octave.org> parents: 23503 diff changeset	802 octave_idx_type iidx;
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	803
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	804 // for row vectors, use single index to speed things up.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	805 if (nrows == 1)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	806 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	807 idx.resize (1);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	808 iidx = 0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	809 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	810 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	811 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	812 idx.resize (2);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	813 idx(0) = octave_value::magic_colon_t;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	814 iidx = 1;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	815 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	816
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	817 for (octave_idx_type i = 1; i <= steps; i++)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	818 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	819 // do_index_op expects one-based indices.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	820 idx(iidx) = i;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	821 octave_value val = arg.do_index_op (idx);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	822
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	823 ult.assign (octave_value::op_asn_eq, val);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	824
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	825 if (loop_body)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	826 loop_body->accept (*this);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	827
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	828 if (quit_loop_now ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	829 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	830 }
23563 614d71cdf614 maint: Strip trailing whitespace from files. John W. Eaton <jwe@octave.org> parents: 23553 diff changeset	831 }
23514 fd7a16594614 Don't iterate over empty for loop expressions (bug #50893). Rik <rik@octave.org> parents: 23503 diff changeset	832 else
fd7a16594614 Don't iterate over empty for loop expressions (bug #50893). Rik <rik@octave.org> parents: 23503 diff changeset	833 {
fd7a16594614 Don't iterate over empty for loop expressions (bug #50893). Rik <rik@octave.org> parents: 23503 diff changeset	834 // Handle empty cases, while still assigning to loop var.
fd7a16594614 Don't iterate over empty for loop expressions (bug #50893). Rik <rik@octave.org> parents: 23503 diff changeset	835 ult.assign (octave_value::op_asn_eq, arg);
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	836 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	837 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	838 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	839 error ("invalid type in for loop expression near line %d, column %d",
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	840 cmd.line (), cmd.column ());
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	841 }
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	842
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	843 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	844 tree_evaluator::visit_complex_for_command (tree_complex_for_command& cmd)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	845 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	846 if (debug_mode)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	847 do_breakpoint (cmd.is_breakpoint (true));
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	848
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	849 octave::unwind_protect frame;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	850
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	851 frame.protect_var (in_loop_command);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	852
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	853 in_loop_command = true;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	854
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	855 tree_expression *expr = cmd.control_expr ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	856
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	857 octave_value rhs = evaluate (expr);
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	858
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	859 if (rhs.is_undefined ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	860 return;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	861
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	862 if (! rhs.is_map ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	863 error ("in statement 'for [X, Y] = VAL', VAL must be a structure");
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	864
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	865 // Cycle through structure elements. First element of id_list
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	866 // is set to value and the second is set to the name of the
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	867 // structure element.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	868
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	869 tree_argument_list *lhs = cmd.left_hand_side ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	870
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	871 tree_argument_list::iterator p = lhs->begin ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	872
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	873 tree_expression elt = p++;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	874
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	875 octave_lvalue val_ref = elt->lvalue (this);
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	876
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	877 elt = *p;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	878
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	879 octave_lvalue key_ref = elt->lvalue (this);
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	880
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	881 const octave_map tmp_val = rhs.map_value ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	882
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	883 tree_statement_list *loop_body = cmd.body ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	884
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	885 string_vector keys = tmp_val.keys ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	886
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	887 octave_idx_type nel = keys.numel ();
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	888
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	889 for (octave_idx_type i = 0; i < nel; i++)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	890 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	891 std::string key = keys[i];
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	892
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	893 const Cell val_lst = tmp_val.contents (key);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	894
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	895 octave_idx_type n = val_lst.numel ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	896
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	897 octave_value val = (n == 1) ? val_lst(0) : octave_value (val_lst);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	898
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	899 val_ref.assign (octave_value::op_asn_eq, val);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	900 key_ref.assign (octave_value::op_asn_eq, key);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	901
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	902 if (loop_body)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	903 loop_body->accept (*this);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	904
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	905 if (quit_loop_now ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	906 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	907 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	908 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	909
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	910 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	911 tree_evaluator::visit_octave_user_script (octave_user_script&)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	912 {
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	913 // ??
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	914 panic_impossible ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	915 }
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	916
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	917 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	918 tree_evaluator::visit_octave_user_function (octave_user_function&)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	919 {
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	920 // ??
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	921 panic_impossible ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	922 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	923
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	924 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	925 tree_evaluator::visit_octave_user_function_header (octave_user_function&)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	926 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	927 panic_impossible ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	928 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	929
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	930 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	931 tree_evaluator::visit_octave_user_function_trailer (octave_user_function&)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	932 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	933 panic_impossible ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	934 }
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	935
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	936 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	937 tree_evaluator::visit_function_def (tree_function_def& cmd)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	938 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	939 octave_value fcn = cmd.function ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	940
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	941 octave_function *f = fcn.function_value ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	942
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	943 if (f)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	944 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	945 std::string nm = f->name ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	946
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	947 symbol_table::install_cmdline_function (nm, fcn);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	948
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	949 // Make sure that any variable with the same name as the new
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	950 // function is cleared.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	951
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	952 symbol_table::assign (nm);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	953 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	954 }
13225 359153d26cc1 eliminate DO_SIMPLE_FOR_LOOP_ONCE macro John W. Eaton <jwe@octave.org> parents: 12833 diff changeset	955
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	956 void
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	957 tree_evaluator::visit_identifier (tree_identifier& expr)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	958 {
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	959 octave_value_list retval;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	960
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	961 symbol_table::symbol_reference sym = expr.symbol ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	962
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	963 octave_value val = sym->find ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	964
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	965 if (val.is_defined ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	966 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	967 // GAGME -- this would be cleaner if we required
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	968 // parens to indicate function calls.
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	969 //
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	970 // If this identifier refers to a function, we need to know
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	971 // whether it is indexed so that we can do the same thing
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	972 // for 'f' and 'f()'. If the index is present and the function
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	973 // object declares it can handle it, return the function object
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	974 // and let tree_index_expression::rvalue handle indexing.
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	975 // Otherwise, arrange to call the function here, so that we don't
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	976 // return the function definition as a value.
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	977
23457 21baad6b35c4 maint: Use C++11 nullptr rather than 0 or NULL when possible. Rik <rik@octave.org> parents: 23450 diff changeset	978 octave_function *fcn = nullptr;
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	979
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	980 if (val.is_function ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	981 fcn = val.function_value (true);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	982
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	983 int nargout = m_nargout_stack.top ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	984
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	985 if (fcn && ! (expr.is_postfix_indexed ()
23503 6a2fed2d39ac improve some function names John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	986 && fcn->accepts_postfix_index (expr.postfix_index ())))
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	987 {
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23523 diff changeset	988 retval = fcn->call (*this, nargout);
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	989 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	990 else
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	991 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	992 if (expr.print_result () && nargout == 0
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	993 && octave::tree_evaluator::statement_printing_enabled ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	994 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	995 octave_value_list args = ovl (val);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	996 args.stash_name_tags (string_vector (expr.name ()));
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	997 octave::feval ("display", args);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	998 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	999
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1000 retval = val;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1001 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1002 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1003 else if (sym->is_added_static ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1004 expr.static_workspace_error ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1005 else
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1006 expr.eval_undefined_error ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1007
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1008 m_value_stack.push (retval);
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1009 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1010
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1011 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1012 tree_evaluator::visit_if_clause (tree_if_clause&)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1013 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1014 panic_impossible ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1015 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1016
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1017 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1018 tree_evaluator::visit_if_command (tree_if_command& cmd)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1019 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1020 tree_if_command_list *lst = cmd.cmd_list ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1021
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1022 if (lst)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1023 lst->accept (*this);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1024 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1025
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1026 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1027 tree_evaluator::visit_if_command_list (tree_if_command_list& lst)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1028 {
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23435 diff changeset	1029 for (tree_if_clause *tic : lst)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1030 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1031 tree_expression *expr = tic->condition ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1032
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1033 if (statement_context == function \|\| statement_context == script)
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	1034 m_call_stack.set_location (tic->line (), tic->column ());
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1035
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1036 if (debug_mode && ! tic->is_else_clause ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1037 do_breakpoint (tic->is_breakpoint (true));
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1038
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1039 if (tic->is_else_clause () \|\| is_logically_true (expr, "if"))
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1040 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1041 tree_statement_list *stmt_lst = tic->commands ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1042
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1043 if (stmt_lst)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1044 stmt_lst->accept (*this);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1045
20784 52f6921dde09 * pt-eval.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20715 diff changeset	1046 break;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1047 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1048 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1049 }
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1050 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1051
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1052 // Final step of processing an indexing error. Add the name of the
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1053 // variable being indexed, if any, then issue an error. (Will this also
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1054 // be needed by pt-lvalue, which calls subsref?)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1055
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1056 static void
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1057 final_index_error (octave::index_exception& e,
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1058 const octave::tree_expression *expr)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1059 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1060 std::string extra_message;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1061
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1062 if (expr->is_identifier ()
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1063 && dynamic_cast<const octave::tree_identifier *> (expr)->is_variable ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1064 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1065 std::string var = expr->name ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1066
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1067 e.set_var (var);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1068
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1069 octave_value fcn = symbol_table::find_function (var);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1070
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1071 if (fcn.is_function ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1072 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1073 octave_function *fp = fcn.function_value ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1074
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1075 if (fp && fp->name () == var)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1076 extra_message = " (note: variable '" + var + "' shadows function)";
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1077 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1078 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1079
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1080 std::string msg = e.message () + extra_message;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1081
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1082 error_with_id (e.err_id (), msg.c_str ());
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1083 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1084
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1085 namespace octave
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1086 {
23521 551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1087 // Unlike Matlab, which does not allow the result of a function call
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1088 // or array indexing expression to be further indexed, Octave attempts
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1089 // to handle arbitrary index expressions. For example, Octave allows
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1090 // expressions like
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1091 //
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1092 // svd (rand (10))(1:5)
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1093 //
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1094 // Although octave_value objects may contain function objects, no
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1095 // indexing operation or function call is supposed to return them
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1096 // directly. Instead, the language is supposed to only allow function
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1097 // objects to be stored as function handles (named or anonymous) or as
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1098 // inline functions. The only place a function object should appear
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1099 // directly is if the symbol stored in a tree_identifier object
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1100 // resolves to a function. This means that the only place we need to
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1101 // look for functions is in the first element of the index
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1102 // expression.
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1103 //
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1104 // Steps:
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1105 //
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1106 // * Obtain the initial value from the expression component of the
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1107 // tree_index_expression object. If it is a tree_identifier object
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1108 // indexed by '(args)' and the identifier is not a variable, then
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1109 // peform a function call. Use the (optional) arguments to perform
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1110 // the function lookup so we choose the correct function or class
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1111 // method to call. Otherwise, evaluate the first expression
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1112 // without any additional arguments.
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1113 //
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1114 // * Iterate over the remaining elements of the index expression and
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1115 // call the octave_value::subsref method. If indexing a class or
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1116 // classdef object, build up a list of indices for a call to the
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1117 // subsref method for the object. Otherwise, use the result of
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1118 // each temporary evaluation for the next index element.
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1119 //
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1120 // * If not indexing a class or classdef object and any partial
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1121 // expression evaluation produces a class or classdef object, then
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1122 // build up a complete argument list from that point on for a final
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1123 // subsref call for that object.
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1124 //
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1125 // Multiple partial evaluations may be required. For example,
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1126 // given a class or classdef object X, then for the expression
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1127 //
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1128 // x.a{end}(2:end).b
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1129 //
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1130 // we must evaluate x.a to obtain the size for the first {end}
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1131 // expression, then we must evaluate x.a{end} to obtain the size
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1132 // for the second (2:end) expression. Finally, the complete
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1133 // expression may be evaluated.
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1134 //
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1135 // If X is a cell array in the above expression, and none of the
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1136 // intermediate evaluations produces a class or classdef object,
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1137 // then the evaluation is performed as the following series of
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1138 // steps
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1139 //
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1140 // tmp = x.a
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1141 // tmp = tmp{end}
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1142 // tmp = tmp(2:end)
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1143 // result = tmp.b
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1144 //
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1145 // If any of the partial evaluations produces a class or classdef
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1146 // object, then the subsref method for that object is called as
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1147 // described above. For example, suppose x.a produces a classdef
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1148 // object. Then the evaluation is performed as the following
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1149 // series of steps
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1150 //
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1151 // base_expr = tmp = x.a
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1152 // tmp = base_expr{end}
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1153 // base_expr{end}(2:end).b
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1154 //
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1155 // In the last two steps, the partial value computed in the
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1156 // previous step is used to determine the value of END.
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1157
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1158 void
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1159 tree_evaluator::visit_index_expression (tree_index_expression& idx_expr)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1160 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1161 octave_value_list retval;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1162
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1163 int nargout = m_nargout_stack.top ();
23458 0f4ed33886de maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	1164
23521 551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1165 std::string type = idx_expr.type_tags ();
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1166 std::list<tree_argument_list *> args = idx_expr.arg_lists ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1167 std::list<string_vector> arg_nm = idx_expr.arg_names ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1168 std::list<tree_expression *> dyn_field = idx_expr.dyn_fields ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1169
23521 551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1170 assert (! args.empty ());
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1171
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1172 std::list<tree_argument_list *>::iterator p_args = args.begin ();
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1173 std::list<string_vector>::iterator p_arg_nm = arg_nm.begin ();
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1174 std::list<tree_expression *>::iterator p_dyn_field = dyn_field.begin ();
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1175
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1176 int n = args.size ();
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1177 int beg = 0;
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1178
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1179 octave_value base_expr_val;
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1180
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1181 tree_expression *expr = idx_expr.expression ();
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1182
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1183 if (expr->is_identifier () && type[beg] == '(')
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1184 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1185 tree_identifier id = dynamic_cast<tree_identifier > (expr);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1186
23521 551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1187 if (! id->is_variable ())
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1188 {
23521 551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1189 octave_value_list first_args;
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1190
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1191 tree_argument_list al = p_args;
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1192
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1193 if (al && al->length () > 0)
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1194 {
23521 551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1195 // Function calls inside an argument list can't have
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1196 // ignored output arguments.
23482 c9937e865768 make isargout work again for nested function calls John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	1197
c9937e865768 make isargout work again for nested function calls John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	1198 unwind_protect frame;
c9937e865768 make isargout work again for nested function calls John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	1199
c9937e865768 make isargout work again for nested function calls John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	1200 m_lvalue_list_stack.push (0);
c9937e865768 make isargout work again for nested function calls John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	1201
c9937e865768 make isargout work again for nested function calls John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	1202 frame.add_method (m_lvalue_list_stack,
c9937e865768 make isargout work again for nested function calls John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	1203 &value_stack<const std::list<octave_lvalue>*>::pop);
c9937e865768 make isargout work again for nested function calls John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	1204
23521 551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1205 string_vector anm = *p_arg_nm;
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1206 first_args = al->convert_to_const_vector (this);
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1207 first_args.stash_name_tags (anm);
23521 551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1208 }
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1209
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1210 octave_function *fcn = nullptr;
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1211
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1212 octave_value val = id->do_lookup (first_args);
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1213
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1214 if (val.is_function ())
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1215 fcn = val.function_value (true);
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1216
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1217 if (fcn)
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1218 {
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1219 try
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1220 {
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23523 diff changeset	1221 retval = fcn->call (*this, nargout, first_args);
23521 551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1222 }
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1223 catch (octave::index_exception& e)
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1224 {
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1225 final_index_error (e, expr);
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1226 }
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1227
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1228 beg++;
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1229 p_args++;
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1230 p_arg_nm++;
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1231 p_dyn_field++;
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1232
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1233 if (n > beg)
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1234 {
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1235 // More indices to follow. Silently ignore
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1236 // extra output values.
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1237
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1238 if (retval.length () == 0)
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1239 error ("indexing undefined value");
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1240 else
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1241 base_expr_val = retval(0);
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1242 }
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1243 else
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1244 {
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1245 // No more indices, so we are done.
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1246
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1247 m_value_stack.push (retval);
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1248 return;
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1249 }
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1250 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1251 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1252 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1253
23521 551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1254 if (base_expr_val.is_undefined ())
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1255 base_expr_val = evaluate (expr);
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1256
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1257 bool indexing_object = base_expr_val.is_object ();
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1258
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1259 std::list<octave_value_list> idx;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1260
23521 551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1261 octave_value partial_expr_val = base_expr_val;
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1262
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1263 for (int i = beg; i < n; i++)
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1264 {
23521 551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1265 if (i > beg)
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1266 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1267 tree_argument_list al = p_args;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1268
23521 551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1269 if (! indexing_object \|\| (al && al->has_magic_end ()))
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1270 {
23521 551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1271 // Evaluate what we have so far to find the value to
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1272 // pass to the END function.
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1273
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1274 try
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1275 {
23521 551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1276 // Silently ignore extra output values.
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1277
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1278 octave_value_list tmp_list
23521 551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1279 = base_expr_val.subsref (type.substr (beg, i-beg), idx, nargout);
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1280
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1281 partial_expr_val = tmp_list.length () ? tmp_list(0) : octave_value ();
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1282
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1283 if (! indexing_object)
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1284 {
23521 551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1285 base_expr_val = partial_expr_val;
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1286
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1287 if (partial_expr_val.is_cs_list ())
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1288 err_indexed_cs_list ();
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1289
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1290 retval = partial_expr_val;
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1291
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1292 beg = i;
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1293 idx.clear ();
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1294
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1295 if (partial_expr_val.is_object ())
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1296 {
23521 551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1297 // Found an object, so now we'll build up
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1298 // complete index list for one big subsref
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1299 // call from this point on.
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1300
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1301 indexing_object = true;
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1302 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1303 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1304 }
23521 551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1305 catch (octave::index_exception& e)
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1306 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1307 final_index_error (e, expr);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1308 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1309 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1310 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1311
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1312 switch (type[i])
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1313 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1314 case '(':
23521 551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1315 idx.push_back (make_value_list (p_args, p_arg_nm, &partial_expr_val));
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1316 break;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1317
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1318 case '{':
23521 551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1319 idx.push_back (make_value_list (p_args, p_arg_nm, &partial_expr_val));
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1320 break;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1321
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1322 case '.':
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1323 idx.push_back (octave_value
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1324 (idx_expr.get_struct_index (this, p_arg_nm, p_dyn_field)));
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1325 break;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1326
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1327 default:
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1328 panic_impossible ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1329 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1330
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1331 p_args++;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1332 p_arg_nm++;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1333 p_dyn_field++;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1334 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1335
23521 551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1336 if (! idx.empty ())
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1337 {
23521 551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1338 try
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1339 {
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1340 retval = base_expr_val.subsref (type.substr (beg, n-beg), idx, nargout);
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1341 }
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1342 catch (octave::index_exception& e) // range problems, bad index type, etc.
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1343 {
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1344 final_index_error (e, expr);
551fa3879615 improve compatibility and simplify evaluation of index expressions John W. Eaton <jwe@octave.org> parents: 23514 diff changeset	1345 }
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1346 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1347
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1348 m_value_stack.push (retval);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1349 }
23458 0f4ed33886de maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	1350
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1351 void
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1352 tree_evaluator::visit_matrix (tree_matrix& expr)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1353 {
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1354 octave_value retval = Matrix ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1355
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1356 bool all_strings_p = false;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1357 bool all_sq_strings_p = false;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1358 bool all_dq_strings_p = false;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1359 bool all_empty_p = false;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1360 bool all_real_p = false;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1361 bool any_sparse_p = false;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1362 bool any_class_p = false;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1363 bool frc_str_conv = false;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1364
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1365 tm_const tmp (expr, this);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1366
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1367 if (tmp && ! tmp.empty ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1368 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1369 dim_vector dv = tmp.dims ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1370 all_strings_p = tmp.all_strings_p ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1371 all_sq_strings_p = tmp.all_sq_strings_p ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1372 all_dq_strings_p = tmp.all_dq_strings_p ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1373 all_empty_p = tmp.all_empty_p ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1374 all_real_p = tmp.all_real_p ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1375 any_sparse_p = tmp.any_sparse_p ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1376 any_class_p = tmp.any_class_p ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1377 frc_str_conv = tmp.some_strings_p ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1378
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1379 // Try to speed up the common cases.
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1380
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1381 std::string result_type = tmp.class_name ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1382
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1383 if (any_class_p)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1384 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1385 retval = do_class_concat (tmp);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1386 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1387 else if (result_type == "double")
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1388 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1389 if (any_sparse_p)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1390 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1391 if (all_real_p)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1392 retval = do_single_type_concat<SparseMatrix> (dv, tmp);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1393 else
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1394 retval = do_single_type_concat<SparseComplexMatrix> (dv, tmp);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1395 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1396 else
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1397 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1398 if (all_real_p)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1399 retval = do_single_type_concat<NDArray> (dv, tmp);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1400 else
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1401 retval = do_single_type_concat<ComplexNDArray> (dv, tmp);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1402 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1403 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1404 else if (result_type == "single")
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1405 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1406 if (all_real_p)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1407 retval = do_single_type_concat<FloatNDArray> (dv, tmp);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1408 else
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1409 retval = do_single_type_concat<FloatComplexNDArray> (dv, tmp);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1410 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1411 else if (result_type == "char")
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1412 {
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23449 diff changeset	1413 char type = (all_dq_strings_p ? '"' : '\'');
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1414
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1415 if (! all_strings_p)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1416 warn_implicit_conversion ("Octave:num-to-str",
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1417 "numeric", result_type);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1418 else
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1419 maybe_warn_string_concat (all_dq_strings_p, all_sq_strings_p);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1420
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1421 charNDArray result (dv, Vstring_fill_char);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1422
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1423 single_type_concat<charNDArray> (result, tmp);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1424
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1425 retval = octave_value (result, type);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1426 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1427 else if (result_type == "logical")
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1428 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1429 if (any_sparse_p)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1430 retval = do_single_type_concat<SparseBoolMatrix> (dv, tmp);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1431 else
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1432 retval = do_single_type_concat<boolNDArray> (dv, tmp);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1433 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1434 else if (result_type == "int8")
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1435 retval = do_single_type_concat<int8NDArray> (dv, tmp);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1436 else if (result_type == "int16")
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1437 retval = do_single_type_concat<int16NDArray> (dv, tmp);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1438 else if (result_type == "int32")
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1439 retval = do_single_type_concat<int32NDArray> (dv, tmp);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1440 else if (result_type == "int64")
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1441 retval = do_single_type_concat<int64NDArray> (dv, tmp);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1442 else if (result_type == "uint8")
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1443 retval = do_single_type_concat<uint8NDArray> (dv, tmp);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1444 else if (result_type == "uint16")
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1445 retval = do_single_type_concat<uint16NDArray> (dv, tmp);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1446 else if (result_type == "uint32")
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1447 retval = do_single_type_concat<uint32NDArray> (dv, tmp);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1448 else if (result_type == "uint64")
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1449 retval = do_single_type_concat<uint64NDArray> (dv, tmp);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1450 else if (result_type == "cell")
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1451 retval = do_single_type_concat<Cell> (dv, tmp);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1452 else if (result_type == "struct")
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1453 retval = do_single_type_concat<octave_map> (dv, tmp);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1454 else
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1455 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1456 // The line below might seem crazy, since we take a copy of
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1457 // the first argument, resize it to be empty and then resize
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1458 // it to be full. This is done since it means that there is
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1459 // no recopying of data, as would happen if we used a single
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1460 // resize. It should be noted that resize operation is also
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1461 // significantly slower than the do_cat_op function, so it
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1462 // makes sense to have an empty matrix and copy all data.
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1463 //
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1464 // We might also start with a empty octave_value using
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1465 //
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1466 // ctmp = octave_value_typeinfo::lookup_type
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1467 // (tmp.begin() -> begin() -> type_name());
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1468 //
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1469 // and then directly resize. However, for some types there
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1470 // might be some additional setup needed, and so this should
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1471 // be avoided.
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1472
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1473 octave_value ctmp;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1474
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1475 // Find the first non-empty object
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1476
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1477 if (any_sparse_p)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1478 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1479 // Start with sparse matrix to avoid issues memory issues
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1480 // with things like [ones(1,4),sprandn(1e8,4,1e-4)]
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1481 if (all_real_p)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1482 ctmp = octave_sparse_matrix ().resize (dv);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1483 else
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1484 ctmp = octave_sparse_complex_matrix ().resize (dv);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1485 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1486 else
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1487 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1488 for (tm_row_const& row : tmp)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1489 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1490 octave_quit ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1491
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1492 for (auto& elt : row)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1493 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1494 octave_quit ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1495
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1496 ctmp = elt;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1497
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1498 if (! ctmp.all_zero_dims ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1499 goto found_non_empty;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1500 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1501 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1502
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1503 ctmp = (*(tmp.begin () -> begin ()));
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1504
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1505 found_non_empty:
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1506
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1507 if (! all_empty_p)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1508 ctmp = ctmp.resize (dim_vector (0,0)).resize (dv);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1509 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1510
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1511 // Now, extract the values from the individual elements and
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1512 // insert them in the result matrix.
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1513
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1514 int dv_len = dv.ndims ();
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23449 diff changeset	1515 octave_idx_type ntmp = (dv_len > 1 ? dv_len : 2);
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1516 Array<octave_idx_type> ra_idx (dim_vector (ntmp, 1), 0);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1517
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1518 for (tm_row_const& row : tmp)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1519 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1520 octave_quit ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1521
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1522 for (auto& elt : row)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1523 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1524 octave_quit ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1525
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1526 if (elt.is_empty ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1527 continue;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1528
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1529 ctmp = do_cat_op (ctmp, elt, ra_idx);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1530
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1531 ra_idx (1) += elt.columns ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1532 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1533
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1534 ra_idx (0) += row.rows ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1535 ra_idx (1) = 0;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1536 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1537
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1538 retval = ctmp;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1539
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1540 if (frc_str_conv && ! retval.is_string ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1541 retval = retval.convert_to_str ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1542 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1543 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1544
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1545 m_value_stack.push (retval);
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1546 }
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	1547
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1548 void
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1549 tree_evaluator::visit_cell (tree_cell& expr)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1550 {
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1551 octave_value retval;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1552
23482 c9937e865768 make isargout work again for nested function calls John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	1553 // Function calls inside an argument list can't have ignored
c9937e865768 make isargout work again for nested function calls John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	1554 // output arguments.
c9937e865768 make isargout work again for nested function calls John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	1555
c9937e865768 make isargout work again for nested function calls John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	1556 unwind_protect frame;
c9937e865768 make isargout work again for nested function calls John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	1557
c9937e865768 make isargout work again for nested function calls John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	1558 m_lvalue_list_stack.push (0);
c9937e865768 make isargout work again for nested function calls John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	1559
c9937e865768 make isargout work again for nested function calls John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	1560 frame.add_method (m_lvalue_list_stack,
c9937e865768 make isargout work again for nested function calls John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	1561 &value_stack<const std::list<octave_lvalue>*>::pop);
c9937e865768 make isargout work again for nested function calls John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	1562
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1563 octave_idx_type nr = expr.length ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1564 octave_idx_type nc = -1;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1565
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1566 Cell val;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1567
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1568 octave_idx_type i = 0;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1569
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23435 diff changeset	1570 for (tree_argument_list *elt : expr)
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1571 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1572 octave_value_list row = elt->convert_to_const_vector (this);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1573
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1574 if (nr == 1)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1575 // Optimize the single row case.
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1576 val = row.cell_value ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1577 else if (nc < 0)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1578 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1579 nc = row.length ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1580
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1581 val = Cell (nr, nc);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1582 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1583 else
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1584 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1585 octave_idx_type this_nc = row.length ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1586
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1587 if (this_nc != nc)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1588 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1589 if (this_nc == 0)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1590 continue; // blank line
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1591 else
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1592 error ("number of columns must match");
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1593 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1594 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1595
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1596 for (octave_idx_type j = 0; j < nc; j++)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1597 val(i,j) = row(j);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1598
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1599 i++;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1600 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1601
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1602 if (i < nr)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1603 val.resize (dim_vector (i, nc)); // there were blank rows
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1604
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1605 retval = val;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1606
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1607 m_value_stack.push (retval);
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1608 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1609
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1610 void
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1611 tree_evaluator::visit_multi_assignment (tree_multi_assignment& expr)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1612 {
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1613 octave_value_list val;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1614
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1615 tree_expression *rhs = expr.right_hand_side ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1616
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1617 if (rhs)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1618 {
23481 73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	1619 unwind_protect frame;
73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	1620
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1621 tree_argument_list *lhs = expr.left_hand_side ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1622
23481 73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	1623 std::list<octave_lvalue> lvalue_list = make_lvalue_list (lhs);
73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	1624
73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	1625 m_lvalue_list_stack.push (&lvalue_list);
73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	1626
73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	1627 frame.add_method (m_lvalue_list_stack,
73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	1628 &value_stack<const std::list<octave_lvalue>*>::pop);
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1629
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1630 octave_idx_type n_out = 0;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1631
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1632 for (const auto& lval : lvalue_list)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1633 n_out += lval.numel ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1634
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1635 // The following trick is used to keep rhs_val constant.
23481 73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	1636 const octave_value_list rhs_val1 = evaluate_n (rhs, n_out);
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1637 const octave_value_list rhs_val = (rhs_val1.length () == 1
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1638 && rhs_val1(0).is_cs_list ()
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1639 ? rhs_val1(0).list_value ()
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1640 : rhs_val1);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1641
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1642 octave_idx_type k = 0;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1643
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1644 octave_idx_type n = rhs_val.length ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1645
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1646 // To avoid copying per elements and possible optimizations, we
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1647 // postpone joining the final values.
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1648 std::list<octave_value_list> retval_list;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1649
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1650 tree_argument_list::iterator q = lhs->begin ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1651
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1652 for (octave_lvalue ult : lvalue_list)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1653 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1654 tree_expression lhs_elt = q++;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1655
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1656 octave_idx_type nel = ult.numel ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1657
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1658 if (nel != 1)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1659 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1660 // Huge kluge so that wrapper scripts with lines like
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1661 //
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1662 // [varargout{1:nargout}] = fcn (args);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1663 //
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1664 // Will work the same as calling fcn directly when nargout
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1665 // is 0 and fcn produces more than one output even when
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1666 // nargout is 0. This only works if varargout has not yet
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1667 // been defined. See also bug #43813.
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1668
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1669 if (lvalue_list.size () == 1 && nel == 0 && n > 0
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1670 && ! ult.is_black_hole () && ult.is_undefined ()
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1671 && ult.index_type () == "{" && ult.index_is_empty ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1672 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1673 // Convert undefined lvalue with empty index to a cell
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1674 // array with a single value and indexed by 1 to
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1675 // handle a single output.
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1676
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1677 nel = 1;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1678
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1679 ult.define (Cell (1, 1));
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1680
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1681 ult.clear_index ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1682 std::list<octave_value_list> idx;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1683 idx.push_back (octave_value_list (octave_value (1)));
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1684 ult.set_index ("{", idx);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1685 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1686
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1687 if (k + nel > n)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1688 error ("some elements undefined in return list");
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1689
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1690 // This element of the return list expects a
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1691 // comma-separated list of values. Slicing avoids
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1692 // copying.
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1693
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1694 octave_value_list ovl = rhs_val.slice (k, nel);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1695
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1696 ult.assign (octave_value::op_asn_eq, octave_value (ovl));
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1697
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1698 retval_list.push_back (ovl);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1699
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1700 k += nel;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1701 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1702 else
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1703 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1704 if (k < n)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1705 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1706 ult.assign (octave_value::op_asn_eq, rhs_val(k));
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1707
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1708 if (ult.is_black_hole ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1709 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1710 k++;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1711 continue;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1712 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1713 else
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1714 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1715 retval_list.push_back (rhs_val(k));
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1716
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1717 k++;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1718 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1719 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1720 else
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1721 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1722 // This can happen for a function like
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1723 //
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1724 // function varargout = f ()
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1725 // varargout{1} = nargout;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1726 // endfunction
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1727 //
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1728 // called with
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1729 //
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1730 // [a, ~] = f ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1731 //
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1732 // Then the list of of RHS values will contain one
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1733 // element but we are iterating over the list of all
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1734 // RHS values. We shouldn't complain that a value we
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1735 // don't need is missing from the list.
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1736
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1737 if (! ult.is_black_hole ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1738 error ("element number %d undefined in return list", k+1);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1739
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1740 k++;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1741 continue;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1742 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1743 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1744
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1745 if (expr.print_result ()
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1746 && octave::tree_evaluator::statement_printing_enabled ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1747 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1748 // We clear any index here so that we can get
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1749 // the new value of the referenced object below,
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1750 // instead of the indexed value (which should be
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1751 // the same as the right hand side value).
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1752
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1753 ult.clear_index ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1754
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1755 octave_value lhs_val = ult.value ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1756
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1757 octave_value_list args = ovl (lhs_val);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1758 args.stash_name_tags (string_vector (lhs_elt->name ()));
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1759 octave::feval ("display", args);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1760 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1761 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1762
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1763 // Concatenate return values.
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1764 val = retval_list;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1765 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1766
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1767 m_value_stack.push (val);
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1768 }
13225 359153d26cc1 eliminate DO_SIMPLE_FOR_LOOP_ONCE macro John W. Eaton <jwe@octave.org> parents: 12833 diff changeset	1769
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1770 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1771 tree_evaluator::visit_no_op_command (tree_no_op_command& cmd)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1772 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1773 if (debug_mode && cmd.is_end_of_fcn_or_script ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1774 do_breakpoint (cmd.is_breakpoint (true), true);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1775 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1776
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1777 void
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1778 tree_evaluator::visit_constant (tree_constant& expr)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1779 {
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1780 int nargout = m_nargout_stack.top ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1781
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1782 if (nargout > 1)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1783 error ("invalid number of output arguments for constant expression");
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1784
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1785 m_value_stack.push (ovl (expr.value ()));
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1786 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1787
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1788 void
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1789 tree_evaluator::visit_fcn_handle (tree_fcn_handle& expr)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1790 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1791 std::string nm = expr.name ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1792
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1793 octave_value fh = make_fcn_handle (nm);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1794
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1795 m_value_stack.push (ovl (fh));
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1796 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1797
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1798 void
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1799 tree_evaluator::visit_funcall (tree_funcall& expr)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1800 {
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1801 octave_value_list retval;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1802
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1803 octave_value fcn = expr.function ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1804
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1805 octave_value_list args = expr.arguments ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1806
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1807 int nargout = m_nargout_stack.top ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1808
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1809 retval = octave::feval (fcn.function_value (), args, nargout);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1810
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1811 if (retval.length () == 1 && retval(0).is_function ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1812 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1813 // The return object is a function. We may need to re-index it
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1814 // using the same logic as for identifier. This is primarily
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1815 // used for superclass references in classdef.
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1816
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1817 octave_value val = retval(0);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1818 octave_function *f = val.function_value (true);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1819
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1820 if (f && ! (expr.is_postfix_indexed ()
23503 6a2fed2d39ac improve some function names John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	1821 && f->accepts_postfix_index (expr.postfix_index ())))
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1822 {
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23523 diff changeset	1823 retval = f->call (*this, nargout);
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1824 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1825 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1826
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1827 m_value_stack.push (retval);
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1828 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1829
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1830 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1831 tree_evaluator::visit_parameter_list (tree_parameter_list&)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1832 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1833 panic_impossible ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1834 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1835
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1836 void
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1837 tree_evaluator::visit_postfix_expression (tree_postfix_expression& expr)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1838 {
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1839 octave_value val;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1840
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1841 tree_expression *op = expr.operand ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1842
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1843 if (op)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1844 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1845 octave_value::unary_op etype = expr.op_type ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1846
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1847 if (etype == octave_value::op_incr \|\| etype == octave_value::op_decr)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1848 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1849 octave_lvalue ref = op->lvalue (this);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1850
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1851 val = ref.value ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1852
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1853 profile_data_accumulator::enter<tree_postfix_expression>
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1854 block (profiler, expr);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1855
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1856 ref.do_unary_op (etype);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1857 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1858 else
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1859 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1860 octave_value op_val = evaluate (op);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1861
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1862 if (op_val.is_defined ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1863 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1864 profile_data_accumulator::enter<tree_postfix_expression>
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1865 block (profiler, expr);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1866
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1867 val = ::do_unary_op (etype, op_val);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1868 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1869 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1870 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1871
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1872 m_value_stack.push (ovl (val));
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1873 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1874
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1875 void
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1876 tree_evaluator::visit_prefix_expression (tree_prefix_expression& expr)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1877 {
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1878 octave_value val;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1879
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1880 tree_expression *op = expr.operand ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1881
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1882 if (op)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1883 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1884 octave_value::unary_op etype = expr.op_type ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1885
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1886 if (etype == octave_value::op_incr \|\| etype == octave_value::op_decr)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1887 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1888 octave_lvalue op_ref = op->lvalue (this);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1889
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1890 profile_data_accumulator::enter<tree_prefix_expression>
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1891 block (profiler, expr);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1892
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1893 op_ref.do_unary_op (etype);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1894
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1895 val = op_ref.value ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1896 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1897 else
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1898 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1899 octave_value op_val = evaluate (op);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1900
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1901 if (op_val.is_defined ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1902 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1903 profile_data_accumulator::enter<tree_prefix_expression>
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1904 block (profiler, expr);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1905
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1906 // Attempt to do the operation in-place if it is unshared
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1907 // (a temporary expression).
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1908 if (op_val.get_count () == 1)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1909 val = op_val.do_non_const_unary_op (etype);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1910 else
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1911 val = ::do_unary_op (etype, op_val);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1912 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1913 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1914 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1915
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1916 m_value_stack.push (ovl (val));
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1917 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1918
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1919 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1920 tree_evaluator::visit_return_command (tree_return_command& cmd)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1921 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1922 if (debug_mode)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1923 do_breakpoint (cmd.is_breakpoint (true));
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1924
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1925 // Act like dbcont.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1926
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	1927 if (Vdebugging && m_call_stack.current_frame () == current_frame)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1928 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1929 Vdebugging = false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1930
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1931 reset_debug_state ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1932 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1933 else if (statement_context == function \|\| statement_context == script
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1934 \|\| in_loop_command)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1935 tree_return_command::returning = 1;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1936 }
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	1937
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1938 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1939 tree_evaluator::visit_return_list (tree_return_list&)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1940 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1941 panic_impossible ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1942 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1943
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1944 void
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1945 tree_evaluator::visit_simple_assignment (tree_simple_assignment& expr)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1946 {
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1947 octave_value val;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1948
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1949 tree_expression *rhs = expr.right_hand_side ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1950
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1951 if (rhs)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1952 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1953 octave_value rhs_val = evaluate (rhs);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1954
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1955 if (rhs_val.is_undefined ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1956 error ("value on right hand side of assignment is undefined");
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1957
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1958 if (rhs_val.is_cs_list ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1959 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1960 const octave_value_list lst = rhs_val.list_value ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1961
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1962 if (lst.empty ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1963 error ("invalid number of elements on RHS of assignment");
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1964
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1965 rhs_val = lst(0);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1966 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1967
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1968 tree_expression *lhs = expr.left_hand_side ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1969
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1970 try
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1971 {
23481 73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	1972 octave::unwind_protect frame;
73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	1973
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1974 octave_lvalue ult = lhs->lvalue (this);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1975
23481 73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	1976 std::list<octave_lvalue> lvalue_list;
73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	1977 lvalue_list.push_back (ult);
73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	1978
73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	1979 m_lvalue_list_stack.push (&lvalue_list);
73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	1980
73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	1981 frame.add_method (m_lvalue_list_stack,
73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	1982 &value_stack<const std::list<octave_lvalue>*>::pop);
73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	1983
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1984 if (ult.numel () != 1)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1985 err_nonbraced_cs_list_assignment ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1986
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1987 octave_value::assign_op etype = expr.op_type ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1988
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1989 ult.assign (etype, rhs_val);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1990
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1991 if (etype == octave_value::op_asn_eq)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1992 val = rhs_val;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1993 else
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1994 val = ult.value ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1995
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1996 if (expr.print_result ()
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1997 && octave::tree_evaluator::statement_printing_enabled ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1998 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1999 // We clear any index here so that we can
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2000 // get the new value of the referenced
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2001 // object below, instead of the indexed
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2002 // value (which should be the same as the
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2003 // right hand side value).
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2004
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2005 ult.clear_index ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2006
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2007 octave_value lhs_val = ult.value ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2008
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2009 octave_value_list args = ovl (lhs_val);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2010 args.stash_name_tags (string_vector (lhs->name ()));
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2011 octave::feval ("display", args);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2012 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2013 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2014 catch (octave::index_exception& e)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2015 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2016 e.set_var (lhs->name ());
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2017 std::string msg = e.message ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2018 error_with_id (e.err_id (), msg.c_str ());
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2019 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2020 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2021
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2022 m_value_stack.push (ovl (val));
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2023 }
8662 af72c8137d64 improve looping over arrays Jaroslav Hajek <highegg@gmail.com> parents: 8658 diff changeset	2024
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2025 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2026 tree_evaluator::visit_statement (tree_statement& stmt)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2027 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2028 tree_command *cmd = stmt.command ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2029 tree_expression *expr = stmt.expression ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2030
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2031 if (cmd \|\| expr)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2032 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2033 if (statement_context == function \|\| statement_context == script)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2034 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2035 // Skip commands issued at a debug> prompt to avoid disturbing
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2036 // the state of the program we are debugging.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2037
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2038 if (Vtrack_line_num)
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	2039 m_call_stack.set_location (stmt.line (), stmt.column ());
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2040
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2041 if ((statement_context == script
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2042 && ((Vecho_executing_commands & ECHO_SCRIPTS
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	2043 && m_call_stack.all_scripts ())
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2044 \|\| Vecho_executing_commands & ECHO_FUNCTIONS))
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2045 \|\| (statement_context == function
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2046 && Vecho_executing_commands & ECHO_FUNCTIONS))
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2047 stmt.echo_code ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2048 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2049
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2050 try
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2051 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2052 if (cmd)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2053 cmd->accept (*this);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2054 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2055 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2056 if (debug_mode)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2057 do_breakpoint (expr->is_breakpoint (true));
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2058
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2059 // FIXME: maybe all of this should be packaged in
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2060 // one virtual function that returns a flag saying whether
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2061 // or not the expression will take care of binding ans and
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2062 // printing the result.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2063
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2064 // FIXME: it seems that we should just have to
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2065 // evaluate the expression and that should take care of
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2066 // everything, binding ans as necessary?
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2067
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2068 bool do_bind_ans = false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2069
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2070 if (expr->is_identifier ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2071 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2072 tree_identifier id = dynamic_cast<tree_identifier > (expr);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2073
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2074 do_bind_ans = (! id->is_variable ());
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2075 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2076 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2077 do_bind_ans = (! expr->is_assignment_expression ());
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2078
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2079 octave_value tmp_result = evaluate (expr, 0);
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2080
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2081 if (do_bind_ans && tmp_result.is_defined ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2082 bind_ans (tmp_result, expr->print_result ()
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2083 && statement_printing_enabled ());
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2084
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2085 // if (tmp_result.is_defined ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2086 // result_values(0) = tmp_result;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2087 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2088 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2089 catch (const std::bad_alloc&)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2090 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2091 // FIXME: We want to use error_with_id here so that give users
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2092 // control over this error message but error_with_id will
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2093 // require some memory allocations. Is there anything we can
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2094 // do to make those more likely to succeed?
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2095
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2096 error_with_id ("Octave:bad-alloc",
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2097 "out of memory or dimension too large for Octave's index type");
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2098 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2099 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2100 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2101
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2102 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2103 tree_evaluator::visit_statement_list (tree_statement_list& lst)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2104 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2105 // FIXME: commented out along with else clause below.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2106 // static octave_value_list empty_list;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2107
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2108 tree_statement_list::iterator p = lst.begin ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2109
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2110 if (p != lst.end ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2111 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2112 while (true)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2113 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2114 tree_statement elt = p++;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2115
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2116 if (! elt)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2117 error ("invalid statement found in statement list!");
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2118
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2119 octave_quit ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2120
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2121 elt->accept (*this);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2122
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2123 if (tree_break_command::breaking
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2124 \|\| tree_continue_command::continuing)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2125 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2126
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2127 if (tree_return_command::returning)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2128 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2129
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2130 if (p == lst.end ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2131 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2132 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2133 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2134 // Clear previous values before next statement is
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2135 // evaluated so that we aren't holding an extra
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2136 // reference to a value that may be used next. For
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2137 // example, in code like this:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2138 //
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2139 // X = rand (N); # refcount for X should be 1
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2140 // # after this statement
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2141 //
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2142 // X(idx) = val; # no extra copy of X should be
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2143 // # needed, but we will be faked
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2144 // # out if retval is not cleared
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2145 // # between statements here
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2146
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2147 // result_values = empty_list;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2148 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2149 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2150 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2151 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2152
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2153 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2154 tree_evaluator::visit_switch_case (tree_switch_case&)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2155 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2156 panic_impossible ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2157 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2158
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2159 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2160 tree_evaluator::visit_switch_case_list (tree_switch_case_list&)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2161 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2162 panic_impossible ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2163 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2164
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2165 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2166 tree_evaluator::visit_switch_command (tree_switch_command& cmd)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2167 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2168 if (debug_mode)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2169 do_breakpoint (cmd.is_breakpoint (true));
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2170
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2171 tree_expression *expr = cmd.switch_value ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2172
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2173 if (! expr)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2174 error ("missing value in switch command near line %d, column %d",
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2175 cmd.line (), cmd.column ());
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2176
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2177 octave_value val = evaluate (expr);
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2178
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2179 tree_switch_case_list *lst = cmd.case_list ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2180
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2181 if (lst)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2182 {
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23435 diff changeset	2183 for (tree_switch_case t : lst)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2184 {
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2185 if (t->is_default_case () \|\| switch_case_label_matches (t, val))
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2186 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2187 tree_statement_list *stmt_lst = t->commands ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2188
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2189 if (stmt_lst)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2190 stmt_lst->accept (*this);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2191
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2192 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2193 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2194 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2195 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2196 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2197
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2198 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2199 tree_evaluator::visit_try_catch_command (tree_try_catch_command& cmd)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2200 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2201 bool execution_error = false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2202
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	2203 {
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	2204 // unwind frame before catch block
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2205 octave::unwind_protect frame;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2206
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2207 frame.protect_var (buffer_error_messages);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2208 frame.protect_var (Vdebug_on_error);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2209 frame.protect_var (Vdebug_on_warning);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2210
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2211 buffer_error_messages++;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2212 Vdebug_on_error = false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2213 Vdebug_on_warning = false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2214
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2215 // The catch code is not added to unwind_protect stack;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2216 // it doesn't need to be run on interrupts.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2217
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2218 tree_statement_list *try_code = cmd.body ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2219
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2220 if (try_code)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2221 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2222 try
20784 52f6921dde09 * pt-eval.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20715 diff changeset	2223 {
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2224 in_try_catch++;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2225 try_code->accept (*this);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2226 in_try_catch--;
20784 52f6921dde09 * pt-eval.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20715 diff changeset	2227 }
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2228 catch (const octave::execution_exception&)
20784 52f6921dde09 * pt-eval.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20715 diff changeset	2229 {
23110 af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23084 diff changeset	2230 octave::interpreter::recover_from_exception ();
13225 359153d26cc1 eliminate DO_SIMPLE_FOR_LOOP_ONCE macro John W. Eaton <jwe@octave.org> parents: 12833 diff changeset	2231
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2232 in_try_catch--; // must be restored before "catch" block
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2233 execution_error = true;
20784 52f6921dde09 * pt-eval.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20715 diff changeset	2234 }
52f6921dde09 * pt-eval.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20715 diff changeset	2235 }
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2236 // Unwind to let the user print any messages from
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2237 // errors that occurred in the body of the try_catch statement,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2238 // or throw further errors.
20784 52f6921dde09 * pt-eval.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20715 diff changeset	2239 }
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2240
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2241 if (execution_error)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2242 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2243 tree_statement_list *catch_code = cmd.cleanup ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2244 if (catch_code)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2245 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2246 tree_identifier *expr_id = cmd.identifier ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2247 octave_lvalue ult;
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2248
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2249 if (expr_id)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2250 {
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2251 ult = expr_id->lvalue (this);
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2252
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2253 octave_scalar_map err;
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2254
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2255 err.assign ("message", last_error_message ());
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2256 err.assign ("identifier", last_error_id ());
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2257 err.assign ("stack", last_error_stack ());
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2258
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2259 ult.assign (octave_value::op_asn_eq, err);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2260 }
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2261
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2262 // perform actual "catch" block
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2263 if (catch_code)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2264 catch_code->accept (*this);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2265 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2266 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2267 }
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2268
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2269 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2270 tree_evaluator::do_unwind_protect_cleanup_code (tree_statement_list *list)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2271 {
21922 c34f9c182dcf Make debug_on_error to apply to the "catch" block of try/catch (bug #47685) Rik <rik@octave.org> parents: 21743 diff changeset	2272 octave::unwind_protect frame;
c34f9c182dcf Make debug_on_error to apply to the "catch" block of try/catch (bug #47685) Rik <rik@octave.org> parents: 21743 diff changeset	2273
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2274 frame.protect_var (octave_interrupt_state);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2275 octave_interrupt_state = 0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2276
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2277 // We want to preserve the last location info for possible
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2278 // backtracking.
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	2279
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	2280 frame.add_method (m_call_stack, &octave::call_stack::set_line,
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	2281 m_call_stack.current_line ());
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	2282 frame.add_method (m_call_stack, &octave::call_stack::set_column,
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	2283 m_call_stack.current_column ());
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2284
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2285 // Similarly, if we have seen a return or break statement, allow all
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2286 // the cleanup code to run before returning or handling the break.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2287 // We don't have to worry about continue statements because they can
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2288 // only occur in loops.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2289
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2290 frame.protect_var (tree_return_command::returning);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2291 tree_return_command::returning = 0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2292
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2293 frame.protect_var (tree_break_command::breaking);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2294 tree_break_command::breaking = 0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2295
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2296 try
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2297 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2298 if (list)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2299 list->accept (*this);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2300 }
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2301 catch (const octave::execution_exception&)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2302 {
23110 af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23084 diff changeset	2303 octave::interpreter::recover_from_exception ();
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2304
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2305 if (tree_break_command::breaking \|\| tree_return_command::returning)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2306 frame.discard (2);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2307 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2308 frame.run (2);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2309
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2310 frame.discard (2);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2311
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2312 throw;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2313 }
21922 c34f9c182dcf Make debug_on_error to apply to the "catch" block of try/catch (bug #47685) Rik <rik@octave.org> parents: 21743 diff changeset	2314
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2315 // The unwind_protects are popped off the stack in the reverse of
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2316 // the order they are pushed on.
21922 c34f9c182dcf Make debug_on_error to apply to the "catch" block of try/catch (bug #47685) Rik <rik@octave.org> parents: 21743 diff changeset	2317
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2318 // FIXME: these statements say that if we see a break or
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2319 // return statement in the cleanup block, that we want to use the
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2320 // new value of the breaking or returning flag instead of restoring
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2321 // the previous value. Is that the right thing to do? I think so.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2322 // Consider the case of
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2323 //
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2324 // function foo ()
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2325 // unwind_protect
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2326 // fprintf (stderr, "1: this should always be executed\n");
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2327 // break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2328 // fprintf (stderr, "1: this should never be executed\n");
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2329 // unwind_protect_cleanup
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2330 // fprintf (stderr, "2: this should always be executed\n");
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2331 // return;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2332 // fprintf (stderr, "2: this should never be executed\n");
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2333 // end_unwind_protect
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2334 // endfunction
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2335 //
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2336 // If we reset the value of the breaking flag, both the returning
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2337 // flag and the breaking flag will be set, and we shouldn't have
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2338 // both. So, use the most recent one. If there is no return or
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2339 // break in the cleanup block, the values should be reset to
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2340 // whatever they were when the cleanup block was entered.
21922 c34f9c182dcf Make debug_on_error to apply to the "catch" block of try/catch (bug #47685) Rik <rik@octave.org> parents: 21743 diff changeset	2341
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2342 if (tree_break_command::breaking \|\| tree_return_command::returning)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2343 frame.discard (2);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2344 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2345 frame.run (2);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2346 }
20666 e0e2c2ce7e94 defer stack trace until back at top level John W. Eaton <jwe@octave.org> parents: 20560 diff changeset	2347
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2348 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2349 tree_evaluator::visit_unwind_protect_command (tree_unwind_protect_command& cmd)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2350 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2351 tree_statement_list *cleanup_code = cmd.cleanup ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2352
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2353 tree_statement_list *unwind_protect_code = cmd.body ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2354
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2355 if (unwind_protect_code)
21922 c34f9c182dcf Make debug_on_error to apply to the "catch" block of try/catch (bug #47685) Rik <rik@octave.org> parents: 21743 diff changeset	2356 {
c34f9c182dcf Make debug_on_error to apply to the "catch" block of try/catch (bug #47685) Rik <rik@octave.org> parents: 21743 diff changeset	2357 try
c34f9c182dcf Make debug_on_error to apply to the "catch" block of try/catch (bug #47685) Rik <rik@octave.org> parents: 21743 diff changeset	2358 {
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2359 unwind_protect_code->accept (*this);
21922 c34f9c182dcf Make debug_on_error to apply to the "catch" block of try/catch (bug #47685) Rik <rik@octave.org> parents: 21743 diff changeset	2360 }
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2361 catch (const octave::execution_exception&)
21922 c34f9c182dcf Make debug_on_error to apply to the "catch" block of try/catch (bug #47685) Rik <rik@octave.org> parents: 21743 diff changeset	2362 {
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2363 // FIXME: Maybe we should be able to temporarily set the
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2364 // interpreter's exception handling state to something "safe"
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2365 // while the cleanup block runs instead of just resetting it
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2366 // here?
23110 af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23084 diff changeset	2367 octave::interpreter::recover_from_exception ();
21922 c34f9c182dcf Make debug_on_error to apply to the "catch" block of try/catch (bug #47685) Rik <rik@octave.org> parents: 21743 diff changeset	2368
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2369 // Run the cleanup code on exceptions, so that it is run even
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2370 // in case of interrupt or out-of-memory.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2371 do_unwind_protect_cleanup_code (cleanup_code);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2372
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2373 // If an error occurs inside the cleanup code, a new
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2374 // exception will be thrown instead of the original.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2375 throw;
21922 c34f9c182dcf Make debug_on_error to apply to the "catch" block of try/catch (bug #47685) Rik <rik@octave.org> parents: 21743 diff changeset	2376 }
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2377
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2378 // Also execute the unwind_protect_cleanump code if the
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2379 // unwind_protect block runs without error.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2380 do_unwind_protect_cleanup_code (cleanup_code);
21922 c34f9c182dcf Make debug_on_error to apply to the "catch" block of try/catch (bug #47685) Rik <rik@octave.org> parents: 21743 diff changeset	2381 }
c34f9c182dcf Make debug_on_error to apply to the "catch" block of try/catch (bug #47685) Rik <rik@octave.org> parents: 21743 diff changeset	2382 }
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2383
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2384 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2385 tree_evaluator::visit_while_command (tree_while_command& cmd)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2386 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2387 #if defined (HAVE_LLVM)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2388 if (tree_jit::execute (cmd))
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2389 return;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2390 #endif
9383 d57f0c56195f improve error handling Jaroslav Hajek <highegg@gmail.com> parents: 9378 diff changeset	2391
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2392 octave::unwind_protect frame;
10210 752f349052a2 ensure correct backtraces after error in unwind_protect Jaroslav Hajek <highegg@gmail.com> parents: 10194 diff changeset	2393
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2394 frame.protect_var (in_loop_command);
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2395
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2396 in_loop_command = true;
20666 e0e2c2ce7e94 defer stack trace until back at top level John W. Eaton <jwe@octave.org> parents: 20560 diff changeset	2397
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2398 tree_expression *expr = cmd.condition ();
20824 8848e35e5ef8 better handling of exceptions in unwind-protect blocks John W. Eaton <jwe@octave.org> parents: 20784 diff changeset	2399
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2400 if (! expr)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2401 panic_impossible ();
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2402
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2403 for (;;)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2404 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2405 if (debug_mode)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2406 do_breakpoint (cmd.is_breakpoint (true));
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2407
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2408 if (is_logically_true (expr, "while"))
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2409 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2410 tree_statement_list *loop_body = cmd.body ();
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2411
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2412 if (loop_body)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2413 loop_body->accept (*this);
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2414
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2415 if (quit_loop_now ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2416 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2417 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2418 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2419 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2420 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2421 }
20666 e0e2c2ce7e94 defer stack trace until back at top level John W. Eaton <jwe@octave.org> parents: 20560 diff changeset	2422
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2423 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2424 tree_evaluator::visit_do_until_command (tree_do_until_command& cmd)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2425 {
21211 2cf8bc5c7017 use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	2426 #if defined (HAVE_LLVM)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2427 if (tree_jit::execute (cmd))
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2428 return;
15023 75d1bc2fd6d2 Compile top level while loops in JIT. Max Brister <max@2bass.com> parents: 14932 diff changeset	2429 #endif
75d1bc2fd6d2 Compile top level while loops in JIT. Max Brister <max@2bass.com> parents: 14932 diff changeset	2430
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2431 octave::unwind_protect frame;
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2432
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2433 frame.protect_var (in_loop_command);
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2434
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2435 in_loop_command = true;
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2436
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2437 tree_expression *expr = cmd.condition ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2438 int until_line = cmd.line ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2439 int until_column = cmd.column ();
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2440
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2441 if (! expr)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2442 panic_impossible ();
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2443
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2444 for (;;)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2445 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2446 tree_statement_list *loop_body = cmd.body ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2447
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2448 if (loop_body)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2449 loop_body->accept (*this);
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2450
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2451 if (quit_loop_now ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2452 break;
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2453
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2454 if (debug_mode)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2455 do_breakpoint (cmd.is_breakpoint (true));
18325 2a8243d8327a jit compiler: Add support for the do_until statement LYH <lyh.kernel@gmail.com> parents: 18270 diff changeset	2456
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	2457 m_call_stack.set_location (until_line, until_column);
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2458
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2459 if (is_logically_true (expr, "do-until"))
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2460 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2461 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2462 }
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2463
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2464 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2465 tree_evaluator::do_breakpoint (tree_statement& stmt) const
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2466 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2467 do_breakpoint (stmt.is_breakpoint (true), stmt.is_end_of_fcn_or_script ());
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2468 }
8845 5a6db6bd1a02 eigs.cc (Feigs): fix handling of sigma arg John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	2469
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2470 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2471 tree_evaluator::do_breakpoint (bool is_breakpoint,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2472 bool is_end_of_fcn_or_script) const
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2473 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2474 bool break_on_this_statement = false;
21542 7ba48ff6ce83 Record correct line number with "until" command (bug #43249) Lachlan Andrew <lachlanbis@gmail.com> parents: 21301 diff changeset	2475
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2476 if (octave_debug_on_interrupt_state)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2477 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2478 break_on_this_statement = true;
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2479
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2480 octave_debug_on_interrupt_state = false;
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2481
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	2482 current_frame = m_call_stack.current_frame ();
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2483 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2484 else if (is_breakpoint)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2485 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2486 break_on_this_statement = true;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2487
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2488 dbstep_flag = 0;
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2489
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	2490 current_frame = m_call_stack.current_frame ();
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2491 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2492 else if (dbstep_flag > 0)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2493 {
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	2494 if (m_call_stack.current_frame () == current_frame)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2495 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2496 if (dbstep_flag == 1 \|\| is_end_of_fcn_or_script)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2497 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2498 // We get here if we are doing a "dbstep" or a "dbstep N" and the
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2499 // count has reached 1 so that we must stop and return to debug
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2500 // prompt. Alternatively, "dbstep N" has been used but the end
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2501 // of the frame has been reached so we stop at the last line and
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2502 // return to prompt.
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2503
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2504 break_on_this_statement = true;
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2505
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2506 dbstep_flag = 0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2507 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2508 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2509 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2510 // Executing "dbstep N". Decrease N by one and continue.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2511
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2512 dbstep_flag--;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2513 }
15574 d20cbfec6df7 Fix off-by-1 error when executing 'dbstep N' Rik <rik@octave.org> parents: 15469 diff changeset	2514
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2515 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2516 else if (dbstep_flag == 1
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	2517 && m_call_stack.current_frame () < current_frame)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2518 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2519 // We stepped out from the end of a function.
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2520
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	2521 current_frame = m_call_stack.current_frame ();
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2522
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2523 break_on_this_statement = true;
15574 d20cbfec6df7 Fix off-by-1 error when executing 'dbstep N' Rik <rik@octave.org> parents: 15469 diff changeset	2524
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2525 dbstep_flag = 0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2526 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2527 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2528 else if (dbstep_flag == -1)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2529 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2530 // We get here if we are doing a "dbstep in".
16396 c6a13c1900fc make "dbstep out" and "dbstep" after "dbstep in" work properly John W. Eaton <jwe@octave.org> parents: 16354 diff changeset	2531
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2532 break_on_this_statement = true;
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2533
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2534 dbstep_flag = 0;
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2535
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	2536 current_frame = m_call_stack.current_frame ();
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2537 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2538 else if (dbstep_flag == -2)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2539 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2540 // We get here if we are doing a "dbstep out". Check for end of
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2541 // function and whether the current frame is the same as the
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2542 // cached value because we want to step out from the frame where
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2543 // "dbstep out" was evaluated, not from any functions called from
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2544 // that frame.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2545
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2546 if (is_end_of_fcn_or_script
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	2547 && m_call_stack.current_frame () == current_frame)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2548 dbstep_flag = -1;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2549 }
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2550
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2551 if (break_on_this_statement)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2552 do_keyboard ();
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2553
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2554 }
10219 979fb2606c4f new tree_evaluator::do_keyoard function Ryan Rusaw <rrusaw@gmail.com> parents: 10210 diff changeset	2555
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2556 // ARGS is currently unused, but since the do_keyboard function in
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2557 // input.cc accepts an argument list, we preserve it here so that the
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2558 // interface won't have to change if we decide to use it in the future.
10219 979fb2606c4f new tree_evaluator::do_keyoard function Ryan Rusaw <rrusaw@gmail.com> parents: 10210 diff changeset	2559
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2560 octave_value
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2561 tree_evaluator::do_keyboard (const octave_value_list& args) const
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2562 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2563 return ::do_keyboard (args);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2564 }
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2565
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2566 bool
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2567 tree_evaluator::is_logically_true (tree_expression *expr,
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2568 const char *warn_for)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2569 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2570 bool expr_value = false;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2571
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2572 octave_value t1 = evaluate (expr);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2573
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2574 if (t1.is_defined ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2575 return t1.is_true ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2576 else
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2577 error ("%s: undefined value used in conditional expression", warn_for);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2578
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2579 return expr_value;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2580 }
23481 73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	2581
23482 c9937e865768 make isargout work again for nested function calls John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	2582 octave_value_list
c9937e865768 make isargout work again for nested function calls John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	2583 tree_evaluator::make_value_list (octave::tree_argument_list *args,
c9937e865768 make isargout work again for nested function calls John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	2584 const string_vector& arg_nm,
c9937e865768 make isargout work again for nested function calls John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	2585 const octave_value *object, bool rvalue)
c9937e865768 make isargout work again for nested function calls John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	2586 {
c9937e865768 make isargout work again for nested function calls John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	2587 octave_value_list retval;
c9937e865768 make isargout work again for nested function calls John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	2588
c9937e865768 make isargout work again for nested function calls John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	2589 if (args)
c9937e865768 make isargout work again for nested function calls John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	2590 {
c9937e865768 make isargout work again for nested function calls John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	2591 // Function calls inside an argument list can't have ignored
c9937e865768 make isargout work again for nested function calls John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	2592 // output arguments.
c9937e865768 make isargout work again for nested function calls John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	2593
c9937e865768 make isargout work again for nested function calls John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	2594 unwind_protect frame;
c9937e865768 make isargout work again for nested function calls John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	2595
c9937e865768 make isargout work again for nested function calls John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	2596 m_lvalue_list_stack.push (0);
c9937e865768 make isargout work again for nested function calls John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	2597
c9937e865768 make isargout work again for nested function calls John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	2598 frame.add_method (m_lvalue_list_stack,
c9937e865768 make isargout work again for nested function calls John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	2599 &value_stack<const std::list<octave_lvalue>*>::pop);
c9937e865768 make isargout work again for nested function calls John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	2600
c9937e865768 make isargout work again for nested function calls John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	2601 if (rvalue && object && args->has_magic_end ()
c9937e865768 make isargout work again for nested function calls John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	2602 && object->is_undefined ())
c9937e865768 make isargout work again for nested function calls John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	2603 err_invalid_inquiry_subscript ();
c9937e865768 make isargout work again for nested function calls John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	2604
c9937e865768 make isargout work again for nested function calls John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	2605 retval = args->convert_to_const_vector (this, object);
c9937e865768 make isargout work again for nested function calls John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	2606 }
c9937e865768 make isargout work again for nested function calls John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	2607
c9937e865768 make isargout work again for nested function calls John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	2608 octave_idx_type n = retval.length ();
c9937e865768 make isargout work again for nested function calls John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	2609
c9937e865768 make isargout work again for nested function calls John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	2610 if (n > 0)
c9937e865768 make isargout work again for nested function calls John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	2611 retval.stash_name_tags (arg_nm);
c9937e865768 make isargout work again for nested function calls John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	2612
c9937e865768 make isargout work again for nested function calls John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	2613 return retval;
c9937e865768 make isargout work again for nested function calls John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	2614 }
c9937e865768 make isargout work again for nested function calls John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	2615
23481 73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	2616 std::list<octave_lvalue>
73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	2617 tree_evaluator::make_lvalue_list (tree_argument_list *lhs)
73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	2618 {
73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	2619 std::list<octave_lvalue> retval;
73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	2620
73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	2621 for (tree_expression elt : lhs)
73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	2622 retval.push_back (elt->lvalue (this));
73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	2623
73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	2624 return retval;
73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23470 diff changeset	2625 }
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2626 }
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2627
10578 cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10315 diff changeset	2628 DEFUN (max_recursion_depth, args, nargout,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21922 diff changeset	2629 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21922 diff changeset	2630 @deftypefn {} {@var{val} =} max_recursion_depth ()
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21922 diff changeset	2631 @deftypefnx {} {@var{old_val} =} max_recursion_depth (@var{new_val})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21922 diff changeset	2632 @deftypefnx {} {} max_recursion_depth (@var{new_val}, "local")
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21922 diff changeset	2633 Query or set the internal limit on the number of times a function may
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21922 diff changeset	2634 be called recursively.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21922 diff changeset	2635
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21922 diff changeset	2636 If the limit is exceeded, an error message is printed and control returns to
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21922 diff changeset	2637 the top level.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21922 diff changeset	2638
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21922 diff changeset	2639 When called from inside a function with the @qcode{"local"} option, the
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21922 diff changeset	2640 variable is changed locally for the function and any subroutines it calls.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21922 diff changeset	2641 The original variable value is restored when exiting the function.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21922 diff changeset	2642 @end deftypefn */)
10578 cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10315 diff changeset	2643 {
cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10315 diff changeset	2644 return SET_INTERNAL_VARIABLE (max_recursion_depth);
cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10315 diff changeset	2645 }
cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10315 diff changeset	2646
12833 9f0f2c226053 codesprint: new tests for functions in pt-eval.cc John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	2647 /*
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	2648 %!test
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	2649 %! orig_val = max_recursion_depth ();
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	2650 %! old_val = max_recursion_depth (2*orig_val);
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	2651 %! assert (orig_val, old_val);
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	2652 %! assert (max_recursion_depth (), 2*orig_val);
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	2653 %! max_recursion_depth (orig_val);
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	2654 %! assert (max_recursion_depth (), orig_val);
14429 eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14294 diff changeset	2655
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14294 diff changeset	2656 %!error (max_recursion_depth (1, 2))
12833 9f0f2c226053 codesprint: new tests for functions in pt-eval.cc John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	2657 */
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	2658
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2659 DEFUN (silent_functions, args, nargout,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21922 diff changeset	2660 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21922 diff changeset	2661 @deftypefn {} {@var{val} =} silent_functions ()
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21922 diff changeset	2662 @deftypefnx {} {@var{old_val} =} silent_functions (@var{new_val})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21922 diff changeset	2663 @deftypefnx {} {} silent_functions (@var{new_val}, "local")
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21922 diff changeset	2664 Query or set the internal variable that controls whether internal
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21922 diff changeset	2665 output from a function is suppressed.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21922 diff changeset	2666
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21922 diff changeset	2667 If this option is disabled, Octave will display the results produced by
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21922 diff changeset	2668 evaluating expressions within a function body that are not terminated with
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21922 diff changeset	2669 a semicolon.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21922 diff changeset	2670
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21922 diff changeset	2671 When called from inside a function with the @qcode{"local"} option, the
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21922 diff changeset	2672 variable is changed locally for the function and any subroutines it calls.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21922 diff changeset	2673 The original variable value is restored when exiting the function.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21922 diff changeset	2674 @end deftypefn */)
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2675 {
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2676 return SET_INTERNAL_VARIABLE (silent_functions);
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2677 }
12833 9f0f2c226053 codesprint: new tests for functions in pt-eval.cc John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	2678
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	2679 /*
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	2680 %!test
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	2681 %! orig_val = silent_functions ();
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	2682 %! old_val = silent_functions (! orig_val);
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	2683 %! assert (orig_val, old_val);
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	2684 %! assert (silent_functions (), ! orig_val);
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	2685 %! silent_functions (orig_val);
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	2686 %! assert (silent_functions (), orig_val);
14429 eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14294 diff changeset	2687
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14294 diff changeset	2688 %!error (silent_functions (1, 2))
12833 9f0f2c226053 codesprint: new tests for functions in pt-eval.cc John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	2689 */

Mercurial > octave

annotate libinterp/parse-tree/pt-eval.cc @ 23563:614d71cdf614