Mercurial > octave
view libinterp/parse-tree/pt-decl.cc @ 23469:2699c5974844
handle global and persistent in tree_decl_command, not as separate classes
* pt-decl.h, pt-decl.cc (tree_decl_command::mark_as_global,
tree_decl_command::mark_as_persistent, tree_decl_command::dup):
New functions.
(tree_global_command, tree_persistent_command): Delete classes.
(tree_decl_elt::decl_type): New enum. Store command type in each
initializer list element.
(tree_decl_elt::mark_as_global, tree_decl_elt::is_global,
tree_decl_elt::mark_as_persistent, tree_decl_elt::is_persistent):
New functions.
(tree_decl_init_list::mark_as_global, tree_decl_init_list::is_global,
tree_decl_init_list::mark_as_persistent, tree_decl_init_list::is_persistent):
New functions.
* pt-walk.h (tree_walker::visit_decl_command): New function.
(tree_walker::visit_global_command,
tree_walker::visit_persistent_command): Delete.
Update all derived classes.
* oct-parse.in.yy (base_parser::make_decl_command): Tag initialization
lists as global or persistent here.
* pt-eval.cc (tree_evaluator::visit_decl_command): New function.
Visit initialization list instead of looping here.
(tree_evaluator::visit_decl_init_list): Loop and visit elements here.
(tree_evaluator::visit_decl_elt): Handle evaluation of elements here.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 04 May 2017 15:02:46 -0400 |
parents | c763214a8260 |
children | a41fdb801db6 |
line wrap: on
line source
/* Copyright (C) 1996-2017 John W. Eaton This file is part of Octave. Octave is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. Octave is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Octave; see the file COPYING. If not, see <http://www.gnu.org/licenses/>. */ #if defined (HAVE_CONFIG_H) # include "config.h" #endif #include "defun.h" #include "error.h" #include "pt-cmd.h" #include "ov.h" #include "oct-lvalue.h" #include "pt-bp.h" #include "pt-decl.h" #include "pt-exp.h" #include "pt-id.h" #include "pt-walk.h" #include "utils.h" #include "variables.h" namespace octave { // Declarations (global, static, etc.). tree_decl_elt::~tree_decl_elt (void) { delete id; delete expr; } tree_decl_elt * tree_decl_elt::dup (symbol_table::scope_id scope, symbol_table::context_id context) const { return new tree_decl_elt (id ? id->dup (scope, context) : 0, expr ? expr->dup (scope, context) : 0); } // Initializer lists for declaration statements. tree_decl_init_list * tree_decl_init_list::dup (symbol_table::scope_id scope, symbol_table::context_id context) const { tree_decl_init_list *new_dil = new tree_decl_init_list (); for (const tree_decl_elt *elt : *this) new_dil->append (elt ? elt->dup (scope, context) : 0); return new_dil; } // Declaration commands (global, static). tree_decl_command::tree_decl_command (const std::string& n, tree_decl_init_list *t, int l, int c) : tree_command (l, c), cmd_name (n), init_list (t) { if (t) { if (cmd_name == "global") mark_as_global (); else if (cmd_name == "persistent") mark_as_persistent (); else error ("tree_decl_command: unknown decl type: %s", cmd_name); } } tree_decl_command::~tree_decl_command (void) { delete init_list; } tree_command * tree_decl_command::dup (symbol_table::scope_id scope, symbol_table::context_id context) const { tree_decl_init_list *new_init_list = init_list ? init_list->dup (scope, context) : 0; return new tree_decl_command (name (), new_init_list, line (), column ()); } }