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