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

annotate libinterp/parse-tree/pt-idx.cc @ 23576:00e518162fda

maint: Deprecate is_cell and replace with iscell. * ov.h (is_cell): Use OCTAVE_DEPRECATED macro around is_cell function. * ov.h (iscell): New function. * cellfun.cc, daspk.cc, dasrt.cc, dassl.cc, data.cc, debug.cc, graphics.cc, graphics.in.h, ls-mat5.cc, lsode.cc, mex.cc, mxarray.in.h, oct-stream.cc, regexp.cc, str2double.cc, strfind.cc, strfns.cc, utils.cc, ov-base.h, ov-cell.cc, ov-cell.h, ov-class.cc, ov-classdef.cc, ov-java.cc, ov-struct.cc, ov.cc, ovl.cc, bp-table.cc, pt-cell.h, pt-eval.cc, pt-exp.h, pt-idx.cc, pt-tm-const.cc: Replace instances of is_cell with iscell.

author	Rik <rik@octave.org>
date	Sun, 11 Jun 2017 15:35:21 -0700
parents	855122b993da
children	5cb3a2bb5e1e

rev	line source
2980 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	1 /*
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	2
23219 3ac9f9ecfae5 maint: Update copyright dates. John W. Eaton <jwe@octave.org> parents: 23083 diff changeset	3 Copyright (C) 1996-2017 John W. Eaton
2980 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	4
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	5 This file is part of Octave.
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	6
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	7 Octave is free software; you can redistribute it and/or modify it
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 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: 22407 diff changeset	9 the Free Software Foundation; either version 3 of the License, or
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
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6833 diff changeset	19 <http://www.gnu.org/licenses/>.
2980 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	20
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	21 */
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	22
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	23 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21200 diff changeset	24 # include "config.h"
2980 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	25 #endif
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	26
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"
3930 61d4427c016e [project @ 2002-05-07 00:47:31 by jwe] jwe parents: 3929 diff changeset	29 #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	30 #include "ovl.h"
2980 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	31 #include "oct-lvalue.h"
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	32 #include "ov.h"
3930 61d4427c016e [project @ 2002-05-07 00:47:31 by jwe] jwe parents: 3929 diff changeset	33 #include "pager.h"
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: 2980 diff changeset	34 #include "pt-arg-list.h"
3930 61d4427c016e [project @ 2002-05-07 00:47:31 by jwe] jwe parents: 3929 diff changeset	35 #include "pt-bp.h"
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23396 diff changeset	36 #include "pt-eval.h"
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7200 diff changeset	37 #include "pt-id.h"
2980 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	38 #include "pt-idx.h"
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	39 #include "pt-walk.h"
3930 61d4427c016e [project @ 2002-05-07 00:47:31 by jwe] jwe parents: 3929 diff changeset	40 #include "utils.h"
61d4427c016e [project @ 2002-05-07 00:47:31 by jwe] jwe parents: 3929 diff changeset	41 #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	42 #include "errwarn.h"
2980 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	43
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	44 namespace octave
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3930 diff changeset	45 {
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	46 // Index expressions.
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	47
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	48 tree_index_expression::tree_index_expression (int l, int c)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	49 : tree_expression (l, c), expr (0), args (0), type (),
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	50 arg_nm (), dyn_field () { }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	51
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	52 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	53 tree_argument_list *lst,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	54 int l, int c, char t)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	55 : tree_expression (l, c), expr (e), args (0), type (),
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	56 arg_nm (), dyn_field ()
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	57 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	58 append (lst, t);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	59 }
4131 597fbc55ea40 [project @ 2002-10-29 17:12:53 by jwe] jwe parents: 4066 diff changeset	60
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	61 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	62 const std::string& n,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	63 int l, int c)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	64 : tree_expression (l, c), expr (e), args (0), type (),
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	65 arg_nm (), dyn_field ()
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	66 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	67 append (n);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	68 }
3930 61d4427c016e [project @ 2002-05-07 00:47:31 by jwe] jwe parents: 3929 diff changeset	69
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	70 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	71 tree_expression *df,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	72 int l, int c)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	73 : tree_expression (l, c), expr (e), args (0), type (),
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	74 arg_nm (), dyn_field ()
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	75 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	76 append (df);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	77 }
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3930 diff changeset	78
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	79 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	80 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	81 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	82 args.push_back (lst);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	83 type.append (1, t);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	84 arg_nm.push_back (lst ? lst->get_arg_names () : string_vector ());
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	85 dyn_field.push_back (static_cast<tree_expression *> (0));
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	86
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	87 if (lst && lst->has_magic_tilde ())
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	88 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	89 }
13970 c93b953f7d54 plug some memory leaks John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	90
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	91 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	92 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	93 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	94 args.push_back (static_cast<tree_argument_list *> (0));
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	95 type.append (".");
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	96 arg_nm.push_back (n);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	97 dyn_field.push_back (static_cast<tree_expression *> (0));
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	98 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	99
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	100 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	101 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	102 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	103 args.push_back (static_cast<tree_argument_list *> (0));
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	104 type.append (".");
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	105 arg_nm.push_back ("");
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	106 dyn_field.push_back (df);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	107 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	108
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	109 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	110 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	111 delete expr;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	112
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	113 while (! args.empty ())
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	114 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	115 std::list<tree_argument_list *>::iterator p = args.begin ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	116 delete *p;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	117 args.erase (p);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	118 }
2980 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	119
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	120 while (! dyn_field.empty ())
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	121 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	122 std::list<tree_expression *>::iterator p = dyn_field.begin ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	123 delete *p;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	124 dyn_field.erase (p);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	125 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	126 }
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 4675 diff changeset	127
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	128 bool
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	129 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	130 {
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23435 diff changeset	131 for (const tree_argument_list *elt : args)
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	132 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	133 if (elt && elt->has_magic_end ())
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	134 return true;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	135 }
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 4675 diff changeset	136
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	137 return false;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	138 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	139
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	140 // 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	141 // assignment.
2991 fc751d2a99fd [project @ 1997-05-16 21:00:48 by jwe] jwe parents: 2984 diff changeset	142
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	143 std::string
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	144 tree_index_expression::name (void) const
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	145 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	146 return expr->name ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	147 }
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3930 diff changeset	148 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3930 diff changeset	149
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3930 diff changeset	150 static inline octave_value_list
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23396 diff changeset	151 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: 23396 diff changeset	152 const string_vector& arg_nm, const octave_value *object,
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23396 diff changeset	153 bool rvalue = true)
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3930 diff changeset	154 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3930 diff changeset	155 octave_value_list retval;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3930 diff changeset	156
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3930 diff changeset	157 if (args)
9125 8ab1e6f63cdc gripe on magic end query for undefined variable Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	158 {
14343 acc26b860afa fix indexed assignment bug (bug #35482) John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	159 if (rvalue && object && args->has_magic_end () && object->is_undefined ())
21100 e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme. Rik <rik@octave.org> parents: 20977 diff changeset	160 err_invalid_inquiry_subscript ();
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21100 diff changeset	161
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23396 diff changeset	162 retval = args->convert_to_const_vector (tw, object);
9125 8ab1e6f63cdc gripe on magic end query for undefined variable Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	163 }
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3930 diff changeset	164
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	165 octave_idx_type n = retval.length ();
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3930 diff changeset	166
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	167 if (n > 0)
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	168 retval.stash_name_tags (arg_nm);
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3930 diff changeset	169
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3930 diff changeset	170 return retval;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3930 diff changeset	171 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3930 diff changeset	172
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	173 namespace octave
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	174 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	175 std::string
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	176 tree_index_expression::get_struct_index
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23396 diff changeset	177 (tree_evaluator *tw,
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23396 diff changeset	178 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	179 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	180 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	181 std::string fn = (*p_arg_nm)(0);
4131 597fbc55ea40 [project @ 2002-10-29 17:12:53 by jwe] jwe parents: 4066 diff changeset	182
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	183 if (fn.empty ())
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	184 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	185 tree_expression df = p_dyn_field;
4131 597fbc55ea40 [project @ 2002-10-29 17:12:53 by jwe] jwe parents: 4066 diff changeset	186
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	187 if (df)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	188 {
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23396 diff changeset	189 octave_value t = tw->evaluate (df);
4131 597fbc55ea40 [project @ 2002-10-29 17:12:53 by jwe] jwe parents: 4066 diff changeset	190
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	191 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	192 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	193 else
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	194 panic_impossible ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	195 }
4131 597fbc55ea40 [project @ 2002-10-29 17:12:53 by jwe] jwe parents: 4066 diff changeset	196
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	197 return fn;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	198 }
10832 1b2fcd122c6a allow user detect ignored outputs in m-functions Jaroslav Hajek <highegg@gmail.com> parents: 10659 diff changeset	199 }
1b2fcd122c6a allow user detect ignored outputs in m-functions Jaroslav Hajek <highegg@gmail.com> parents: 10659 diff changeset	200
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 19697 diff changeset	201 // Final step of processing an indexing error. Add the name of the
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 19697 diff changeset	202 // variable being indexed, if any, then issue an error. (Will this also
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 19697 diff changeset	203 // be needed by pt-lvalue, which calls subsref?)
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 19697 diff changeset	204
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 19697 diff changeset	205 static void
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	206 final_index_error (octave::index_exception& e,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	207 const octave::tree_expression *expr)
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 19697 diff changeset	208 {
23071 dcbd2ceadff1 warn about shadowed functions when reporting index errors (bug #48652) John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	209 std::string extra_message;
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 19697 diff changeset	210
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 19697 diff changeset	211 if (expr->is_identifier ()
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	212 && dynamic_cast<const octave::tree_identifier *> (expr)->is_variable ())
23071 dcbd2ceadff1 warn about shadowed functions when reporting index errors (bug #48652) John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	213 {
dcbd2ceadff1 warn about shadowed functions when reporting index errors (bug #48652) John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	214 std::string var = expr->name ();
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7200 diff changeset	215
23071 dcbd2ceadff1 warn about shadowed functions when reporting index errors (bug #48652) John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	216 e.set_var (var);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7200 diff changeset	217
23071 dcbd2ceadff1 warn about shadowed functions when reporting index errors (bug #48652) John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	218 octave_value fcn = symbol_table::find_function (var);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7200 diff changeset	219
23071 dcbd2ceadff1 warn about shadowed functions when reporting index errors (bug #48652) John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	220 if (fcn.is_function ())
dcbd2ceadff1 warn about shadowed functions when reporting index errors (bug #48652) John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	221 {
dcbd2ceadff1 warn about shadowed functions when reporting index errors (bug #48652) John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	222 octave_function *fp = fcn.function_value ();
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7200 diff changeset	223
23071 dcbd2ceadff1 warn about shadowed functions when reporting index errors (bug #48652) John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	224 if (fp && fp->name () == var)
dcbd2ceadff1 warn about shadowed functions when reporting index errors (bug #48652) John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	225 extra_message = " (note: variable '" + var + "' shadows function)";
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10206 diff changeset	226 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7200 diff changeset	227 }
2980 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	228
23071 dcbd2ceadff1 warn about shadowed functions when reporting index errors (bug #48652) John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	229 std::string msg = e.message () + extra_message;
18439 d5aa615dcf4c Fix package function call with magic "end" in arguments. Michael Goffioul <michael.goffioul@gmail.com> parents: 17787 diff changeset	230
20652 7a8096f8df5d more cleanup of indexing exceptions John W. Eaton <jwe@octave.org> parents: 20650 diff changeset	231 error_with_id (e.err_id (), msg.c_str ());
2980 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	232 }
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	233
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	234 namespace octave
2980 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	235 {
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	236 octave_lvalue
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23396 diff changeset	237 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	238 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	239 octave_lvalue retval;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	240
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	241 std::list<octave_value_list> idx;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	242 std::string tmp_type;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	243
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	244 int n = args.size ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	245
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	246 std::list<tree_argument_list *>::iterator p_args = args.begin ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	247 std::list<string_vector>::iterator p_arg_nm = arg_nm.begin ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	248 std::list<tree_expression *>::iterator p_dyn_field = dyn_field.begin ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	249
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23396 diff changeset	250 retval = expr->lvalue (tw);
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	251
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	252 octave_value tmp = retval.value ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	253
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	254 octave_idx_type tmpi = 0;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	255 std::list<octave_value_list> tmpidx;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	256
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	257 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	258 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	259 if (retval.numel () != 1)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	260 err_indexed_cs_list ();
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 (tmpi < i)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	263 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	264 try
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10206 diff changeset	265 {
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	266 tmp = tmp.subsref (type.substr (tmpi, i-tmpi), tmpidx, true);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	267 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	268 catch (octave::index_exception& e) // problems with range, invalid type etc.
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 final_index_error (e, expr);
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	271 }
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	272
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	273 tmpidx.clear ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	274 }
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	275
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	276 switch (type[i])
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	277 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	278 case '(':
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10206 diff changeset	279 {
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	280 octave_value_list tidx
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23396 diff changeset	281 = 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	282
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	283 idx.push_back (tidx);
5846 db0598f94c0f [project @ 2006-06-07 18:16:16 by jwe] jwe parents: 5775 diff changeset	284
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	285 if (i < n - 1)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10206 diff changeset	286 {
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	287 if (type[i+1] != '.')
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	288 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	289
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	290 tmpidx.push_back (tidx);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	291 tmpi = i+1;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10206 diff changeset	292 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10206 diff changeset	293 }
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	294 break;
3930 61d4427c016e [project @ 2002-05-07 00:47:31 by jwe] jwe parents: 3929 diff changeset	295
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	296 case '{':
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	297 {
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	298 octave_value_list tidx
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23396 diff changeset	299 = 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	300
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	301 if (tmp.is_undefined ())
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	302 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	303 if (tidx.has_magic_colon ())
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	304 err_invalid_inquiry_subscript ();
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	305
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	306 tmp = Cell ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	307 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	308 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	309 && (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	310 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	311 tmp = Cell ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	312 }
18439 d5aa615dcf4c Fix package function call with magic "end" in arguments. Michael Goffioul <michael.goffioul@gmail.com> parents: 17787 diff changeset	313
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	314 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	315
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	316 idx.push_back (tidx);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	317 tmpidx.push_back (tidx);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	318 tmpi = i;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	319 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	320 break;
2980 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	321
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	322 case '.':
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	323 {
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23396 diff changeset	324 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	325
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	326 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	327 && (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	328 \|\| tmp.iscell ()));
2980 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	329
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	330 if (i > 0 && type[i-1] == '(')
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	331 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	332 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	333
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	334 // 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	335 // dimensions are 0x0, not 1x1.
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	336 if (tmp.is_undefined ())
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	337 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	338 if (pidx.has_magic_colon ())
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	339 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	340
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	341 tmp = octave_map ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	342 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	343 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	344 tmp = octave_map ();
5846 db0598f94c0f [project @ 2006-06-07 18:16:16 by jwe] jwe parents: 5775 diff changeset	345
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	346 retval.numel (tmp.numel (pidx));
6833 e8a18d380097 [project @ 2007-08-27 17:22:50 by jwe] jwe parents: 6811 diff changeset	347
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	348 tmpi = i-1;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	349 tmpidx.push_back (tidx);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	350 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	351 else
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	352 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	353 if (tmp.is_undefined () \|\| autoconv)
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 tmpi = i+1;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	356 tmp = octave_value ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	357 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	358 else
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	359 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	360 retval.numel (tmp.numel (octave_value_list ()));
7099 70f30a92b725 [project @ 2007-11-05 21:51:24 by jwe] jwe parents: 7057 diff changeset	361
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	362 tmpi = i;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	363 tmpidx.push_back (tidx);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	364 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	365 }
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21100 diff changeset	366
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	367 idx.push_back (tidx);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	368 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	369 break;
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	370
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	371 default:
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	372 panic_impossible ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	373 }
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	374
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	375 if (idx.back ().empty ())
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	376 error ("invalid empty index list");
5846 db0598f94c0f [project @ 2006-06-07 18:16:16 by jwe] jwe parents: 5775 diff changeset	377
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	378 p_args++;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	379 p_arg_nm++;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	380 p_dyn_field++;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	381 }
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	382
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	383 retval.set_index (type, idx);
8546 3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8011 diff changeset	384
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	385 return retval;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	386 }
4234 90e44267e8cf [project @ 2002-12-21 17:15:25 by jwe] jwe parents: 4233 diff changeset	387
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	388 tree_index_expression *
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	389 tree_index_expression::dup (symbol_table::scope_id scope,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	390 symbol_table::context_id context) const
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	391 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	392 tree_index_expression *new_idx_expr
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	393 = 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	394
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23449 diff changeset	395 new_idx_expr->expr = (expr ? expr->dup (scope, context) : 0);
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	396
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	397 std::list<tree_argument_list *> new_args;
5846 db0598f94c0f [project @ 2006-06-07 18:16:16 by jwe] jwe parents: 5775 diff changeset	398
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23435 diff changeset	399 for (const tree_argument_list *elt : args)
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	400 new_args.push_back (elt ? elt->dup (scope, context) : 0);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	401
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	402 new_idx_expr->args = new_args;
3930 61d4427c016e [project @ 2002-05-07 00:47:31 by jwe] jwe parents: 3929 diff changeset	403
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	404 new_idx_expr->type = type;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	405
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	406 new_idx_expr->arg_nm = arg_nm;
7099 70f30a92b725 [project @ 2007-11-05 21:51:24 by jwe] jwe parents: 7057 diff changeset	407
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	408 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	409
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23435 diff changeset	410 for (const tree_expression *elt : dyn_field)
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	411 new_dyn_field.push_back (elt ? elt->dup (scope, context) : 0);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	412
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	413 new_idx_expr->dyn_field = new_dyn_field;
8546 3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8011 diff changeset	414
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	415 new_idx_expr->copy_base (*this);
4234 90e44267e8cf [project @ 2002-12-21 17:15:25 by jwe] jwe parents: 4233 diff changeset	416
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	417 return new_idx_expr;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23071 diff changeset	418 }
2980 cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	419 }
cd5ad3fd8049 [project @ 1997-05-16 01:12:13 by jwe] jwe parents: diff changeset	420
7099 70f30a92b725 [project @ 2007-11-05 21:51:24 by jwe] jwe parents: 7057 diff changeset	421 /*
70f30a92b725 [project @ 2007-11-05 21:51:24 by jwe] jwe parents: 7057 diff changeset	422 %!test
14429 eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14343 diff changeset	423 %! clear x;
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14343 diff changeset	424 %! clear y;
14343 acc26b860afa fix indexed assignment bug (bug #35482) John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	425 %! y = 3;
acc26b860afa fix indexed assignment bug (bug #35482) John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	426 %! x(y(end)) = 1;
acc26b860afa fix indexed assignment bug (bug #35482) John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	427 %! 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	428 %! clear x;
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14343 diff changeset	429 %! clear y;
14343 acc26b860afa fix indexed assignment bug (bug #35482) John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	430 %! y = {3};
acc26b860afa fix indexed assignment bug (bug #35482) John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	431 %! x(y{end}) = 1;
acc26b860afa fix indexed assignment bug (bug #35482) John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	432 %! assert (x, [0, 0, 1]);
acc26b860afa fix indexed assignment bug (bug #35482) John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	433
acc26b860afa fix indexed assignment bug (bug #35482) John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	434 %!test
7099 70f30a92b725 [project @ 2007-11-05 21:51:24 by jwe] jwe parents: 7057 diff changeset	435 %! x = {1, 2, 3};
70f30a92b725 [project @ 2007-11-05 21:51:24 by jwe] jwe parents: 7057 diff changeset	436 %! [x{:}] = deal (4, 5, 6);
70f30a92b725 [project @ 2007-11-05 21:51:24 by jwe] jwe parents: 7057 diff changeset	437 %! assert (x, {4, 5, 6});
70f30a92b725 [project @ 2007-11-05 21:51:24 by jwe] jwe parents: 7057 diff changeset	438
70f30a92b725 [project @ 2007-11-05 21:51:24 by jwe] jwe parents: 7057 diff changeset	439 %!test
70f30a92b725 [project @ 2007-11-05 21:51:24 by jwe] jwe parents: 7057 diff changeset	440 %! [x.a, x.b.c] = deal (1, 2);
70f30a92b725 [project @ 2007-11-05 21:51:24 by jwe] jwe parents: 7057 diff changeset	441 %! assert (x.a == 1 && x.b.c == 2);
70f30a92b725 [project @ 2007-11-05 21:51:24 by jwe] jwe parents: 7057 diff changeset	442
70f30a92b725 [project @ 2007-11-05 21:51:24 by jwe] jwe parents: 7057 diff changeset	443 %!test
70f30a92b725 [project @ 2007-11-05 21:51:24 by jwe] jwe parents: 7057 diff changeset	444 %! [x.a, x(2).b] = deal (1, 2);
70f30a92b725 [project @ 2007-11-05 21:51:24 by jwe] jwe parents: 7057 diff changeset	445 %! 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	446
70f30a92b725 [project @ 2007-11-05 21:51:24 by jwe] jwe parents: 7057 diff changeset	447 %!test
70f30a92b725 [project @ 2007-11-05 21:51:24 by jwe] jwe parents: 7057 diff changeset	448 %! x = struct (zeros (0, 1), {"a", "b"});
70f30a92b725 [project @ 2007-11-05 21:51:24 by jwe] jwe parents: 7057 diff changeset	449 %! x(2).b = 1;
70f30a92b725 [project @ 2007-11-05 21:51:24 by jwe] jwe parents: 7057 diff changeset	450 %! assert (x(2).b == 1);
70f30a92b725 [project @ 2007-11-05 21:51:24 by jwe] jwe parents: 7057 diff changeset	451
70f30a92b725 [project @ 2007-11-05 21:51:24 by jwe] jwe parents: 7057 diff changeset	452 %!test
70f30a92b725 [project @ 2007-11-05 21:51:24 by jwe] jwe parents: 7057 diff changeset	453 %! x = struct (zeros (0, 1), {"a", "b"});
70f30a92b725 [project @ 2007-11-05 21:51:24 by jwe] jwe parents: 7057 diff changeset	454 %! x(2).b = 1;
70f30a92b725 [project @ 2007-11-05 21:51:24 by jwe] jwe parents: 7057 diff changeset	455 %! assert (x(2).b == 1);
70f30a92b725 [project @ 2007-11-05 21:51:24 by jwe] jwe parents: 7057 diff changeset	456 */

Mercurial > octave

annotate libinterp/parse-tree/pt-idx.cc @ 23576:00e518162fda