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

annotate libinterp/parse-tree/pt-idx.cc @ 26662:05fc703b419a

update handling of command-style function call syntax in eval * lex.h, lex.ll (lexical_feedback::m_allow_command_syntax): New data member. (lexical_feedback::reset): Reset it. (lexical_feedback::previous_token_may_be_command, base_lexer::looks_like_command_arg): Return false immediately if m_allow_command_syntax is false. (base_lexer::is_variable): Check if name is a variable if parsing in top level scope. * parse.h, oct-parse.yy (base_parser::disallow_command_syntax): New function. (word_list_command): Mark index expression as a word list command. * pt-eval.cc (tree_evaluator::eval_string): If nargout > 0, don't allow evaluated code to be parsed as a command-style function call. (tree_evaluator::visit_index_expression): Error if identifier is a variable and index expression is a command-style function call. * pt-idx.h, pt-idx.cc (tree_index_expression::m_word_list_cmd): New member variable. (tree_index_expression::mark_word_list_cmd, tree_index_expression::is_word_list_cmd): New functions. * clearvars.m: Avoid evaluating command-style function call when assigning result of call to eval. * test/eval-command.tst: New file. * bug-38565.tst, bug-38576.tst: Delete obsolete tests. * test/module.mk: Update.

author	John W. Eaton <jwe@octave.org>
date	Thu, 31 Jan 2019 18:45:37 +0000
parents	e4909f142491
children	072d0610cc56

rev	line source
2980 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	1 /*
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	2
26376 00f796120a6d maint: Update copyright dates in all source files. John W. Eaton <jwe@octave.org> parents: 26094 diff changeset	3 Copyright (C) 1996-2019 John W. Eaton
2980 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	4
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	5 This file is part of Octave.
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	6
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24356 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: 22407 diff changeset	8 under the terms of the GNU General Public License as published by
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24356 diff changeset	9 the Free Software Foundation, either version 3 of the License, or
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	10 (at your option) any later version.
2980 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	11
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 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: 22407 diff changeset	13 WITHOUT ANY WARRANTY; without even the implied warranty of
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	15 GNU General Public License for more details.
2980 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	16
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	17 You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6833 diff changeset	18 along with Octave; see the file COPYING. If not, see
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24356 diff changeset	19 <https://www.gnu.org/licenses/>.
2980 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	20
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	21 */
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	22
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	23 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21200 diff changeset	24 # include "config.h"
2980 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	25 #endif
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	26
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3930 diff changeset	27 #include "Cell.h"
2980 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	28 #include "error.h"
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23576 diff changeset	29 #include "interpreter-private.h"
3930 61d4427c016e [project @ 2002-05-07 00:47:31 by jwe] jwe parents: 3929 diff changeset	30 #include "oct-map.h"
20940 48b2ad5ee801 maint: Rename oct-obj.[cc\|h] to ovl.[cc\|h] for clarity. Rik <rik@octave.org> parents: 20700 diff changeset	31 #include "ovl.h"
2980 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	32 #include "oct-lvalue.h"
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	33 #include "ov.h"
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: 2980 diff changeset	34 #include "pt-arg-list.h"
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23396 diff changeset	35 #include "pt-eval.h"
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7200 diff changeset	36 #include "pt-id.h"
2980 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	37 #include "pt-idx.h"
3930 61d4427c016e [project @ 2002-05-07 00:47:31 by jwe] jwe parents: 3929 diff changeset	38 #include "utils.h"
61d4427c016e [project @ 2002-05-07 00:47:31 by jwe] jwe parents: 3929 diff changeset	39 #include "variables.h"
21100 e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme. Rik <rik@octave.org> parents: 20977 diff changeset	40 #include "errwarn.h"
2980 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	41
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	42 namespace octave
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3930 diff changeset	43 {
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	44 // Index expressions.
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	45
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	46 tree_index_expression::tree_index_expression (int l, int c)
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24722 diff changeset	47 : tree_expression (l, c), m_expr (nullptr), m_args (0), m_type (),
26662 05fc703b419a update handling of command-style function call syntax in eval John W. Eaton <jwe@octave.org> parents: 26660 diff changeset	48 m_arg_nm (), m_dyn_field (), m_word_list_cmd (false) { }
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	49
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	50 tree_index_expression::tree_index_expression (tree_expression *e,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	51 tree_argument_list *lst,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	52 int l, int c, char t)
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24722 diff changeset	53 : tree_expression (l, c), m_expr (e), m_args (0), m_type (),
26662 05fc703b419a update handling of command-style function call syntax in eval John W. Eaton <jwe@octave.org> parents: 26660 diff changeset	54 m_arg_nm (), m_dyn_field (), m_word_list_cmd (false)
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	55 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	56 append (lst, t);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	57 }
4131 597fbc55ea40 [project @ 2002-10-29 17:12:53 by jwe] jwe parents: 4066 diff changeset	58
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	59 tree_index_expression::tree_index_expression (tree_expression *e,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	60 const std::string& n,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	61 int l, int c)
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24722 diff changeset	62 : tree_expression (l, c), m_expr (e), m_args (0), m_type (),
26662 05fc703b419a update handling of command-style function call syntax in eval John W. Eaton <jwe@octave.org> parents: 26660 diff changeset	63 m_arg_nm (), m_dyn_field (), m_word_list_cmd (false)
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	64 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	65 append (n);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	66 }
3930 61d4427c016e [project @ 2002-05-07 00:47:31 by jwe] jwe parents: 3929 diff changeset	67
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	68 tree_index_expression::tree_index_expression (tree_expression *e,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	69 tree_expression *df,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	70 int l, int c)
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24722 diff changeset	71 : tree_expression (l, c), m_expr (e), m_args (0), m_type (),
26662 05fc703b419a update handling of command-style function call syntax in eval John W. Eaton <jwe@octave.org> parents: 26660 diff changeset	72 m_arg_nm (), m_dyn_field (), m_word_list_cmd (false)
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	73 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	74 append (df);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	75 }
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3930 diff changeset	76
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	77 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	78 tree_index_expression::append (tree_argument_list *lst, char t)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	79 {
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24722 diff changeset	80 m_args.push_back (lst);
7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24722 diff changeset	81 m_type.append (1, t);
7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24722 diff changeset	82 m_arg_nm.push_back (lst ? lst->get_arg_names () : string_vector ());
7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24722 diff changeset	83 m_dyn_field.push_back (static_cast<tree_expression *> (nullptr));
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	84
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	85 if (lst && lst->has_magic_tilde ())
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	86 error ("invalid use of empty argument (~) in index expression");
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	87 }
13970 c93b953f7d54 plug some memory leaks John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	88
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	89 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	90 tree_index_expression::append (const std::string& n)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	91 {
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24722 diff changeset	92 m_args.push_back (static_cast<tree_argument_list *> (nullptr));
7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24722 diff changeset	93 m_type += '.';
7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24722 diff changeset	94 m_arg_nm.push_back (n);
7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24722 diff changeset	95 m_dyn_field.push_back (static_cast<tree_expression *> (nullptr));
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	96 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	97
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	98 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	99 tree_index_expression::append (tree_expression *df)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	100 {
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24722 diff changeset	101 m_args.push_back (static_cast<tree_argument_list *> (nullptr));
7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24722 diff changeset	102 m_type += '.';
7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24722 diff changeset	103 m_arg_nm.push_back ("");
7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24722 diff changeset	104 m_dyn_field.push_back (df);
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	105 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	106
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	107 tree_index_expression::~tree_index_expression (void)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	108 {
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24722 diff changeset	109 delete m_expr;
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	110
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24722 diff changeset	111 while (! m_args.empty ())
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	112 {
25337 3ff9192b676e use auto keyword to declare iterator variables where possible John W. Eaton <jwe@octave.org> parents: 25336 diff changeset	113 auto p = m_args.begin ();
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	114 delete *p;
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24722 diff changeset	115 m_args.erase (p);
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	116 }
2980 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	117
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24722 diff changeset	118 while (! m_dyn_field.empty ())
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	119 {
25337 3ff9192b676e use auto keyword to declare iterator variables where possible John W. Eaton <jwe@octave.org> parents: 25336 diff changeset	120 auto p = m_dyn_field.begin ();
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	121 delete *p;
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24722 diff changeset	122 m_dyn_field.erase (p);
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	123 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	124 }
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 4675 diff changeset	125
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	126 bool
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	127 tree_index_expression::has_magic_end (void) const
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	128 {
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24722 diff changeset	129 for (const tree_argument_list *elt : m_args)
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	130 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	131 if (elt && elt->has_magic_end ())
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	132 return true;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	133 }
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 4675 diff changeset	134
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	135 return false;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	136 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	137
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	138 // This is useful for printing the name of the variable in an indexed
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	139 // assignment.
2991 fc751d2a99fd [project @ 1997-05-16 21:00:48 by jwe] jwe parents: 2984 diff changeset	140
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	141 std::string
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	142 tree_index_expression::name (void) const
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	143 {
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24722 diff changeset	144 return m_expr->name ();
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	145 }
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3930 diff changeset	146
24722 af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	147 static inline octave_value_list
25383 d3a035528c9a use reference to tree_evaluator instead of pointer John W. Eaton <jwe@octave.org> parents: 25382 diff changeset	148 make_value_list (tree_evaluator& tw,
25336 389757b7b6af eliminate redundant octave:: namespace tags John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	149 tree_argument_list *m_args,
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24722 diff changeset	150 const string_vector& m_arg_nm, const octave_value *object,
24722 af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	151 bool rvalue = true)
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	152 {
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	153 octave_value_list retval;
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21100 diff changeset	154
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24722 diff changeset	155 if (m_args)
24722 af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	156 {
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24722 diff changeset	157 if (rvalue && object && m_args->has_magic_end ()
24722 af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	158 && object->is_undefined ())
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	159 err_invalid_inquiry_subscript ();
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3930 diff changeset	160
25383 d3a035528c9a use reference to tree_evaluator instead of pointer John W. Eaton <jwe@octave.org> parents: 25382 diff changeset	161 retval = tw.convert_to_const_vector (m_args, object);
24722 af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	162 }
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3930 diff changeset	163
24722 af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	164 octave_idx_type n = retval.length ();
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3930 diff changeset	165
24722 af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	166 if (n > 0)
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24722 diff changeset	167 retval.stash_name_tags (m_arg_nm);
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3930 diff changeset	168
24722 af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	169 return retval;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	170 }
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	171
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	172 std::string
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	173 tree_index_expression::get_struct_index
25383 d3a035528c9a use reference to tree_evaluator instead of pointer John W. Eaton <jwe@octave.org> parents: 25382 diff changeset	174 (tree_evaluator& tw,
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23396 diff changeset	175 std::list<string_vector>::const_iterator p_arg_nm,
4219 23d06c9e1edd [project @ 2002-12-06 21:29:17 by jwe] jwe parents: 4192 diff changeset	176 std::list<tree_expression *>::const_iterator p_dyn_field) const
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	177 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	178 std::string fn = (*p_arg_nm)(0);
4131 597fbc55ea40 [project @ 2002-10-29 17:12:53 by jwe] jwe parents: 4066 diff changeset	179
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	180 if (fn.empty ())
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	181 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	182 tree_expression df = p_dyn_field;
4131 597fbc55ea40 [project @ 2002-10-29 17:12:53 by jwe] jwe parents: 4066 diff changeset	183
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	184 if (df)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	185 {
25383 d3a035528c9a use reference to tree_evaluator instead of pointer John W. Eaton <jwe@octave.org> parents: 25382 diff changeset	186 octave_value t = tw.evaluate (df);
4131 597fbc55ea40 [project @ 2002-10-29 17:12:53 by jwe] jwe parents: 4066 diff changeset	187
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	188 fn = t.xstring_value ("dynamic structure field names must be strings");
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	189 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	190 else
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	191 panic_impossible ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	192 }
4131 597fbc55ea40 [project @ 2002-10-29 17:12:53 by jwe] jwe parents: 4066 diff changeset	193
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	194 return fn;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	195 }
10832 1b2fcd122c6a allow user detect ignored outputs in m-functions Jaroslav Hajek <highegg@gmail.com> parents: 10659 diff changeset	196
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	197 octave_lvalue
25383 d3a035528c9a use reference to tree_evaluator instead of pointer John W. Eaton <jwe@octave.org> parents: 25382 diff changeset	198 tree_index_expression::lvalue (tree_evaluator& tw)
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	199 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	200 std::list<octave_value_list> idx;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	201 std::string tmp_type;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	202
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24722 diff changeset	203 int n = m_args.size ();
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	204
25337 3ff9192b676e use auto keyword to declare iterator variables where possible John W. Eaton <jwe@octave.org> parents: 25336 diff changeset	205 auto p_args = m_args.begin ();
3ff9192b676e use auto keyword to declare iterator variables where possible John W. Eaton <jwe@octave.org> parents: 25336 diff changeset	206 auto p_arg_nm = m_arg_nm.begin ();
3ff9192b676e use auto keyword to declare iterator variables where possible John W. Eaton <jwe@octave.org> parents: 25336 diff changeset	207 auto p_dyn_field = m_dyn_field.begin ();
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	208
26660 e4909f142491 * pt-idx.cc (tree_index_expression::lvalue): Style fix. John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	209 octave_lvalue retval = m_expr->lvalue (tw);
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	210
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	211 octave_value tmp = retval.value ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	212
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	213 octave_idx_type tmpi = 0;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	214 std::list<octave_value_list> tmpidx;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	215
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	216 for (int i = 0; i < n; i++)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	217 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	218 if (retval.numel () != 1)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	219 err_indexed_cs_list ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	220
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	221 if (tmpi < i)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	222 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	223 try
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10206 diff changeset	224 {
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24722 diff changeset	225 tmp = tmp.subsref (m_type.substr (tmpi, i-tmpi), tmpidx, true);
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	226 }
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	227 catch (index_exception& e) // problems with range, invalid type etc.
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	228 {
26094 8fb0df0c8772 eliminate duplicate final_index_error function John W. Eaton <jwe@octave.org> parents: 25383 diff changeset	229 tw.final_index_error (e, m_expr);
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	230 }
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	231
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	232 tmpidx.clear ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	233 }
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	234
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24722 diff changeset	235 switch (m_type[i])
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	236 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	237 case '(':
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10206 diff changeset	238 {
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	239 octave_value_list tidx
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23396 diff changeset	240 = make_value_list (tw, p_args, p_arg_nm, &tmp, false);
4432 ff7187bd3075 [project @ 2003-06-19 16:40:53 by jwe] jwe parents: 4234 diff changeset	241
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	242 idx.push_back (tidx);
5846 db0598f94c0f [project @ 2006-06-07 18:16:16 by jwe] jwe parents: 5775 diff changeset	243
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	244 if (i < n - 1)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10206 diff changeset	245 {
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24722 diff changeset	246 if (m_type[i+1] != '.')
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	247 error ("() must be followed by . or close the index chain");
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	248
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	249 tmpidx.push_back (tidx);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	250 tmpi = i+1;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10206 diff changeset	251 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10206 diff changeset	252 }
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	253 break;
3930 61d4427c016e [project @ 2002-05-07 00:47:31 by jwe] jwe parents: 3929 diff changeset	254
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	255 case '{':
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	256 {
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	257 octave_value_list tidx
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23396 diff changeset	258 = make_value_list (tw, p_args, p_arg_nm, &tmp, false);
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3930 diff changeset	259
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	260 if (tmp.is_undefined ())
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	261 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	262 if (tidx.has_magic_colon ())
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	263 err_invalid_inquiry_subscript ();
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	264
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	265 tmp = Cell ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	266 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	267 else if (tmp.is_zero_by_zero ()
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	268 && (tmp.is_matrix_type () \|\| tmp.is_string ()))
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	269 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	270 tmp = Cell ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	271 }
18439 d5aa615dcf4c Fix package function call with magic "end" in arguments. Michael Goffioul <michael.goffioul@gmail.com> parents: 17787 diff changeset	272
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	273 retval.numel (tmp.numel (tidx));
18439 d5aa615dcf4c Fix package function call with magic "end" in arguments. Michael Goffioul <michael.goffioul@gmail.com> parents: 17787 diff changeset	274
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	275 idx.push_back (tidx);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	276 tmpidx.push_back (tidx);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	277 tmpi = i;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	278 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	279 break;
2980 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	280
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	281 case '.':
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	282 {
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23396 diff changeset	283 octave_value tidx = get_struct_index (tw, p_arg_nm, p_dyn_field);
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	284
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	285 bool autoconv = (tmp.is_zero_by_zero ()
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	286 && (tmp.is_matrix_type () \|\| tmp.is_string ()
23576 00e518162fda maint: Deprecate is_cell and replace with iscell. Rik <rik@octave.org> parents: 23450 diff changeset	287 \|\| tmp.iscell ()));
2980 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	288
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24722 diff changeset	289 if (i > 0 && m_type[i-1] == '(')
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	290 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	291 octave_value_list pidx = idx.back ();
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21100 diff changeset	292
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	293 // Use octave_map, not octave_scalar_map so that the
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	294 // dimensions are 0x0, not 1x1.
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	295 if (tmp.is_undefined ())
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	296 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	297 if (pidx.has_magic_colon ())
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	298 err_invalid_inquiry_subscript ();
21120 499b851fbfae Replace pattern if/err_XXX/else/code with if/err_XXX/ code. Rik <rik@octave.org> parents: 21118 diff changeset	299
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	300 tmp = octave_map ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	301 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	302 else if (autoconv)
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21100 diff changeset	303 tmp = octave_map ();
5846 db0598f94c0f [project @ 2006-06-07 18:16:16 by jwe] jwe parents: 5775 diff changeset	304
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	305 retval.numel (tmp.numel (pidx));
6833 e8a18d380097 [project @ 2007-08-27 17:22:50 by jwe] jwe parents: 6811 diff changeset	306
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	307 tmpi = i-1;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	308 tmpidx.push_back (tidx);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	309 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	310 else
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	311 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	312 if (tmp.is_undefined () \|\| autoconv)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	313 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	314 tmpi = i+1;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	315 tmp = octave_value ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	316 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	317 else
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	318 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	319 retval.numel (tmp.numel (octave_value_list ()));
7099 70f30a92b725 [project @ 2007-11-05 21:51:24 by jwe] jwe parents: 7057 diff changeset	320
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	321 tmpi = i;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	322 tmpidx.push_back (tidx);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	323 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	324 }
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21100 diff changeset	325
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	326 idx.push_back (tidx);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	327 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	328 break;
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	329
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	330 default:
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	331 panic_impossible ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	332 }
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	333
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	334 if (idx.back ().empty ())
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	335 error ("invalid empty index list");
5846 db0598f94c0f [project @ 2006-06-07 18:16:16 by jwe] jwe parents: 5775 diff changeset	336
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	337 p_args++;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	338 p_arg_nm++;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	339 p_dyn_field++;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	340 }
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	341
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24722 diff changeset	342 retval.set_index (m_type, idx);
8546 3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8011 diff changeset	343
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	344 return retval;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	345 }
4234 90e44267e8cf [project @ 2002-12-21 17:15:25 by jwe] jwe parents: 4233 diff changeset	346
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	347 tree_index_expression *
24270 bc3819b7cca1 don't use symbol_table:: nesting for symbol_record, symbol_scope, or fcn_info John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	348 tree_index_expression::dup (symbol_scope& scope) const
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	349 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	350 tree_index_expression *new_idx_expr
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	351 = new tree_index_expression (line (), column ());
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21100 diff changeset	352
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24722 diff changeset	353 new_idx_expr->m_expr = (m_expr ? m_expr->dup (scope) : nullptr);
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	354
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	355 std::list<tree_argument_list *> new_args;
5846 db0598f94c0f [project @ 2006-06-07 18:16:16 by jwe] jwe parents: 5775 diff changeset	356
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24722 diff changeset	357 for (const tree_argument_list *elt : m_args)
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23696 diff changeset	358 new_args.push_back (elt ? elt->dup (scope) : nullptr);
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	359
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24722 diff changeset	360 new_idx_expr->m_args = new_args;
3930 61d4427c016e [project @ 2002-05-07 00:47:31 by jwe] jwe parents: 3929 diff changeset	361
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24722 diff changeset	362 new_idx_expr->m_type = m_type;
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	363
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24722 diff changeset	364 new_idx_expr->m_arg_nm = m_arg_nm;
7099 70f30a92b725 [project @ 2007-11-05 21:51:24 by jwe] jwe parents: 7057 diff changeset	365
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	366 std::list<tree_expression *> new_dyn_field;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	367
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24722 diff changeset	368 for (const tree_expression *elt : m_dyn_field)
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23696 diff changeset	369 new_dyn_field.push_back (elt ? elt->dup (scope) : nullptr);
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	370
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24722 diff changeset	371 new_idx_expr->m_dyn_field = new_dyn_field;
8546 3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8011 diff changeset	372
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	373 new_idx_expr->copy_base (*this);
4234 90e44267e8cf [project @ 2002-12-21 17:15:25 by jwe] jwe parents: 4233 diff changeset	374
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	375 return new_idx_expr;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	376 }
2980 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	377 }
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	378
7099 70f30a92b725 [project @ 2007-11-05 21:51:24 by jwe] jwe parents: 7057 diff changeset	379 /*
70f30a92b725 [project @ 2007-11-05 21:51:24 by jwe] jwe parents: 7057 diff changeset	380 %!test
14429 eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14343 diff changeset	381 %! clear x;
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14343 diff changeset	382 %! clear y;
14343 acc26b860afa fix indexed assignment bug (bug #35482) John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	383 %! y = 3;
acc26b860afa fix indexed assignment bug (bug #35482) John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	384 %! x(y(end)) = 1;
acc26b860afa fix indexed assignment bug (bug #35482) John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	385 %! assert (x, [0, 0, 1]);
14429 eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14343 diff changeset	386 %! clear x;
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14343 diff changeset	387 %! clear y;
14343 acc26b860afa fix indexed assignment bug (bug #35482) John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	388 %! y = {3};
acc26b860afa fix indexed assignment bug (bug #35482) John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	389 %! x(y{end}) = 1;
acc26b860afa fix indexed assignment bug (bug #35482) John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	390 %! assert (x, [0, 0, 1]);
acc26b860afa fix indexed assignment bug (bug #35482) John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	391
acc26b860afa fix indexed assignment bug (bug #35482) John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	392 %!test
7099 70f30a92b725 [project @ 2007-11-05 21:51:24 by jwe] jwe parents: 7057 diff changeset	393 %! x = {1, 2, 3};
70f30a92b725 [project @ 2007-11-05 21:51:24 by jwe] jwe parents: 7057 diff changeset	394 %! [x{:}] = deal (4, 5, 6);
70f30a92b725 [project @ 2007-11-05 21:51:24 by jwe] jwe parents: 7057 diff changeset	395 %! assert (x, {4, 5, 6});
70f30a92b725 [project @ 2007-11-05 21:51:24 by jwe] jwe parents: 7057 diff changeset	396
70f30a92b725 [project @ 2007-11-05 21:51:24 by jwe] jwe parents: 7057 diff changeset	397 %!test
70f30a92b725 [project @ 2007-11-05 21:51:24 by jwe] jwe parents: 7057 diff changeset	398 %! [x.a, x.b.c] = deal (1, 2);
70f30a92b725 [project @ 2007-11-05 21:51:24 by jwe] jwe parents: 7057 diff changeset	399 %! assert (x.a == 1 && x.b.c == 2);
70f30a92b725 [project @ 2007-11-05 21:51:24 by jwe] jwe parents: 7057 diff changeset	400
70f30a92b725 [project @ 2007-11-05 21:51:24 by jwe] jwe parents: 7057 diff changeset	401 %!test
70f30a92b725 [project @ 2007-11-05 21:51:24 by jwe] jwe parents: 7057 diff changeset	402 %! [x.a, x(2).b] = deal (1, 2);
70f30a92b725 [project @ 2007-11-05 21:51:24 by jwe] jwe parents: 7057 diff changeset	403 %! assert (x(1).a == 1 && isempty (x(2).a) && isempty (x(1).b) && x(2).b == 2);
70f30a92b725 [project @ 2007-11-05 21:51:24 by jwe] jwe parents: 7057 diff changeset	404
70f30a92b725 [project @ 2007-11-05 21:51:24 by jwe] jwe parents: 7057 diff changeset	405 %!test
70f30a92b725 [project @ 2007-11-05 21:51:24 by jwe] jwe parents: 7057 diff changeset	406 %! x = struct (zeros (0, 1), {"a", "b"});
70f30a92b725 [project @ 2007-11-05 21:51:24 by jwe] jwe parents: 7057 diff changeset	407 %! x(2).b = 1;
70f30a92b725 [project @ 2007-11-05 21:51:24 by jwe] jwe parents: 7057 diff changeset	408 %! assert (x(2).b == 1);
70f30a92b725 [project @ 2007-11-05 21:51:24 by jwe] jwe parents: 7057 diff changeset	409
70f30a92b725 [project @ 2007-11-05 21:51:24 by jwe] jwe parents: 7057 diff changeset	410 %!test
70f30a92b725 [project @ 2007-11-05 21:51:24 by jwe] jwe parents: 7057 diff changeset	411 %! x = struct (zeros (0, 1), {"a", "b"});
70f30a92b725 [project @ 2007-11-05 21:51:24 by jwe] jwe parents: 7057 diff changeset	412 %! x(2).b = 1;
70f30a92b725 [project @ 2007-11-05 21:51:24 by jwe] jwe parents: 7057 diff changeset	413 %! assert (x(2).b == 1);
70f30a92b725 [project @ 2007-11-05 21:51:24 by jwe] jwe parents: 7057 diff changeset	414 */

Mercurial > octave

annotate libinterp/parse-tree/pt-idx.cc @ 26662:05fc703b419a