Mercurial > hg > octave-nkf
view libinterp/parse-tree/pt-decl.cc @ 18588:932aca9a7c57
Allow multi-level classdef package.
* lex.h (octave_base_lexer::fq_identifier_contains_keyword,
octave_base_lexer::handle_fq_identifier,
octave_base_lexer::enable_fq_identifier): New methods.
* lex.ll (octave_base_lexer::fq_identifier_contains_keyword,
octave_base_lexer::handle_fq_identifier,
octave_base_lexer::enable_fq_identifier): Likewise.
(FQ_IDENT_START, FQIDENT): New exclusive start condition and regex to
handle fully-qualified identifier.
(superclass reference rule, metaclass query rule): Use FQIDENT.
(octave_base_lexer::handle_superclass_identifier,
octave_base_lexer::handle_meta_identifier): Don't split package name.
* parse.h (octave_base_parser::make_superclass_ref,
octave_base_parser::make_meta_class_query): Remove package_nm argument.
* pt-classdef.h (tree_classdef_superclass::id,
tree_classdef_superclass::pkg): Removed members, replaced by cls_name.
(tree_classdef_superclass::~tree_classdef_superclass): Remove deletion
of removed members.
(tree_classdef_superclass::cls_name): New member.
(tree_classdef_superclass::tree_classdef_superclass): Initialize it.
(tree_classdef_superclass::ident, tree_classdef_superclass::package):
Removed methods.
(tree_classdef_superclass::class_name): New method.
* token.h (token::meta_name_token): Remove enum value.
(token(int, std::string, std::string, std::string, int, int)): Remove
constructor.
(token::superclass_package_name, token::meta_package_name,
token::meta_class_name): Remove methods.
(token::sc::package_nm, token::mc): Remove union members.
* token.cc
(token(int, std::string, std::string, std::string, int, int)): Remove
constructor.
(token::~token): Remove case of meta_name_token.
(token::superclass_package_name, token::meta_package_name,
token::meta_class_name): Remove methods.
* oct-parse.in.yy (FQ_IDENT): New terminal.
(superclass_identifier): Adapt to changes in class token and class
octave_base_parser.
(meta_identifier): Likewise.
(superclass_list): Add mid-rule to enable fully-qualified identifier.
(superclass): Use FQ_IDENT.
(octave_base_parser::make_superclass_ref,
octave_base_parser::make_meta_class_query): Remove package_nm argument.
* ov-classdef.cc (octave_classdef_superclass_ref::do_multi_index_op):
Adapt to removal of package_nm argument.
(F__meta_class_query__): Likewise.
(cdef_class::make_meta_class): Adapt to changes in class
tree_classdef_superclass.
author | Michael Goffioul <michael.goffioul@gmail.com> |
---|---|
date | Sat, 22 Feb 2014 19:56:17 -0500 |
parents | 175b392e91fe |
children | 4197fc428c7d |
line wrap: on
line source
/* Copyright (C) 1996-2013 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/>. */ #ifdef 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" // Declarations (global, static, etc.). tree_decl_elt::~tree_decl_elt (void) { delete id; delete expr; } bool tree_decl_elt::eval (void) { bool retval = false; if (id && expr) { octave_lvalue ult = id->lvalue (); octave_value init_val = expr->rvalue1 (); if (! error_state) { ult.assign (octave_value::op_asn_eq, init_val); retval = true; } } return retval; } 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); } void tree_decl_elt::accept (tree_walker& tw) { tw.visit_decl_elt (*this); } // 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_iterator p = begin (); p != end (); p++) { const tree_decl_elt *elt = *p; new_dil->append (elt ? elt->dup (scope, context) : 0); } return new_dil; } void tree_decl_init_list::accept (tree_walker& tw) { tw.visit_decl_init_list (*this); } // Base class for declaration commands (global, static). tree_decl_command::~tree_decl_command (void) { delete init_list; } // Global. tree_command * tree_global_command::dup (symbol_table::scope_id scope, symbol_table::context_id context) const { return new tree_global_command (init_list ? init_list->dup (scope, context) : 0, line (), column ()); } void tree_global_command::accept (tree_walker& tw) { tw.visit_global_command (*this); } // Static. tree_command * tree_persistent_command::dup (symbol_table::scope_id scope, symbol_table::context_id context) const { return new tree_persistent_command (init_list ? init_list->dup (scope, context) : 0, line (), column ()); } void tree_persistent_command::accept (tree_walker& tw) { tw.visit_persistent_command (*this); }