Mercurial > hg > octave-nkf
view libinterp/parse-tree/pt-cmd.h @ 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 | ebb3ef964372 |
children | 4197fc428c7d |
line wrap: on
line source
/* Copyright (C) 1994-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/>. */ #if !defined (octave_pt_cmd_h) #define octave_pt_cmd_h 1 #include <string> class tree_walker; #include "ov-fcn.h" #include "pt.h" #include "pt-bp.h" #include "symtab.h" // A base class for commands. class tree_command : public tree { public: tree_command (int l = -1, int c = -1) : tree (l, c) { } virtual ~tree_command (void) { } virtual tree_command *dup (symbol_table::scope_id, symbol_table::context_id context) const = 0; private: // No copying! tree_command (const tree_command&); tree_command& operator = (const tree_command&); }; // No-op. class tree_no_op_command : public tree_command { public: tree_no_op_command (const std::string& cmd = "no_op", bool e = false, int l = -1, int c = -1) : tree_command (l, c), eof (e), orig_cmd (cmd) { } ~tree_no_op_command (void) { } tree_command *dup (symbol_table::scope_id scope, symbol_table::context_id context) const; void accept (tree_walker& tw); bool is_end_of_fcn_or_script (void) const { return (orig_cmd == "endfunction" || orig_cmd == "endscript"); } bool is_end_of_file (void) const { return eof; } std::string original_command (void) { return orig_cmd; } private: bool eof; std::string orig_cmd; // No copying! tree_no_op_command (const tree_no_op_command&); tree_no_op_command& operator = (const tree_no_op_command&); }; // Function definition. class tree_function_def : public tree_command { public: tree_function_def (octave_function *f, int l = -1, int c = -1) : tree_command (l, c), fcn (f) { } ~tree_function_def (void) { } tree_command *dup (symbol_table::scope_id scope, symbol_table::context_id context) const; void accept (tree_walker& tw); octave_value function (void) { return fcn; } private: octave_value fcn; tree_function_def (const octave_value& v, int l = -1, int c = -1) : tree_command (l, c), fcn (v) { } // No copying! tree_function_def (const tree_function_def&); tree_function_def& operator = (const tree_function_def&); }; #endif