octave: libinterp/parse-tree/pt-decl.h annotate

annotate libinterp/parse-tree/pt-decl.h @ 24356:8b14ba8296af

refactor symbol_record object When referencing non-local variables, look in correct parent scope context. Cache pointer to parent scope for non-local access. Don't cache pointer to declaration scope. * symrec.h, symrec.cc (symbol_record::symbol_record_rep::m_fwd_scope): New data member. (symbol_record::symbol_record_rep::symbol_record_rep): Eliminate symbol_scope argument. Change all uses. (symbol_record::symbol_record_rep::assign, symbol_record::symbol_record_rep::do_non_const_unary_op): New argument, context Change all uses. Don't look to forward reference here. (symbol_record::symbol_record_rep::varref, symbol_record::symbol_record_rep::varval): New argument, context. Change all uses. Use context from forward scope when forwarding to non-local reference. (symbol_record::symbol_record_rep::clear, symbol_record::symbol_record_rep::is_defind, symbol_record::symbol_record_rep::is_variable, symbol_record::symbol_record_rep::dump): New argument, context. Change all uses. (symbol_record::symbol_record_rep::bind_fwd_rep): New argument, fwd_scope. Change all uses. (symbol_record::symbol_record_rep::bind_fwd_rep, symbol_record::symbol_record_rep::unbind_fwd_rep): Return after forwarding. (symbol_record::symbol_record_rep::get_fwd_scope_context): New function. (symbol_record::symbol_record_rep::get_decl_scope_context): Delete. (symbol_record::symbol_record_rep::m_decl_scope): Delete data member and all uses. (symbol_record::symbol_record): Eliminate symbol_scope argument. Change all uses. (symbol_record::find, symbol_record::assign, symbol_record::do_non_const_unary_opt, symbol_record::varval, symbol_record::clear, symbol_record::is_defined, symbol_record::is_undefined, symbol_record::is_valid, symbol_record::is_variable, symbol_record::dump): New arg, context. Change all uses. (symbol_record::decl_scope): Delete. (symbol_record::bind_fwd_rep): New arg, fwd_scope. Change all uses. * load-save.h, load-save.cc (do_save): New argument, context. Change all uses. (save_vars): Work with scope instead of symbol table. * variables.cc (symbol_info::symbol_info, symbol_info::append): New arg, context. Change all uses. * oct-lvalue.h, oct-lvalue.cc (octave_lvalue::m_context): New data member. (octave_lvalue::octave_lvalue): New argument, context. Change all uses. * pt-decl.h (tree_decl_elt::is_defined, tree_decl_elt::is_variable): New argument, context. Change all uses. * pt-id.h, pt-id.cc (tree_identifier::link_to_global): New argument, global_scope. (tree_identifier::is_defined, tree_identifier::is_variable, tree_black_hole::is_variable): New argument, context. Change all uses. * pt-misc.h, pt-misc.cc (tree_parameter_list::is_defined): New argument, context. Change all uses.

author	John W. Eaton <jwe@octave.org>
date	Mon, 04 Dec 2017 12:30:40 -0500
parents	bc3819b7cca1
children	3fc24b792a24

rev	line source
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	1 /*
20f5cec4f11c [project @ 1997-05-16 03:29:26 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
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	4
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	5 This file is part of Octave.
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	6
20f5cec4f11c [project @ 1997-05-16 03:29:26 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.
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 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.
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	16
20f5cec4f11c [project @ 1997-05-16 03:29:26 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: 6215 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: 6215 diff changeset	19 <http://www.gnu.org/licenses/>.
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	20
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	21 */
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	22
20791 f7084eae3318 maint: Use Octave coding conventions for #if statements. Rik <rik@octave.org> parents: 19697 diff changeset	23 #if ! defined (octave_pt_decl_h)
17822 ebb3ef964372 maint: Use common #define syntax "octave_filename_h" in h_files. Rik <rik@octave.org> parents: 17787 diff changeset	24 #define octave_pt_decl_h 1
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	25
21244 1473547f50f5 include octave-config.h in public header files John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	26 #include "octave-config.h"
1473547f50f5 include octave-config.h in public header files John W. Eaton <jwe@octave.org> parents: 21055 diff changeset	27
24216 81d723f0cdfe clean up change merged from stable John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	28 #include <list>
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	29 #include <string>
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	30
4219 23d06c9e1edd [project @ 2002-12-06 21:29:17 by jwe] jwe parents: 4212 diff changeset	31 #include "base-list.h"
6215 516d3071b34c [project @ 2006-12-15 03:24:12 by jwe] jwe parents: 5861 diff changeset	32 #include "oct-lvalue.h"
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	33 #include "pt-cmd.h"
6215 516d3071b34c [project @ 2006-12-15 03:24:12 by jwe] jwe parents: 5861 diff changeset	34 #include "pt-id.h"
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	35 #include "pt-walk.h"
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	36 #include "symtab.h"
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	37
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	38 namespace octave
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	39 {
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	40 class tree_evaluator;
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	41 class tree_expression;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	42 class tree_identifier;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	43
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	44 // List of expressions that make up a declaration statement.
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	45
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	46 class tree_decl_elt
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	47 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	48 public:
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	49
23469 2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	50 enum decl_type
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	51 {
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	52 unknown,
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	53 global,
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	54 persistent
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	55 };
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	56
23457 21baad6b35c4 maint: Use C++11 nullptr rather than 0 or NULL when possible. Rik <rik@octave.org> parents: 23446 diff changeset	57 tree_decl_elt (tree_identifier i = nullptr, tree_expression e = nullptr)
23469 2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	58 : type (unknown), id (i), expr (e) { }
6215 516d3071b34c [project @ 2006-12-15 03:24:12 by jwe] jwe parents: 5861 diff changeset	59
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	60 // No copying!
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	61
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	62 tree_decl_elt (const tree_decl_elt&) = delete;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	63
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	64 tree_decl_elt& operator = (const tree_decl_elt&) = delete;
6215 516d3071b34c [project @ 2006-12-15 03:24:12 by jwe] jwe parents: 5861 diff changeset	65
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	66 ~tree_decl_elt (void);
6215 516d3071b34c [project @ 2006-12-15 03:24:12 by jwe] jwe parents: 5861 diff changeset	67
24356 8b14ba8296af refactor symbol_record object John W. Eaton <jwe@octave.org> parents: 24270 diff changeset	68 bool is_defined (symbol_record::context_id context)
8b14ba8296af refactor symbol_record object John W. Eaton <jwe@octave.org> parents: 24270 diff changeset	69 {
8b14ba8296af refactor symbol_record object John W. Eaton <jwe@octave.org> parents: 24270 diff changeset	70 return id ? id->is_defined (context) : false;
8b14ba8296af refactor symbol_record object John W. Eaton <jwe@octave.org> parents: 24270 diff changeset	71 }
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	72
24356 8b14ba8296af refactor symbol_record object John W. Eaton <jwe@octave.org> parents: 24270 diff changeset	73 bool is_variable (symbol_record::context_id context)
8b14ba8296af refactor symbol_record object John W. Eaton <jwe@octave.org> parents: 24270 diff changeset	74 {
8b14ba8296af refactor symbol_record object John W. Eaton <jwe@octave.org> parents: 24270 diff changeset	75 return id ? id->is_variable (context) : false;
8b14ba8296af refactor symbol_record object John W. Eaton <jwe@octave.org> parents: 24270 diff changeset	76 }
6215 516d3071b34c [project @ 2006-12-15 03:24:12 by jwe] jwe parents: 5861 diff changeset	77
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	78 void mark_as_formal_parameter (void)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	79 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	80 if (id)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	81 id->mark_as_formal_parameter ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	82 }
6215 516d3071b34c [project @ 2006-12-15 03:24:12 by jwe] jwe parents: 5861 diff changeset	83
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	84 bool lvalue_ok (void) { return id ? id->lvalue_ok () : false; }
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8523 diff changeset	85
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	86 octave_lvalue lvalue (tree_evaluator *tw)
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	87 {
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	88 return id ? id->lvalue (tw) : octave_lvalue ();
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	89 }
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	90
23470 a41fdb801db6 use mark_global and mark_persistent consistently John W. Eaton <jwe@octave.org> parents: 23469 diff changeset	91 void mark_global (void) { type = global; }
23469 2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	92 bool is_global (void) const { return type == global; }
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	93
23470 a41fdb801db6 use mark_global and mark_persistent consistently John W. Eaton <jwe@octave.org> parents: 23469 diff changeset	94 void mark_persistent (void) { type = persistent; }
23469 2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	95 bool is_persistent (void) const { return type == persistent; }
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	96
23446 cd4e1ee28716 maint: Use convention 'void * fcn ()' for functions which return pointers. Rik <rik@octave.org> parents: 23435 diff changeset	97 tree_identifier * ident (void) { return id; }
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	98
24216 81d723f0cdfe clean up change merged from stable John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	99 std::string name (void) const { return id ? id->name () : ""; }
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	100
23446 cd4e1ee28716 maint: Use convention 'void * fcn ()' for functions which return pointers. Rik <rik@octave.org> parents: 23435 diff changeset	101 tree_expression * expression (void) { return expr; }
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	102
24270 bc3819b7cca1 don't use symbol_table:: nesting for symbol_record, symbol_scope, or fcn_info John W. Eaton <jwe@octave.org> parents: 24216 diff changeset	103 tree_decl_elt * dup (symbol_scope& scope) const;
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	104
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	105 void accept (tree_walker& tw)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	106 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	107 tw.visit_decl_elt (*this);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	108 }
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	109
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	110 private:
2988 daa1ed1f5462 [project @ 1997-05-16 07:23:15 by jwe] jwe parents: 2982 diff changeset	111
23469 2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	112 decl_type type;
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	113
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	114 // An identifier to tag with the declared property.
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	115 tree_identifier *id;
2988 daa1ed1f5462 [project @ 1997-05-16 07:23:15 by jwe] jwe parents: 2982 diff changeset	116
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	117 // An initializer expression (may be zero);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	118 tree_expression *expr;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	119 };
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	120
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23615 diff changeset	121 class tree_decl_init_list : public base_list<tree_decl_elt *>
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	122 {
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	123 public:
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	124
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	125 tree_decl_init_list (void) { }
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	126
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	127 tree_decl_init_list (tree_decl_elt *t) { append (t); }
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	128
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	129 // No copying!
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	130
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	131 tree_decl_init_list (const tree_decl_init_list&) = delete;
22869 f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	132
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	133 tree_decl_init_list& operator = (const tree_decl_init_list&) = delete;
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	134
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	135 ~tree_decl_init_list (void)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	136 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	137 while (! empty ())
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	138 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	139 iterator p = begin ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	140 delete *p;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	141 erase (p);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	142 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	143 }
2988 daa1ed1f5462 [project @ 1997-05-16 07:23:15 by jwe] jwe parents: 2982 diff changeset	144
23470 a41fdb801db6 use mark_global and mark_persistent consistently John W. Eaton <jwe@octave.org> parents: 23469 diff changeset	145 void mark_global (void)
23469 2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	146 {
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	147 for (tree_decl_elt elt : this)
23470 a41fdb801db6 use mark_global and mark_persistent consistently John W. Eaton <jwe@octave.org> parents: 23469 diff changeset	148 elt->mark_global ();
23469 2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	149 }
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	150
23470 a41fdb801db6 use mark_global and mark_persistent consistently John W. Eaton <jwe@octave.org> parents: 23469 diff changeset	151 void mark_persistent (void)
23469 2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	152 {
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	153 for (tree_decl_elt elt : this)
23470 a41fdb801db6 use mark_global and mark_persistent consistently John W. Eaton <jwe@octave.org> parents: 23469 diff changeset	154 elt->mark_persistent ();
23469 2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	155 }
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	156
24216 81d723f0cdfe clean up change merged from stable John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	157 std::list<std::string> variable_names (void) const
81d723f0cdfe clean up change merged from stable John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	158 {
81d723f0cdfe clean up change merged from stable John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	159 std::list<std::string> retval;
81d723f0cdfe clean up change merged from stable John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	160
81d723f0cdfe clean up change merged from stable John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	161 for (const tree_decl_elt elt : this)
81d723f0cdfe clean up change merged from stable John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	162 {
81d723f0cdfe clean up change merged from stable John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	163 std::string nm = elt->name ();
81d723f0cdfe clean up change merged from stable John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	164
81d723f0cdfe clean up change merged from stable John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	165 if (! nm.empty ())
81d723f0cdfe clean up change merged from stable John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	166 retval.push_back (nm);
81d723f0cdfe clean up change merged from stable John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	167 }
81d723f0cdfe clean up change merged from stable John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	168
81d723f0cdfe clean up change merged from stable John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	169 return retval;
81d723f0cdfe clean up change merged from stable John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	170 }
81d723f0cdfe clean up change merged from stable John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	171
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	172 void accept (tree_walker& tw)
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	173 {
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	174 tw.visit_decl_init_list (*this);
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	175 }
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	176 };
2988 daa1ed1f5462 [project @ 1997-05-16 07:23:15 by jwe] jwe parents: 2982 diff changeset	177
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	178 // Base class for declaration commands -- global, static, etc.
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	179
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	180 class tree_decl_command : public tree_command
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	181 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	182 public:
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	183
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	184 tree_decl_command (const std::string& n, int l = -1, int c = -1)
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23696 diff changeset	185 : tree_command (l, c), cmd_name (n), init_list (nullptr) { }
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	186
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	187 tree_decl_command (const std::string& n, tree_decl_init_list *t,
23469 2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	188 int l = -1, int c = -1);
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	189
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	190 // No copying!
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	191
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	192 tree_decl_command (const tree_decl_command&) = delete;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	193
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	194 tree_decl_command& operator = (const tree_decl_command&) = delete;
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	195
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	196 ~tree_decl_command (void);
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	197
23470 a41fdb801db6 use mark_global and mark_persistent consistently John W. Eaton <jwe@octave.org> parents: 23469 diff changeset	198 void mark_global (void)
23469 2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	199 {
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	200 if (init_list)
23470 a41fdb801db6 use mark_global and mark_persistent consistently John W. Eaton <jwe@octave.org> parents: 23469 diff changeset	201 init_list->mark_global ();
23469 2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	202 }
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	203
23470 a41fdb801db6 use mark_global and mark_persistent consistently John W. Eaton <jwe@octave.org> parents: 23469 diff changeset	204 void mark_persistent (void)
23469 2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	205 {
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	206 if (init_list)
23470 a41fdb801db6 use mark_global and mark_persistent consistently John W. Eaton <jwe@octave.org> parents: 23469 diff changeset	207 init_list->mark_persistent ();
23469 2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	208 }
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	209
23446 cd4e1ee28716 maint: Use convention 'void * fcn ()' for functions which return pointers. Rik <rik@octave.org> parents: 23435 diff changeset	210 tree_decl_init_list * initializer_list (void) { return init_list; }
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	211
23469 2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	212 std::string name (void) const { return cmd_name; }
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	213
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	214 void accept (tree_walker& tw)
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	215 {
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	216 tw.visit_decl_command (*this);
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	217 }
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	218
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	219 private:
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	220
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	221 // The name of this command -- global, static, etc.
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	222 std::string cmd_name;
2988 daa1ed1f5462 [project @ 1997-05-16 07:23:15 by jwe] jwe parents: 2982 diff changeset	223
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	224 // The list of variables or initializers in this declaration command.
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	225 tree_decl_init_list *init_list;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	226 };
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	227 }
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	228
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	229 #if defined (OCTAVE_USE_DEPRECATED_FUNCTIONS)
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	230
23615 be7b884ac589 use version number in OCTAVE_DEPRECATED macro John W. Eaton <jwe@octave.org> parents: 23602 diff changeset	231 OCTAVE_DEPRECATED (4.4, "use 'octave::tree_decl_elt' instead")
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	232 typedef octave::tree_decl_elt tree_decl_elt;
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8523 diff changeset	233
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	234 // tree_decl_init_list is derived from a template.
2988 daa1ed1f5462 [project @ 1997-05-16 07:23:15 by jwe] jwe parents: 2982 diff changeset	235
23615 be7b884ac589 use version number in OCTAVE_DEPRECATED macro John W. Eaton <jwe@octave.org> parents: 23602 diff changeset	236 OCTAVE_DEPRECATED (4.4, "use 'octave::tree_decl_command' instead")
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	237 typedef octave::tree_decl_command tree_decl_command;
2988 daa1ed1f5462 [project @ 1997-05-16 07:23:15 by jwe] jwe parents: 2982 diff changeset	238
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	239 #endif
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22333 diff changeset	240
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	241 #endif

Mercurial > octave

annotate libinterp/parse-tree/pt-decl.h @ 24356:8b14ba8296af