Mercurial > octave-nkf
view src/ov-class.h @ 15037:56b8eb7c9c04 classdef
improvements in parsing classdef
* liboctave/base-list.h (octave_base_list::octave_base_list (void),
octave_base_list::octave_base_list (const std::list<elt_type>&),
octave_base_list::operator = (const octave_base_list&),
octave_base_list::~octave_base_list (void)):
Now public.
* pt-classdef.h, pt-classdef.cc: New files.
* src/Makefile.am (PT_INCLUDES): Add pt-classdef.h to the list.
(PT_SRC): Add pt-classdef.cc to the list.
* pt-all.h: Include pt-classdef.h.
* ov.cc: Include ov-classdef.h.
* ov-classdef.cc: Include pt-classdef.h.
(cdef_class:make_meta_class): New method.
(F__meta_get_class__): Delete.
(F__superclass_reference__, F__meta_class_query__):
New functions.
* pt-id.h: Include oct-lvalue.h.
* pt-walk.h (tree_walker::visit_classdef (tree_classdef&),
tree_walker::visit_classdef_attribute (tree_classdef_attribute&),
tree_walker::visit_classdef_attribute_list (tree_classdef_attribute_list&),
tree_walker::visit_classdef_superclass (tree_classdef_superclass&),
tree_walker::visit_classdef_superclass_list (tree_classdef_superclass_list&),
tree_walker::visit_classdef_property (tree_classdef_property&),
tree_walker::visit_classdef_property_list (tree_classdef_property_list&),
tree_walker::visit_classdef_properties_block (tree_classdef_properties_block&),
tree_walker::visit_classdef_methods_list (tree_classdef_methods_list&),
tree_walker::visit_classdef_methods_block (tree_classdef_methods_block&),
tree_walker::visit_classdef_event (tree_classdef_event&),
tree_walker::visit_classdef_events_list (tree_classdef_events_list&),
tree_walker::visit_classdef_events_block (tree_classdef_events_block&),
tree_walker::visit_classdef_enum (tree_classdef_enum&),
tree_walker::visit_classdef_enum_list (tree_classdef_enum_list&),
tree_walker::visit_classdef_enum_block (tree_classdef_enum_block&),
tree_walker::visit_classdef_body (tree_classdef_body&)):
New virtual functions.
* token.h, token.cc (token::sc::mr, token::sc::cr, token::sc::pr,
token::mc::mr, token::mc::pr): Delete.
(token::sc::method_name, token::sc::package_name, token::sc::class_name,
token::mc::package_name, token::mc::class_name): New member variables.
(token::method_rec, token::class_rec, token::package_rec,
token::meta_class_rec, token::meta_package_rec): Delete.
(token::superclass_method_name, token::superclass_package_name,
token::superclass_class_name, token::meta_package_name,
token::meta_class_name): New methods.
(token::token (symbol_table::symbol_record*, int, int),
token::token (symbol_table::symbol_record*, symbol_table::symbol_record*, int, int),
token::token (symbol_table::symbol_record*, symbol_table::symbol_record*, symbol_table::symbol_record*, int, int)):
Delete.
(token::token (const std::string&, const std::string&, int, int),
token::token (const std::string&, const std::string&, const std::string&, int, int)):
New constructors.
(token::scls_rec_token, token::meta_rec_token): Delete enum values.
(token::scls_name_token, token::meta_rec_token): New enum values.
(token::~token): Delete sc and mc struct memebers.
* lex.ll, lex.h (lexical_feedback::parsing_classdef_get_method,
lexical_feedback::parsing_classdef_set_method)): New data members.
(lexical_feedback::lexical_feedback, lexical_feedback::init):
Initialize new data members.
(prep_lexer_for_classdef_file): New function.
(CLASSDEF_FILE_BEGIN): New exclusive start state.
(handle_superclass_identifier, handle_meta_identifier): Split
identifier here and create token with character strings.
(display_token): Handle CLASSDEF_FILE.
(display_state): Handle CLASSDEF_FILE_BEGIN.
* oct-parse.yy: Include ov-classdef.h and pt-funcall.h.
(classdef_object): New static variable.
(make_superclass_ref, make_meta_class_query, make_classdef,
make_classdef_properties_block, make_classdef_methods_block,
make_classdef_events_block, make_classdef_enum_block)): New functions.
(dummy_type): Delete unused nonterminal type.
(tok_type, tree_funcall_type, tree_function_def_type,
tree_classdef_type, tree_classdef_attribute_type,
tree_classdef_attribute_list_type, tree_classdef_superclass_type,
tree_classdef_superclass_list_type, tree_classdef_body_type,
tree_classdef_property_type, tree_classdef_property_list_type,
tree_classdef_properties_block_type, tree_classdef_methods_list_type,
tree_classdef_methods_block_type, tree_classdef_event_type,
tree_classdef_events_list_type, tree_classdef_events_block_type,
tree_classdef_enum_type, tree_classdef_enum_list_type,
tree_classdef_enum_block_type):
New types for nonterminals.
(CLASSDEF): Declare to have a tok_val token value.
(CLASSDEF_FILE): New token.
(classdef_end, properties_beg, methods_beg, events_beg, enum_beg,
classdef1): Delete nonterminals.
(property_list): Rename from properties_list.
(attr, class_event, class_enum, class_property, property_list,
properties_block, methods_list, methods_block, opt_attr_list,
attr_list, events_list, events_blcok, enum_list, enum_block,
class_body, classdef): Declare with specific types. Create parse tree
objects for these nonterminals.
(classdef_file): New nonterminal.
(parse_fcn_file): Handle classdef files. Don't treat classdef files
as scripts.
(command): Don't handle classdef here.
(input): Accept classdef_file here.
(fcn_name): If GET, set lexer_flags.parsing_classdef_get_method.
If SET, set lexer_flags.parsing_classdef_set_method.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Fri, 27 Jul 2012 17:10:25 -0400 |
parents | 460a3c6d8bf1 |
children |
line wrap: on
line source
/* Copyright (C) 2007-2012 John W. Eaton Copyright (C) 2009 VZLU Prague 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_class_h) #define octave_class_h 1 #include <cstdlib> #include <iosfwd> #include <string> #include "mx-base.h" #include "str-vec.h" #include "error.h" #include "oct-alloc.h" #include "oct-map.h" #include "ov-base.h" #include "ov-typeinfo.h" class octave_value_list; class tree_walker; // Data structures. class octave_class : public octave_base_value { public: octave_class (void) : octave_base_value (), map (), c_name (), parent_list (), obsolete_copies (0) { } octave_class (const octave_map& m, const std::string& id, const std::list<std::string>& plist) : octave_base_value (), map (m), c_name (id), parent_list (plist), obsolete_copies (0) { } octave_class (const octave_map& m, const std::string& id, const octave_value_list& parents); octave_class (const octave_class& s) : octave_base_value (s), map (s.map), c_name (s.c_name), parent_list (s.parent_list), obsolete_copies (0) { } ~octave_class (void) { } octave_base_value *clone (void) const { return new octave_class (*this); } octave_base_value *unique_clone (void); octave_base_value *empty_clone (void) const { return new octave_class (octave_map (map.keys ()), c_name, parent_list); } Cell dotref (const octave_value_list& idx); Matrix size (void); octave_idx_type numel (const octave_value_list&); octave_value subsref (const std::string& type, const std::list<octave_value_list>& idx) { octave_value_list tmp = subsref (type, idx, 1); return tmp.length () > 0 ? tmp(0) : octave_value (); } octave_value_list subsref (const std::string& type, const std::list<octave_value_list>& idx, int nargout); octave_value_list do_multi_index_op (int nargout, const octave_value_list& idx) { return subsref ("(", std::list<octave_value_list> (1, idx), nargout); } static octave_value numeric_conv (const Cell& val, const std::string& type); void assign(const std::string& k, const octave_value& rhs) { map.assign (k, rhs); }; octave_value subsasgn (const std::string& type, const std::list<octave_value_list>& idx, const octave_value& rhs); octave_value undef_subsasgn (const std::string& type, const std::list<octave_value_list>& idx, const octave_value& rhs); idx_vector index_vector (void) const; dim_vector dims (void) const { return map.dims (); } size_t byte_size (void) const; // This is the number of elements in each field. The total number // of elements is numel () * nfields (). octave_idx_type numel (void) const { dim_vector dv = dims (); return dv.numel (); } octave_idx_type nfields (void) const { return map.nfields (); } size_t nparents (void) const { return parent_list.size (); } octave_value reshape (const dim_vector& new_dims) const { octave_class retval = octave_class (*this); retval.map = retval.map_value ().reshape (new_dims); return octave_value (new octave_class (retval)); } octave_value resize (const dim_vector& dv, bool = false) const { octave_class retval = octave_class (*this); retval.map.resize (dv); return octave_value (new octave_class (retval)); } bool is_defined (void) const { return true; } bool is_map (void) const { return false; } bool is_object (void) const { return true; } octave_map map_value (void) const { return map; } string_vector map_keys (void) const; std::list<std::string> parent_class_name_list (void) const { return parent_list; } string_vector parent_class_names (void) const { return string_vector (parent_list); } octave_base_value *find_parent_class (const std::string&); octave_base_value *unique_parent_class (const std::string&); string_vector all_strings (bool pad) const; void print (std::ostream& os, bool pr_as_read_syntax = false) const; void print_raw (std::ostream& os, bool pr_as_read_syntax = false) const; bool print_name_tag (std::ostream& os, const std::string& name) const; void print_with_name (std::ostream& os, const std::string& name, bool print_padding = true); bool reconstruct_exemplar (void); static void clear_exemplar_map (void); bool reconstruct_parents (void); bool save_ascii (std::ostream& os); bool load_ascii (std::istream& is); bool save_binary (std::ostream& os, bool& save_as_floats); bool load_binary (std::istream& is, bool swap, oct_mach_info::float_format fmt); #if defined (HAVE_HDF5) bool save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats); bool load_hdf5 (hid_t loc_id, const char *name); #endif mxArray *as_mxArray (void) const; private: octave_map map; DECLARE_OCTAVE_ALLOCATOR public: int type_id (void) const { return t_id; } std::string type_name (void) const { return t_name; } std::string class_name (void) const { return c_name; } static int static_type_id (void) { return t_id; } static std::string static_type_name (void) { return t_name; } static std::string static_class_name (void) { return "<unknown>"; } static void register_type (void); private: static int t_id; static const std::string t_name; std::string c_name; std::list<std::string> parent_list; bool in_class_method (void); std::string get_current_method_class (void); octave_value subsasgn_common (const octave_value& obj, const std::string& type, const std::list<octave_value_list>& idx, const octave_value& rhs); int obsolete_copies; public: // The list of field names and parent classes defines a class. We // keep track of each class that has been created so that we know class exemplar_info { public: exemplar_info (void) : field_names (), parent_class_names () { } exemplar_info (const octave_value& obj); exemplar_info (const exemplar_info& x) : field_names (x.field_names), parent_class_names (x.parent_class_names) { } exemplar_info& operator = (const exemplar_info& x) { if (&x != this) { field_names = x.field_names; parent_class_names = x.parent_class_names; } return *this; } octave_idx_type nfields (void) const { return field_names.length (); } size_t nparents (void) const { return parent_class_names.size (); } string_vector fields (void) const { return field_names; } std::list<std::string> parents (void) const { return parent_class_names; } bool compare (const octave_value& obj) const; private: string_vector field_names; std::list<std::string> parent_class_names; }; // A map from class names to lists of fields. static std::map<std::string, exemplar_info> exemplar_map; typedef std::map<std::string, exemplar_info>::iterator exemplar_iterator; typedef std::map<std::string, exemplar_info>::const_iterator exemplar_const_iterator; }; #endif