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