Mercurial > hg > octave-nkf
annotate src/symtab.h @ 11557:e9d72a3caa46
mark automatic variables as automatic
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Mon, 17 Jan 2011 13:36:59 -0500 |
parents | 50a7935f2512 |
children | cda4aa780d58 |
rev | line source |
---|---|
8 | 1 /* |
2 | |
11523 | 3 Copyright (C) 1993-2011 John W. Eaton |
10521
4d1fc073fbb7
add some missing copyright stmts
Jaroslav Hajek <highegg@gmail.com>
parents:
10321
diff
changeset
|
4 Copyright (C) 2009 VZLU Prague |
7336 | 5 |
8 | 6 This file is part of Octave. |
7 | |
8 Octave is free software; you can redistribute it and/or modify it | |
9 under the terms of the GNU General Public License as published by the | |
7016 | 10 Free Software Foundation; either version 3 of the License, or (at your |
11 option) any later version. | |
8 | 12 |
13 Octave is distributed in the hope that it will be useful, but WITHOUT | |
14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
16 for more details. | |
17 | |
18 You should have received a copy of the GNU General Public License | |
7016 | 19 along with Octave; see the file COPYING. If not, see |
20 <http://www.gnu.org/licenses/>. | |
8 | 21 |
22 */ | |
23 | |
383 | 24 #if !defined (octave_symtab_h) |
25 #define octave_symtab_h 1 | |
8 | 26 |
7336 | 27 #include <deque> |
28 #include <list> | |
29 #include <map> | |
30 #include <set> | |
31 #include <string> | |
2953 | 32 |
7336 | 33 #include "glob-match.h" |
7779
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
34 #include "regex-match.h" |
2846 | 35 |
7336 | 36 class tree_argument_list; |
9639
8d79f36ebdde
store scope->function pointer
Jaroslav Hajek <highegg@gmail.com>
parents:
9581
diff
changeset
|
37 class octave_user_function; |
3013 | 38 |
7336 | 39 #include "oct-obj.h" |
40 #include "ov.h" | |
1412 | 41 |
8 | 42 class |
6109 | 43 OCTINTERP_API |
8 | 44 symbol_table |
45 { | |
46 public: | |
47 | |
7336 | 48 typedef int scope_id; |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
49 typedef size_t context_id; |
7336 | 50 |
51 class | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
52 scope_id_cache |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
53 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
54 protected: |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
55 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
56 typedef std::set<scope_id>::iterator set_iterator; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
57 typedef std::set<scope_id>::const_iterator set_const_iterator; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
58 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
59 // We start with 2 because we allocate 0 for the global symbols |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
60 // and 1 for the top-level workspace. |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
61 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
62 scope_id_cache (void) : next_available (2), in_use (), free_list () { } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
63 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
64 public: |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
65 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
66 ~scope_id_cache (void) { } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
67 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
68 static scope_id alloc (void) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
69 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
70 return instance_ok () ? instance->do_alloc () : -1; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
71 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
72 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
73 static void free (scope_id scope) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
74 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
75 if (instance_ok ()) |
10313 | 76 return instance->do_free (scope); |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
77 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
78 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
79 static std::list<scope_id> scopes (void) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
80 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
81 return instance_ok () ? instance->do_scopes () : std::list<scope_id> (); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
82 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
83 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
84 static bool instance_ok (void) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
85 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
86 bool retval = true; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
87 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
88 if (! instance) |
10313 | 89 instance = new scope_id_cache (); |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
90 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
91 if (! instance) |
10313 | 92 { |
93 ::error ("unable to create scope_id_cache object!"); | |
94 | |
95 retval = false; | |
96 } | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
97 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
98 return retval; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
99 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
100 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
101 private: |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
102 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
103 static scope_id_cache *instance; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
104 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
105 // The next available scope not in the free list. |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
106 scope_id next_available; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
107 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
108 // The set of scope IDs that are currently allocated. |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
109 std::set<scope_id> in_use; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
110 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
111 // The set of scope IDs that are currently available. |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
112 std::set<scope_id> free_list; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
113 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
114 scope_id do_alloc (void) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
115 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
116 scope_id retval; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
117 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
118 set_iterator p = free_list.begin (); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
119 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
120 if (p != free_list.end ()) |
10313 | 121 { |
122 retval = *p; | |
123 free_list.erase (p); | |
124 } | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
125 else |
10313 | 126 retval = next_available++; |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
127 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
128 in_use.insert (retval); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
129 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
130 return retval; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
131 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
132 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
133 void do_free (scope_id scope) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
134 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
135 set_iterator p = in_use.find (scope); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
136 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
137 if (p != in_use.end ()) |
10313 | 138 { |
139 in_use.erase (p); | |
140 free_list.insert (scope); | |
141 } | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
142 else |
10313 | 143 error ("free_scope: scope %d not found!", scope); |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
144 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
145 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
146 std::list<scope_id> do_scopes (void) const |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
147 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
148 std::list<scope_id> retval; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
149 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
150 for (set_const_iterator p = in_use.begin (); p != in_use.end (); p++) |
10313 | 151 retval.push_back (*p); |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
152 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
153 retval.sort (); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
154 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
155 return retval; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
156 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
157 }; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
158 |
9413
5cd879a0d8c4
speed-up function call by caching its name lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
9409
diff
changeset
|
159 class fcn_info; |
5cd879a0d8c4
speed-up function call by caching its name lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
9409
diff
changeset
|
160 |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
161 class |
7336 | 162 symbol_record |
163 { | |
164 public: | |
165 | |
166 // generic variable | |
167 static const unsigned int local = 1; | |
168 | |
169 // varargin, argn, .nargin., .nargout. | |
170 // (FIXME -- is this really used now?) | |
171 static const unsigned int automatic = 2; | |
172 | |
173 // formal parameter | |
174 static const unsigned int formal = 4; | |
175 | |
176 // not listed or cleared (.nargin., .nargout.) | |
177 static const unsigned int hidden = 8; | |
178 | |
179 // inherited from parent scope; not cleared at function exit | |
180 static const unsigned int inherited = 16; | |
181 | |
182 // global (redirects to global scope) | |
183 static const unsigned int global = 32; | |
184 | |
185 // not cleared at function exit | |
186 static const unsigned int persistent = 64; | |
187 | |
8881
8ed42c679af5
after defining a script or function, clear local variables created for parsing
John W. Eaton <jwe@octave.org>
parents:
8819
diff
changeset
|
188 // temporary variables forced into symbol table for parsing |
8ed42c679af5
after defining a script or function, clear local variables created for parsing
John W. Eaton <jwe@octave.org>
parents:
8819
diff
changeset
|
189 static const unsigned int forced = 128; |
8ed42c679af5
after defining a script or function, clear local variables created for parsing
John W. Eaton <jwe@octave.org>
parents:
8819
diff
changeset
|
190 |
7336 | 191 private: |
192 | |
193 class | |
194 symbol_record_rep | |
4009 | 195 { |
7336 | 196 public: |
197 | |
198 symbol_record_rep (const std::string& nm, const octave_value& v, | |
10313 | 199 unsigned int sc) |
200 : name (nm), value_stack (), storage_class (sc), finfo (), count (1) | |
7336 | 201 { |
10313 | 202 value_stack.push_back (v); |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
203 } |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
204 |
8881
8ed42c679af5
after defining a script or function, clear local variables created for parsing
John W. Eaton <jwe@octave.org>
parents:
8819
diff
changeset
|
205 void force_variable (context_id context) |
8ed42c679af5
after defining a script or function, clear local variables created for parsing
John W. Eaton <jwe@octave.org>
parents:
8819
diff
changeset
|
206 { |
10313 | 207 octave_value& val = varref (context); |
208 | |
209 if (! val.is_defined ()) | |
210 mark_forced (); | |
8881
8ed42c679af5
after defining a script or function, clear local variables created for parsing
John W. Eaton <jwe@octave.org>
parents:
8819
diff
changeset
|
211 } |
8ed42c679af5
after defining a script or function, clear local variables created for parsing
John W. Eaton <jwe@octave.org>
parents:
8819
diff
changeset
|
212 |
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
213 octave_value& varref (context_id context) |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
214 { |
10313 | 215 if (is_global ()) |
216 return symbol_table::global_varref (name); | |
217 else if (is_persistent ()) | |
218 return symbol_table::persistent_varref (name); | |
219 else | |
220 { | |
221 context_id n = value_stack.size (); | |
222 while (n++ <= context) | |
223 value_stack.push_back (octave_value ()); | |
224 | |
225 return value_stack[context]; | |
226 } | |
7336 | 227 } |
228 | |
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
229 octave_value varval (context_id context) const |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
230 { |
10313 | 231 if (is_global ()) |
232 return symbol_table::global_varval (name); | |
233 else if (is_persistent ()) | |
234 return symbol_table::persistent_varval (name); | |
235 else | |
236 { | |
237 if (context < value_stack.size ()) | |
238 return value_stack[context]; | |
239 else | |
240 return octave_value (); | |
241 } | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
242 } |
7336 | 243 |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
244 void push_context (void) |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
245 { |
10313 | 246 if (! (is_persistent () || is_global ())) |
247 value_stack.push_back (octave_value ()); | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
248 } |
7336 | 249 |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
250 // If pop_context returns 0, we are out of values and this element |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
251 // of the symbol table should be deleted. This can happen for |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
252 // functions like |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
253 // |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
254 // function foo (n) |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
255 // if (n > 0) |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
256 // foo (n-1); |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
257 // else |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
258 // eval ("x = 1"); |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
259 // endif |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
260 // endfunction |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
261 // |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
262 // Here, X should only exist in the final stack frame. |
7336 | 263 |
7374 | 264 size_t pop_context (void) |
265 { | |
10313 | 266 size_t retval = 1; |
267 | |
268 if (! (is_persistent () || is_global ())) | |
269 { | |
270 value_stack.pop_back (); | |
271 retval = value_stack.size (); | |
272 } | |
273 | |
274 return retval; | |
7374 | 275 } |
7336 | 276 |
277 void clear (void) | |
278 { | |
10313 | 279 if (! (is_hidden () || is_inherited ())) |
280 { | |
281 if (is_global ()) | |
282 unmark_global (); | |
283 | |
284 if (is_persistent ()) | |
285 { | |
286 symbol_table::persistent_varref (name) | |
287 = varval (xcurrent_context); | |
288 | |
289 unmark_persistent (); | |
290 } | |
291 | |
292 varref (xcurrent_context) = octave_value (); | |
293 } | |
7336 | 294 } |
295 | |
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
296 bool is_defined (context_id context) const |
7336 | 297 { |
10313 | 298 return varval (context).is_defined (); |
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
299 } |
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
300 |
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
301 bool is_variable (context_id context) const |
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
302 { |
10313 | 303 return (! is_local () || is_defined (context) || is_forced ()); |
7336 | 304 } |
305 | |
306 bool is_local (void) const { return storage_class & local; } | |
307 bool is_automatic (void) const { return storage_class & automatic; } | |
308 bool is_formal (void) const { return storage_class & formal; } | |
309 bool is_hidden (void) const { return storage_class & hidden; } | |
310 bool is_inherited (void) const { return storage_class & inherited; } | |
311 bool is_global (void) const { return storage_class & global; } | |
312 bool is_persistent (void) const { return storage_class & persistent; } | |
8881
8ed42c679af5
after defining a script or function, clear local variables created for parsing
John W. Eaton <jwe@octave.org>
parents:
8819
diff
changeset
|
313 bool is_forced (void) const { return storage_class & forced; } |
7336 | 314 |
315 void mark_local (void) { storage_class |= local; } | |
316 void mark_automatic (void) { storage_class |= automatic; } | |
317 void mark_formal (void) { storage_class |= formal; } | |
318 void mark_hidden (void) { storage_class |= hidden; } | |
319 void mark_inherited (void) { storage_class |= inherited; } | |
320 void mark_global (void) | |
321 { | |
10313 | 322 if (is_persistent ()) |
323 error ("can't make persistent variable %s global", name.c_str ()); | |
324 else | |
325 storage_class |= global; | |
7336 | 326 } |
327 void mark_persistent (void) | |
328 { | |
10313 | 329 if (is_global ()) |
330 error ("can't make global variable %s persistent", name.c_str ()); | |
331 else | |
332 storage_class |= persistent; | |
7336 | 333 } |
8881
8ed42c679af5
after defining a script or function, clear local variables created for parsing
John W. Eaton <jwe@octave.org>
parents:
8819
diff
changeset
|
334 void mark_forced (void) { storage_class |= forced; } |
7336 | 335 |
336 void unmark_local (void) { storage_class &= ~local; } | |
337 void unmark_automatic (void) { storage_class &= ~automatic; } | |
338 void unmark_formal (void) { storage_class &= ~formal; } | |
339 void unmark_hidden (void) { storage_class &= ~hidden; } | |
340 void unmark_inherited (void) { storage_class &= ~inherited; } | |
341 void unmark_global (void) { storage_class &= ~global; } | |
342 void unmark_persistent (void) { storage_class &= ~persistent; } | |
8881
8ed42c679af5
after defining a script or function, clear local variables created for parsing
John W. Eaton <jwe@octave.org>
parents:
8819
diff
changeset
|
343 void unmark_forced (void) { storage_class &= ~forced; } |
7336 | 344 |
345 void init_persistent (void) | |
346 { | |
10313 | 347 if (! is_defined (xcurrent_context)) |
348 { | |
349 mark_persistent (); | |
350 | |
351 varref (xcurrent_context) = symbol_table::persistent_varval (name); | |
352 } | |
353 // FIXME -- this causes trouble with recursive calls. | |
354 // else | |
355 // error ("unable to declare existing variable persistent"); | |
7336 | 356 } |
357 | |
358 void erase_persistent (void) | |
359 { | |
10313 | 360 unmark_persistent (); |
361 symbol_table::erase_persistent (name); | |
7336 | 362 } |
363 | |
8906
ab87d08d9a1b
improve symbol inheritance for anonymous functions
John W. Eaton <jwe@octave.org>
parents:
8884
diff
changeset
|
364 symbol_record_rep *dup (void) const |
7336 | 365 { |
10313 | 366 return new symbol_record_rep (name, varval (xcurrent_context), |
367 storage_class); | |
7336 | 368 } |
369 | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
370 void dump (std::ostream& os, const std::string& prefix) const; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
371 |
7336 | 372 std::string name; |
373 | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
374 std::deque<octave_value> value_stack; |
7336 | 375 |
376 unsigned int storage_class; | |
377 | |
9413
5cd879a0d8c4
speed-up function call by caching its name lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
9409
diff
changeset
|
378 fcn_info *finfo; |
5cd879a0d8c4
speed-up function call by caching its name lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
9409
diff
changeset
|
379 |
7336 | 380 size_t count; |
381 | |
382 private: | |
383 | |
384 // No copying! | |
385 | |
386 symbol_record_rep (const symbol_record_rep& ov); | |
387 | |
388 symbol_record_rep& operator = (const symbol_record_rep&); | |
389 }; | |
390 | |
391 public: | |
392 | |
393 symbol_record (const std::string& nm = std::string (), | |
10313 | 394 const octave_value& v = octave_value (), |
395 unsigned int sc = local) | |
7336 | 396 : rep (new symbol_record_rep (nm, v, sc)) { } |
397 | |
398 symbol_record (const symbol_record& sr) | |
399 : rep (sr.rep) | |
400 { | |
401 rep->count++; | |
402 } | |
403 | |
404 symbol_record& operator = (const symbol_record& sr) | |
405 { | |
406 if (this != &sr) | |
10313 | 407 { |
408 if (--rep->count == 0) | |
409 delete rep; | |
410 | |
411 rep = sr.rep; | |
412 rep->count++; | |
413 } | |
7336 | 414 |
415 return *this; | |
416 } | |
417 | |
418 ~symbol_record (void) | |
419 { | |
420 if (--rep->count == 0) | |
10313 | 421 delete rep; |
7336 | 422 } |
423 | |
424 symbol_record dup (void) const { return symbol_record (rep->dup ()); } | |
425 | |
426 std::string name (void) const { return rep->name; } | |
427 | |
9445
c5f03874ea2a
simplify symbol_table::find and associated functions
Jaroslav Hajek <highegg@gmail.com>
parents:
9444
diff
changeset
|
428 octave_value find (const octave_value_list& args = octave_value_list ()) const; |
7336 | 429 |
8881
8ed42c679af5
after defining a script or function, clear local variables created for parsing
John W. Eaton <jwe@octave.org>
parents:
8819
diff
changeset
|
430 void force_variable (context_id context = xcurrent_context) |
8ed42c679af5
after defining a script or function, clear local variables created for parsing
John W. Eaton <jwe@octave.org>
parents:
8819
diff
changeset
|
431 { |
8ed42c679af5
after defining a script or function, clear local variables created for parsing
John W. Eaton <jwe@octave.org>
parents:
8819
diff
changeset
|
432 rep->force_variable (context); |
8ed42c679af5
after defining a script or function, clear local variables created for parsing
John W. Eaton <jwe@octave.org>
parents:
8819
diff
changeset
|
433 } |
8ed42c679af5
after defining a script or function, clear local variables created for parsing
John W. Eaton <jwe@octave.org>
parents:
8819
diff
changeset
|
434 |
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
435 octave_value& varref (context_id context = xcurrent_context) |
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
436 { |
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
437 return rep->varref (context); |
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
438 } |
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
439 |
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
440 octave_value varval (context_id context = xcurrent_context) const |
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
441 { |
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
442 return rep->varval (context); |
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
443 } |
7336 | 444 |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
445 void push_context (void) { rep->push_context (); } |
7336 | 446 |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
447 size_t pop_context (void) { return rep->pop_context (); } |
7336 | 448 |
449 void clear (void) { rep->clear (); } | |
450 | |
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
451 bool is_defined (context_id context = xcurrent_context) const |
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
452 { |
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
453 return rep->is_defined (context); |
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
454 } |
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
455 |
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
456 bool is_variable (context_id context = xcurrent_context) const |
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
457 { |
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
458 return rep->is_variable (context); |
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
459 } |
7336 | 460 |
461 bool is_local (void) const { return rep->is_local (); } | |
462 bool is_automatic (void) const { return rep->is_automatic (); } | |
463 bool is_formal (void) const { return rep->is_formal (); } | |
464 bool is_global (void) const { return rep->is_global (); } | |
465 bool is_hidden (void) const { return rep->is_hidden (); } | |
466 bool is_inherited (void) const { return rep->is_inherited (); } | |
467 bool is_persistent (void) const { return rep->is_persistent (); } | |
8881
8ed42c679af5
after defining a script or function, clear local variables created for parsing
John W. Eaton <jwe@octave.org>
parents:
8819
diff
changeset
|
468 bool is_forced (void) const { return rep->is_forced (); } |
7336 | 469 |
470 void mark_local (void) { rep->mark_local (); } | |
471 void mark_automatic (void) { rep->mark_automatic (); } | |
472 void mark_formal (void) { rep->mark_formal (); } | |
473 void mark_hidden (void) { rep->mark_hidden (); } | |
474 void mark_inherited (void) { rep->mark_inherited (); } | |
475 void mark_global (void) { rep->mark_global (); } | |
476 void mark_persistent (void) { rep->mark_persistent (); } | |
8881
8ed42c679af5
after defining a script or function, clear local variables created for parsing
John W. Eaton <jwe@octave.org>
parents:
8819
diff
changeset
|
477 void mark_forced (void) { rep->mark_forced (); } |
7336 | 478 |
479 void unmark_local (void) { rep->unmark_local (); } | |
480 void unmark_automatic (void) { rep->unmark_automatic (); } | |
481 void unmark_formal (void) { rep->unmark_formal (); } | |
482 void unmark_hidden (void) { rep->unmark_hidden (); } | |
483 void unmark_inherited (void) { rep->unmark_inherited (); } | |
484 void unmark_global (void) { rep->unmark_global (); } | |
485 void unmark_persistent (void) { rep->unmark_persistent (); } | |
8881
8ed42c679af5
after defining a script or function, clear local variables created for parsing
John W. Eaton <jwe@octave.org>
parents:
8819
diff
changeset
|
486 void unmark_forced (void) { rep->unmark_forced (); } |
7336 | 487 |
488 void init_persistent (void) { rep->init_persistent (); } | |
489 | |
490 void erase_persistent (void) { rep->erase_persistent (); } | |
491 | |
492 unsigned int xstorage_class (void) const { return rep->storage_class; } | |
493 | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
494 void |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
495 dump (std::ostream& os, const std::string& prefix = std::string ()) const |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
496 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
497 rep->dump (os, prefix); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
498 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
499 |
7336 | 500 private: |
501 | |
502 symbol_record_rep *rep; | |
503 | |
504 symbol_record (symbol_record_rep *new_rep) : rep (new_rep) { } | |
505 }; | |
506 | |
507 class | |
508 fcn_info | |
509 { | |
510 public: | |
511 | |
512 typedef std::map<std::string, std::string> dispatch_map_type; | |
513 | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
514 typedef std::map<scope_id, octave_value>::const_iterator scope_val_const_iterator; |
7336 | 515 typedef std::map<scope_id, octave_value>::iterator scope_val_iterator; |
4238 | 516 |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
517 typedef std::map<std::string, octave_value>::const_iterator str_val_const_iterator; |
7336 | 518 typedef std::map<std::string, octave_value>::iterator str_val_iterator; |
519 | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
520 typedef dispatch_map_type::const_iterator dispatch_map_const_iterator; |
7336 | 521 typedef dispatch_map_type::iterator dispatch_map_iterator; |
522 | |
523 private: | |
524 | |
525 class | |
526 fcn_info_rep | |
527 { | |
528 public: | |
529 | |
530 fcn_info_rep (const std::string& nm) | |
10313 | 531 : name (nm), subfunctions (), private_functions (), |
532 class_constructors (), class_methods (), cmdline_function (), | |
533 autoload_function (), function_on_path (), built_in_function (), | |
534 count (1) { } | |
7336 | 535 |
536 octave_value load_private_function (const std::string& dir_name); | |
537 | |
538 octave_value load_class_constructor (void); | |
539 | |
540 octave_value load_class_method (const std::string& dispatch_type); | |
541 | |
9463
d34baf412786
support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
542 octave_value find (const octave_value_list& args, bool local_funcs); |
7336 | 543 |
9444
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
544 octave_value builtin_find (void); |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
545 |
7336 | 546 octave_value find_method (const std::string& dispatch_type); |
547 | |
548 octave_value find_autoload (void); | |
549 | |
550 octave_value find_user_function (void); | |
551 | |
552 bool is_user_function_defined (void) const | |
553 { | |
10313 | 554 return function_on_path.is_defined (); |
7336 | 555 } |
556 | |
9463
d34baf412786
support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
557 octave_value find_function (const octave_value_list& args, bool local_funcs) |
7336 | 558 { |
10313 | 559 return find (args, local_funcs); |
7336 | 560 } |
561 | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
562 void lock_subfunction (scope_id scope) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
563 { |
10313 | 564 scope_val_iterator p = subfunctions.find (scope); |
565 | |
566 if (p != subfunctions.end ()) | |
567 p->second.lock (); | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
568 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
569 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
570 void unlock_subfunction (scope_id scope) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
571 { |
10313 | 572 scope_val_iterator p = subfunctions.find (scope); |
573 | |
574 if (p != subfunctions.end ()) | |
575 p->second.unlock (); | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
576 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
577 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
578 std::pair<std::string, octave_value> |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
579 subfunction_defined_in_scope (scope_id scope) const |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
580 { |
10313 | 581 scope_val_const_iterator p = subfunctions.find (scope); |
582 | |
583 return p == subfunctions.end () | |
584 ? std::pair<std::string, octave_value> () | |
585 : std::pair<std::string, octave_value> (name, p->second); | |
586 } | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
587 |
7876
8447a5024650
clear subfunctions when clearing parent function
John W. Eaton <jwe@octave.org>
parents:
7779
diff
changeset
|
588 void erase_subfunction (scope_id scope) |
8447a5024650
clear subfunctions when clearing parent function
John W. Eaton <jwe@octave.org>
parents:
7779
diff
changeset
|
589 { |
10313 | 590 scope_val_iterator p = subfunctions.find (scope); |
591 | |
592 if (p != subfunctions.end ()) | |
593 subfunctions.erase (p); | |
7876
8447a5024650
clear subfunctions when clearing parent function
John W. Eaton <jwe@octave.org>
parents:
7779
diff
changeset
|
594 } |
8447a5024650
clear subfunctions when clearing parent function
John W. Eaton <jwe@octave.org>
parents:
7779
diff
changeset
|
595 |
11445
40f311a69417
fix OO field access in subfunctions of private functions
John W. Eaton <jwe@octave.org>
parents:
11238
diff
changeset
|
596 void mark_subfunction_in_scope_as_private (scope_id scope, |
40f311a69417
fix OO field access in subfunctions of private functions
John W. Eaton <jwe@octave.org>
parents:
11238
diff
changeset
|
597 const std::string& class_name); |
40f311a69417
fix OO field access in subfunctions of private functions
John W. Eaton <jwe@octave.org>
parents:
11238
diff
changeset
|
598 |
7336 | 599 void install_cmdline_function (const octave_value& f) |
600 { | |
10313 | 601 cmdline_function = f; |
7336 | 602 } |
603 | |
604 void install_subfunction (const octave_value& f, scope_id scope) | |
605 { | |
10313 | 606 subfunctions[scope] = f; |
7336 | 607 } |
608 | |
609 void install_user_function (const octave_value& f) | |
610 { | |
10313 | 611 function_on_path = f; |
7336 | 612 } |
613 | |
614 void install_built_in_function (const octave_value& f) | |
615 { | |
10313 | 616 built_in_function = f; |
7336 | 617 } |
618 | |
7489
8e4592e49fa7
don't clear locked functions
John W. Eaton <jwe@octave.org>
parents:
7374
diff
changeset
|
619 template <class T> |
8e4592e49fa7
don't clear locked functions
John W. Eaton <jwe@octave.org>
parents:
7374
diff
changeset
|
620 void |
8e4592e49fa7
don't clear locked functions
John W. Eaton <jwe@octave.org>
parents:
7374
diff
changeset
|
621 clear_unlocked (std::map<T, octave_value>& map) |
7336 | 622 { |
10313 | 623 typename std::map<T, octave_value>::iterator p = map.begin (); |
624 | |
625 while (p != map.end ()) | |
626 { | |
627 if (p->second.islocked ()) | |
628 p++; | |
629 else | |
630 map.erase (p++); | |
631 } | |
7489
8e4592e49fa7
don't clear locked functions
John W. Eaton <jwe@octave.org>
parents:
7374
diff
changeset
|
632 } |
8e4592e49fa7
don't clear locked functions
John W. Eaton <jwe@octave.org>
parents:
7374
diff
changeset
|
633 |
8e4592e49fa7
don't clear locked functions
John W. Eaton <jwe@octave.org>
parents:
7374
diff
changeset
|
634 void clear_cmdline_function (void) |
8e4592e49fa7
don't clear locked functions
John W. Eaton <jwe@octave.org>
parents:
7374
diff
changeset
|
635 { |
10313 | 636 if (! cmdline_function.islocked ()) |
637 cmdline_function = octave_value (); | |
7489
8e4592e49fa7
don't clear locked functions
John W. Eaton <jwe@octave.org>
parents:
7374
diff
changeset
|
638 } |
8e4592e49fa7
don't clear locked functions
John W. Eaton <jwe@octave.org>
parents:
7374
diff
changeset
|
639 |
8e4592e49fa7
don't clear locked functions
John W. Eaton <jwe@octave.org>
parents:
7374
diff
changeset
|
640 void clear_autoload_function (void) |
8e4592e49fa7
don't clear locked functions
John W. Eaton <jwe@octave.org>
parents:
7374
diff
changeset
|
641 { |
10313 | 642 if (! autoload_function.islocked ()) |
643 autoload_function = octave_value (); | |
7336 | 644 } |
645 | |
646 // FIXME -- should this also clear the cmdline and other "user | |
647 // defined" functions? | |
648 void clear_user_function (void) | |
649 { | |
10313 | 650 if (! function_on_path.islocked ()) |
651 { | |
652 function_on_path.erase_subfunctions (); | |
653 | |
654 function_on_path = octave_value (); | |
655 } | |
7336 | 656 } |
657 | |
658 void clear_mex_function (void) | |
659 { | |
10313 | 660 if (function_on_path.is_mex_function ()) |
661 clear_user_function (); | |
7489
8e4592e49fa7
don't clear locked functions
John W. Eaton <jwe@octave.org>
parents:
7374
diff
changeset
|
662 } |
8e4592e49fa7
don't clear locked functions
John W. Eaton <jwe@octave.org>
parents:
7374
diff
changeset
|
663 |
8e4592e49fa7
don't clear locked functions
John W. Eaton <jwe@octave.org>
parents:
7374
diff
changeset
|
664 void clear (void) |
8e4592e49fa7
don't clear locked functions
John W. Eaton <jwe@octave.org>
parents:
7374
diff
changeset
|
665 { |
10313 | 666 clear_unlocked (subfunctions); |
667 clear_unlocked (private_functions); | |
668 clear_unlocked (class_constructors); | |
669 clear_unlocked (class_methods); | |
670 clear_cmdline_function (); | |
671 clear_autoload_function (); | |
672 clear_user_function (); | |
7336 | 673 } |
674 | |
675 void add_dispatch (const std::string& type, const std::string& fname) | |
676 { | |
10313 | 677 dispatch_map[type] = fname; |
7336 | 678 } |
679 | |
680 void clear_dispatch (const std::string& type) | |
681 { | |
10313 | 682 dispatch_map_iterator p = dispatch_map.find (type); |
683 | |
684 if (p != dispatch_map.end ()) | |
685 dispatch_map.erase (p); | |
7336 | 686 } |
687 | |
688 void print_dispatch (std::ostream& os) const; | |
689 | |
690 std::string help_for_dispatch (void) const; | |
691 | |
692 dispatch_map_type get_dispatch (void) const { return dispatch_map; } | |
693 | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
694 void dump (std::ostream& os, const std::string& prefix) const; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
695 |
7336 | 696 std::string name; |
697 | |
698 // Scope id to function object. | |
699 std::map<scope_id, octave_value> subfunctions; | |
700 | |
701 // Directory name to function object. | |
702 std::map<std::string, octave_value> private_functions; | |
703 | |
704 // Class name to function object. | |
705 std::map<std::string, octave_value> class_constructors; | |
706 | |
707 // Dispatch type to function object. | |
708 std::map<std::string, octave_value> class_methods; | |
709 | |
710 // Legacy dispatch map (dispatch type name to function name). | |
711 dispatch_map_type dispatch_map; | |
712 | |
713 octave_value cmdline_function; | |
714 | |
715 octave_value autoload_function; | |
716 | |
717 octave_value function_on_path; | |
718 | |
719 octave_value built_in_function; | |
720 | |
721 size_t count; | |
722 | |
723 private: | |
724 | |
9463
d34baf412786
support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
725 octave_value xfind (const octave_value_list& args, bool local_funcs); |
8691
7838271ee25c
symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call
John W. Eaton <jwe@octave.org>
parents:
8282
diff
changeset
|
726 |
9444
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
727 octave_value x_builtin_find (void); |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
728 |
7336 | 729 // No copying! |
730 | |
731 fcn_info_rep (const fcn_info_rep&); | |
732 | |
733 fcn_info_rep& operator = (const fcn_info_rep&); | |
734 }; | |
735 | |
736 public: | |
737 | |
738 fcn_info (const std::string& nm = std::string ()) | |
739 : rep (new fcn_info_rep (nm)) { } | |
740 | |
8906
ab87d08d9a1b
improve symbol inheritance for anonymous functions
John W. Eaton <jwe@octave.org>
parents:
8884
diff
changeset
|
741 fcn_info (const fcn_info& fi) : rep (fi.rep) |
7336 | 742 { |
743 rep->count++; | |
744 } | |
745 | |
8906
ab87d08d9a1b
improve symbol inheritance for anonymous functions
John W. Eaton <jwe@octave.org>
parents:
8884
diff
changeset
|
746 fcn_info& operator = (const fcn_info& fi) |
7336 | 747 { |
8906
ab87d08d9a1b
improve symbol inheritance for anonymous functions
John W. Eaton <jwe@octave.org>
parents:
8884
diff
changeset
|
748 if (this != &fi) |
10313 | 749 { |
750 if (--rep->count == 0) | |
751 delete rep; | |
752 | |
753 rep = fi.rep; | |
754 rep->count++; | |
755 } | |
7336 | 756 |
757 return *this; | |
758 } | |
759 | |
760 ~fcn_info (void) | |
761 { | |
762 if (--rep->count == 0) | |
10313 | 763 delete rep; |
7336 | 764 } |
765 | |
9463
d34baf412786
support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
766 octave_value find (const octave_value_list& args = octave_value_list (), |
d34baf412786
support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
767 bool local_funcs = true) |
d34baf412786
support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
768 { |
d34baf412786
support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
769 return rep->find (args, local_funcs); |
d34baf412786
support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
770 } |
7336 | 771 |
9444
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
772 octave_value builtin_find (void) |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
773 { |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
774 return rep->builtin_find (); |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
775 } |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
776 |
7336 | 777 octave_value find_method (const std::string& dispatch_type) const |
778 { | |
779 return rep->find_method (dispatch_type); | |
780 } | |
781 | |
782 octave_value find_built_in_function (void) const | |
783 { | |
784 return rep->built_in_function; | |
785 } | |
786 | |
787 octave_value find_autoload (void) | |
788 { | |
789 return rep->find_autoload (); | |
790 } | |
791 | |
792 octave_value find_user_function (void) | |
793 { | |
794 return rep->find_user_function (); | |
795 } | |
796 | |
797 bool is_user_function_defined (void) const | |
798 { | |
799 return rep->is_user_function_defined (); | |
800 } | |
801 | |
9463
d34baf412786
support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
802 octave_value find_function (const octave_value_list& args = octave_value_list (), |
d34baf412786
support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
803 bool local_funcs = true) |
7336 | 804 { |
9463
d34baf412786
support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
805 return rep->find_function (args, local_funcs); |
7336 | 806 } |
807 | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
808 void lock_subfunction (scope_id scope) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
809 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
810 rep->lock_subfunction (scope); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
811 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
812 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
813 void unlock_subfunction (scope_id scope) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
814 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
815 rep->unlock_subfunction (scope); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
816 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
817 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
818 std::pair<std::string, octave_value> |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
819 subfunction_defined_in_scope (scope_id scope = xcurrent_scope) const |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
820 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
821 return rep->subfunction_defined_in_scope (scope); |
10313 | 822 } |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
823 |
7876
8447a5024650
clear subfunctions when clearing parent function
John W. Eaton <jwe@octave.org>
parents:
7779
diff
changeset
|
824 void erase_subfunction (scope_id scope) |
8447a5024650
clear subfunctions when clearing parent function
John W. Eaton <jwe@octave.org>
parents:
7779
diff
changeset
|
825 { |
8447a5024650
clear subfunctions when clearing parent function
John W. Eaton <jwe@octave.org>
parents:
7779
diff
changeset
|
826 rep->erase_subfunction (scope); |
8447a5024650
clear subfunctions when clearing parent function
John W. Eaton <jwe@octave.org>
parents:
7779
diff
changeset
|
827 } |
8447a5024650
clear subfunctions when clearing parent function
John W. Eaton <jwe@octave.org>
parents:
7779
diff
changeset
|
828 |
11445
40f311a69417
fix OO field access in subfunctions of private functions
John W. Eaton <jwe@octave.org>
parents:
11238
diff
changeset
|
829 void mark_subfunction_in_scope_as_private (scope_id scope, |
40f311a69417
fix OO field access in subfunctions of private functions
John W. Eaton <jwe@octave.org>
parents:
11238
diff
changeset
|
830 const std::string& class_name) |
40f311a69417
fix OO field access in subfunctions of private functions
John W. Eaton <jwe@octave.org>
parents:
11238
diff
changeset
|
831 { |
40f311a69417
fix OO field access in subfunctions of private functions
John W. Eaton <jwe@octave.org>
parents:
11238
diff
changeset
|
832 rep->mark_subfunction_in_scope_as_private (scope, class_name); |
40f311a69417
fix OO field access in subfunctions of private functions
John W. Eaton <jwe@octave.org>
parents:
11238
diff
changeset
|
833 } |
40f311a69417
fix OO field access in subfunctions of private functions
John W. Eaton <jwe@octave.org>
parents:
11238
diff
changeset
|
834 |
7336 | 835 void install_cmdline_function (const octave_value& f) |
836 { | |
837 rep->install_cmdline_function (f); | |
838 } | |
839 | |
840 void install_subfunction (const octave_value& f, scope_id scope) | |
841 { | |
842 rep->install_subfunction (f, scope); | |
843 } | |
844 | |
845 void install_user_function (const octave_value& f) | |
846 { | |
847 rep->install_user_function (f); | |
848 } | |
849 | |
850 void install_built_in_function (const octave_value& f) | |
851 { | |
852 rep->install_built_in_function (f); | |
853 } | |
854 | |
855 void clear (void) { rep->clear (); } | |
8881
8ed42c679af5
after defining a script or function, clear local variables created for parsing
John W. Eaton <jwe@octave.org>
parents:
8819
diff
changeset
|
856 |
7336 | 857 void clear_user_function (void) { rep->clear_user_function (); } |
858 | |
9958
80432f0ee895
improve octave_shlib for safer shared libs treatment
Jaroslav Hajek <highegg@gmail.com>
parents:
9639
diff
changeset
|
859 void clear_autoload_function (void) { rep->clear_autoload_function (); } |
80432f0ee895
improve octave_shlib for safer shared libs treatment
Jaroslav Hajek <highegg@gmail.com>
parents:
9639
diff
changeset
|
860 |
7336 | 861 void clear_mex_function (void) { rep->clear_mex_function (); } |
7972
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7901
diff
changeset
|
862 |
7336 | 863 void add_dispatch (const std::string& type, const std::string& fname) |
864 { | |
865 rep->add_dispatch (type, fname); | |
866 } | |
867 | |
868 void clear_dispatch (const std::string& type) | |
869 { | |
870 rep->clear_dispatch (type); | |
871 } | |
872 | |
873 void print_dispatch (std::ostream& os) const | |
874 { | |
875 rep->print_dispatch (os); | |
876 } | |
877 | |
878 std::string help_for_dispatch (void) const { return rep->help_for_dispatch (); } | |
879 | |
880 dispatch_map_type get_dispatch (void) const | |
881 { | |
882 return rep->get_dispatch (); | |
4009 | 883 } |
3011 | 884 |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
885 void |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
886 dump (std::ostream& os, const std::string& prefix = std::string ()) const |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
887 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
888 rep->dump (os, prefix); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
889 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
890 |
7336 | 891 private: |
892 | |
893 fcn_info_rep *rep; | |
894 }; | |
895 | |
896 static scope_id global_scope (void) { return xglobal_scope; } | |
897 static scope_id top_scope (void) { return xtop_scope; } | |
898 | |
899 static scope_id current_scope (void) { return xcurrent_scope; } | |
900 | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
901 static context_id current_context (void) { return xcurrent_context; } |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
902 |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
903 static scope_id alloc_scope (void) { return scope_id_cache::alloc (); } |
7336 | 904 |
905 static void set_scope (scope_id scope) | |
906 { | |
907 if (scope == xglobal_scope) | |
908 error ("can't set scope to global"); | |
909 else if (scope != xcurrent_scope) | |
910 { | |
10313 | 911 all_instances_iterator p = all_instances.find (scope); |
912 | |
913 if (p == all_instances.end ()) | |
914 { | |
915 symbol_table *inst = new symbol_table (); | |
916 | |
917 if (inst) | |
918 all_instances[scope] = instance = inst; | |
919 } | |
920 else | |
921 instance = p->second; | |
922 | |
923 xcurrent_scope = scope; | |
924 xcurrent_context = 0; | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
925 } |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
926 } |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
927 |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
928 static void set_scope_and_context (scope_id scope, context_id context) |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
929 { |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
930 if (scope == xglobal_scope) |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
931 error ("can't set scope to global"); |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
932 else |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
933 { |
10313 | 934 if (scope != xcurrent_scope) |
935 { | |
936 all_instances_iterator p = all_instances.find (scope); | |
937 | |
938 if (p == all_instances.end ()) | |
939 error ("scope not found!"); | |
940 else | |
941 { | |
942 instance = p->second; | |
943 | |
944 xcurrent_scope = scope; | |
9355
5e4da3b3747e
fix context restoration in error state
Jaroslav Hajek <highegg@gmail.com>
parents:
9315
diff
changeset
|
945 |
5e4da3b3747e
fix context restoration in error state
Jaroslav Hajek <highegg@gmail.com>
parents:
9315
diff
changeset
|
946 xcurrent_context = context; |
10313 | 947 } |
948 } | |
9355
5e4da3b3747e
fix context restoration in error state
Jaroslav Hajek <highegg@gmail.com>
parents:
9315
diff
changeset
|
949 else |
5e4da3b3747e
fix context restoration in error state
Jaroslav Hajek <highegg@gmail.com>
parents:
9315
diff
changeset
|
950 xcurrent_context = context; |
7336 | 951 } |
952 } | |
953 | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
954 static void erase_scope (scope_id scope) |
7336 | 955 { |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
956 assert (scope != xglobal_scope); |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
957 |
7336 | 958 all_instances_iterator p = all_instances.find (scope); |
959 | |
960 if (p != all_instances.end ()) | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
961 { |
10313 | 962 delete p->second; |
963 | |
964 all_instances.erase (p); | |
965 | |
966 free_scope (scope); | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
967 } |
7336 | 968 } |
969 | |
7876
8447a5024650
clear subfunctions when clearing parent function
John W. Eaton <jwe@octave.org>
parents:
7779
diff
changeset
|
970 static void erase_subfunctions_in_scope (scope_id scope) |
8447a5024650
clear subfunctions when clearing parent function
John W. Eaton <jwe@octave.org>
parents:
7779
diff
changeset
|
971 { |
8447a5024650
clear subfunctions when clearing parent function
John W. Eaton <jwe@octave.org>
parents:
7779
diff
changeset
|
972 for (fcn_table_iterator q = fcn_table.begin (); |
10313 | 973 q != fcn_table.end (); q++) |
7876
8447a5024650
clear subfunctions when clearing parent function
John W. Eaton <jwe@octave.org>
parents:
7779
diff
changeset
|
974 q->second.erase_subfunction (scope); |
8447a5024650
clear subfunctions when clearing parent function
John W. Eaton <jwe@octave.org>
parents:
7779
diff
changeset
|
975 } |
8447a5024650
clear subfunctions when clearing parent function
John W. Eaton <jwe@octave.org>
parents:
7779
diff
changeset
|
976 |
11445
40f311a69417
fix OO field access in subfunctions of private functions
John W. Eaton <jwe@octave.org>
parents:
11238
diff
changeset
|
977 static void |
40f311a69417
fix OO field access in subfunctions of private functions
John W. Eaton <jwe@octave.org>
parents:
11238
diff
changeset
|
978 mark_subfunctions_in_scope_as_private (scope_id scope, |
40f311a69417
fix OO field access in subfunctions of private functions
John W. Eaton <jwe@octave.org>
parents:
11238
diff
changeset
|
979 const std::string& class_name) |
40f311a69417
fix OO field access in subfunctions of private functions
John W. Eaton <jwe@octave.org>
parents:
11238
diff
changeset
|
980 { |
40f311a69417
fix OO field access in subfunctions of private functions
John W. Eaton <jwe@octave.org>
parents:
11238
diff
changeset
|
981 for (fcn_table_iterator q = fcn_table.begin (); |
40f311a69417
fix OO field access in subfunctions of private functions
John W. Eaton <jwe@octave.org>
parents:
11238
diff
changeset
|
982 q != fcn_table.end (); q++) |
40f311a69417
fix OO field access in subfunctions of private functions
John W. Eaton <jwe@octave.org>
parents:
11238
diff
changeset
|
983 q->second.mark_subfunction_in_scope_as_private (scope, class_name); |
40f311a69417
fix OO field access in subfunctions of private functions
John W. Eaton <jwe@octave.org>
parents:
11238
diff
changeset
|
984 } |
40f311a69417
fix OO field access in subfunctions of private functions
John W. Eaton <jwe@octave.org>
parents:
11238
diff
changeset
|
985 |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
986 static scope_id dup_scope (scope_id scope) |
7336 | 987 { |
988 scope_id retval = -1; | |
989 | |
990 symbol_table *inst = get_instance (scope); | |
991 | |
992 if (inst) | |
993 { | |
10313 | 994 scope_id new_scope = alloc_scope (); |
995 | |
996 symbol_table *new_symbol_table = new symbol_table (); | |
997 | |
998 if (new_symbol_table) | |
999 { | |
1000 all_instances[new_scope] = new_symbol_table; | |
1001 | |
1002 inst->do_dup_scope (*new_symbol_table); | |
1003 | |
1004 retval = new_scope; | |
1005 } | |
7336 | 1006 } |
1007 | |
1008 return retval; | |
1009 } | |
1010 | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1011 static std::list<scope_id> scopes (void) |
7336 | 1012 { |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1013 return scope_id_cache::scopes (); |
7336 | 1014 } |
1015 | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1016 static symbol_record |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1017 find_symbol (const std::string& name, scope_id scope = xcurrent_scope) |
7336 | 1018 { |
1019 symbol_table *inst = get_instance (scope); | |
1020 | |
1021 return inst ? inst->do_find_symbol (name) : symbol_record (); | |
1022 } | |
4009 | 1023 |
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
1024 static void |
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
1025 inherit (scope_id scope, scope_id donor_scope, context_id donor_context) |
7336 | 1026 { |
1027 symbol_table *inst = get_instance (scope); | |
1028 | |
1029 if (inst) | |
8051
36a485f7f335
symtab.h (symbol_table::do_inherit): copy alll symbols from donor scope
John W. Eaton <jwe@octave.org>
parents:
7972
diff
changeset
|
1030 { |
10313 | 1031 symbol_table *donor_symbol_table = get_instance (donor_scope); |
1032 | |
1033 if (donor_symbol_table) | |
1034 inst->do_inherit (*donor_symbol_table, donor_context); | |
8051
36a485f7f335
symtab.h (symbol_table::do_inherit): copy alll symbols from donor scope
John W. Eaton <jwe@octave.org>
parents:
7972
diff
changeset
|
1035 } |
7336 | 1036 } |
1037 | |
1038 static bool at_top_level (void) { return xcurrent_scope == xtop_scope; } | |
1039 | |
1040 // Find a value corresponding to the given name in the table. | |
1041 static octave_value | |
9445
c5f03874ea2a
simplify symbol_table::find and associated functions
Jaroslav Hajek <highegg@gmail.com>
parents:
9444
diff
changeset
|
1042 find (const std::string& name, |
c5f03874ea2a
simplify symbol_table::find and associated functions
Jaroslav Hajek <highegg@gmail.com>
parents:
9444
diff
changeset
|
1043 const octave_value_list& args = octave_value_list (), |
10313 | 1044 bool skip_variables = false, |
9463
d34baf412786
support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
1045 bool local_funcs = true); |
7336 | 1046 |
9444
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
1047 static octave_value builtin_find (const std::string& name); |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
1048 |
7336 | 1049 // Insert a new name in the table. |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1050 static symbol_record& insert (const std::string& name) |
7336 | 1051 { |
1052 static symbol_record foobar; | |
1053 | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1054 symbol_table *inst = get_instance (xcurrent_scope); |
4009 | 1055 |
7336 | 1056 return inst ? inst->do_insert (name) : foobar; |
1057 } | |
1058 | |
8881
8ed42c679af5
after defining a script or function, clear local variables created for parsing
John W. Eaton <jwe@octave.org>
parents:
8819
diff
changeset
|
1059 static void force_variable (const std::string& name, |
10313 | 1060 scope_id scope = xcurrent_scope, |
1061 context_id context = xcurrent_context) | |
8881
8ed42c679af5
after defining a script or function, clear local variables created for parsing
John W. Eaton <jwe@octave.org>
parents:
8819
diff
changeset
|
1062 { |
8ed42c679af5
after defining a script or function, clear local variables created for parsing
John W. Eaton <jwe@octave.org>
parents:
8819
diff
changeset
|
1063 symbol_table *inst = get_instance (scope); |
8ed42c679af5
after defining a script or function, clear local variables created for parsing
John W. Eaton <jwe@octave.org>
parents:
8819
diff
changeset
|
1064 |
8ed42c679af5
after defining a script or function, clear local variables created for parsing
John W. Eaton <jwe@octave.org>
parents:
8819
diff
changeset
|
1065 if (inst) |
8ed42c679af5
after defining a script or function, clear local variables created for parsing
John W. Eaton <jwe@octave.org>
parents:
8819
diff
changeset
|
1066 inst->do_force_variable (name, context); |
8ed42c679af5
after defining a script or function, clear local variables created for parsing
John W. Eaton <jwe@octave.org>
parents:
8819
diff
changeset
|
1067 } |
8ed42c679af5
after defining a script or function, clear local variables created for parsing
John W. Eaton <jwe@octave.org>
parents:
8819
diff
changeset
|
1068 |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1069 static octave_value& varref (const std::string& name, |
10313 | 1070 scope_id scope = xcurrent_scope, |
1071 context_id context = xcurrent_context) | |
7336 | 1072 { |
1073 static octave_value foobar; | |
1074 | |
1075 symbol_table *inst = get_instance (scope); | |
1076 | |
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
1077 return inst ? inst->do_varref (name, context) : foobar; |
7336 | 1078 } |
1079 | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1080 static octave_value varval (const std::string& name, |
10313 | 1081 scope_id scope = xcurrent_scope, |
1082 context_id context = xcurrent_context) | |
7336 | 1083 { |
1084 symbol_table *inst = get_instance (scope); | |
1085 | |
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
1086 return inst ? inst->do_varval (name, context) : octave_value (); |
7336 | 1087 } |
1088 | |
1089 static octave_value& | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1090 global_varref (const std::string& name) |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1091 { |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1092 global_table_iterator p = global_table.find (name); |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1093 |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1094 return (p == global_table.end ()) ? global_table[name] : p->second; |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1095 } |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1096 |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1097 static octave_value |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1098 global_varval (const std::string& name) |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1099 { |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1100 global_table_const_iterator p = global_table.find (name); |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1101 |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1102 return (p != global_table.end ()) ? p->second : octave_value (); |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1103 } |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1104 |
10071
e42b1bbd1052
variables.cc (get_top_level_value, set_top_level_value): new functions
John W. Eaton <jwe@octave.org>
parents:
9981
diff
changeset
|
1105 static octave_value& |
e42b1bbd1052
variables.cc (get_top_level_value, set_top_level_value): new functions
John W. Eaton <jwe@octave.org>
parents:
9981
diff
changeset
|
1106 top_level_varref (const std::string& name) |
e42b1bbd1052
variables.cc (get_top_level_value, set_top_level_value): new functions
John W. Eaton <jwe@octave.org>
parents:
9981
diff
changeset
|
1107 { |
e42b1bbd1052
variables.cc (get_top_level_value, set_top_level_value): new functions
John W. Eaton <jwe@octave.org>
parents:
9981
diff
changeset
|
1108 return varref (name, top_scope (), 0); |
e42b1bbd1052
variables.cc (get_top_level_value, set_top_level_value): new functions
John W. Eaton <jwe@octave.org>
parents:
9981
diff
changeset
|
1109 } |
e42b1bbd1052
variables.cc (get_top_level_value, set_top_level_value): new functions
John W. Eaton <jwe@octave.org>
parents:
9981
diff
changeset
|
1110 |
e42b1bbd1052
variables.cc (get_top_level_value, set_top_level_value): new functions
John W. Eaton <jwe@octave.org>
parents:
9981
diff
changeset
|
1111 static octave_value |
e42b1bbd1052
variables.cc (get_top_level_value, set_top_level_value): new functions
John W. Eaton <jwe@octave.org>
parents:
9981
diff
changeset
|
1112 top_level_varval (const std::string& name) |
e42b1bbd1052
variables.cc (get_top_level_value, set_top_level_value): new functions
John W. Eaton <jwe@octave.org>
parents:
9981
diff
changeset
|
1113 { |
e42b1bbd1052
variables.cc (get_top_level_value, set_top_level_value): new functions
John W. Eaton <jwe@octave.org>
parents:
9981
diff
changeset
|
1114 return varval (name, top_scope (), 0); |
e42b1bbd1052
variables.cc (get_top_level_value, set_top_level_value): new functions
John W. Eaton <jwe@octave.org>
parents:
9981
diff
changeset
|
1115 } |
e42b1bbd1052
variables.cc (get_top_level_value, set_top_level_value): new functions
John W. Eaton <jwe@octave.org>
parents:
9981
diff
changeset
|
1116 |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1117 static octave_value& persistent_varref (const std::string& name) |
7336 | 1118 { |
1119 static octave_value foobar; | |
1120 | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1121 symbol_table *inst = get_instance (xcurrent_scope); |
7336 | 1122 |
1123 return inst ? inst->do_persistent_varref (name) : foobar; | |
1124 } | |
1125 | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1126 static octave_value persistent_varval (const std::string& name) |
7336 | 1127 { |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1128 symbol_table *inst = get_instance (xcurrent_scope); |
7336 | 1129 |
1130 return inst ? inst->do_persistent_varval (name) : octave_value (); | |
1131 } | |
1132 | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1133 static void erase_persistent (const std::string& name) |
7336 | 1134 { |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1135 symbol_table *inst = get_instance (xcurrent_scope); |
7336 | 1136 |
1137 if (inst) | |
1138 inst->do_erase_persistent (name); | |
1139 } | |
8 | 1140 |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1141 static bool is_variable (const std::string& name) |
7336 | 1142 { |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1143 symbol_table *inst = get_instance (xcurrent_scope); |
7336 | 1144 |
1145 return inst ? inst->do_is_variable (name) : false; | |
1146 } | |
1147 | |
1148 static bool | |
1149 is_built_in_function_name (const std::string& name) | |
1150 { | |
1151 octave_value val = find_built_in_function (name); | |
1152 | |
1153 return val.is_defined (); | |
1154 } | |
1155 | |
1156 static octave_value | |
1157 find_method (const std::string& name, const std::string& dispatch_type) | |
1158 { | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1159 fcn_table_const_iterator p = fcn_table.find (name); |
8 | 1160 |
7336 | 1161 if (p != fcn_table.end ()) |
1162 return p->second.find_method (dispatch_type); | |
1163 else | |
1164 { | |
10313 | 1165 fcn_info finfo (name); |
1166 | |
1167 octave_value fcn = finfo.find_method (dispatch_type); | |
1168 | |
1169 if (fcn.is_defined ()) | |
1170 fcn_table[name] = finfo; | |
1171 | |
1172 return fcn; | |
7336 | 1173 } |
1174 } | |
1175 | |
1176 static octave_value | |
1177 find_built_in_function (const std::string& name) | |
1178 { | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1179 fcn_table_const_iterator p = fcn_table.find (name); |
7336 | 1180 |
1181 return (p != fcn_table.end ()) | |
1182 ? p->second.find_built_in_function () : octave_value (); | |
1183 } | |
1184 | |
1185 static octave_value | |
1186 find_autoload (const std::string& name) | |
1187 { | |
1188 fcn_table_iterator p = fcn_table.find (name); | |
4913 | 1189 |
7336 | 1190 return (p != fcn_table.end ()) |
1191 ? p->second.find_autoload () : octave_value (); | |
1192 } | |
1193 | |
1194 static octave_value | |
9445
c5f03874ea2a
simplify symbol_table::find and associated functions
Jaroslav Hajek <highegg@gmail.com>
parents:
9444
diff
changeset
|
1195 find_function (const std::string& name, |
9463
d34baf412786
support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
1196 const octave_value_list& args = octave_value_list (), |
d34baf412786
support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
1197 bool local_funcs = true); |
7336 | 1198 |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1199 static octave_value find_user_function (const std::string& name) |
7336 | 1200 { |
1201 fcn_table_iterator p = fcn_table.find (name); | |
1202 | |
1203 return (p != fcn_table.end ()) | |
1204 ? p->second.find_user_function () : octave_value (); | |
1205 } | |
1206 | |
1207 static void install_cmdline_function (const std::string& name, | |
10313 | 1208 const octave_value& fcn) |
7336 | 1209 { |
1210 fcn_table_iterator p = fcn_table.find (name); | |
1211 | |
1212 if (p != fcn_table.end ()) | |
1213 { | |
10313 | 1214 fcn_info& finfo = p->second; |
1215 | |
1216 finfo.install_cmdline_function (fcn); | |
7336 | 1217 } |
1218 else | |
1219 { | |
10313 | 1220 fcn_info finfo (name); |
1221 | |
1222 finfo.install_cmdline_function (fcn); | |
1223 | |
1224 fcn_table[name] = finfo; | |
7336 | 1225 } |
1226 } | |
1227 | |
1228 static void install_subfunction (const std::string& name, | |
10313 | 1229 const octave_value& fcn, |
1230 scope_id scope) | |
7336 | 1231 { |
1232 fcn_table_iterator p = fcn_table.find (name); | |
1233 | |
1234 if (p != fcn_table.end ()) | |
1235 { | |
10313 | 1236 fcn_info& finfo = p->second; |
1237 | |
1238 finfo.install_subfunction (fcn, scope); | |
7336 | 1239 } |
1240 else | |
1241 { | |
10313 | 1242 fcn_info finfo (name); |
1243 | |
1244 finfo.install_subfunction (fcn, scope); | |
1245 | |
1246 fcn_table[name] = finfo; | |
7336 | 1247 } |
1248 } | |
1249 | |
1250 static void install_user_function (const std::string& name, | |
10313 | 1251 const octave_value& fcn) |
7336 | 1252 { |
1253 fcn_table_iterator p = fcn_table.find (name); | |
1254 | |
1255 if (p != fcn_table.end ()) | |
1256 { | |
10313 | 1257 fcn_info& finfo = p->second; |
1258 | |
1259 finfo.install_user_function (fcn); | |
7336 | 1260 } |
1261 else | |
1262 { | |
10313 | 1263 fcn_info finfo (name); |
1264 | |
1265 finfo.install_user_function (fcn); | |
1266 | |
1267 fcn_table[name] = finfo; | |
7336 | 1268 } |
1269 } | |
605 | 1270 |
7336 | 1271 static void install_built_in_function (const std::string& name, |
10313 | 1272 const octave_value& fcn) |
7336 | 1273 { |
1274 fcn_table_iterator p = fcn_table.find (name); | |
1275 | |
1276 if (p != fcn_table.end ()) | |
1277 { | |
10313 | 1278 fcn_info& finfo = p->second; |
1279 | |
1280 finfo.install_built_in_function (fcn); | |
7336 | 1281 } |
1282 else | |
1283 { | |
10313 | 1284 fcn_info finfo (name); |
1285 | |
1286 finfo.install_built_in_function (fcn); | |
1287 | |
1288 fcn_table[name] = finfo; | |
7336 | 1289 } |
1290 } | |
1291 | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1292 static void clear (const std::string& name) |
7336 | 1293 { |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1294 clear_variable (name); |
7336 | 1295 } |
1296 | |
1297 static void clear_all (void) | |
1298 { | |
1299 clear_variables (); | |
10559
0ecbb17d130a
Clear global variables when 'clear -all' called
Rik <code@nomad.inbox5.com>
parents:
10521
diff
changeset
|
1300 |
0ecbb17d130a
Clear global variables when 'clear -all' called
Rik <code@nomad.inbox5.com>
parents:
10521
diff
changeset
|
1301 clear_global_pattern ("*"); |
7336 | 1302 |
1303 clear_functions (); | |
1304 } | |
1305 | |
9396
17af7cce7d1b
yet more unwind_protect improvements
Jaroslav Hajek <highegg@gmail.com>
parents:
9355
diff
changeset
|
1306 static void clear_variables (scope_id scope) |
7336 | 1307 { |
8282
47a3d2f829e4
clear local symbol table after parsing function
John W. Eaton <jwe@octave.org>
parents:
8123
diff
changeset
|
1308 symbol_table *inst = get_instance (scope); |
7336 | 1309 |
1310 if (inst) | |
1311 inst->do_clear_variables (); | |
1312 } | |
1313 | |
9396
17af7cce7d1b
yet more unwind_protect improvements
Jaroslav Hajek <highegg@gmail.com>
parents:
9355
diff
changeset
|
1314 // This is split for unwind_protect. |
17af7cce7d1b
yet more unwind_protect improvements
Jaroslav Hajek <highegg@gmail.com>
parents:
9355
diff
changeset
|
1315 static void clear_variables (void) |
17af7cce7d1b
yet more unwind_protect improvements
Jaroslav Hajek <highegg@gmail.com>
parents:
9355
diff
changeset
|
1316 { |
17af7cce7d1b
yet more unwind_protect improvements
Jaroslav Hajek <highegg@gmail.com>
parents:
9355
diff
changeset
|
1317 clear_variables (xcurrent_scope); |
17af7cce7d1b
yet more unwind_protect improvements
Jaroslav Hajek <highegg@gmail.com>
parents:
9355
diff
changeset
|
1318 } |
17af7cce7d1b
yet more unwind_protect improvements
Jaroslav Hajek <highegg@gmail.com>
parents:
9355
diff
changeset
|
1319 |
9240
f27a8c07f0b2
clear -classes and support.
Robert T. Short <octave@phaselockedsystems.com>
parents:
9144
diff
changeset
|
1320 static void clear_objects (scope_id scope = xcurrent_scope) |
f27a8c07f0b2
clear -classes and support.
Robert T. Short <octave@phaselockedsystems.com>
parents:
9144
diff
changeset
|
1321 { |
f27a8c07f0b2
clear -classes and support.
Robert T. Short <octave@phaselockedsystems.com>
parents:
9144
diff
changeset
|
1322 symbol_table *inst = get_instance (scope); |
f27a8c07f0b2
clear -classes and support.
Robert T. Short <octave@phaselockedsystems.com>
parents:
9144
diff
changeset
|
1323 |
f27a8c07f0b2
clear -classes and support.
Robert T. Short <octave@phaselockedsystems.com>
parents:
9144
diff
changeset
|
1324 if (inst) |
f27a8c07f0b2
clear -classes and support.
Robert T. Short <octave@phaselockedsystems.com>
parents:
9144
diff
changeset
|
1325 inst->do_clear_objects (); |
f27a8c07f0b2
clear -classes and support.
Robert T. Short <octave@phaselockedsystems.com>
parents:
9144
diff
changeset
|
1326 } |
f27a8c07f0b2
clear -classes and support.
Robert T. Short <octave@phaselockedsystems.com>
parents:
9144
diff
changeset
|
1327 |
9009
da58ec8f62e8
tag bug don't define forced variables
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
1328 static void unmark_forced_variables (scope_id scope = xcurrent_scope) |
8881
8ed42c679af5
after defining a script or function, clear local variables created for parsing
John W. Eaton <jwe@octave.org>
parents:
8819
diff
changeset
|
1329 { |
8ed42c679af5
after defining a script or function, clear local variables created for parsing
John W. Eaton <jwe@octave.org>
parents:
8819
diff
changeset
|
1330 symbol_table *inst = get_instance (scope); |
8ed42c679af5
after defining a script or function, clear local variables created for parsing
John W. Eaton <jwe@octave.org>
parents:
8819
diff
changeset
|
1331 |
8ed42c679af5
after defining a script or function, clear local variables created for parsing
John W. Eaton <jwe@octave.org>
parents:
8819
diff
changeset
|
1332 if (inst) |
9009
da58ec8f62e8
tag bug don't define forced variables
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
1333 inst->do_unmark_forced_variables (); |
8881
8ed42c679af5
after defining a script or function, clear local variables created for parsing
John W. Eaton <jwe@octave.org>
parents:
8819
diff
changeset
|
1334 } |
8ed42c679af5
after defining a script or function, clear local variables created for parsing
John W. Eaton <jwe@octave.org>
parents:
8819
diff
changeset
|
1335 |
7336 | 1336 static void clear_functions (void) |
1337 { | |
1338 for (fcn_table_iterator p = fcn_table.begin (); p != fcn_table.end (); p++) | |
1339 p->second.clear (); | |
1340 } | |
1341 | |
1342 static void clear_function (const std::string& name) | |
1343 { | |
1344 clear_user_function (name); | |
1345 } | |
1346 | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1347 static void clear_global (const std::string& name) |
7336 | 1348 { |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1349 symbol_table *inst = get_instance (xcurrent_scope); |
7336 | 1350 |
1351 if (inst) | |
1352 inst->do_clear_global (name); | |
1353 } | |
1354 | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1355 static void clear_variable (const std::string& name) |
7336 | 1356 { |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1357 symbol_table *inst = get_instance (xcurrent_scope); |
7336 | 1358 |
1359 if (inst) | |
1360 inst->do_clear_variable (name); | |
1361 } | |
1362 | |
1363 static void clear_symbol (const std::string& name) | |
1364 { | |
1365 // FIXME -- are we supposed to do both here? | |
1366 | |
1367 clear_variable (name); | |
1368 clear_function (name); | |
1369 } | |
1370 | |
1371 static void clear_function_pattern (const std::string& pat) | |
1372 { | |
1373 glob_match pattern (pat); | |
1374 | |
1375 for (fcn_table_iterator p = fcn_table.begin (); p != fcn_table.end (); p++) | |
1376 { | |
10313 | 1377 if (pattern.match (p->first)) |
1378 p->second.clear_user_function (); | |
7336 | 1379 } |
1380 } | |
1381 | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1382 static void clear_global_pattern (const std::string& pat) |
7336 | 1383 { |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1384 symbol_table *inst = get_instance (xcurrent_scope); |
4009 | 1385 |
7336 | 1386 if (inst) |
1387 inst->do_clear_global_pattern (pat); | |
1388 } | |
1389 | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1390 static void clear_variable_pattern (const std::string& pat) |
7336 | 1391 { |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1392 symbol_table *inst = get_instance (xcurrent_scope); |
7336 | 1393 |
1394 if (inst) | |
1395 inst->do_clear_variable_pattern (pat); | |
1396 } | |
1397 | |
7779
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1398 static void clear_variable_regexp (const std::string& pat) |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1399 { |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1400 symbol_table *inst = get_instance (xcurrent_scope); |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1401 |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1402 if (inst) |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1403 inst->do_clear_variable_regexp (pat); |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1404 } |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1405 |
7336 | 1406 static void clear_symbol_pattern (const std::string& pat) |
1407 { | |
1408 // FIXME -- are we supposed to do both here? | |
1409 | |
1410 clear_variable_pattern (pat); | |
1411 clear_function_pattern (pat); | |
1412 } | |
1413 | |
1414 static void clear_user_function (const std::string& name) | |
1415 { | |
1416 fcn_table_iterator p = fcn_table.find (name); | |
1417 | |
1418 if (p != fcn_table.end ()) | |
1419 { | |
10313 | 1420 fcn_info& finfo = p->second; |
1421 | |
1422 finfo.clear_user_function (); | |
7336 | 1423 } |
1424 // FIXME -- is this necessary, or even useful? | |
1425 // else | |
1426 // error ("clear: no such function `%s'", name.c_str ()); | |
1427 } | |
1428 | |
9958
80432f0ee895
improve octave_shlib for safer shared libs treatment
Jaroslav Hajek <highegg@gmail.com>
parents:
9639
diff
changeset
|
1429 // This clears oct and mex files, incl. autoloads. |
80432f0ee895
improve octave_shlib for safer shared libs treatment
Jaroslav Hajek <highegg@gmail.com>
parents:
9639
diff
changeset
|
1430 static void clear_dld_function (const std::string& name) |
80432f0ee895
improve octave_shlib for safer shared libs treatment
Jaroslav Hajek <highegg@gmail.com>
parents:
9639
diff
changeset
|
1431 { |
80432f0ee895
improve octave_shlib for safer shared libs treatment
Jaroslav Hajek <highegg@gmail.com>
parents:
9639
diff
changeset
|
1432 fcn_table_iterator p = fcn_table.find (name); |
80432f0ee895
improve octave_shlib for safer shared libs treatment
Jaroslav Hajek <highegg@gmail.com>
parents:
9639
diff
changeset
|
1433 |
80432f0ee895
improve octave_shlib for safer shared libs treatment
Jaroslav Hajek <highegg@gmail.com>
parents:
9639
diff
changeset
|
1434 if (p != fcn_table.end ()) |
80432f0ee895
improve octave_shlib for safer shared libs treatment
Jaroslav Hajek <highegg@gmail.com>
parents:
9639
diff
changeset
|
1435 { |
10313 | 1436 fcn_info& finfo = p->second; |
1437 | |
1438 finfo.clear_autoload_function (); | |
1439 finfo.clear_user_function (); | |
9958
80432f0ee895
improve octave_shlib for safer shared libs treatment
Jaroslav Hajek <highegg@gmail.com>
parents:
9639
diff
changeset
|
1440 } |
80432f0ee895
improve octave_shlib for safer shared libs treatment
Jaroslav Hajek <highegg@gmail.com>
parents:
9639
diff
changeset
|
1441 } |
80432f0ee895
improve octave_shlib for safer shared libs treatment
Jaroslav Hajek <highegg@gmail.com>
parents:
9639
diff
changeset
|
1442 |
7336 | 1443 static void clear_mex_functions (void) |
1444 { | |
1445 for (fcn_table_iterator p = fcn_table.begin (); p != fcn_table.end (); p++) | |
1446 { | |
10313 | 1447 fcn_info& finfo = p->second; |
1448 | |
1449 finfo.clear_mex_function (); | |
7336 | 1450 } |
1451 } | |
1452 | |
7972
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7901
diff
changeset
|
1453 static bool set_class_relationship (const std::string& sup_class, |
10313 | 1454 const std::string& inf_class); |
7972
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7901
diff
changeset
|
1455 |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7901
diff
changeset
|
1456 static bool is_superiorto (const std::string& a, const std::string& b); |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7901
diff
changeset
|
1457 |
7336 | 1458 static void alias_built_in_function (const std::string& alias, |
10313 | 1459 const std::string& name) |
7336 | 1460 { |
1461 octave_value fcn = find_built_in_function (name); | |
1462 | |
1463 if (fcn.is_defined ()) | |
1464 { | |
10313 | 1465 fcn_info finfo (alias); |
1466 | |
1467 finfo.install_built_in_function (fcn); | |
1468 | |
1469 fcn_table[alias] = finfo; | |
7336 | 1470 } |
1471 else | |
1472 panic ("alias: `%s' is undefined", name.c_str ()); | |
1473 } | |
1474 | |
1475 static void add_dispatch (const std::string& name, const std::string& type, | |
10313 | 1476 const std::string& fname) |
7336 | 1477 { |
1478 fcn_table_iterator p = fcn_table.find (name); | |
1479 | |
1480 if (p != fcn_table.end ()) | |
1481 { | |
10313 | 1482 fcn_info& finfo = p->second; |
1483 | |
1484 finfo.add_dispatch (type, fname); | |
7336 | 1485 } |
1486 else | |
1487 { | |
10313 | 1488 fcn_info finfo (name); |
1489 | |
1490 finfo.add_dispatch (type, fname); | |
1491 | |
1492 fcn_table[name] = finfo; | |
7336 | 1493 } |
1494 } | |
1495 | |
1496 static void clear_dispatch (const std::string& name, const std::string& type) | |
1497 { | |
1498 fcn_table_iterator p = fcn_table.find (name); | |
1499 | |
1500 if (p != fcn_table.end ()) | |
1501 { | |
10313 | 1502 fcn_info& finfo = p->second; |
1503 | |
1504 finfo.clear_dispatch (type); | |
7336 | 1505 } |
1506 } | |
1507 | |
1508 static void print_dispatch (std::ostream& os, const std::string& name) | |
1509 { | |
1510 fcn_table_iterator p = fcn_table.find (name); | |
4009 | 1511 |
7336 | 1512 if (p != fcn_table.end ()) |
1513 { | |
10313 | 1514 fcn_info& finfo = p->second; |
1515 | |
1516 finfo.print_dispatch (os); | |
7336 | 1517 } |
1518 } | |
1519 | |
1520 static fcn_info::dispatch_map_type get_dispatch (const std::string& name) | |
1521 { | |
1522 fcn_info::dispatch_map_type retval; | |
1523 | |
1524 fcn_table_iterator p = fcn_table.find (name); | |
1525 | |
1526 if (p != fcn_table.end ()) | |
1527 { | |
10313 | 1528 fcn_info& finfo = p->second; |
1529 | |
1530 retval = finfo.get_dispatch (); | |
7336 | 1531 } |
1532 | |
1533 return retval; | |
1534 } | |
1535 | |
1536 static std::string help_for_dispatch (const std::string& name) | |
1537 { | |
1538 std::string retval; | |
1539 | |
1540 fcn_table_iterator p = fcn_table.find (name); | |
1541 | |
1542 if (p != fcn_table.end ()) | |
1543 { | |
10313 | 1544 fcn_info& finfo = p->second; |
1545 | |
1546 retval = finfo.help_for_dispatch (); | |
7336 | 1547 } |
1548 | |
1549 return retval; | |
1550 } | |
1551 | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1552 static void push_context (void) |
7336 | 1553 { |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1554 if (xcurrent_scope == xglobal_scope || xcurrent_scope == xtop_scope) |
7336 | 1555 error ("invalid call to xymtab::push_context"); |
1556 else | |
1557 { | |
10313 | 1558 symbol_table *inst = get_instance (xcurrent_scope); |
1559 | |
1560 if (inst) | |
1561 inst->do_push_context (); | |
7336 | 1562 } |
1563 } | |
1564 | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1565 static void pop_context (void) |
7336 | 1566 { |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1567 if (xcurrent_scope == xglobal_scope || xcurrent_scope == xtop_scope) |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1568 error ("invalid call to xymtab::pop_context"); |
7336 | 1569 else |
1570 { | |
10313 | 1571 symbol_table *inst = get_instance (xcurrent_scope); |
1572 | |
1573 if (inst) | |
1574 inst->do_pop_context (); | |
7336 | 1575 } |
1576 } | |
1577 | |
1578 // For unwind_protect. | |
1579 static void pop_context (void *) { pop_context (); } | |
1580 | |
11557
e9d72a3caa46
mark automatic variables as automatic
John W. Eaton <jwe@octave.org>
parents:
11548
diff
changeset
|
1581 static void mark_automatic (const std::string& name) |
e9d72a3caa46
mark automatic variables as automatic
John W. Eaton <jwe@octave.org>
parents:
11548
diff
changeset
|
1582 { |
e9d72a3caa46
mark automatic variables as automatic
John W. Eaton <jwe@octave.org>
parents:
11548
diff
changeset
|
1583 symbol_table *inst = get_instance (xcurrent_scope); |
e9d72a3caa46
mark automatic variables as automatic
John W. Eaton <jwe@octave.org>
parents:
11548
diff
changeset
|
1584 |
e9d72a3caa46
mark automatic variables as automatic
John W. Eaton <jwe@octave.org>
parents:
11548
diff
changeset
|
1585 if (inst) |
e9d72a3caa46
mark automatic variables as automatic
John W. Eaton <jwe@octave.org>
parents:
11548
diff
changeset
|
1586 inst->do_mark_automatic (name); |
e9d72a3caa46
mark automatic variables as automatic
John W. Eaton <jwe@octave.org>
parents:
11548
diff
changeset
|
1587 } |
e9d72a3caa46
mark automatic variables as automatic
John W. Eaton <jwe@octave.org>
parents:
11548
diff
changeset
|
1588 |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1589 static void mark_hidden (const std::string& name) |
7336 | 1590 { |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1591 symbol_table *inst = get_instance (xcurrent_scope); |
7336 | 1592 |
1593 if (inst) | |
1594 inst->do_mark_hidden (name); | |
1595 } | |
1596 | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1597 static void mark_global (const std::string& name) |
7336 | 1598 { |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1599 symbol_table *inst = get_instance (xcurrent_scope); |
7336 | 1600 |
1601 if (inst) | |
1602 inst->do_mark_global (name); | |
1603 } | |
1604 | |
1605 static std::list<symbol_record> | |
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
1606 all_variables (scope_id scope = xcurrent_scope, |
10313 | 1607 context_id context = xcurrent_context, |
1608 bool defined_only = true) | |
7336 | 1609 { |
1610 symbol_table *inst = get_instance (scope); | |
1611 | |
1612 return inst | |
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
1613 ? inst->do_all_variables (context, defined_only) : std::list<symbol_record> (); |
7336 | 1614 } |
3011 | 1615 |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1616 static std::list<symbol_record> glob (const std::string& pattern) |
7336 | 1617 { |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1618 symbol_table *inst = get_instance (xcurrent_scope); |
7336 | 1619 |
1620 return inst ? inst->do_glob (pattern) : std::list<symbol_record> (); | |
1621 } | |
1622 | |
7779
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1623 static std::list<symbol_record> regexp (const std::string& pattern) |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1624 { |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1625 symbol_table *inst = get_instance (xcurrent_scope); |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1626 |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1627 return inst ? inst->do_regexp (pattern) : std::list<symbol_record> (); |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1628 } |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1629 |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1630 static std::list<symbol_record> glob_variables (const std::string& pattern) |
7336 | 1631 { |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1632 symbol_table *inst = get_instance (xcurrent_scope); |
7336 | 1633 |
1634 return inst ? inst->do_glob (pattern, true) : std::list<symbol_record> (); | |
1635 } | |
1636 | |
7779
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1637 static std::list<symbol_record> regexp_variables (const std::string& pattern) |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1638 { |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1639 symbol_table *inst = get_instance (xcurrent_scope); |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1640 |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1641 return inst ? inst->do_regexp (pattern, true) : std::list<symbol_record> (); |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1642 } |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1643 |
7336 | 1644 static std::list<symbol_record> |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1645 glob_global_variables (const std::string& pattern) |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1646 { |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1647 std::list<symbol_record> retval; |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1648 |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1649 glob_match pat (pattern); |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1650 |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1651 for (global_table_const_iterator p = global_table.begin (); |
10313 | 1652 p != global_table.end (); p++) |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1653 { |
10313 | 1654 // We generate a list of symbol_record objects so that |
1655 // the results from glob_variables and glob_global_variables | |
1656 // may be handled the same way. | |
1657 | |
1658 if (pat.match (p->first)) | |
1659 retval.push_back (symbol_record (p->first, p->second, | |
1660 symbol_record::global)); | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1661 } |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1662 |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1663 return retval; |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1664 } |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1665 |
7779
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1666 static std::list<symbol_record> |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1667 regexp_global_variables (const std::string& pattern) |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1668 { |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1669 std::list<symbol_record> retval; |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1670 |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1671 regex_match pat (pattern); |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1672 |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1673 for (global_table_const_iterator p = global_table.begin (); |
10313 | 1674 p != global_table.end (); p++) |
7779
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1675 { |
10313 | 1676 // We generate a list of symbol_record objects so that |
1677 // the results from regexp_variables and regexp_global_variables | |
1678 // may be handled the same way. | |
1679 | |
1680 if (pat.match (p->first)) | |
1681 retval.push_back (symbol_record (p->first, p->second, | |
1682 symbol_record::global)); | |
7779
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1683 } |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1684 |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1685 return retval; |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1686 } |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1687 |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1688 static std::list<symbol_record> glob_variables (const string_vector& patterns) |
7336 | 1689 { |
1690 std::list<symbol_record> retval; | |
1691 | |
1692 size_t len = patterns.length (); | |
8 | 1693 |
7336 | 1694 for (size_t i = 0; i < len; i++) |
1695 { | |
10313 | 1696 std::list<symbol_record> tmp = glob_variables (patterns[i]); |
1697 | |
1698 retval.insert (retval.begin (), tmp.begin (), tmp.end ()); | |
7336 | 1699 } |
1700 | |
1701 return retval; | |
1702 } | |
1703 | |
7779
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1704 static std::list<symbol_record> regexp_variables |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1705 (const string_vector& patterns) |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1706 { |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1707 std::list<symbol_record> retval; |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1708 |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1709 size_t len = patterns.length (); |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1710 |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1711 for (size_t i = 0; i < len; i++) |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1712 { |
10313 | 1713 std::list<symbol_record> tmp = regexp_variables (patterns[i]); |
1714 | |
1715 retval.insert (retval.begin (), tmp.begin (), tmp.end ()); | |
7779
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1716 } |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1717 |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1718 return retval; |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1719 } |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1720 |
7336 | 1721 static std::list<std::string> user_function_names (void) |
1722 { | |
1723 std::list<std::string> retval; | |
1724 | |
1725 for (fcn_table_iterator p = fcn_table.begin (); | |
10313 | 1726 p != fcn_table.end (); p++) |
7336 | 1727 { |
10313 | 1728 if (p->second.is_user_function_defined ()) |
1729 retval.push_back (p->first); | |
7336 | 1730 } |
1731 | |
1732 if (! retval.empty ()) | |
1733 retval.sort (); | |
1734 | |
1735 return retval; | |
1736 } | |
3011 | 1737 |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1738 static std::list<std::string> global_variable_names (void) |
7336 | 1739 { |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1740 std::list<std::string> retval; |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1741 |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1742 for (global_table_const_iterator p = global_table.begin (); |
10313 | 1743 p != global_table.end (); p++) |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1744 retval.push_back (p->first); |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1745 |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1746 retval.sort (); |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1747 |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1748 return retval; |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1749 } |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1750 |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1751 static std::list<std::string> top_level_variable_names (void) |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1752 { |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1753 symbol_table *inst = get_instance (xtop_scope); |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1754 |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1755 return inst ? inst->do_variable_names () : std::list<std::string> (); |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1756 } |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1757 |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1758 static std::list<std::string> variable_names (void) |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1759 { |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1760 symbol_table *inst = get_instance (xcurrent_scope); |
7336 | 1761 |
1762 return inst ? inst->do_variable_names () : std::list<std::string> (); | |
1763 } | |
1764 | |
1765 static std::list<std::string> built_in_function_names (void) | |
1766 { | |
1767 std::list<std::string> retval; | |
1768 | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1769 for (fcn_table_const_iterator p = fcn_table.begin (); |
10313 | 1770 p != fcn_table.end (); p++) |
7336 | 1771 { |
10313 | 1772 octave_value fcn = p->second.find_built_in_function (); |
1773 | |
1774 if (fcn.is_defined ()) | |
1775 retval.push_back (p->first); | |
7336 | 1776 } |
1777 | |
1778 if (! retval.empty ()) | |
1779 retval.sort (); | |
220 | 1780 |
7336 | 1781 return retval; |
1782 } | |
1783 | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1784 static bool is_local_variable (const std::string& name) |
7336 | 1785 { |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1786 if (xcurrent_scope == xglobal_scope) |
7336 | 1787 return false; |
1788 else | |
1789 { | |
10313 | 1790 symbol_table *inst = get_instance (xcurrent_scope); |
1791 | |
1792 return inst ? inst->do_is_local_variable (name) : false; | |
7336 | 1793 } |
1794 } | |
5861 | 1795 |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1796 static bool is_global (const std::string& name) |
7336 | 1797 { |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1798 if (xcurrent_scope == xglobal_scope) |
7336 | 1799 return true; |
1800 else | |
1801 { | |
10313 | 1802 symbol_table *inst = get_instance (xcurrent_scope); |
1803 | |
1804 return inst ? inst->do_is_global (name) : false; | |
7336 | 1805 } |
1806 } | |
3011 | 1807 |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1808 static void dump (std::ostream& os, scope_id scope = xcurrent_scope); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1809 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1810 static void dump_global (std::ostream& os); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1811 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1812 static void dump_functions (std::ostream& os); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1813 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1814 static void cache_name (scope_id scope, const std::string& name) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1815 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1816 symbol_table *inst = get_instance (scope, false); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1817 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1818 if (inst) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1819 inst->do_cache_name (name); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1820 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1821 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1822 static void lock_subfunctions (scope_id scope = xcurrent_scope) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1823 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1824 for (fcn_table_iterator p = fcn_table.begin (); |
10313 | 1825 p != fcn_table.end (); p++) |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1826 p->second.lock_subfunction (scope); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1827 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1828 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1829 static void unlock_subfunctions (scope_id scope = xcurrent_scope) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1830 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1831 for (fcn_table_iterator p = fcn_table.begin (); |
10313 | 1832 p != fcn_table.end (); p++) |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1833 p->second.unlock_subfunction (scope); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1834 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1835 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1836 static void free_scope (scope_id scope) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1837 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1838 if (scope == xglobal_scope || scope == xtop_scope) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1839 error ("can't free global or top-level scopes!"); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1840 else |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1841 symbol_table::scope_id_cache::free (scope); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1842 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1843 |
8819
96d87674b818
also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents:
8691
diff
changeset
|
1844 static void stash_dir_name_for_subfunctions (scope_id scope, |
10313 | 1845 const std::string& dir_name); |
8819
96d87674b818
also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents:
8691
diff
changeset
|
1846 |
9581
3d0d2bda3a0f
fix previous change, avoid duplicate loads of methods in descendant classes
Jaroslav Hajek <highegg@gmail.com>
parents:
9509
diff
changeset
|
1847 static void add_to_parent_map (const std::string& classname, |
10313 | 1848 const std::list<std::string>& parent_list) |
9581
3d0d2bda3a0f
fix previous change, avoid duplicate loads of methods in descendant classes
Jaroslav Hajek <highegg@gmail.com>
parents:
9509
diff
changeset
|
1849 { |
3d0d2bda3a0f
fix previous change, avoid duplicate loads of methods in descendant classes
Jaroslav Hajek <highegg@gmail.com>
parents:
9509
diff
changeset
|
1850 parent_map[classname] = parent_list; |
3d0d2bda3a0f
fix previous change, avoid duplicate loads of methods in descendant classes
Jaroslav Hajek <highegg@gmail.com>
parents:
9509
diff
changeset
|
1851 } |
3d0d2bda3a0f
fix previous change, avoid duplicate loads of methods in descendant classes
Jaroslav Hajek <highegg@gmail.com>
parents:
9509
diff
changeset
|
1852 |
11238
1783b360976f
also consider parent classes when checking if class methods are out of date
John W. Eaton <jwe@octave.org>
parents:
10633
diff
changeset
|
1853 static std::list<std::string> |
1783b360976f
also consider parent classes when checking if class methods are out of date
John W. Eaton <jwe@octave.org>
parents:
10633
diff
changeset
|
1854 parent_classes (const std::string& dispatch_type) |
1783b360976f
also consider parent classes when checking if class methods are out of date
John W. Eaton <jwe@octave.org>
parents:
10633
diff
changeset
|
1855 { |
1783b360976f
also consider parent classes when checking if class methods are out of date
John W. Eaton <jwe@octave.org>
parents:
10633
diff
changeset
|
1856 std::list<std::string> retval; |
1783b360976f
also consider parent classes when checking if class methods are out of date
John W. Eaton <jwe@octave.org>
parents:
10633
diff
changeset
|
1857 |
1783b360976f
also consider parent classes when checking if class methods are out of date
John W. Eaton <jwe@octave.org>
parents:
10633
diff
changeset
|
1858 const_parent_map_iterator it = parent_map.find (dispatch_type); |
1783b360976f
also consider parent classes when checking if class methods are out of date
John W. Eaton <jwe@octave.org>
parents:
10633
diff
changeset
|
1859 |
1783b360976f
also consider parent classes when checking if class methods are out of date
John W. Eaton <jwe@octave.org>
parents:
10633
diff
changeset
|
1860 if (it != parent_map.end ()) |
1783b360976f
also consider parent classes when checking if class methods are out of date
John W. Eaton <jwe@octave.org>
parents:
10633
diff
changeset
|
1861 retval = it->second; |
1783b360976f
also consider parent classes when checking if class methods are out of date
John W. Eaton <jwe@octave.org>
parents:
10633
diff
changeset
|
1862 |
1783b360976f
also consider parent classes when checking if class methods are out of date
John W. Eaton <jwe@octave.org>
parents:
10633
diff
changeset
|
1863 return retval; |
1783b360976f
also consider parent classes when checking if class methods are out of date
John W. Eaton <jwe@octave.org>
parents:
10633
diff
changeset
|
1864 } |
1783b360976f
also consider parent classes when checking if class methods are out of date
John W. Eaton <jwe@octave.org>
parents:
10633
diff
changeset
|
1865 |
9639
8d79f36ebdde
store scope->function pointer
Jaroslav Hajek <highegg@gmail.com>
parents:
9581
diff
changeset
|
1866 static octave_user_function *get_curr_fcn (scope_id scope = xcurrent_scope) |
8d79f36ebdde
store scope->function pointer
Jaroslav Hajek <highegg@gmail.com>
parents:
9581
diff
changeset
|
1867 { |
8d79f36ebdde
store scope->function pointer
Jaroslav Hajek <highegg@gmail.com>
parents:
9581
diff
changeset
|
1868 symbol_table *inst = get_instance (scope); |
8d79f36ebdde
store scope->function pointer
Jaroslav Hajek <highegg@gmail.com>
parents:
9581
diff
changeset
|
1869 return inst->curr_fcn; |
8d79f36ebdde
store scope->function pointer
Jaroslav Hajek <highegg@gmail.com>
parents:
9581
diff
changeset
|
1870 } |
8d79f36ebdde
store scope->function pointer
Jaroslav Hajek <highegg@gmail.com>
parents:
9581
diff
changeset
|
1871 |
8d79f36ebdde
store scope->function pointer
Jaroslav Hajek <highegg@gmail.com>
parents:
9581
diff
changeset
|
1872 static void set_curr_fcn (octave_user_function *curr_fcn, |
8d79f36ebdde
store scope->function pointer
Jaroslav Hajek <highegg@gmail.com>
parents:
9581
diff
changeset
|
1873 scope_id scope = xcurrent_scope) |
8d79f36ebdde
store scope->function pointer
Jaroslav Hajek <highegg@gmail.com>
parents:
9581
diff
changeset
|
1874 { |
8d79f36ebdde
store scope->function pointer
Jaroslav Hajek <highegg@gmail.com>
parents:
9581
diff
changeset
|
1875 assert (scope != xtop_scope && scope != xglobal_scope); |
8d79f36ebdde
store scope->function pointer
Jaroslav Hajek <highegg@gmail.com>
parents:
9581
diff
changeset
|
1876 symbol_table *inst = get_instance (scope); |
8d79f36ebdde
store scope->function pointer
Jaroslav Hajek <highegg@gmail.com>
parents:
9581
diff
changeset
|
1877 // FIXME: normally, functions should not usurp each other's scope. |
8d79f36ebdde
store scope->function pointer
Jaroslav Hajek <highegg@gmail.com>
parents:
9581
diff
changeset
|
1878 // If for any incredible reason this is needed, call |
8d79f36ebdde
store scope->function pointer
Jaroslav Hajek <highegg@gmail.com>
parents:
9581
diff
changeset
|
1879 // set_user_function (0, scope) first. |
8d79f36ebdde
store scope->function pointer
Jaroslav Hajek <highegg@gmail.com>
parents:
9581
diff
changeset
|
1880 assert (inst->curr_fcn == 0 || curr_fcn == 0); |
8d79f36ebdde
store scope->function pointer
Jaroslav Hajek <highegg@gmail.com>
parents:
9581
diff
changeset
|
1881 inst->curr_fcn = curr_fcn; |
8d79f36ebdde
store scope->function pointer
Jaroslav Hajek <highegg@gmail.com>
parents:
9581
diff
changeset
|
1882 } |
8d79f36ebdde
store scope->function pointer
Jaroslav Hajek <highegg@gmail.com>
parents:
9581
diff
changeset
|
1883 |
9981
692ab4eaf965
clean up top-level variables when exiting Octave
Jaroslav Hajek <highegg@gmail.com>
parents:
9958
diff
changeset
|
1884 static void cleanup (void); |
692ab4eaf965
clean up top-level variables when exiting Octave
Jaroslav Hajek <highegg@gmail.com>
parents:
9958
diff
changeset
|
1885 |
8 | 1886 private: |
1887 | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1888 typedef std::map<std::string, symbol_record>::const_iterator table_const_iterator; |
7336 | 1889 typedef std::map<std::string, symbol_record>::iterator table_iterator; |
1890 | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1891 typedef std::map<std::string, octave_value>::const_iterator global_table_const_iterator; |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1892 typedef std::map<std::string, octave_value>::iterator global_table_iterator; |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1893 |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1894 typedef std::map<std::string, octave_value>::const_iterator persistent_table_const_iterator; |
7336 | 1895 typedef std::map<std::string, octave_value>::iterator persistent_table_iterator; |
1896 | |
1897 typedef std::map<scope_id, symbol_table*>::const_iterator all_instances_const_iterator; | |
1898 typedef std::map<scope_id, symbol_table*>::iterator all_instances_iterator; | |
1899 | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1900 typedef std::map<std::string, fcn_info>::const_iterator fcn_table_const_iterator; |
7336 | 1901 typedef std::map<std::string, fcn_info>::iterator fcn_table_iterator; |
1902 | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1903 // Name for this table (usually the file name of the function |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1904 // corresponding to the scope); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1905 std::string table_name; |
7336 | 1906 |
1907 // Map from symbol names to symbol info. | |
1908 std::map<std::string, symbol_record> table; | |
1909 | |
9639
8d79f36ebdde
store scope->function pointer
Jaroslav Hajek <highegg@gmail.com>
parents:
9581
diff
changeset
|
1910 // The associated user code (may be null). |
8d79f36ebdde
store scope->function pointer
Jaroslav Hajek <highegg@gmail.com>
parents:
9581
diff
changeset
|
1911 octave_user_function *curr_fcn; |
8d79f36ebdde
store scope->function pointer
Jaroslav Hajek <highegg@gmail.com>
parents:
9581
diff
changeset
|
1912 |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1913 // Map from names of global variables to values. |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1914 static std::map<std::string, octave_value> global_table; |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1915 |
7336 | 1916 // Map from names of persistent variables to values. |
1917 std::map<std::string, octave_value> persistent_table; | |
1918 | |
1919 // Pointer to symbol table for current scope (variables only). | |
1920 static symbol_table *instance; | |
3011 | 1921 |
7336 | 1922 // Map from scope id to symbol table instances. |
1923 static std::map<scope_id, symbol_table*> all_instances; | |
1924 | |
1925 // Map from function names to function info (subfunctions, private | |
1926 // functions, class constructors, class methods, etc.) | |
1927 static std::map<std::string, fcn_info> fcn_table; | |
1928 | |
7972
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7901
diff
changeset
|
1929 // Mape from class names to set of classes that have lower |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7901
diff
changeset
|
1930 // precedence. |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7901
diff
changeset
|
1931 static std::map<std::string, std::set<std::string> > class_precedence_table; |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7901
diff
changeset
|
1932 |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7901
diff
changeset
|
1933 typedef std::map<std::string, std::set<std::string> >::const_iterator class_precedence_table_const_iterator; |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7901
diff
changeset
|
1934 typedef std::map<std::string, std::set<std::string> >::iterator class_precedence_table_iterator; |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7901
diff
changeset
|
1935 |
9581
3d0d2bda3a0f
fix previous change, avoid duplicate loads of methods in descendant classes
Jaroslav Hajek <highegg@gmail.com>
parents:
9509
diff
changeset
|
1936 // Map from class names to parent class names. |
3d0d2bda3a0f
fix previous change, avoid duplicate loads of methods in descendant classes
Jaroslav Hajek <highegg@gmail.com>
parents:
9509
diff
changeset
|
1937 static std::map<std::string, std::list<std::string> > parent_map; |
3d0d2bda3a0f
fix previous change, avoid duplicate loads of methods in descendant classes
Jaroslav Hajek <highegg@gmail.com>
parents:
9509
diff
changeset
|
1938 |
3d0d2bda3a0f
fix previous change, avoid duplicate loads of methods in descendant classes
Jaroslav Hajek <highegg@gmail.com>
parents:
9509
diff
changeset
|
1939 typedef std::map<std::string, std::list<std::string> >::const_iterator const_parent_map_iterator; |
3d0d2bda3a0f
fix previous change, avoid duplicate loads of methods in descendant classes
Jaroslav Hajek <highegg@gmail.com>
parents:
9509
diff
changeset
|
1940 typedef std::map<std::string, std::list<std::string> >::iterator parent_map_iterator; |
3d0d2bda3a0f
fix previous change, avoid duplicate loads of methods in descendant classes
Jaroslav Hajek <highegg@gmail.com>
parents:
9509
diff
changeset
|
1941 |
7336 | 1942 static const scope_id xglobal_scope; |
1943 static const scope_id xtop_scope; | |
1944 | |
1945 static scope_id xcurrent_scope; | |
1946 | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1947 static context_id xcurrent_context; |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1948 |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1949 symbol_table (void) |
9639
8d79f36ebdde
store scope->function pointer
Jaroslav Hajek <highegg@gmail.com>
parents:
9581
diff
changeset
|
1950 : table_name (), table (), curr_fcn (0) { } |
7336 | 1951 |
1952 ~symbol_table (void) { } | |
3011 | 1953 |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1954 static symbol_table *get_instance (scope_id scope, bool create = true) |
7336 | 1955 { |
1956 symbol_table *retval = 0; | |
1957 | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1958 bool ok = true; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1959 |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1960 if (scope != xglobal_scope) |
7336 | 1961 { |
10313 | 1962 if (scope == xcurrent_scope) |
1963 { | |
1964 if (! instance && create) | |
1965 { | |
1966 symbol_table *inst = new symbol_table (); | |
1967 | |
1968 if (inst) | |
1969 { | |
1970 all_instances[scope] = instance = inst; | |
1971 | |
1972 if (scope == xtop_scope) | |
1973 instance->do_cache_name ("top-level"); | |
1974 } | |
1975 } | |
1976 | |
1977 if (! instance) | |
1978 ok = false; | |
1979 | |
1980 retval = instance; | |
1981 } | |
1982 else | |
1983 { | |
1984 all_instances_iterator p = all_instances.find (scope); | |
1985 | |
1986 if (p == all_instances.end ()) | |
1987 { | |
1988 if (create) | |
1989 { | |
1990 retval = new symbol_table (); | |
1991 | |
1992 if (retval) | |
1993 all_instances[scope] = retval; | |
1994 else | |
1995 ok = false; | |
1996 } | |
1997 else | |
1998 ok = false; | |
1999 } | |
2000 else | |
2001 retval = p->second; | |
2002 } | |
7336 | 2003 } |
2004 | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2005 if (! ok) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2006 error ("unable to %s symbol_table object for scope %d!", |
10313 | 2007 create ? "create" : "find", scope); |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2008 |
7336 | 2009 return retval; |
2010 } | |
2011 | |
2012 void insert_symbol_record (const symbol_record& sr) | |
2013 { | |
2014 table[sr.name ()] = sr; | |
2015 } | |
4238 | 2016 |
4913 | 2017 void |
7336 | 2018 do_dup_scope (symbol_table& new_symbol_table) const |
2019 { | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2020 for (table_const_iterator p = table.begin (); p != table.end (); p++) |
7336 | 2021 new_symbol_table.insert_symbol_record (p->second.dup ()); |
2022 } | |
2023 | |
2024 symbol_record do_find_symbol (const std::string& name) | |
2025 { | |
2026 table_iterator p = table.find (name); | |
2027 | |
2028 if (p == table.end ()) | |
2029 return do_insert (name); | |
2030 else | |
2031 return p->second; | |
2032 } | |
2033 | |
8906
ab87d08d9a1b
improve symbol inheritance for anonymous functions
John W. Eaton <jwe@octave.org>
parents:
8884
diff
changeset
|
2034 void do_inherit (symbol_table& donor_table, context_id donor_context) |
7336 | 2035 { |
8906
ab87d08d9a1b
improve symbol inheritance for anonymous functions
John W. Eaton <jwe@octave.org>
parents:
8884
diff
changeset
|
2036 for (table_iterator p = table.begin (); p != table.end (); p++) |
7336 | 2037 { |
10313 | 2038 symbol_record& sr = p->second; |
2039 | |
2040 if (! (sr.is_automatic () || sr.is_formal ())) | |
2041 { | |
2042 std::string nm = sr.name (); | |
2043 | |
2044 if (nm != "__retval__") | |
2045 { | |
2046 octave_value val = donor_table.do_varval (nm, donor_context); | |
2047 | |
2048 if (val.is_defined ()) | |
2049 { | |
2050 sr.varref (0) = val; | |
2051 | |
2052 sr.mark_inherited (); | |
2053 } | |
2054 } | |
2055 } | |
7336 | 2056 } |
2057 } | |
2058 | |
9413
5cd879a0d8c4
speed-up function call by caching its name lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
9409
diff
changeset
|
2059 static fcn_info *get_fcn_info (const std::string& name) |
5cd879a0d8c4
speed-up function call by caching its name lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
9409
diff
changeset
|
2060 { |
5cd879a0d8c4
speed-up function call by caching its name lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
9409
diff
changeset
|
2061 fcn_table_iterator p = fcn_table.find (name); |
5cd879a0d8c4
speed-up function call by caching its name lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
9409
diff
changeset
|
2062 return p != fcn_table.end () ? &p->second : 0; |
5cd879a0d8c4
speed-up function call by caching its name lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
9409
diff
changeset
|
2063 } |
5cd879a0d8c4
speed-up function call by caching its name lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
9409
diff
changeset
|
2064 |
7336 | 2065 octave_value |
9445
c5f03874ea2a
simplify symbol_table::find and associated functions
Jaroslav Hajek <highegg@gmail.com>
parents:
9444
diff
changeset
|
2066 do_find (const std::string& name, const octave_value_list& args, |
9463
d34baf412786
support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
2067 bool skip_variables, bool local_funcs); |
7336 | 2068 |
9444
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
2069 octave_value do_builtin_find (const std::string& name); |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
2070 |
7336 | 2071 symbol_record& do_insert (const std::string& name) |
2072 { | |
2073 table_iterator p = table.find (name); | |
2074 | |
2075 return p == table.end () | |
2076 ? (table[name] = symbol_record (name)) : p->second; | |
2077 } | |
2078 | |
8881
8ed42c679af5
after defining a script or function, clear local variables created for parsing
John W. Eaton <jwe@octave.org>
parents:
8819
diff
changeset
|
2079 void do_force_variable (const std::string& name, context_id context) |
8ed42c679af5
after defining a script or function, clear local variables created for parsing
John W. Eaton <jwe@octave.org>
parents:
8819
diff
changeset
|
2080 { |
8ed42c679af5
after defining a script or function, clear local variables created for parsing
John W. Eaton <jwe@octave.org>
parents:
8819
diff
changeset
|
2081 table_iterator p = table.find (name); |
8ed42c679af5
after defining a script or function, clear local variables created for parsing
John W. Eaton <jwe@octave.org>
parents:
8819
diff
changeset
|
2082 |
8ed42c679af5
after defining a script or function, clear local variables created for parsing
John W. Eaton <jwe@octave.org>
parents:
8819
diff
changeset
|
2083 if (p == table.end ()) |
8ed42c679af5
after defining a script or function, clear local variables created for parsing
John W. Eaton <jwe@octave.org>
parents:
8819
diff
changeset
|
2084 { |
10313 | 2085 symbol_record& sr = do_insert (name); |
2086 | |
2087 sr.force_variable (context); | |
8881
8ed42c679af5
after defining a script or function, clear local variables created for parsing
John W. Eaton <jwe@octave.org>
parents:
8819
diff
changeset
|
2088 } |
8884 | 2089 else |
2090 p->second.force_variable (context); | |
8881
8ed42c679af5
after defining a script or function, clear local variables created for parsing
John W. Eaton <jwe@octave.org>
parents:
8819
diff
changeset
|
2091 } |
8ed42c679af5
after defining a script or function, clear local variables created for parsing
John W. Eaton <jwe@octave.org>
parents:
8819
diff
changeset
|
2092 |
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
2093 octave_value& do_varref (const std::string& name, context_id context) |
7336 | 2094 { |
2095 table_iterator p = table.find (name); | |
2096 | |
2097 if (p == table.end ()) | |
2098 { | |
10313 | 2099 symbol_record& sr = do_insert (name); |
2100 | |
2101 return sr.varref (context); | |
7336 | 2102 } |
2103 else | |
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
2104 return p->second.varref (context); |
7336 | 2105 } |
4913 | 2106 |
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
2107 octave_value do_varval (const std::string& name, context_id context) const |
7336 | 2108 { |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2109 table_const_iterator p = table.find (name); |
7336 | 2110 |
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
2111 return (p != table.end ()) ? p->second.varval (context) : octave_value (); |
7336 | 2112 } |
2113 | |
2114 octave_value& do_persistent_varref (const std::string& name) | |
2115 { | |
2116 persistent_table_iterator p = persistent_table.find (name); | |
2117 | |
2118 return (p == persistent_table.end ()) | |
2119 ? persistent_table[name] : p->second; | |
2120 } | |
2121 | |
2122 octave_value do_persistent_varval (const std::string& name) | |
2123 { | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2124 persistent_table_const_iterator p = persistent_table.find (name); |
7336 | 2125 |
2126 return (p != persistent_table.end ()) ? p->second : octave_value (); | |
2127 } | |
2128 | |
2129 void do_erase_persistent (const std::string& name) | |
2130 { | |
2131 persistent_table_iterator p = persistent_table.find (name); | |
2132 | |
2133 if (p != persistent_table.end ()) | |
2134 persistent_table.erase (p); | |
2135 } | |
2136 | |
2137 bool do_is_variable (const std::string& name) const | |
2138 { | |
2139 bool retval = false; | |
2140 | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2141 table_const_iterator p = table.find (name); |
7336 | 2142 |
2143 if (p != table.end ()) | |
2144 { | |
10313 | 2145 const symbol_record& sr = p->second; |
2146 | |
2147 retval = sr.is_variable (); | |
7336 | 2148 } |
2149 | |
2150 return retval; | |
2151 } | |
2152 | |
2153 void do_push_context (void) | |
2154 { | |
2155 for (table_iterator p = table.begin (); p != table.end (); p++) | |
2156 p->second.push_context (); | |
2157 } | |
2158 | |
2159 void do_pop_context (void) | |
2160 { | |
7374 | 2161 for (table_iterator p = table.begin (); p != table.end (); ) |
2162 { | |
10313 | 2163 if (p->second.pop_context () == 0) |
2164 table.erase (p++); | |
2165 else | |
2166 p++; | |
7374 | 2167 } |
7336 | 2168 } |
2169 | |
2170 void do_clear_variables (void) | |
2171 { | |
2172 for (table_iterator p = table.begin (); p != table.end (); p++) | |
2173 p->second.clear (); | |
2174 } | |
2175 | |
9240
f27a8c07f0b2
clear -classes and support.
Robert T. Short <octave@phaselockedsystems.com>
parents:
9144
diff
changeset
|
2176 void do_clear_objects (void) |
f27a8c07f0b2
clear -classes and support.
Robert T. Short <octave@phaselockedsystems.com>
parents:
9144
diff
changeset
|
2177 { |
f27a8c07f0b2
clear -classes and support.
Robert T. Short <octave@phaselockedsystems.com>
parents:
9144
diff
changeset
|
2178 for (table_iterator p = table.begin (); p != table.end (); p++) |
f27a8c07f0b2
clear -classes and support.
Robert T. Short <octave@phaselockedsystems.com>
parents:
9144
diff
changeset
|
2179 { |
10313 | 2180 symbol_record& sr = p->second; |
2181 octave_value& val = sr.varref (); | |
2182 if (val.is_object()) | |
2183 p->second.clear (); | |
9240
f27a8c07f0b2
clear -classes and support.
Robert T. Short <octave@phaselockedsystems.com>
parents:
9144
diff
changeset
|
2184 } |
f27a8c07f0b2
clear -classes and support.
Robert T. Short <octave@phaselockedsystems.com>
parents:
9144
diff
changeset
|
2185 } |
f27a8c07f0b2
clear -classes and support.
Robert T. Short <octave@phaselockedsystems.com>
parents:
9144
diff
changeset
|
2186 |
f27a8c07f0b2
clear -classes and support.
Robert T. Short <octave@phaselockedsystems.com>
parents:
9144
diff
changeset
|
2187 void do_unmark_forced_variables (void) |
8881
8ed42c679af5
after defining a script or function, clear local variables created for parsing
John W. Eaton <jwe@octave.org>
parents:
8819
diff
changeset
|
2188 { |
8ed42c679af5
after defining a script or function, clear local variables created for parsing
John W. Eaton <jwe@octave.org>
parents:
8819
diff
changeset
|
2189 for (table_iterator p = table.begin (); p != table.end (); p++) |
9009
da58ec8f62e8
tag bug don't define forced variables
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2190 p->second.unmark_forced (); |
8881
8ed42c679af5
after defining a script or function, clear local variables created for parsing
John W. Eaton <jwe@octave.org>
parents:
8819
diff
changeset
|
2191 } |
8ed42c679af5
after defining a script or function, clear local variables created for parsing
John W. Eaton <jwe@octave.org>
parents:
8819
diff
changeset
|
2192 |
7336 | 2193 void do_clear_global (const std::string& name) |
2194 { | |
2195 table_iterator p = table.find (name); | |
4913 | 2196 |
7336 | 2197 if (p != table.end ()) |
2198 { | |
10313 | 2199 symbol_record& sr = p->second; |
2200 | |
2201 if (sr.is_global ()) | |
9315
73e36b147e45
properly clear global variables
Jaroslav Hajek <highegg@gmail.com>
parents:
9260
diff
changeset
|
2202 sr.unmark_global (); |
7336 | 2203 } |
9315
73e36b147e45
properly clear global variables
Jaroslav Hajek <highegg@gmail.com>
parents:
9260
diff
changeset
|
2204 |
73e36b147e45
properly clear global variables
Jaroslav Hajek <highegg@gmail.com>
parents:
9260
diff
changeset
|
2205 global_table_iterator q = global_table.find (name); |
73e36b147e45
properly clear global variables
Jaroslav Hajek <highegg@gmail.com>
parents:
9260
diff
changeset
|
2206 |
73e36b147e45
properly clear global variables
Jaroslav Hajek <highegg@gmail.com>
parents:
9260
diff
changeset
|
2207 if (q != global_table.end ()) |
73e36b147e45
properly clear global variables
Jaroslav Hajek <highegg@gmail.com>
parents:
9260
diff
changeset
|
2208 global_table.erase (q); |
73e36b147e45
properly clear global variables
Jaroslav Hajek <highegg@gmail.com>
parents:
9260
diff
changeset
|
2209 |
7336 | 2210 } |
2211 | |
2212 void do_clear_variable (const std::string& name) | |
2213 { | |
2214 table_iterator p = table.find (name); | |
2215 | |
2216 if (p != table.end ()) | |
2217 p->second.clear (); | |
2218 } | |
2219 | |
2220 void do_clear_global_pattern (const std::string& pat) | |
2221 { | |
2222 glob_match pattern (pat); | |
2223 | |
2224 for (table_iterator p = table.begin (); p != table.end (); p++) | |
2225 { | |
10313 | 2226 symbol_record& sr = p->second; |
2227 | |
2228 if (sr.is_global () && pattern.match (sr.name ())) | |
9315
73e36b147e45
properly clear global variables
Jaroslav Hajek <highegg@gmail.com>
parents:
9260
diff
changeset
|
2229 sr.unmark_global (); |
7336 | 2230 } |
9315
73e36b147e45
properly clear global variables
Jaroslav Hajek <highegg@gmail.com>
parents:
9260
diff
changeset
|
2231 |
11548
50a7935f2512
Don't invalidate iterators when calling std::map::erase, found by cppcheck
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11523
diff
changeset
|
2232 |
9315
73e36b147e45
properly clear global variables
Jaroslav Hajek <highegg@gmail.com>
parents:
9260
diff
changeset
|
2233 for (global_table_iterator q = global_table.begin (); |
11548
50a7935f2512
Don't invalidate iterators when calling std::map::erase, found by cppcheck
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11523
diff
changeset
|
2234 q != global_table.end ();) |
9315
73e36b147e45
properly clear global variables
Jaroslav Hajek <highegg@gmail.com>
parents:
9260
diff
changeset
|
2235 { |
10313 | 2236 if (pattern.match (q->first)) |
11548
50a7935f2512
Don't invalidate iterators when calling std::map::erase, found by cppcheck
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11523
diff
changeset
|
2237 global_table.erase (q++); //Gotta be careful to not |
50a7935f2512
Don't invalidate iterators when calling std::map::erase, found by cppcheck
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11523
diff
changeset
|
2238 //invalidate iterators |
50a7935f2512
Don't invalidate iterators when calling std::map::erase, found by cppcheck
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11523
diff
changeset
|
2239 else |
50a7935f2512
Don't invalidate iterators when calling std::map::erase, found by cppcheck
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11523
diff
changeset
|
2240 q++; |
9315
73e36b147e45
properly clear global variables
Jaroslav Hajek <highegg@gmail.com>
parents:
9260
diff
changeset
|
2241 } |
73e36b147e45
properly clear global variables
Jaroslav Hajek <highegg@gmail.com>
parents:
9260
diff
changeset
|
2242 |
73e36b147e45
properly clear global variables
Jaroslav Hajek <highegg@gmail.com>
parents:
9260
diff
changeset
|
2243 |
7336 | 2244 } |
2245 | |
2246 void do_clear_variable_pattern (const std::string& pat) | |
2247 { | |
2248 glob_match pattern (pat); | |
2249 | |
2250 for (table_iterator p = table.begin (); p != table.end (); p++) | |
2251 { | |
10313 | 2252 symbol_record& sr = p->second; |
2253 | |
2254 if (sr.is_defined () || sr.is_global ()) | |
2255 { | |
2256 if (pattern.match (sr.name ())) | |
2257 sr.clear (); | |
2258 } | |
7336 | 2259 } |
2260 } | |
2261 | |
7779
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2262 void do_clear_variable_regexp (const std::string& pat) |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2263 { |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2264 regex_match pattern (pat); |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2265 |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2266 for (table_iterator p = table.begin (); p != table.end (); p++) |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2267 { |
10313 | 2268 symbol_record& sr = p->second; |
2269 | |
2270 if (sr.is_defined () || sr.is_global ()) | |
2271 { | |
2272 if (pattern.match (sr.name ())) | |
2273 sr.clear (); | |
2274 } | |
7779
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2275 } |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2276 } |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2277 |
11557
e9d72a3caa46
mark automatic variables as automatic
John W. Eaton <jwe@octave.org>
parents:
11548
diff
changeset
|
2278 void do_mark_automatic (const std::string& name) |
e9d72a3caa46
mark automatic variables as automatic
John W. Eaton <jwe@octave.org>
parents:
11548
diff
changeset
|
2279 { |
e9d72a3caa46
mark automatic variables as automatic
John W. Eaton <jwe@octave.org>
parents:
11548
diff
changeset
|
2280 do_insert (name).mark_automatic (); |
e9d72a3caa46
mark automatic variables as automatic
John W. Eaton <jwe@octave.org>
parents:
11548
diff
changeset
|
2281 } |
e9d72a3caa46
mark automatic variables as automatic
John W. Eaton <jwe@octave.org>
parents:
11548
diff
changeset
|
2282 |
7336 | 2283 void do_mark_hidden (const std::string& name) |
2284 { | |
10633
d022061c288d
symbol_table minor improvements
Jaroslav Hajek <highegg@gmail.com>
parents:
10559
diff
changeset
|
2285 do_insert (name).mark_hidden (); |
7336 | 2286 } |
2287 | |
2288 void do_mark_global (const std::string& name) | |
2289 { | |
10633
d022061c288d
symbol_table minor improvements
Jaroslav Hajek <highegg@gmail.com>
parents:
10559
diff
changeset
|
2290 do_insert (name).mark_global (); |
7336 | 2291 } |
2292 | |
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
2293 std::list<symbol_record> |
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
2294 do_all_variables (context_id context, bool defined_only) const |
7336 | 2295 { |
2296 std::list<symbol_record> retval; | |
2297 | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2298 for (table_const_iterator p = table.begin (); p != table.end (); p++) |
7336 | 2299 { |
10313 | 2300 const symbol_record& sr = p->second; |
2301 | |
2302 if (defined_only && ! sr.is_defined (context)) | |
2303 continue; | |
2304 | |
2305 retval.push_back (sr); | |
7336 | 2306 } |
2307 | |
2308 return retval; | |
2309 } | |
2310 | |
2311 std::list<symbol_record> do_glob (const std::string& pattern, | |
10313 | 2312 bool vars_only = false) const |
7336 | 2313 { |
2314 std::list<symbol_record> retval; | |
2315 | |
2316 glob_match pat (pattern); | |
2317 | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2318 for (table_const_iterator p = table.begin (); p != table.end (); p++) |
7336 | 2319 { |
10313 | 2320 if (pat.match (p->first)) |
2321 { | |
2322 const symbol_record& sr = p->second; | |
2323 | |
2324 if (vars_only && ! sr.is_variable ()) | |
2325 continue; | |
2326 | |
2327 retval.push_back (sr); | |
2328 } | |
7336 | 2329 } |
2330 | |
2331 return retval; | |
2332 } | |
2333 | |
7779
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2334 std::list<symbol_record> do_regexp (const std::string& pattern, |
10313 | 2335 bool vars_only = false) const |
7779
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2336 { |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2337 std::list<symbol_record> retval; |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2338 |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2339 regex_match pat (pattern); |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2340 |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2341 for (table_const_iterator p = table.begin (); p != table.end (); p++) |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2342 { |
10313 | 2343 if (pat.match (p->first)) |
2344 { | |
2345 const symbol_record& sr = p->second; | |
2346 | |
2347 if (vars_only && ! sr.is_variable ()) | |
2348 continue; | |
2349 | |
2350 retval.push_back (sr); | |
2351 } | |
7779
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2352 } |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2353 |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2354 return retval; |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2355 } |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2356 |
7336 | 2357 std::list<std::string> do_variable_names (void) |
2358 { | |
2359 std::list<std::string> retval; | |
2360 | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2361 for (table_const_iterator p = table.begin (); p != table.end (); p++) |
9260
9c2349a51218
properly unmark forced variables
John W. Eaton <jwe@octave.org>
parents:
9240
diff
changeset
|
2362 { |
10313 | 2363 if (p->second.is_variable ()) |
2364 retval.push_back (p->first); | |
9260
9c2349a51218
properly unmark forced variables
John W. Eaton <jwe@octave.org>
parents:
9240
diff
changeset
|
2365 } |
7336 | 2366 |
2367 retval.sort (); | |
2368 | |
2369 return retval; | |
2370 } | |
2371 | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2372 static std::map<std::string, octave_value> |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2373 subfunctions_defined_in_scope (scope_id scope = xcurrent_scope) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2374 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2375 std::map<std::string, octave_value> retval; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2376 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2377 for (fcn_table_const_iterator p = fcn_table.begin (); |
10313 | 2378 p != fcn_table.end (); p++) |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2379 { |
10313 | 2380 std::pair<std::string, octave_value> tmp |
2381 = p->second.subfunction_defined_in_scope (scope); | |
2382 | |
2383 std::string nm = tmp.first; | |
2384 | |
2385 if (! nm.empty ()) | |
2386 retval[nm] = tmp.second; | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2387 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2388 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2389 return retval; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2390 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2391 |
7336 | 2392 bool do_is_local_variable (const std::string& name) const |
2393 { | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2394 table_const_iterator p = table.find (name); |
7336 | 2395 |
2396 return (p != table.end () | |
10313 | 2397 && ! p->second.is_global () |
2398 && p->second.is_defined ()); | |
7336 | 2399 } |
2400 | |
2401 bool do_is_global (const std::string& name) const | |
2402 { | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2403 table_const_iterator p = table.find (name); |
7336 | 2404 |
2405 return p != table.end () && p->second.is_global (); | |
2406 } | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2407 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2408 void do_dump (std::ostream& os); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2409 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2410 void do_cache_name (const std::string& name) { table_name = name; } |
3011 | 2411 }; |
2790 | 2412 |
9450
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9446
diff
changeset
|
2413 extern bool out_of_date_check (octave_value& function, |
9509
c5330ef7aecd
fix handles to private functions, simplify out-of-date checks in symtab
Jaroslav Hajek <highegg@gmail.com>
parents:
9474
diff
changeset
|
2414 const std::string& dispatch_type = std::string (), |
c5330ef7aecd
fix handles to private functions, simplify out-of-date checks in symtab
Jaroslav Hajek <highegg@gmail.com>
parents:
9474
diff
changeset
|
2415 bool check_relative = true); |
9450
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9446
diff
changeset
|
2416 |
10087
090173f2db40
improve overload dispatching of built-in classes
Jaroslav Hajek <highegg@gmail.com>
parents:
10071
diff
changeset
|
2417 extern OCTINTERP_API std::string |
090173f2db40
improve overload dispatching of built-in classes
Jaroslav Hajek <highegg@gmail.com>
parents:
10071
diff
changeset
|
2418 get_dispatch_type (const octave_value_list& args); |
090173f2db40
improve overload dispatching of built-in classes
Jaroslav Hajek <highegg@gmail.com>
parents:
10071
diff
changeset
|
2419 extern OCTINTERP_API std::string |
10321
97b4bd6f0925
partially rewrite function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
10313
diff
changeset
|
2420 get_dispatch_type (const octave_value_list& args, builtin_type_t& builtin_type); |
8123
eb2beef9a9ff
clear breakpoints is function found to be out of date
David Bateman <dbateman@free.fr>
parents:
8051
diff
changeset
|
2421 |
8 | 2422 #endif |