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

annotate libinterp/parse-tree/pt-eval.cc @ 23450:855122b993da

maint: Wrap tertiary operator in parentheses "(COND ? x : y)". * Canvas.cc, color-picker.cc, dialog.cc, marker.cc, main-window.cc, Cell.cc, __magick_read__.cc, __pchip_deriv__.cc, __qp__.cc, bsxfun.cc, call-stack.cc, cellfun.cc, data.cc, defaults.cc, det.cc, eig.cc, error.cc, file-io.cc, filter.cc, find.cc, gammainc.cc, gcd.cc, gl-render.cc, graphics.cc, graphics.in.h, help.cc, hex2num.cc, inv.cc, load-save.cc, lookup.cc, ls-mat4.cc, ls-mat5.cc, ls-oct-binary.cc, ls-oct-text.cc, lu.cc, max.cc, mex.cc, oct-hist.cc, oct-map.cc, oct-procbuf.cc, oct-stream.cc, pr-output.cc, rand.cc, regexp.cc, schur.cc, str2double.cc, strfns.cc, symtab.cc, sysdep.cc, tril.cc, variables.cc, xdiv.cc, audiodevinfo.cc, audioread.cc, colamd.cc, gzip.cc, ov-base-diag.cc, ov-base-mat.h, ov-base-scalar.h, ov-class.cc, ov-classdef.cc, ov-fcn-handle.cc, ov-range.cc, ov-range.h, ov-struct.cc, ov-usr-fcn.cc, ov.cc, octave.cc, op-class.cc, pt-eval.cc, pt-funcall.cc, pt-idx.cc, pt-jit.cc, pt-stmt.cc, version.cc, Array-util.cc, Array.cc, CDiagMatrix.cc, CMatrix.cc, CNDArray.cc, CSparse.cc, Range.cc, Sparse.cc, chNDArray.cc, dDiagMatrix.cc, dMatrix.cc, dNDArray.cc, dSparse.cc, dim-vector.cc, fCDiagMatrix.cc, fCMatrix.cc, fCNDArray.cc, fDiagMatrix.cc, fMatrix.cc, fNDArray.cc, idx-vector.cc, idx-vector.h, Faddeeva.cc, DASPK.cc, DASRT.cc, DASSL.cc, EIG.cc, fEIG.cc, gsvd.cc, lo-specfun.cc, oct-rand.cc, qr.cc, qrp.cc, randgamma.cc, schur.cc, svd.cc, Sparse-diag-op-defs.h, mx-inlines.cc, oct-env.cc, cmd-edit.cc, kpse.cc, oct-inttypes.h, oct-sort.cc: Wrap tertiary operator in parentheses "(COND ? x : y)".

author	Rik <rik@octave.org>
date	Thu, 27 Apr 2017 17:33:10 -0700
parents	c763214a8260
children	21baad6b35c4

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 ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	85 m_lvalue_list_stack.pop ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	86 m_nargout_stack.pop ();
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
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	112 octave_function *curr_fcn = octave::call_stack::current ();
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
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	289 tree_expression *op_lhs = expr.lhs ();
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
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	295 tree_expression *op_rhs = expr.rhs ();
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 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	303 octave_value::binary_op etype = expr.op_type ();
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
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	368 octave_value_list tmp2 = fcn.do_multi_index_op (1, tmp1);
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
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	411 octave_value
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	412 tree_evaluator::evaluate (tree_decl_elt *elt)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	413 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	414 // Do not allow functions to return null values.
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	415
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	416 tree_identifier *id = elt->ident ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	417
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	418 return id ? evaluate (id).storable_value () : octave_value ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	419 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	420
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	421 void
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	422 tree_evaluator::initialize_undefined_parameter_list_elements
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	423 (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	424 int nargout, const octave_value& val)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	425 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	426 bool warned = false;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	427
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	428 int count = 0;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	429
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	430 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	431 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	432
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	433 octave_idx_type k = 0;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	434
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23435 diff changeset	435 for (tree_decl_elt elt : param_list)
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	436 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	437 if (++count > nargout)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	438 break;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	439
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	440 if (! elt->is_variable ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	441 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	442 if (! warned)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	443 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	444 warned = true;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	445
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	446 while (k < ignored.numel ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	447 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	448 octave_idx_type l = ignored (k);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	449 if (l == count)
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 warned = false;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	452 break;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	453 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	454 else if (l > count)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	455 break;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	456 else
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	457 k++;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	458 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	459
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	460 if (warned)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	461 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	462 warning_with_id
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	463 ("Octave:undefined-return-values",
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	464 "%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	465 warnfor.c_str ());
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 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	468
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	469 octave_lvalue lval = elt->lvalue (this);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	470
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	471 lval.assign (octave_value::op_asn_eq, val);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	472 }
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 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	475
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	476 void
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	477 tree_evaluator::define_parameter_list_from_arg_vector
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	478 (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	479 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	480 int i = -1;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	481
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23435 diff changeset	482 for (tree_decl_elt elt : param_list)
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	483 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	484 i++;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	485
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	486 octave_lvalue ref = elt->lvalue (this);
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 if (i < args.length ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	489 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	490 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	491 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	492 if (! eval_decl_elt (elt))
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	493 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	494 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	495 else
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	496 ref.define (args(i));
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	497 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	498 else
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	499 eval_decl_elt (elt);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	500 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	501 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	502
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	503 void
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	504 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	505 {
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23435 diff changeset	506 for (tree_decl_elt elt : param_list)
23435 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 octave_lvalue ref = elt->lvalue (this);
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 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	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
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	514 octave_value_list
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	515 tree_evaluator::convert_parameter_list_to_const_vector
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	516 (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	517 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	518 octave_idx_type vlen = varargout.numel ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	519 int len = param_list->length ();
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 // Special case. Will do a shallow copy.
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	522 if (len == 0)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	523 return varargout;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	524 else if (nargout <= len)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	525 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	526 octave_value_list retval (nargout);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	527
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	528 int i = 0;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	529
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23435 diff changeset	530 for (tree_decl_elt elt : param_list)
23435 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 if (elt->is_defined ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	533 retval(i++) = evaluate (elt);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	534 else
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	535 break;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	536 }
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 return retval;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	539 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	540 else
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	541 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	542 octave_value_list retval (len + vlen);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	543
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	544 int i = 0;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	545
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23435 diff changeset	546 for (tree_decl_elt elt : param_list)
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	547 retval(i++) = evaluate (elt);
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 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	550 retval(i++) = varargout(j);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	551
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	552 return retval;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	553 }
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
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	556 bool
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	557 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	558 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	559 bool retval = false;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	560
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	561 tree_identifier *id = elt->ident ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	562 tree_expression *expr = elt->expression ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	563
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	564 if (id && expr)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	565 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	566 octave_lvalue ult = id->lvalue (this);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	567
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	568 octave_value init_val = evaluate (expr);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	569
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	570 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	571
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	572 retval = true;
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
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	578 bool
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	579 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	580 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	581 {
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	582 tree_expression *label = expr->case_label ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	583
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	584 octave_value label_value = evaluate (label);
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 if (label_value.is_defined ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	587 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	588 if (label_value.is_cell ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	589 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	590 Cell cell (label_value.cell_value ());
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 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	593 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	594 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	595 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	596 bool match = val.is_equal (cell(i,j));
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 if (match)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	599 return true;
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 }
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 else
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	604 return val.is_equal (label_value);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	605 }
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 return false;
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
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	610 void
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	611 tree_evaluator::do_global_init (octave::tree_decl_elt& elt)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	612 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	613 octave::tree_identifier *id = elt.ident ();
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 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	616 {
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	617 id->mark_global ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	618
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	619 octave_lvalue ult = id->lvalue (this);
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 if (ult.is_undefined ())
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 octave::tree_expression *expr = elt.expression ();
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 octave_value init_val;
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 if (expr)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	628 init_val = evaluate (expr);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	629 else
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	630 init_val = Matrix ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	631
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	632 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	633 }
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 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	636
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	637 void
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	638 tree_evaluator::do_static_init (octave::tree_decl_elt& elt)
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 octave::tree_identifier *id = elt.ident ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	641
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	642 if (id)
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 id->mark_as_static ();
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 octave_lvalue ult = id->lvalue (this);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	647
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	648 if (ult.is_undefined ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	649 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	650 octave::tree_expression *expr = elt.expression ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	651
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	652 octave_value init_val;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	653
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	654 if (expr)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	655 init_val = evaluate (expr);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	656 else
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	657 init_val = Matrix ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	658
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	659 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	660 }
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	661 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	662 }
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	663
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	664 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	665 tree_evaluator::visit_global_command (tree_global_command& cmd)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	666 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	667 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	668 do_breakpoint (cmd.is_breakpoint (true));
8845 5a6db6bd1a02 eigs.cc (Feigs): fix handling of sigma arg John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	669
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	670 tree_decl_init_list *init_list = cmd.initializer_list ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	671
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	672 if (init_list)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	673 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	674 // If we called init_list->accept (*this), we would need a way
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	675 // to tell tree_evaluator::visit_decl_init_list that we are
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	676 // evaluating a global init list.
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	677
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23435 diff changeset	678 for (tree_decl_elt elt : init_list)
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	679 do_global_init (*elt);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	680 }
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	681 }
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	682
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	683 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	684 tree_evaluator::visit_persistent_command (tree_persistent_command& cmd)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	685 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	686 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	687 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	688
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	689 tree_decl_init_list *init_list = cmd.initializer_list ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	690
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	691 if (init_list)
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 // If we called init_list->accept (*this), we would need a way
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	694 // to tell tree_evaluator::visit_decl_init_list that we are
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	695 // evaluating a static init list.
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	696
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23435 diff changeset	697 for (tree_decl_elt elt : init_list)
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	698 do_static_init (*elt);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	699 }
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	700 }
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	701
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	702 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	703 tree_evaluator::visit_decl_elt (tree_decl_elt&)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	704 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	705 panic_impossible ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	706 }
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	707
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	708 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	709 tree_evaluator::visit_decl_init_list (tree_decl_init_list&)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	710 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	711 panic_impossible ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	712 }
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	713 }
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	714
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	715 // 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	716 static inline bool
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	717 quit_loop_now (void)
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	718 {
10142 829e69ec3110 make OCTAVE_QUIT a function Jaroslav Hajek <highegg@gmail.com> parents: 10066 diff changeset	719 octave_quit ();
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	720
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	721 // 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	722
23369 2a6246cc4a68 * pt-eval.cc (quit_loop_now): Avoid deprecated variable warnings. John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	723 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	724 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	725
23369 2a6246cc4a68 * pt-eval.cc (quit_loop_now): Avoid deprecated variable warnings. John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	726 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	727 \|\| 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	728 \|\| 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	729
23398 d4ef04757ead eliminate some compiler warnings John W. Eaton <jwe@octave.org> parents: 23369 diff changeset	730 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	731 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	732
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	733 return quit;
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	734 }
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	735
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	736 namespace octave
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	737 {
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	738 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	739 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	740 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	741 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	742 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	743
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	744 // 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	745 // and cmd.maxproc_expr ();
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	746
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	747 octave::unwind_protect frame;
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	748
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	749 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	750
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	751 in_loop_command = true;
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	752
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	753 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	754
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	755 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	756
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	757 #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	758 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	759 return;
15027 741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	760 #endif
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	761
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	762 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	763 return;
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 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	766
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	767 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	768
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	769 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	770
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	771 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	772 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	773 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	774
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	775 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	776
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	777 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	778 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	779 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	780
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	781 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	782
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	783 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	784 loop_body->accept (*this);
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	785
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	786 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	787 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	788 }
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 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	791 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	792 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	793
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	794 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	795 loop_body->accept (*this);
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	796
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	797 // 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	798 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	799 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	800 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	801 \|\| 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	802 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	803 // 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	804 // columns.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	805
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	806 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	807
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	808 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	809 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	810
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	811 if (steps > 0)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	812 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	813 octave_value arg = rhs;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	814 if (rhs.ndims () > 2)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	815 arg = arg.reshape (dv);
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	816
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	817 // 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	818 octave_value_list idx;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	819 octave_idx_type iidx;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	820 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	821 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	822 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	823 iidx = 0;
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 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	826 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	827 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	828 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	829 iidx = 1;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	830 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	831
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	832 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	833 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	834 // 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	835 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	836 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	837
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	838 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	839
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	840 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	841 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	842
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	843 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	844 break;
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 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	847 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	848 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	849 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	850 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	851 }
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	852
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	853 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	854 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	855 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	856 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	857 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	858
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	859 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	860
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	861 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	862
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	863 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	864
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	865 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	866
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	867 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	868
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	869 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	870 return;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	871
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	872 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	873 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	874
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	875 // 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	876 // 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	877 // structure element.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	878
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	879 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	880
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	881 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	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_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	884
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	885 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	886
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	887 elt = *p;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	888
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	889 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	890
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	891 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	892
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	893 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	894
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	895 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	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_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	898
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	899 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	900 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	901 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	902
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	903 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	904
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	905 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	906
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	907 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	908
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	909 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	910 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	911
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	912 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	913 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	914
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	915 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	916 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	917 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	918 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	919
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	920 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	921 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	922 {
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	923 // ??
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	924 panic_impossible ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	925 }
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	926
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	927 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	928 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	929 {
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	930 // ??
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	931 panic_impossible ();
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
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	934 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	935 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	936 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	937 panic_impossible ();
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
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	940 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	941 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	942 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	943 panic_impossible ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	944 }
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	945
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	946 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	947 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	948 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	949 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	950
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	951 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	952
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	953 if (f)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	954 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	955 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	956
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	957 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	958
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	959 // 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	960 // 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	961
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	962 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	963 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	964 }
13225 359153d26cc1 eliminate DO_SIMPLE_FOR_LOOP_ONCE macro John W. Eaton <jwe@octave.org> parents: 12833 diff changeset	965
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	966 void
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	967 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	968 {
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	969 octave_value_list retval;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	970
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	971 symbol_table::symbol_reference sym = expr.symbol ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	972
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	973 octave_value val = sym->find ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	974
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	975 if (val.is_defined ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	976 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	977 // GAGME -- this would be cleaner if we required
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	978 // parens to indicate function calls.
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 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	981 // 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	982 // 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	983 // 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	984 // and let tree_index_expression::rvalue handle indexing.
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	985 // 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	986 // return the function definition as a value.
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	987
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	988 octave_function *fcn = 0;
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 if (val.is_function ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	991 fcn = val.function_value (true);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	992
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	993 int nargout = m_nargout_stack.top ();
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 if (fcn && ! (expr.is_postfix_indexed ()
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	996 && fcn->is_postfix_index_handled (expr.postfix_index ())))
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	997 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	998 octave_value_list tmp_args;
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 const std::list<octave_lvalue> *lvalue_list
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1001 = m_lvalue_list_stack.top ();
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 retval = (lvalue_list
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1004 ? val.do_multi_index_op (nargout, tmp_args, lvalue_list)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1005 : val.do_multi_index_op (nargout, tmp_args));
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1006 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1007 else
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1008 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1009 if (expr.print_result () && nargout == 0
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1010 && octave::tree_evaluator::statement_printing_enabled ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1011 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1012 octave_value_list args = ovl (val);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1013 args.stash_name_tags (string_vector (expr.name ()));
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1014 octave::feval ("display", args);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1015 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1016
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1017 retval = val;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1018 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1019 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1020 else if (sym->is_added_static ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1021 expr.static_workspace_error ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1022 else
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1023 expr.eval_undefined_error ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1024
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1025 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	1026 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1027
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1028 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1029 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	1030 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1031 panic_impossible ();
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
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1034 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1035 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	1036 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1037 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	1038
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1039 if (lst)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1040 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	1041 }
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 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1044 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	1045 {
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23435 diff changeset	1046 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	1047 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1048 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	1049
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1050 if (statement_context == function \|\| statement_context == script)
23052 f97e22a9012a move octave_call_stack inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1051 octave::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	1052
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1053 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	1054 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	1055
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1056 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	1057 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1058 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	1059
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1060 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	1061 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	1062
20784 52f6921dde09 * pt-eval.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20715 diff changeset	1063 break;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1064 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1065 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1066 }
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1067 }
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 static inline octave_value_list
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1070 make_value_list (octave::tree_evaluator tw, octave::tree_argument_list args,
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1071 const string_vector& arg_nm,
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1072 const octave_value *object, bool rvalue = true)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1073 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1074 octave_value_list retval;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1075
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1076 if (args)
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 if (rvalue && object && args->has_magic_end () && object->is_undefined ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1079 err_invalid_inquiry_subscript ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1080
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1081 retval = args->convert_to_const_vector (tw, object);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1082 }
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 octave_idx_type n = retval.length ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1085
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1086 if (n > 0)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1087 retval.stash_name_tags (arg_nm);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1088
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1089 return retval;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1090 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1091
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1092 // 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	1093 // 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	1094 // be needed by pt-lvalue, which calls subsref?)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1095
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1096 static void
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1097 final_index_error (octave::index_exception& e,
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1098 const octave::tree_expression *expr)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1099 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1100 std::string extra_message;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1101
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1102 if (expr->is_identifier ()
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1103 && 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	1104 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1105 std::string var = expr->name ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1106
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1107 e.set_var (var);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1108
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1109 octave_value fcn = symbol_table::find_function (var);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1110
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1111 if (fcn.is_function ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1112 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1113 octave_function *fp = fcn.function_value ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1114
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1115 if (fp && fp->name () == var)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1116 extra_message = " (note: variable '" + var + "' shadows function)";
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1117 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1118 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1119
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1120 std::string msg = e.message () + extra_message;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1121
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1122 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	1123 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1124
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1125 namespace octave
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1126 {
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1127 void
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1128 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	1129 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1130 octave_value_list retval;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1131
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1132 int nargout = m_nargout_stack.top ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1133
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1134 octave_value first_expr_val;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1135
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1136 octave_value_list first_args;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1137
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1138 bool have_args = false;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1139
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1140 tree_expression *expr = idx_expr.expression ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1141 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	1142 std::string type = idx_expr.type_tags ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1143 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	1144 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	1145
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1146 if (expr->is_identifier () && type[0] == '(')
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1147 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1148 tree_identifier id = dynamic_cast<tree_identifier > (expr);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1149
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1150 if (! (id->is_variable () \|\| args.empty ()))
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1151 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1152 tree_argument_list al = (args.begin ());
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1153
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23449 diff changeset	1154 size_t n = (al ? al->length () : 0);
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1155
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1156 if (n > 0)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1157 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1158 string_vector anm = *(arg_nm.begin ());
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1159 have_args = true;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1160 first_args = al -> convert_to_const_vector (this);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1161 first_args.stash_name_tags (anm);
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 first_expr_val = id->do_lookup (first_args);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1164 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1165 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1166 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1167
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1168 if (first_expr_val.is_undefined ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1169 first_expr_val = evaluate (expr);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1170
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1171 octave_value tmp = first_expr_val;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1172 octave_idx_type tmpi = 0;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1173
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1174 std::list<octave_value_list> idx;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1175
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1176 int n = args.size ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1177
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1178 std::list<tree_argument_list *>::iterator p_args = args.begin ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1179 std::list<string_vector>::iterator p_arg_nm = arg_nm.begin ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1180 std::list<tree_expression *>::iterator p_dyn_field = dyn_field.begin ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1181
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1182 for (int i = 0; i < n; i++)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1183 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1184 if (i > 0)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1185 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1186 tree_argument_list al = p_args;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1187
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1188 // In Matlab, () can only be followed by '.'. In Octave, we
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1189 // do not enforce this for rvalue expressions, but we'll
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1190 // split the evaluation at this point. This will,
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1191 // hopefully, allow Octave's looser rules apply smoothly for
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1192 // Matlab overloaded subsref codes.
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1193
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1194 // We might have an expression like
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1195 //
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1196 // x{end}.a(end)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1197 //
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1198 // and we are looking at the argument list that contains the
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1199 // second (or third, etc.) "end" token, so we must evaluate
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1200 // everything up to the point of that argument list so we
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1201 // can pass the appropriate value to the built-in end
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1202 // function.
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1203
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1204 // An expression like
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1205 //
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1206 // s.a (f (1:end))
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1207 //
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1208 // can mean a lot of different things depending on the types
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1209 // of s, a, and f. Let's just say it's complicated and that
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1210 // the following code is definitely not correct in all
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1211 // cases. That it is already so complex makes me think that
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1212 // there must be a better way.
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1213
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1214 bool split = ((type[i-1] == '(' && type[i] != '.')
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1215 \|\| (al && al->has_magic_end ()
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1216 && ! tmp.is_classdef_object ()));
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1217
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1218 if (split)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1219 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1220 try
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1221 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1222 octave_value_list tmp_list
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1223 =tmp.subsref (type.substr (tmpi, i-tmpi), idx, nargout);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1224
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23449 diff changeset	1225 tmp = (tmp_list.length () ? tmp_list(0) : octave_value ());
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1226 tmpi = i;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1227 idx.clear ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1228
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1229 if (tmp.is_cs_list ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1230 err_indexed_cs_list ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1231
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1232 if (tmp.is_function ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1233 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1234 octave_function *fcn = tmp.function_value (true);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1235
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1236 if (fcn && ! fcn->is_postfix_index_handled (type[i]))
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1237 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1238 octave_value_list empty_args;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1239
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1240 tmp_list = tmp.do_multi_index_op (1, empty_args);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1241 tmp = (tmp_list.length ()
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1242 ? tmp_list(0) : octave_value ());
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1243
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1244 if (tmp.is_cs_list ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1245 err_indexed_cs_list ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1246 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1247 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1248 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1249 catch (octave::index_exception& e) // problems with index range, type etc.
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 final_index_error (e, expr);
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 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1254 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1255
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1256 switch (type[i])
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1257 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1258 case '(':
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1259 if (have_args)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1260 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1261 idx.push_back (first_args);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1262 have_args = false;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1263 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1264 else
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1265 idx.push_back (make_value_list (this, p_args, p_arg_nm, &tmp));
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1266 break;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1267
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1268 case '{':
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1269 idx.push_back (make_value_list (this, p_args, p_arg_nm, &tmp));
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1270 break;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1271
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1272 case '.':
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1273 idx.push_back (octave_value
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1274 (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	1275 break;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1276
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1277 default:
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1278 panic_impossible ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1279 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1280
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1281 p_args++;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1282 p_arg_nm++;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1283 p_dyn_field++;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1284 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1285
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1286 const std::list<octave_lvalue> *lvalue_list = m_lvalue_list_stack.top ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1287
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1288 try
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1289 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1290 retval = tmp.subsref (type.substr (tmpi, n - tmpi), idx, nargout,
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1291 lvalue_list);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1292 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1293 catch (octave::index_exception& e) // range problems, bad index type, etc.
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1294 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1295 final_index_error (e, expr);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1296 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1297
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23449 diff changeset	1298 octave_value val = (retval.length () ? retval(0) : octave_value ());
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1299
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1300 if (val.is_function ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1301 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1302 octave_function *fcn = val.function_value (true);
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 if (fcn)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1305 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1306 octave_value_list empty_args;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1307
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1308 retval = (lvalue_list
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1309 ? val.do_multi_index_op (nargout, empty_args,
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1310 lvalue_list)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1311 : val.do_multi_index_op (nargout, empty_args));
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1312 }
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
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1315 m_value_stack.push (retval);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1316 }
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 void
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1319 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	1320 {
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1321 octave_value retval = Matrix ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1322
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1323 bool all_strings_p = false;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1324 bool all_sq_strings_p = false;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1325 bool all_dq_strings_p = false;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1326 bool all_empty_p = false;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1327 bool all_real_p = false;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1328 bool any_sparse_p = false;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1329 bool any_class_p = false;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1330 bool frc_str_conv = false;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1331
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1332 tm_const tmp (expr, this);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1333
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1334 if (tmp && ! tmp.empty ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1335 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1336 dim_vector dv = tmp.dims ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1337 all_strings_p = tmp.all_strings_p ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1338 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	1339 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	1340 all_empty_p = tmp.all_empty_p ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1341 all_real_p = tmp.all_real_p ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1342 any_sparse_p = tmp.any_sparse_p ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1343 any_class_p = tmp.any_class_p ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1344 frc_str_conv = tmp.some_strings_p ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1345
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1346 // Try to speed up the common cases.
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 std::string result_type = tmp.class_name ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1349
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1350 if (any_class_p)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1351 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1352 retval = do_class_concat (tmp);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1353 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1354 else if (result_type == "double")
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 if (any_sparse_p)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1357 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1358 if (all_real_p)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1359 retval = do_single_type_concat<SparseMatrix> (dv, tmp);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1360 else
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1361 retval = do_single_type_concat<SparseComplexMatrix> (dv, tmp);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1362 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1363 else
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 if (all_real_p)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1366 retval = do_single_type_concat<NDArray> (dv, tmp);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1367 else
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1368 retval = do_single_type_concat<ComplexNDArray> (dv, tmp);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1369 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1370 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1371 else if (result_type == "single")
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1372 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1373 if (all_real_p)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1374 retval = do_single_type_concat<FloatNDArray> (dv, tmp);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1375 else
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1376 retval = do_single_type_concat<FloatComplexNDArray> (dv, tmp);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1377 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1378 else if (result_type == "char")
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1379 {
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23449 diff changeset	1380 char type = (all_dq_strings_p ? '"' : '\'');
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1381
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1382 if (! all_strings_p)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1383 warn_implicit_conversion ("Octave:num-to-str",
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1384 "numeric", result_type);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1385 else
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1386 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	1387
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1388 charNDArray result (dv, Vstring_fill_char);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1389
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1390 single_type_concat<charNDArray> (result, tmp);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1391
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1392 retval = octave_value (result, type);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1393 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1394 else if (result_type == "logical")
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 if (any_sparse_p)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1397 retval = do_single_type_concat<SparseBoolMatrix> (dv, tmp);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1398 else
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1399 retval = do_single_type_concat<boolNDArray> (dv, tmp);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1400 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1401 else if (result_type == "int8")
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1402 retval = do_single_type_concat<int8NDArray> (dv, tmp);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1403 else if (result_type == "int16")
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1404 retval = do_single_type_concat<int16NDArray> (dv, tmp);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1405 else if (result_type == "int32")
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1406 retval = do_single_type_concat<int32NDArray> (dv, tmp);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1407 else if (result_type == "int64")
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1408 retval = do_single_type_concat<int64NDArray> (dv, tmp);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1409 else if (result_type == "uint8")
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1410 retval = do_single_type_concat<uint8NDArray> (dv, tmp);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1411 else if (result_type == "uint16")
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1412 retval = do_single_type_concat<uint16NDArray> (dv, tmp);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1413 else if (result_type == "uint32")
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1414 retval = do_single_type_concat<uint32NDArray> (dv, tmp);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1415 else if (result_type == "uint64")
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1416 retval = do_single_type_concat<uint64NDArray> (dv, tmp);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1417 else if (result_type == "cell")
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1418 retval = do_single_type_concat<Cell> (dv, tmp);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1419 else if (result_type == "struct")
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1420 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	1421 else
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 // 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	1424 // 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	1425 // 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	1426 // 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	1427 // 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	1428 // 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	1429 // 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	1430 //
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1431 // 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	1432 //
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1433 // ctmp = octave_value_typeinfo::lookup_type
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1434 // (tmp.begin() -> begin() -> type_name());
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1435 //
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1436 // 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	1437 // 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	1438 // be avoided.
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1439
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1440 octave_value ctmp;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1441
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1442 // Find the first non-empty object
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1443
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1444 if (any_sparse_p)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1445 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1446 // 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	1447 // 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	1448 if (all_real_p)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1449 ctmp = octave_sparse_matrix ().resize (dv);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1450 else
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1451 ctmp = octave_sparse_complex_matrix ().resize (dv);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1452 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1453 else
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1454 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1455 for (tm_row_const& row : tmp)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1456 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1457 octave_quit ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1458
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1459 for (auto& elt : row)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1460 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1461 octave_quit ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1462
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1463 ctmp = elt;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1464
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1465 if (! ctmp.all_zero_dims ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1466 goto found_non_empty;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1467 }
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
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1470 ctmp = (*(tmp.begin () -> begin ()));
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1471
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1472 found_non_empty:
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1473
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1474 if (! all_empty_p)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1475 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	1476 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1477
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1478 // 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	1479 // insert them in the result matrix.
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1480
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1481 int dv_len = dv.ndims ();
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23449 diff changeset	1482 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	1483 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	1484
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1485 for (tm_row_const& row : tmp)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1486 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1487 octave_quit ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1488
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1489 for (auto& elt : row)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1490 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1491 octave_quit ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1492
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1493 if (elt.is_empty ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1494 continue;
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 = do_cat_op (ctmp, elt, ra_idx);
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 ra_idx (1) += elt.columns ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1499 }
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 ra_idx (0) += row.rows ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1502 ra_idx (1) = 0;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1503 }
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 retval = ctmp;
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 (frc_str_conv && ! retval.is_string ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1508 retval = retval.convert_to_str ();
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
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1512 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	1513 }
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	1514
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1515 void
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1516 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	1517 {
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1518 octave_value retval;
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_idx_type nr = expr.length ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1521 octave_idx_type nc = -1;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1522
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1523 Cell val;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1524
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1525 octave_idx_type i = 0;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1526
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23435 diff changeset	1527 for (tree_argument_list *elt : expr)
23435 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 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	1530
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1531 if (nr == 1)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1532 // Optimize the single row case.
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1533 val = row.cell_value ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1534 else if (nc < 0)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1535 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1536 nc = row.length ();
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 val = Cell (nr, nc);
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 else
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1541 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1542 octave_idx_type this_nc = row.length ();
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 if (this_nc != nc)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1545 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1546 if (this_nc == 0)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1547 continue; // blank line
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1548 else
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1549 error ("number of columns must match");
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1550 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1551 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1552
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1553 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	1554 val(i,j) = row(j);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1555
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1556 i++;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1557 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1558
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1559 if (i < nr)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1560 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	1561
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1562 retval = val;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1563
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1564 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	1565 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1566
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1567 void
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1568 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	1569 {
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1570 octave_value_list val;
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 tree_expression *rhs = expr.right_hand_side ();
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 (rhs)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1575 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1576 tree_argument_list *lhs = expr.left_hand_side ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1577
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1578 std::list<octave_lvalue> lvalue_list = lhs->lvalue_list (this);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1579
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1580 octave_idx_type n_out = 0;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1581
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1582 for (const auto& lval : lvalue_list)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1583 n_out += lval.numel ();
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 // The following trick is used to keep rhs_val constant.
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1586 const octave_value_list rhs_val1 = evaluate_n (rhs, n_out, &lvalue_list);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1587 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	1588 && rhs_val1(0).is_cs_list ()
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1589 ? rhs_val1(0).list_value ()
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1590 : rhs_val1);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1591
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1592 octave_idx_type k = 0;
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 octave_idx_type n = rhs_val.length ();
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 // 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	1597 // postpone joining the final values.
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1598 std::list<octave_value_list> retval_list;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1599
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1600 tree_argument_list::iterator q = lhs->begin ();
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 for (octave_lvalue ult : lvalue_list)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1603 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1604 tree_expression lhs_elt = q++;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1605
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1606 octave_idx_type nel = ult.numel ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1607
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1608 if (nel != 1)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1609 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1610 // 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	1611 //
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1612 // [varargout{1:nargout}] = fcn (args);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1613 //
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1614 // 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	1615 // 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	1616 // 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	1617 // been defined. See also bug #43813.
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1618
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1619 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	1620 && ! ult.is_black_hole () && ult.is_undefined ()
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1621 && ult.index_type () == "{" && ult.index_is_empty ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1622 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1623 // 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	1624 // 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	1625 // handle a single output.
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1626
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1627 nel = 1;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1628
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1629 ult.define (Cell (1, 1));
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1630
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1631 ult.clear_index ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1632 std::list<octave_value_list> idx;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1633 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	1634 ult.set_index ("{", idx);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1635 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1636
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1637 if (k + nel > n)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1638 error ("some elements undefined in return list");
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1639
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1640 // This element of the return list expects a
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1641 // comma-separated list of values. Slicing avoids
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1642 // copying.
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_value_list ovl = rhs_val.slice (k, nel);
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 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	1647
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1648 retval_list.push_back (ovl);
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 k += nel;
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 else
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 if (k < n)
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 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	1657
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1658 if (ult.is_black_hole ())
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 k++;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1661 continue;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1662 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1663 else
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1664 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1665 retval_list.push_back (rhs_val(k));
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1666
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1667 k++;
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 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1670 else
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1671 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1672 // This can happen for a function like
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1673 //
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1674 // function varargout = f ()
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1675 // varargout{1} = nargout;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1676 // endfunction
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1677 //
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1678 // called with
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1679 //
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1680 // [a, ~] = f ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1681 //
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1682 // 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	1683 // 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	1684 // 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	1685 // don't need is missing from the list.
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 (! ult.is_black_hole ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1688 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	1689
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1690 k++;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1691 continue;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1692 }
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
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1695 if (expr.print_result ()
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1696 && octave::tree_evaluator::statement_printing_enabled ())
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 // 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	1699 // the new value of the referenced object below,
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1700 // instead of the indexed value (which should be
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1701 // the same as the right hand side value).
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1702
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1703 ult.clear_index ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1704
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1705 octave_value lhs_val = ult.value ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1706
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1707 octave_value_list args = ovl (lhs_val);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1708 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	1709 octave::feval ("display", args);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1710 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1711 }
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 // Concatenate return values.
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1714 val = retval_list;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1715 }
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 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	1718 }
13225 359153d26cc1 eliminate DO_SIMPLE_FOR_LOOP_ONCE macro John W. Eaton <jwe@octave.org> parents: 12833 diff changeset	1719
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1720 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1721 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	1722 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1723 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	1724 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	1725 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1726
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1727 void
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1728 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	1729 {
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1730 int nargout = m_nargout_stack.top ();
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 if (nargout > 1)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1733 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	1734
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1735 m_value_stack.push (ovl (expr.value ()));
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
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1738 void
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1739 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	1740 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1741 std::string nm = expr.name ();
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 octave_value fh = make_fcn_handle (nm);
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 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	1746 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1747
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1748 void
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1749 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	1750 {
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1751 octave_value_list retval;
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 octave_value fcn = expr.function ();
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_list args = expr.arguments ();
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 int nargout = m_nargout_stack.top ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1758
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1759 retval = octave::feval (fcn.function_value (), args, nargout);
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 if (retval.length () == 1 && retval(0).is_function ())
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 // 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	1764 // 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	1765 // used for superclass references in classdef.
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 octave_value val = retval(0);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1768 octave_function *f = val.function_value (true);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1769
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1770 if (f && ! (expr.is_postfix_indexed ()
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1771 && f->is_postfix_index_handled (expr.postfix_index ())))
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1772 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1773 octave_value_list tmp_args;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1774
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1775 retval = val.do_multi_index_op (nargout, tmp_args);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1776 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1777 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1778
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1779 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	1780 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1781
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1782 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1783 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	1784 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1785 panic_impossible ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1786 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1787
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1788 void
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1789 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	1790 {
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1791 octave_value val;
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 tree_expression *op = expr.operand ();
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 if (op)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1796 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1797 octave_value::unary_op etype = expr.op_type ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1798
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1799 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	1800 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1801 octave_lvalue ref = op->lvalue (this);
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 val = ref.value ();
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 profile_data_accumulator::enter<tree_postfix_expression>
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1806 block (profiler, expr);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1807
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1808 ref.do_unary_op (etype);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1809 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1810 else
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1811 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1812 octave_value op_val = evaluate (op);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1813
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1814 if (op_val.is_defined ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1815 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1816 profile_data_accumulator::enter<tree_postfix_expression>
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1817 block (profiler, expr);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1818
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1819 val = ::do_unary_op (etype, op_val);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1820 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1821 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1822 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1823
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1824 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	1825 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1826
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1827 void
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1828 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	1829 {
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1830 octave_value val;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1831
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1832 tree_expression *op = expr.operand ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1833
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1834 if (op)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1835 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1836 octave_value::unary_op etype = expr.op_type ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1837
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1838 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	1839 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1840 octave_lvalue op_ref = op->lvalue (this);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1841
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1842 profile_data_accumulator::enter<tree_prefix_expression>
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1843 block (profiler, expr);
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 op_ref.do_unary_op (etype);
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 val = op_ref.value ();
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 else
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 octave_value op_val = evaluate (op);
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 if (op_val.is_defined ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1854 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1855 profile_data_accumulator::enter<tree_prefix_expression>
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1856 block (profiler, expr);
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 // 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	1859 // (a temporary expression).
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1860 if (op_val.get_count () == 1)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1861 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	1862 else
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1863 val = ::do_unary_op (etype, op_val);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1864 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1865 }
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
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1868 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	1869 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1870
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1871 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1872 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	1873 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1874 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	1875 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	1876
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1877 // 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	1878
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1879 if (Vdebugging
23052 f97e22a9012a move octave_call_stack inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1880 && octave::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	1881 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1882 Vdebugging = false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1883
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1884 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	1885 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1886 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	1887 \|\| 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	1888 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	1889 }
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	1890
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1891 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1892 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	1893 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1894 panic_impossible ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1895 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1896
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1897 void
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1898 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	1899 {
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1900 octave_value val;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1901
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1902 tree_expression *rhs = expr.right_hand_side ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1903
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1904 if (rhs)
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 octave_value rhs_val = evaluate (rhs);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1907
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1908 if (rhs_val.is_undefined ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1909 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	1910
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1911 if (rhs_val.is_cs_list ())
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 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	1914
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1915 if (lst.empty ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1916 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	1917
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1918 rhs_val = lst(0);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1919 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1920
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1921 tree_expression *lhs = expr.left_hand_side ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1922
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1923 try
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1924 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1925 octave_lvalue ult = lhs->lvalue (this);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1926
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1927 if (ult.numel () != 1)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1928 err_nonbraced_cs_list_assignment ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1929
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1930 octave_value::assign_op etype = expr.op_type ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1931
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1932 ult.assign (etype, rhs_val);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1933
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1934 if (etype == octave_value::op_asn_eq)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1935 val = rhs_val;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1936 else
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1937 val = ult.value ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1938
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1939 if (expr.print_result ()
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1940 && octave::tree_evaluator::statement_printing_enabled ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1941 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1942 // 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	1943 // get the new value of the referenced
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1944 // object below, instead of the indexed
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1945 // value (which should be the same as the
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1946 // right hand side value).
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1947
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1948 ult.clear_index ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1949
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1950 octave_value lhs_val = ult.value ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1951
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1952 octave_value_list args = ovl (lhs_val);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1953 args.stash_name_tags (string_vector (lhs->name ()));
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1954 octave::feval ("display", args);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1955 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1956 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1957 catch (octave::index_exception& e)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1958 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1959 e.set_var (lhs->name ());
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1960 std::string msg = e.message ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1961 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	1962 }
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	1963 }
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 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	1966 }
8662 af72c8137d64 improve looping over arrays Jaroslav Hajek <highegg@gmail.com> parents: 8658 diff changeset	1967
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1968 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1969 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	1970 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1971 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	1972 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	1973
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1974 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	1975 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1976 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	1977 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1978 // 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	1979 // 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	1980
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1981 if (Vtrack_line_num)
23052 f97e22a9012a move octave_call_stack inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1982 octave::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	1983
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1984 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	1985 && ((Vecho_executing_commands & ECHO_SCRIPTS
23052 f97e22a9012a move octave_call_stack inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1986 && octave::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	1987 \|\| 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	1988 \|\| (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	1989 && 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	1990 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	1991 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1992
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1993 try
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1994 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1995 if (cmd)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1996 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	1997 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1998 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	1999 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	2000 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	2001
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2002 // 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	2003 // 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	2004 // 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	2005 // 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	2006
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2007 // 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	2008 // 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	2009 // 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	2010
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2011 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	2012
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2013 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	2014 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2015 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	2016
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2017 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	2018 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2019 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2020 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	2021
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2022 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	2023
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2024 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	2025 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	2026 && statement_printing_enabled ());
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2027
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2028 // 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	2029 // 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	2030 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2031 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2032 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	2033 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2034 // 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	2035 // 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	2036 // 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	2037 // 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	2038
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2039 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	2040 "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	2041 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2042 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2043 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2044
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2045 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2046 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	2047 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2048 // 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	2049 // 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	2050
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2051 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	2052
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2053 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	2054 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2055 while (true)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2056 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2057 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	2058
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2059 if (! elt)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2060 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	2061
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2062 octave_quit ();
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 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	2065
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2066 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	2067 \|\| 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	2068 break;
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 (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	2071 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2072
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2073 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	2074 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2075 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2076 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2077 // 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	2078 // 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	2079 // 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	2080 // 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	2081 //
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2082 // 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	2083 // # 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	2084 //
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2085 // 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	2086 // # 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	2087 // # 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	2088 // # 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	2089
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2090 // 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	2091 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2092 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2093 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2094 }
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 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2097 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	2098 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2099 panic_impossible ();
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_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	2104 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2105 panic_impossible ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2106 }
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 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2109 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	2110 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2111 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	2112 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	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_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	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 (! expr)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2117 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	2118 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	2119
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2120 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	2121
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2122 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	2123
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2124 if (lst)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2125 {
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23435 diff changeset	2126 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	2127 {
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2128 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	2129 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2130 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	2131
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2132 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	2133 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	2134
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2135 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2136 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2137 }
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 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2140
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2141 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2142 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	2143 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2144 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	2145
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	2146 {
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	2147 // 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	2148 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	2149
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2150 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	2151 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	2152 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	2153
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2154 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	2155 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	2156 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	2157
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2158 // 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	2159 // 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	2160
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2161 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	2162
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2163 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	2164 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2165 try
20784 52f6921dde09 * pt-eval.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20715 diff changeset	2166 {
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2167 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	2168 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	2169 in_try_catch--;
20784 52f6921dde09 * pt-eval.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20715 diff changeset	2170 }
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2171 catch (const octave::execution_exception&)
20784 52f6921dde09 * pt-eval.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20715 diff changeset	2172 {
23110 af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23084 diff changeset	2173 octave::interpreter::recover_from_exception ();
13225 359153d26cc1 eliminate DO_SIMPLE_FOR_LOOP_ONCE macro John W. Eaton <jwe@octave.org> parents: 12833 diff changeset	2174
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2175 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	2176 execution_error = true;
20784 52f6921dde09 * pt-eval.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20715 diff changeset	2177 }
52f6921dde09 * pt-eval.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20715 diff changeset	2178 }
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2179 // 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	2180 // 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	2181 // or throw further errors.
20784 52f6921dde09 * pt-eval.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20715 diff changeset	2182 }
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2183
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2184 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	2185 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2186 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	2187 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	2188 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2189 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	2190 octave_lvalue ult;
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2191
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2192 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	2193 {
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2194 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	2195
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2196 octave_scalar_map err;
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2197
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2198 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	2199 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	2200 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	2201
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2202 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	2203 }
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2204
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2205 // 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	2206 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	2207 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	2208 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2209 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2210 }
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2211
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2212 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2213 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	2214 {
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	2215 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	2216
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2217 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	2218 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	2219
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2220 // 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	2221 // backtracking.
23052 f97e22a9012a move octave_call_stack inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	2222 frame.add_fcn (octave::call_stack::set_line,
f97e22a9012a move octave_call_stack inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	2223 octave::call_stack::current_line ());
f97e22a9012a move octave_call_stack inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	2224 frame.add_fcn (octave::call_stack::set_column,
f97e22a9012a move octave_call_stack inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	2225 octave::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	2226
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2227 // 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	2228 // 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	2229 // 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	2230 // 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	2231
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2232 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	2233 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	2234
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2235 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	2236 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	2237
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2238 try
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2239 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2240 if (list)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2241 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	2242 }
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2243 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	2244 {
23110 af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23084 diff changeset	2245 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	2246
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2247 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	2248 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	2249 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2250 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	2251
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2252 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	2253
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2254 throw;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2255 }
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	2256
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2257 // 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	2258 // 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	2259
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2260 // 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	2261 // 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	2262 // 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	2263 // 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	2264 // 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	2265 //
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2266 // function foo ()
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2267 // unwind_protect
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2268 // 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	2269 // break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2270 // 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	2271 // 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	2272 // 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	2273 // return;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2274 // 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	2275 // 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	2276 // endfunction
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2277 //
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2278 // 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	2279 // 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	2280 // 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	2281 // 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	2282 // 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	2283
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2284 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	2285 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	2286 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2287 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	2288 }
20666 e0e2c2ce7e94 defer stack trace until back at top level John W. Eaton <jwe@octave.org> parents: 20560 diff changeset	2289
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2290 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2291 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	2292 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2293 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	2294
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2295 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	2296
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2297 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	2298 {
c34f9c182dcf Make debug_on_error to apply to the "catch" block of try/catch (bug #47685) Rik <rik@octave.org> parents: 21743 diff changeset	2299 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	2300 {
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2301 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	2302 }
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2303 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	2304 {
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2305 // 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	2306 // 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	2307 // 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	2308 // here?
23110 af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23084 diff changeset	2309 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	2310
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2311 // 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	2312 // 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	2313 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	2314
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2315 // 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	2316 // 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	2317 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	2318 }
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2319
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2320 // 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	2321 // 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	2322 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	2323 }
c34f9c182dcf Make debug_on_error to apply to the "catch" block of try/catch (bug #47685) Rik <rik@octave.org> parents: 21743 diff changeset	2324 }
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2325
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2326 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2327 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	2328 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2329 #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	2330 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	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 #endif
9383 d57f0c56195f improve error handling Jaroslav Hajek <highegg@gmail.com> parents: 9378 diff changeset	2333
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2334 octave::unwind_protect frame;
10210 752f349052a2 ensure correct backtraces after error in unwind_protect Jaroslav Hajek <highegg@gmail.com> parents: 10194 diff changeset	2335
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2336 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	2337
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2338 in_loop_command = true;
20666 e0e2c2ce7e94 defer stack trace until back at top level John W. Eaton <jwe@octave.org> parents: 20560 diff changeset	2339
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2340 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	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 (! expr)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2343 panic_impossible ();
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2344
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2345 for (;;)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2346 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2347 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	2348 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	2349
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2350 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	2351 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2352 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	2353
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2354 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	2355 loop_body->accept (*this);
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2356
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2357 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	2358 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2359 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2360 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2361 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2362 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2363 }
20666 e0e2c2ce7e94 defer stack trace until back at top level John W. Eaton <jwe@octave.org> parents: 20560 diff changeset	2364
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2365 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2366 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	2367 {
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	2368 #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	2369 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	2370 return;
15023 75d1bc2fd6d2 Compile top level while loops in JIT. Max Brister <max@2bass.com> parents: 14932 diff changeset	2371 #endif
75d1bc2fd6d2 Compile top level while loops in JIT. Max Brister <max@2bass.com> parents: 14932 diff changeset	2372
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2373 octave::unwind_protect frame;
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2374
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2375 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	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 in_loop_command = true;
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2378
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2379 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	2380 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	2381 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	2382
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2383 if (! expr)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2384 panic_impossible ();
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2385
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2386 for (;;)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2387 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2388 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	2389
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2390 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	2391 loop_body->accept (*this);
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2392
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2393 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	2394 break;
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 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	2397 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	2398
23052 f97e22a9012a move octave_call_stack inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	2399 octave::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	2400
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2401 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	2402 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2403 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2404 }
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2405
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2406 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2407 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	2408 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2409 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	2410 }
8845 5a6db6bd1a02 eigs.cc (Feigs): fix handling of sigma arg John W. Eaton <jwe@octave.org> parents: 8679 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 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2413 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	2414 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	2415 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2416 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	2417
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2418 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	2419 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2420 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	2421
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2422 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	2423
23052 f97e22a9012a move octave_call_stack inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	2424 current_frame = octave::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	2425 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2426 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	2427 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2428 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	2429
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2430 dbstep_flag = 0;
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2431
23052 f97e22a9012a move octave_call_stack inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	2432 current_frame = octave::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	2433 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2434 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	2435 {
23052 f97e22a9012a move octave_call_stack inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	2436 if (octave::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	2437 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2438 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	2439 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2440 // 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	2441 // 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	2442 // 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	2443 // 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	2444 // return to prompt.
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2445
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2446 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	2447
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2448 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	2449 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2450 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2451 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2452 // 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	2453
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2454 dbstep_flag--;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2455 }
15574 d20cbfec6df7 Fix off-by-1 error when executing 'dbstep N' Rik <rik@octave.org> parents: 15469 diff changeset	2456
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2457 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2458 else if (dbstep_flag == 1
23052 f97e22a9012a move octave_call_stack inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	2459 && octave::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	2460 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2461 // 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	2462
23052 f97e22a9012a move octave_call_stack inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	2463 current_frame = octave::call_stack::current_frame ();
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2464
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2465 break_on_this_statement = true;
15574 d20cbfec6df7 Fix off-by-1 error when executing 'dbstep N' Rik <rik@octave.org> parents: 15469 diff changeset	2466
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2467 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	2468 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2469 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2470 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	2471 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2472 // 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	2473
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2474 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	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 dbstep_flag = 0;
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2477
23052 f97e22a9012a move octave_call_stack inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	2478 current_frame = octave::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	2479 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2480 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	2481 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2482 // 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	2483 // 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	2484 // 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	2485 // "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	2486 // that frame.
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 if (is_end_of_fcn_or_script
23052 f97e22a9012a move octave_call_stack inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	2489 && octave::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	2490 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	2491 }
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2492
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2493 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	2494 do_keyboard ();
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2495
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2496 }
10219 979fb2606c4f new tree_evaluator::do_keyoard function Ryan Rusaw <rrusaw@gmail.com> parents: 10210 diff changeset	2497
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2498 // 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	2499 // 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	2500 // 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	2501
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2502 octave_value
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2503 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	2504 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22164 diff changeset	2505 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	2506 }
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2507
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2508 bool
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2509 tree_evaluator::is_logically_true (tree_expression *expr,
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2510 const char *warn_for)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2511 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2512 bool expr_value = false;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2513
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2514 octave_value t1 = evaluate (expr);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2515
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2516 if (t1.is_defined ())
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2517 return t1.is_true ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2518 else
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2519 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	2520
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2521 return expr_value;
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23398 diff changeset	2522 }
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2523 }
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2524
10578 cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10315 diff changeset	2525 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	2526 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	2527 @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	2528 @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	2529 @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	2530 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	2531 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	2532
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21922 diff changeset	2533 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	2534 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	2535
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21922 diff changeset	2536 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	2537 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	2538 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	2539 @end deftypefn */)
10578 cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10315 diff changeset	2540 {
cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10315 diff changeset	2541 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	2542 }
cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10315 diff changeset	2543
12833 9f0f2c226053 codesprint: new tests for functions in pt-eval.cc John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	2544 /*
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	2545 %!test
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	2546 %! 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	2547 %! 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	2548 %! 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	2549 %! 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	2550 %! 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	2551 %! 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	2552
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14294 diff changeset	2553 %!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	2554 */
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	2555
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2556 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	2557 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	2558 @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	2559 @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	2560 @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	2561 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	2562 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	2563
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21922 diff changeset	2564 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	2565 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	2566 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	2567
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21922 diff changeset	2568 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	2569 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	2570 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	2571 @end deftypefn */)
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2572 {
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: diff changeset	2573 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	2574 }
12833 9f0f2c226053 codesprint: new tests for functions in pt-eval.cc John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	2575
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	2576 /*
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	2577 %!test
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	2578 %! orig_val = silent_functions ();
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	2579 %! 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	2580 %! 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	2581 %! 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	2582 %! silent_functions (orig_val);
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	2583 %! 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	2584
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14294 diff changeset	2585 %!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	2586 */

Mercurial > octave

annotate libinterp/parse-tree/pt-eval.cc @ 23450:855122b993da