Mercurial > hg > octave-nkf
view libinterp/parse-tree/pt-classdef.h @ 16676:7368654f302f classdef
Initial support for (classdef) packages.
* libinterp/interpfcn/load-path.h (class load_path::loader): New class.
(load_path::default_loader, load_path::loader_map): New members.
(load_path::load_path): Initialize them.
(load_path::fcn_map, load_path::private_fcn_map,
load_path::method_map): Move to class load_path::loader.
(load_path::add_to_fcn_map, load_path::add_to_private_fcn_map,
load_path::add_to_method_map, load_path::move_fcn_map,
load_path::move_method_map, load_path::remove_fcn_map,
load_path::remove_private_fcn_map, load_path::remove_method_map):
Move to class load_path::loader.
(load_path::move): Change signature.
(load_path::do_move, load_path::remove, load_path::add,
load_path::get_loader): New methods.
(load_path::find_package, load_path::do_find_package): Likewise.
(load_path::dir_info::package_dir_map): New member.
(load_path::dir_info::dir_info, load_path::dir_info::operator=):
Initialize/assign it.
(load_path::dir_info::get_package_dir): New method.
(load_path::do_find_fcn, load_path::do_find_private_fcn): Remove
methods.
(load_path::find_fcn, load_path::find_private_fcn,
load_path::find_fcn_file, load_path::find_oct_file,
load_path::find_mex_file): Rewrite using class load_path::loader.
New argument for package name.
*libinterp/interpfcn/load-path.cc (load_path::dir_info::initialize):
Clear package_map_dir.
(load_path::dir_info::get_package_dir): New method.
(load_path::dir_info::get_files_list): Use it.
(load_path::add_to_fcn_map, load_path::add_to_private_fcn_map,
load_path::add_to_method_map, load_path::move_fcn_map,
load_path::move_method_map, load_path::remove_fcn_map,
load_path::remove_private_fcn_map, load_path::remove_method_map):
Move to class load_path::loader.
(load_path::move): Move implementation to do_move, rewrite using
class load_path::loader. Signature change.
(load_path::do_move, load_path::add, load_path::remove): New methods.
(load_path::do_clear): Rewrite using class load_path::loader.
(load_path::do_add): Use "do_move" and "add" methods.
(load_path::do_remove): Rewrite using "remove" method.
(load_path::do_update): Rewitre using class load_path::loader and
"add" method.
(load_path::do_find_method, load_path::do_methods,
load_path::do_overloads, load_path::do_fcn_names, load_path::do_display):
Move Implementation to class load_path::loader, without "do_" prefix.
Rewrite original to redirect to appropriate loaders.
(F__dump_load_path__): New debug function.
* libinterp/interpfcn/symtab.h (symbol_table::package_name): New member.
(symbol_table::symbol_table): Initialize it.
(symbol_table::find): New scope argument.
(symbol_table::alloc_package_scope): New method.
(symbol_table::fcn_info::find, symbol_table::fcn_info::find_function,
symbol_table::fcn_info::find_user_function,
symbol_table::fcn_info::fcn_info_rep::xfind,
symbol_table::fcn_info::fcn_info_rep::load_class_constructor,
symbol_table::fcn_info::fcn_info_rep::find,
symbol_table::fcn_info::fcn_info_rep::find_user_function): New
argument for package name.
(symbol_table::fcn_info::fcn_info_rep::package): New member.
(symbol_table::fcn_info::fcn_info_rep::find_package,
symbol_table::fcn_info::fcn_info_rep::clear_package): New methods.
(symbol_table::fcn_info::fcn_info_rep::clear): Clear package.
* libinterp/interpfcn/symtab.cc
(symbol_table::fcn_info::fcn_info_rep::load_class_constructor,
symbol_table::fcn_info::fcn_info_rep::find,
symbol_table::fcn_info::fcn_info_rep::xfind,
symbol_table::fcn_info::fcn_info_rep::find_user_function):
New argument for package name.
(symbol_table::fcn_info::fcn_info_rep::find_package): New method.
(symbol_table::find): New scope argument.
(symbol_table::do_find): Use package_name member.
* libinterp/octave-value/ov-classdef.h
(cdef_package::cdef_package_rep::scope): New member.
(cdef_package::cdef_package_rep::~cdef_package_rep): New destructor.
(cdef_package::cdef_package_rep::meta_subsref,
cdef_package::cdef_package_rep::meta_release,
cdef_package::cdef_package_rep::meta_is_postfix_index_handled,
cdef_package::cdef_package_rep::find,
cdef_package::cdef_package_rep::wrap): New methods.
(cdef_package::find): New method.
(cdef_manager::find_package, cdef_manager::do_find_package): New
argument "load_if_not_found".
(cdef_manager::find_package_symbol,
cdef_manager::do_find_package_symbol): New methods.
* libinterp/octave-value/ov-classdef.cc
(cdef_manager::do_find_package_symbol): New method.
(cdef_manager::do_find_package): New argument. Create package object if
it is not loaded yet and the package exists in load_path.
(cdef_manager::do_find_class): Handle class names with package.
(cdef_package::cdef_package_rep::meta_subsref,
cdef_package::cdef_package_rep::meta_release,
cdef_package::cdef_package_rep::find): New methods.
(cdef_class::make_meta_class): Handle package-scoped classes.
(make_package): Assign correct name to the package object.
* libinterp/parse-tree/pt-classdef.h (tree_classdef::pack_name): New
member.
(tree_classdef::tree_classdef): New argument. Initialize it.
(tree_classdef::package_name): New accessor.
* libinterp/parse-tree/parse.h (octave_base_parser::curr_package_name):
New member.
(octave_base_parser::octave_base_parser): Initialize it.
(load_fcn_from_file): New argument for package name.
* libinterp/parse-tree/oct-parse.in.yy (load_fcn_from_file): New
argument for package name. Change callers.
(parse_fcn_from_file): New argument for package name. Change callers.
(octave_base_parser::make_classdef): Use curr_package_name to create
the tree_classdef object.
* libinterp/octave-value/ov-fcn-handle.cc (octave_fcn_handle::set_fcn):
Adapt to new load_fcn_from_file signature.
* libinterp/interp-core/ls-mat5.cc (read_mat5_binary_element): Adapt
to new load_fcn_from_file signature.
author | Michael Goffioul <michael.goffioul@gmail.com> |
---|---|
date | Fri, 17 May 2013 23:17:25 -0400 |
parents | 32fe9f6f229a |
children | c4f5c781c3ca |
line wrap: on
line source
/* Copyright (C) 2012 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_tree_classdef_h) #define octave_tree_classdef_h 1 class octave_value; class tree_walker; #include "pt-cmd.h" #include "pt-exp.h" #include "pt-id.h" #include "base-list.h" #include <list> class tree_classdef_attribute { public: tree_classdef_attribute (tree_identifier *i = 0, tree_expression *e = 0) : id (i), expr (e), neg (false) { } tree_classdef_attribute (tree_identifier *i, bool b) : id (i), expr (0), neg (b) { } ~tree_classdef_attribute (void) { delete id; delete expr; } tree_identifier *ident (void) { return id; } tree_expression *expression (void) { return expr; } bool negate (void) { return neg; } void accept (tree_walker&); private: tree_identifier *id; tree_expression *expr; bool neg; // No copying! tree_classdef_attribute (const tree_classdef_attribute&); tree_classdef_attribute& operator = (const tree_classdef_attribute&); }; class tree_classdef_attribute_list : public octave_base_list<tree_classdef_attribute *> { public: tree_classdef_attribute_list (void) { } tree_classdef_attribute_list (tree_classdef_attribute *a) { append (a); } tree_classdef_attribute_list (const octave_base_list<tree_classdef_attribute *>& a) : octave_base_list<tree_classdef_attribute *> (a) { } ~tree_classdef_attribute_list (void); void accept (tree_walker&); private: // No copying! tree_classdef_attribute_list (const tree_classdef_attribute_list&); tree_classdef_attribute_list& operator = (const tree_classdef_attribute_list&); }; class tree_classdef_superclass { public: tree_classdef_superclass (tree_identifier *i = 0, tree_identifier *p = 0) : id (i), pkg (p) { } ~tree_classdef_superclass (void) { delete id; delete pkg; } tree_identifier *ident (void) { return id; } tree_identifier * package (void) { return pkg; } void accept (tree_walker&); private: tree_identifier *id; tree_identifier *pkg; // No copying! tree_classdef_superclass (const tree_classdef_superclass&); tree_classdef_superclass& operator = (const tree_classdef_superclass&); }; class tree_classdef_superclass_list : public octave_base_list<tree_classdef_superclass *> { public: tree_classdef_superclass_list (void) { } tree_classdef_superclass_list (tree_classdef_superclass *sc) { append (sc); } tree_classdef_superclass_list (const octave_base_list<tree_classdef_superclass *>& a) : octave_base_list<tree_classdef_superclass *> (a) { } ~tree_classdef_superclass_list (void); void accept (tree_walker&); private: // No copying! tree_classdef_superclass_list (const tree_classdef_superclass_list&); tree_classdef_superclass_list& operator = (const tree_classdef_superclass_list&); }; template <typename T> class tree_classdef_element : public tree { public: tree_classdef_element (tree_classdef_attribute_list *a, octave_base_list<T> *elist, octave_comment_list *lc, octave_comment_list *tc, int l = -1, int c = -1) : tree (l, c), attr_list (a), elt_list (elist), lead_comm (lc), trail_comm (tc) { } ~tree_classdef_element (void) { delete attr_list; delete elt_list; delete lead_comm; delete trail_comm; } tree_classdef_attribute_list *attribute_list (void) { return attr_list; } octave_base_list<T> *element_list (void) { return elt_list; } octave_comment_list *leading_comment (void) { return lead_comm; } octave_comment_list *trailing_comment (void) { return trail_comm; } void accept (tree_walker&) { } private: // List of attributes that apply to this class. tree_classdef_attribute_list *attr_list; // The list of objects contained in this block. octave_base_list<T> *elt_list; // Comment preceding the token marking the beginning of the block. octave_comment_list *lead_comm; // Comment preceding END token. octave_comment_list *trail_comm; // No copying! tree_classdef_element (const tree_classdef_element&); tree_classdef_element& operator = (const tree_classdef_element&); }; class tree_classdef_property { public: tree_classdef_property (tree_identifier *i = 0, tree_expression *e = 0) : id (i), expr (e) { } ~tree_classdef_property (void) { delete id; delete expr; } tree_identifier *ident (void) { return id; } tree_expression *expression (void) { return expr; } void accept (tree_walker&); private: tree_identifier *id; tree_expression *expr; // No copying! tree_classdef_property (const tree_classdef_property&); tree_classdef_property& operator = (const tree_classdef_property&); }; class tree_classdef_property_list : public octave_base_list<tree_classdef_property *> { public: tree_classdef_property_list (void) { } tree_classdef_property_list (tree_classdef_property* p) { append (p); } tree_classdef_property_list (const octave_base_list<tree_classdef_property *>& a) : octave_base_list<tree_classdef_property *> (a) { } ~tree_classdef_property_list (void); void accept (tree_walker&); private: // No copying! tree_classdef_property_list (const tree_classdef_property_list&); tree_classdef_property_list& operator = (const tree_classdef_property_list&); }; class tree_classdef_properties_block : public tree_classdef_element<tree_classdef_property *> { public: tree_classdef_properties_block (tree_classdef_attribute_list *a, tree_classdef_property_list *plist, octave_comment_list *lc, octave_comment_list *tc, int l = -1, int c = -1) : tree_classdef_element<tree_classdef_property *> (a, plist, lc, tc, l, c) { } ~tree_classdef_properties_block (void) { } void accept (tree_walker&); private: // No copying! tree_classdef_properties_block (const tree_classdef_properties_block&); tree_classdef_properties_block& operator = (const tree_classdef_properties_block&); }; class tree_classdef_methods_list : public octave_base_list<octave_value> { public: tree_classdef_methods_list (void) { } tree_classdef_methods_list (const octave_value& f) { append (f); } tree_classdef_methods_list (const octave_base_list<octave_value>& a) : octave_base_list<octave_value> (a) { } ~tree_classdef_methods_list (void) { } void accept (tree_walker&); private: // No copying! tree_classdef_methods_list (const tree_classdef_methods_list&); tree_classdef_methods_list& operator = (const tree_classdef_methods_list&); }; class tree_classdef_methods_block : public tree_classdef_element<octave_value> { public: tree_classdef_methods_block (tree_classdef_attribute_list *a, tree_classdef_methods_list *mlist, octave_comment_list *lc, octave_comment_list *tc, int l = -1, int c = -1) : tree_classdef_element<octave_value> (a, mlist, lc, tc, l, c) { } ~tree_classdef_methods_block (void) { } void accept (tree_walker&); private: // No copying! tree_classdef_methods_block (const tree_classdef_methods_block&); tree_classdef_methods_block& operator = (const tree_classdef_methods_block&); }; class tree_classdef_event { public: tree_classdef_event (tree_identifier *i = 0) : id (i) { } ~tree_classdef_event (void) { delete id; } tree_identifier *ident (void) { return id; } void accept (tree_walker&); private: tree_identifier *id; // No copying! tree_classdef_event (const tree_classdef_event&); tree_classdef_event& operator = (const tree_classdef_event&); }; class tree_classdef_events_list : public octave_base_list<tree_classdef_event *> { public: tree_classdef_events_list (void) { } tree_classdef_events_list (tree_classdef_event *e) { append (e); } tree_classdef_events_list (const octave_base_list<tree_classdef_event *>& a) : octave_base_list<tree_classdef_event *> (a) { } ~tree_classdef_events_list (void); void accept (tree_walker&); private: // No copying! tree_classdef_events_list (const tree_classdef_events_list&); tree_classdef_events_list& operator = (const tree_classdef_events_list&); }; class tree_classdef_events_block : public tree_classdef_element<tree_classdef_event *> { public: tree_classdef_events_block (tree_classdef_attribute_list *a, tree_classdef_events_list *elist, octave_comment_list *lc, octave_comment_list *tc, int l = -1, int c = -1) : tree_classdef_element<tree_classdef_event *> (a, elist, lc, tc, l, c) { } ~tree_classdef_events_block (void) { } void accept (tree_walker&); private: // No copying! tree_classdef_events_block (const tree_classdef_events_block&); tree_classdef_events_block& operator = (const tree_classdef_events_block&); }; class tree_classdef_enum { public: tree_classdef_enum (void) : id (0), expr (0) { } tree_classdef_enum (tree_identifier *i, tree_expression *e) : id (i), expr (e) { } ~tree_classdef_enum (void) { delete id; delete expr; } tree_identifier *ident (void) { return id; } tree_expression *expression (void) { return expr; } void accept (tree_walker&); private: tree_identifier *id; tree_expression *expr; // No copying! tree_classdef_enum (const tree_classdef_enum&); tree_classdef_enum& operator = (const tree_classdef_enum&); }; class tree_classdef_enum_list : public octave_base_list<tree_classdef_enum *> { public: tree_classdef_enum_list (void) { } tree_classdef_enum_list (tree_classdef_enum *e) { append (e); } tree_classdef_enum_list (const octave_base_list<tree_classdef_enum *>& a) : octave_base_list<tree_classdef_enum *> (a) { } ~tree_classdef_enum_list (void); void accept (tree_walker&); private: // No copying! tree_classdef_enum_list (const tree_classdef_enum_list&); tree_classdef_enum_list& operator = (const tree_classdef_enum_list&); }; class tree_classdef_enum_block : public tree_classdef_element<tree_classdef_enum *> { public: tree_classdef_enum_block (tree_classdef_attribute_list *a, tree_classdef_enum_list *elist, octave_comment_list *lc, octave_comment_list *tc, int l = -1, int c = -1) : tree_classdef_element<tree_classdef_enum *> (a, elist, lc, tc, l, c) { } ~tree_classdef_enum_block (void) { } void accept (tree_walker&); private: // No copying! tree_classdef_enum_block (const tree_classdef_enum_block&); tree_classdef_enum_block& operator = (const tree_classdef_enum_block&); }; class tree_classdef_body { public: typedef std::list<tree_classdef_properties_block *>::iterator properties_list_iterator; typedef std::list<tree_classdef_properties_block *>::const_iterator properties_list_const_iterator; typedef std::list<tree_classdef_methods_block *>::iterator methods_list_iterator; typedef std::list<tree_classdef_methods_block *>::const_iterator methods_list_const_iterator; typedef std::list<tree_classdef_events_block *>::iterator events_list_iterator; typedef std::list<tree_classdef_events_block *>::const_iterator events_list_const_iterator; typedef std::list<tree_classdef_enum_block *>::iterator enum_list_iterator; typedef std::list<tree_classdef_enum_block *>::const_iterator enum_list_const_iterator; tree_classdef_body (void) : properties_lst (), methods_lst (), events_lst (), enum_lst () { } tree_classdef_body (tree_classdef_properties_block *pb) : properties_lst (), methods_lst (), events_lst (), enum_lst () { append (pb); } tree_classdef_body (tree_classdef_methods_block *mb) : properties_lst (), methods_lst (), events_lst (), enum_lst () { append (mb); } tree_classdef_body (tree_classdef_events_block *evb) : properties_lst (), methods_lst (), events_lst (), enum_lst () { append (evb); } tree_classdef_body (tree_classdef_enum_block *enb) : properties_lst (), methods_lst (), events_lst (), enum_lst () { append (enb); } ~tree_classdef_body (void); void append (tree_classdef_properties_block *pb) { properties_lst.push_back (pb); } void append (tree_classdef_methods_block *mb) { methods_lst.push_back (mb); } void append (tree_classdef_events_block *evb) { events_lst.push_back (evb); } void append (tree_classdef_enum_block *enb) { enum_lst.push_back (enb); } std::list<tree_classdef_properties_block *> properties_list (void) { return properties_lst; } std::list<tree_classdef_methods_block *> methods_list (void) { return methods_lst; } std::list<tree_classdef_events_block *> events_list (void) { return events_lst; } std::list<tree_classdef_enum_block *> enum_list (void) { return enum_lst; } void accept (tree_walker&); private: std::list<tree_classdef_properties_block *> properties_lst; std::list<tree_classdef_methods_block *> methods_lst; std::list<tree_classdef_events_block *> events_lst; std::list<tree_classdef_enum_block *> enum_lst; // No copying! tree_classdef_body (const tree_classdef_body&); tree_classdef_body& operator = (const tree_classdef_body&); }; // Classdef definition. class tree_classdef : public tree_command { public: tree_classdef (tree_classdef_attribute_list *a, tree_identifier *i, tree_classdef_superclass_list *sc, tree_classdef_body *b, octave_comment_list *lc, octave_comment_list *tc, const std::string& pn = std::string (), int l = -1, int c = -1) : tree_command (l, c), attr_list (a), id (i), supclass_list (sc), element_list (b), lead_comm (lc), trail_comm (tc), pack_name (pn) { } ~tree_classdef (void) { delete attr_list; delete id; delete supclass_list; delete element_list; delete lead_comm; delete trail_comm; } tree_classdef_attribute_list *attribute_list (void) { return attr_list; } tree_identifier *ident (void) { return id; } tree_classdef_superclass_list *superclass_list (void) { return supclass_list; } tree_classdef_body *body (void) { return element_list; } octave_comment_list *leading_comment (void) { return lead_comm; } octave_comment_list *trailing_comment (void) { return trail_comm; } const std::string& package_name (void) const { return pack_name; } octave_function* make_meta_class (void); tree_classdef *dup (symbol_table::scope_id scope, symbol_table::context_id context) const; void accept (tree_walker& tw); private: tree_classdef_attribute_list *attr_list; tree_identifier *id; tree_classdef_superclass_list *supclass_list; tree_classdef_body *element_list; octave_comment_list *lead_comm; octave_comment_list *trail_comm; std::string pack_name; // No copying! tree_classdef (const tree_classdef&); tree_classdef& operator = (const tree_classdef&); }; #endif