Mercurial > octave
annotate src/ov-class.h @ 9147:5579998f8acf
Update to OOP facilities.
* scripts/general/isa.m: Fixed isa so that multiple layers of
class hierarchy are reported correctly.
* src/variables.cc: Make exist('obj') for objects report correctly.
* src/ov-base.h: Added an assign method so ov-class is able to
assign structure elements properly.
* src/ov-class.h: Assign map elements.
* src/ov-class.cc:
- Made sure that there are no duplicate classes in parent tree.
- Simplified search algorithm for parent classes.
- Fixed subsasgn so cls = method(cls,value) works when properly
when method is a parent-class method.
- Added __isa_parent__ so isa works correctly.
author | rtshort@bristlecone.phaselocked.com |
---|---|
date | Wed, 22 Apr 2009 14:33:26 -0400 |
parents | f914834836e7 |
children | d8f9588c6ba1 |
rev | line source |
---|---|
7338 | 1 /* |
2 | |
8920 | 3 Copyright (C) 2007, 2008, 2009 John W. Eaton |
7338 | 4 |
5 This file is part of Octave. | |
6 | |
7 Octave is free software; you can redistribute it and/or modify it | |
8 under the terms of the GNU General Public License as published by the | |
7444 | 9 Free Software Foundation; either version 3 of the License, or (at your |
10 option) any later version. | |
7338 | 11 |
12 Octave is distributed in the hope that it will be useful, but WITHOUT | |
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
15 for more details. | |
16 | |
17 You should have received a copy of the GNU General Public License | |
7444 | 18 along with Octave; see the file COPYING. If not, see |
19 <http://www.gnu.org/licenses/>. | |
7338 | 20 |
21 */ | |
22 | |
23 #if !defined (octave_class_h) | |
24 #define octave_class_h 1 | |
25 | |
26 #include <cstdlib> | |
27 | |
8950
d865363208d6
include <iosfwd> instead of <iostream> in header files
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
28 #include <iosfwd> |
7338 | 29 #include <string> |
30 | |
31 #include "mx-base.h" | |
32 #include "str-vec.h" | |
33 | |
34 #include "error.h" | |
35 #include "oct-alloc.h" | |
36 #include "oct-map.h" | |
37 #include "ov-base.h" | |
38 #include "ov-typeinfo.h" | |
39 | |
40 class octave_value_list; | |
41 | |
42 class tree_walker; | |
43 | |
44 // Data structures. | |
45 | |
46 class | |
47 octave_class : public octave_base_value | |
48 { | |
49 public: | |
50 | |
51 octave_class (void) | |
52 : octave_base_value () { } | |
53 | |
54 octave_class (const Octave_map& m, const std::string& id) | |
55 : octave_base_value (), map (m), c_name (id) { } | |
56 | |
57 octave_class (const octave_class& s) | |
9010
f914834836e7
Partial implementation of derived classes using the old form with "@" files.
rtshort@smoketree.phaselocked.com
parents:
8950
diff
changeset
|
58 : octave_base_value (s), map (s.map), c_name (s.c_name), |
f914834836e7
Partial implementation of derived classes using the old form with "@" files.
rtshort@smoketree.phaselocked.com
parents:
8950
diff
changeset
|
59 parent_list (s.parent_list) { } |
f914834836e7
Partial implementation of derived classes using the old form with "@" files.
rtshort@smoketree.phaselocked.com
parents:
8950
diff
changeset
|
60 |
f914834836e7
Partial implementation of derived classes using the old form with "@" files.
rtshort@smoketree.phaselocked.com
parents:
8950
diff
changeset
|
61 octave_class (const Octave_map& m, const std::string& id, |
f914834836e7
Partial implementation of derived classes using the old form with "@" files.
rtshort@smoketree.phaselocked.com
parents:
8950
diff
changeset
|
62 const octave_value_list& parents); |
7338 | 63 |
64 ~octave_class (void) { } | |
65 | |
66 octave_base_value *clone (void) const { return new octave_class (*this); } | |
8785
70f5a0375afd
oct-map.h: fix think-o in previous change
John W. Eaton <jwe@octave.org>
parents:
8212
diff
changeset
|
67 |
70f5a0375afd
oct-map.h: fix think-o in previous change
John W. Eaton <jwe@octave.org>
parents:
8212
diff
changeset
|
68 octave_base_value *empty_clone (void) const |
70f5a0375afd
oct-map.h: fix think-o in previous change
John W. Eaton <jwe@octave.org>
parents:
8212
diff
changeset
|
69 { |
70f5a0375afd
oct-map.h: fix think-o in previous change
John W. Eaton <jwe@octave.org>
parents:
8212
diff
changeset
|
70 return new octave_class (Octave_map (map.keys ()), class_name ()); |
70f5a0375afd
oct-map.h: fix think-o in previous change
John W. Eaton <jwe@octave.org>
parents:
8212
diff
changeset
|
71 } |
7338 | 72 |
73 Cell dotref (const octave_value_list& idx); | |
74 | |
7651
443a8f5a50fd
require both subsref variants to be defined in octave_value subclasses
John W. Eaton <jwe@octave.org>
parents:
7444
diff
changeset
|
75 octave_value subsref (const std::string& type, |
443a8f5a50fd
require both subsref variants to be defined in octave_value subclasses
John W. Eaton <jwe@octave.org>
parents:
7444
diff
changeset
|
76 const std::list<octave_value_list>& idx) |
7338 | 77 { |
7651
443a8f5a50fd
require both subsref variants to be defined in octave_value subclasses
John W. Eaton <jwe@octave.org>
parents:
7444
diff
changeset
|
78 octave_value_list tmp = subsref (type, idx, 1); |
443a8f5a50fd
require both subsref variants to be defined in octave_value subclasses
John W. Eaton <jwe@octave.org>
parents:
7444
diff
changeset
|
79 return tmp.length () > 0 ? tmp(0) : octave_value (); |
7338 | 80 } |
81 | |
82 octave_value_list subsref (const std::string& type, | |
83 const std::list<octave_value_list>& idx, | |
84 int nargout); | |
85 | |
86 static octave_value numeric_conv (const Cell& val, | |
87 const std::string& type); | |
88 | |
9147
5579998f8acf
Update to OOP facilities.
rtshort@bristlecone.phaselocked.com
parents:
9010
diff
changeset
|
89 void assign(const std::string& k, const octave_value& rhs) |
5579998f8acf
Update to OOP facilities.
rtshort@bristlecone.phaselocked.com
parents:
9010
diff
changeset
|
90 { map.assign (k, rhs); }; |
5579998f8acf
Update to OOP facilities.
rtshort@bristlecone.phaselocked.com
parents:
9010
diff
changeset
|
91 |
7338 | 92 octave_value subsasgn (const std::string& type, |
93 const std::list<octave_value_list>& idx, | |
94 const octave_value& rhs); | |
95 | |
8154
265a821f6555
Add subsindex and ismethod functions
David Bateman <dbateman@free.fr>
parents:
7651
diff
changeset
|
96 idx_vector index_vector (void) const; |
265a821f6555
Add subsindex and ismethod functions
David Bateman <dbateman@free.fr>
parents:
7651
diff
changeset
|
97 |
7338 | 98 dim_vector dims (void) const { return map.dims (); } |
99 | |
100 size_t byte_size (void) const; | |
101 | |
102 // This is the number of elements in each field. The total number | |
103 // of elements is numel () * nfields (). | |
104 octave_idx_type numel (void) const | |
105 { | |
106 dim_vector dv = dims (); | |
107 return dv.numel (); | |
108 } | |
109 | |
110 octave_idx_type nfields (void) const { return map.nfields (); } | |
111 | |
112 octave_value reshape (const dim_vector& new_dims) const | |
113 { return map.reshape (new_dims); } | |
114 | |
115 octave_value resize (const dim_vector& dv, bool = false) const | |
116 { Octave_map tmap = map; tmap.resize (dv); return tmap; } | |
117 | |
118 bool is_defined (void) const { return true; } | |
119 | |
120 bool is_map (void) const { return false; } | |
121 | |
122 bool is_object (void) const { return true; } | |
123 | |
8212
ebf6f6a0f9a7
Allow saving/loading of classes. Add saveobj and loadobj methods
David Bateman <dbateman@free.fr>
parents:
8154
diff
changeset
|
124 Octave_map map_value (void) const { return map; } |
7338 | 125 |
126 string_vector map_keys (void) const; | |
127 | |
9010
f914834836e7
Partial implementation of derived classes using the old form with "@" files.
rtshort@smoketree.phaselocked.com
parents:
8950
diff
changeset
|
128 string_vector parent_class_names (void) const |
f914834836e7
Partial implementation of derived classes using the old form with "@" files.
rtshort@smoketree.phaselocked.com
parents:
8950
diff
changeset
|
129 { return string_vector (parent_list); } |
f914834836e7
Partial implementation of derived classes using the old form with "@" files.
rtshort@smoketree.phaselocked.com
parents:
8950
diff
changeset
|
130 |
f914834836e7
Partial implementation of derived classes using the old form with "@" files.
rtshort@smoketree.phaselocked.com
parents:
8950
diff
changeset
|
131 octave_base_value *find_parent_class (const std::string&); |
f914834836e7
Partial implementation of derived classes using the old form with "@" files.
rtshort@smoketree.phaselocked.com
parents:
8950
diff
changeset
|
132 |
7338 | 133 void print (std::ostream& os, bool pr_as_read_syntax = false) const; |
134 | |
135 void print_raw (std::ostream& os, bool pr_as_read_syntax = false) const; | |
136 | |
137 bool print_name_tag (std::ostream& os, const std::string& name) const; | |
138 | |
139 void print_with_name (std::ostream& os, const std::string& name, | |
140 bool print_padding = true) const; | |
141 | |
8212
ebf6f6a0f9a7
Allow saving/loading of classes. Add saveobj and loadobj methods
David Bateman <dbateman@free.fr>
parents:
8154
diff
changeset
|
142 bool save_ascii (std::ostream& os); |
7338 | 143 |
144 bool load_ascii (std::istream& is); | |
145 | |
146 bool save_binary (std::ostream& os, bool& save_as_floats); | |
147 | |
148 bool load_binary (std::istream& is, bool swap, | |
149 oct_mach_info::float_format fmt); | |
150 | |
151 #if defined (HAVE_HDF5) | |
152 bool save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats); | |
153 | |
154 bool load_hdf5 (hid_t loc_id, const char *name, bool have_h5giterate_bug); | |
155 #endif | |
156 | |
157 mxArray *as_mxArray (void) const; | |
158 | |
159 private: | |
160 | |
161 Octave_map map; | |
162 | |
163 DECLARE_OCTAVE_ALLOCATOR | |
164 | |
165 public: | |
166 int type_id (void) const { return t_id; } | |
167 std::string type_name (void) const { return t_name; } | |
168 std::string class_name (void) const { return c_name; } | |
169 | |
170 static int static_type_id (void) { return t_id; } | |
171 static std::string static_type_name (void) { return t_name; } | |
172 static std::string static_class_name (void) { return "<unknown>"; } | |
173 static void register_type (void); | |
174 | |
175 private: | |
176 static int t_id; | |
177 | |
178 static const std::string t_name; | |
179 std::string c_name; | |
9010
f914834836e7
Partial implementation of derived classes using the old form with "@" files.
rtshort@smoketree.phaselocked.com
parents:
8950
diff
changeset
|
180 std::list<std::string> parent_list; |
7338 | 181 |
182 bool in_class_method (void) const; | |
183 }; | |
184 | |
185 #endif | |
186 | |
187 /* | |
188 ;;; Local Variables: *** | |
189 ;;; mode: C++ *** | |
190 ;;; End: *** | |
191 */ |