Mercurial > octave-nkf
view libinterp/parse-tree/token.h @ 18520: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 | 97e49b588f5d |
children | 4197fc428c7d |
line wrap: on
line source
/* Copyright (C) 1993-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_token_h) #define octave_token_h 1 #include <string> #include "symtab.h" class token { public: enum token_type { generic_token, keyword_token, string_token, double_token, ettype_token, sym_rec_token, scls_name_token, }; enum end_tok_type { simple_end, classdef_end, enumeration_end, events_end, for_end, function_end, if_end, methods_end, parfor_end, properties_end, switch_end, while_end, try_catch_end, unwind_protect_end }; token (int tv, int l = -1, int c = -1); token (int tv, bool is_keyword, int l = -1, int c = -1); token (int tv, const std::string& s, int l = -1, int c = -1); token (int tv, double d, const std::string& s = std::string (), int l = -1, int c = -1); token (int tv, end_tok_type t, int l = -1, int c = -1); token (int tv, symbol_table::symbol_record *s, int l = -1, int c = -1); token (int tv, const std::string& mth, const std::string& cls, int l = -1, int c = -1); ~token (void); void mark_may_be_command (void) { maybe_cmd = true; } bool may_be_command (void) const { return maybe_cmd; } void mark_trailing_space (void) { tspc = true; } bool space_follows_token (void) const { return tspc; } int token_value (void) const { return tok_val; } bool token_value_is (int tv) const { return tv == tok_val; } int line (void) const { return line_num; } int column (void) const { return column_num; } bool is_keyword (void) const { return type_tag == keyword_token || type_tag == ettype_token; } bool is_symbol (void) const { return type_tag == sym_rec_token; } std::string text (void) const; std::string symbol_name (void) const; double number (void) const; token_type ttype (void) const; end_tok_type ettype (void) const; symbol_table::symbol_record *sym_rec (void); std::string superclass_method_name (void); std::string superclass_class_name (void); std::string text_rep (void); private: // No copying! token (const token& tok); token& operator = (const token& tok); bool maybe_cmd; bool tspc; int line_num; int column_num; int tok_val; token_type type_tag; union { std::string *str; double num; end_tok_type et; symbol_table::symbol_record *sr; struct { std::string *method_nm; std::string *class_nm; } sc; }; std::string orig_text; }; #endif