Mercurial > octave-nkf
view libinterp/octave-value/ov-class.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 | bcd71a2531d3 |
children | 56bc1464ec59 |
line wrap: on
line source
/* Copyright (C) 2007-2013 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_ov_class_h) #define octave_ov_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 (bool require_integers = false) 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); 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