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