Mercurial > hg > octave-nkf
view libinterp/parse-tree/pt-assign.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) 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/>. */ #if !defined (octave_pt_assign_h) #define octave_pt_assign_h 1 #include <iosfwd> #include <string> class tree_argument_list; class tree_walker; class octave_value; class octave_value_list; class octave_lvalue; #include "ov.h" #include "pt-exp.h" #include "symtab.h" // Simple assignment expressions. class tree_simple_assignment : public tree_expression { public: tree_simple_assignment (bool plhs = false, int l = -1, int c = -1, octave_value::assign_op t = octave_value::op_asn_eq) : tree_expression (l, c), lhs (0), rhs (0), preserve (plhs), ans_ass (), etype (t) { } tree_simple_assignment (tree_expression *le, tree_expression *re, bool plhs = false, int l = -1, int c = -1, octave_value::assign_op t = octave_value::op_asn_eq); ~tree_simple_assignment (void); bool has_magic_end (void) const { return (rhs && rhs->has_magic_end ()); } bool rvalue_ok (void) const { return true; } octave_value rvalue1 (int nargout = 1); octave_value_list rvalue (int nargout); bool is_assignment_expression (void) const { return true; } std::string oper (void) const; tree_expression *left_hand_side (void) { return lhs; } tree_expression *right_hand_side (void) { return rhs; } tree_expression *dup (symbol_table::scope_id scope, symbol_table::context_id context) const; void accept (tree_walker& tw); octave_value::assign_op op_type (void) const { return etype; } private: void do_assign (octave_lvalue& ult, const octave_value_list& args, const octave_value& rhs_val); void do_assign (octave_lvalue& ult, const octave_value& rhs_val); // The left hand side of the assignment. tree_expression *lhs; // The right hand side of the assignment. tree_expression *rhs; // True if we should not delete the lhs. bool preserve; // True if this is an assignment to the automatic variable ans. bool ans_ass; // The type of the expression. octave_value::assign_op etype; // No copying! tree_simple_assignment (const tree_simple_assignment&); tree_simple_assignment& operator = (const tree_simple_assignment&); }; // Multi-valued assignment expressions. class tree_multi_assignment : public tree_expression { public: tree_multi_assignment (bool plhs = false, int l = -1, int c = -1) : tree_expression (l, c), lhs (0), rhs (0), preserve (plhs) { } tree_multi_assignment (tree_argument_list *lst, tree_expression *r, bool plhs = false, int l = -1, int c = -1); ~tree_multi_assignment (void); bool has_magic_end (void) const { return (rhs && rhs->has_magic_end ()); } bool is_assignment_expression (void) const { return true; } bool rvalue_ok (void) const { return true; } octave_value rvalue1 (int nargout = 1); octave_value_list rvalue (int nargout); std::string oper (void) const; tree_argument_list *left_hand_side (void) { return lhs; } tree_expression *right_hand_side (void) { return rhs; } tree_expression *dup (symbol_table::scope_id scope, symbol_table::context_id context) const; void accept (tree_walker& tw); octave_value::assign_op op_type (void) const { return octave_value::op_asn_eq; } private: // The left hand side of the assignment. tree_argument_list *lhs; // The right hand side of the assignment. tree_expression *rhs; // True if we should not delete the lhs. bool preserve; // No copying! tree_multi_assignment (const tree_multi_assignment&); tree_multi_assignment& operator = (const tree_multi_assignment&); }; #endif