Mercurial > octave
annotate libinterp/corefcn/symtab.h @ 19075:14bb81940528 stable
doc: Update docstring for datenum to describe format argument (bug #43181)
* datenum.m: Update docstring to describe the format argument exactly like
the docstring for datevec. Add test using format argument.
author | Mike Miller <mtmiller@ieee.org> |
---|---|
date | Wed, 10 Sep 2014 08:19:43 -0400 |
parents | 175b392e91fe |
children | 97e49b588f5d |
rev | line source |
---|---|
8 | 1 /* |
2 | |
17744
d63878346099
maint: Update copyright notices for release.
John W. Eaton <jwe@octave.org>
parents:
16940
diff
changeset
|
3 Copyright (C) 1993-2013 John W. Eaton |
10521
4d1fc073fbb7
add some missing copyright stmts
Jaroslav Hajek <highegg@gmail.com>
parents:
10321
diff
changeset
|
4 Copyright (C) 2009 VZLU Prague |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11584
diff
changeset
|
5 |
8 | 6 This file is part of Octave. |
7 | |
8 Octave is free software; you can redistribute it and/or modify it | |
9 under the terms of the GNU General Public License as published by the | |
7016 | 10 Free Software Foundation; either version 3 of the License, or (at your |
11 option) any later version. | |
8 | 12 |
13 Octave is distributed in the hope that it will be useful, but WITHOUT | |
14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
16 for more details. | |
17 | |
18 You should have received a copy of the GNU General Public License | |
7016 | 19 along with Octave; see the file COPYING. If not, see |
20 <http://www.gnu.org/licenses/>. | |
8 | 21 |
22 */ | |
23 | |
383 | 24 #if !defined (octave_symtab_h) |
25 #define octave_symtab_h 1 | |
8 | 26 |
7336 | 27 #include <deque> |
28 #include <list> | |
29 #include <map> | |
30 #include <set> | |
31 #include <string> | |
2953 | 32 |
7336 | 33 #include "glob-match.h" |
16940
99122191d3dd
maint: Rename regexp.h to lo-regexp.h, regexp.cc to lo-regexp.cc in liboctave.
Rik <rik@octave.org>
parents:
16892
diff
changeset
|
34 #include "lo-regexp.h" |
2846 | 35 |
7336 | 36 class tree_argument_list; |
9639
8d79f36ebdde
store scope->function pointer
Jaroslav Hajek <highegg@gmail.com>
parents:
9581
diff
changeset
|
37 class octave_user_function; |
3013 | 38 |
7336 | 39 #include "oct-obj.h" |
16468
0f143f68078d
use signal/slot for updating workspace instead of using event listener
John W. Eaton <jwe@octave.org>
parents:
16442
diff
changeset
|
40 #include "workspace-element.h" |
13985
43cc49c7abd1
Use thread-safe atomic reference counting (GCC and MSVC).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
13983
diff
changeset
|
41 #include "oct-refcount.h" |
7336 | 42 #include "ov.h" |
1412 | 43 |
8 | 44 class |
6109 | 45 OCTINTERP_API |
8 | 46 symbol_table |
47 { | |
48 public: | |
49 | |
7336 | 50 typedef int scope_id; |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
51 typedef size_t context_id; |
7336 | 52 |
53 class | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
54 scope_id_cache |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
55 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
56 protected: |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
57 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
58 typedef std::set<scope_id>::iterator set_iterator; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
59 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
|
60 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
61 // 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
|
62 // and 1 for the top-level workspace. |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
63 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
64 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
|
65 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
66 public: |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
67 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
68 ~scope_id_cache (void) { } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
69 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
70 static scope_id alloc (void) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
71 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
72 return instance_ok () ? instance->do_alloc () : -1; |
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 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
75 static void free (scope_id scope) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
76 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
77 if (instance_ok ()) |
10313 | 78 return instance->do_free (scope); |
7761
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 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
81 static std::list<scope_id> scopes (void) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
82 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
83 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
|
84 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
85 |
13983
7dd7cccf0757
clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents:
12911
diff
changeset
|
86 static void create_instance (void); |
7dd7cccf0757
clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents:
12911
diff
changeset
|
87 |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
88 static bool instance_ok (void) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
89 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
90 bool retval = true; |
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) |
13983
7dd7cccf0757
clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents:
12911
diff
changeset
|
93 create_instance (); |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
94 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
95 if (! instance) |
10313 | 96 { |
97 ::error ("unable to create scope_id_cache object!"); | |
98 | |
99 retval = false; | |
100 } | |
7761
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 return retval; |
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 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
105 private: |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
106 |
12122
f4689107dd8c
Explicitly disallow copying in some classes.
Pascal Dupuis <Pascal.Dupuis@uclouvain.be>
parents:
11586
diff
changeset
|
107 // No copying! |
f4689107dd8c
Explicitly disallow copying in some classes.
Pascal Dupuis <Pascal.Dupuis@uclouvain.be>
parents:
11586
diff
changeset
|
108 |
f4689107dd8c
Explicitly disallow copying in some classes.
Pascal Dupuis <Pascal.Dupuis@uclouvain.be>
parents:
11586
diff
changeset
|
109 scope_id_cache (const scope_id_cache&); |
f4689107dd8c
Explicitly disallow copying in some classes.
Pascal Dupuis <Pascal.Dupuis@uclouvain.be>
parents:
11586
diff
changeset
|
110 |
f4689107dd8c
Explicitly disallow copying in some classes.
Pascal Dupuis <Pascal.Dupuis@uclouvain.be>
parents:
11586
diff
changeset
|
111 scope_id_cache& operator = (const scope_id_cache&); |
f4689107dd8c
Explicitly disallow copying in some classes.
Pascal Dupuis <Pascal.Dupuis@uclouvain.be>
parents:
11586
diff
changeset
|
112 |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
113 static scope_id_cache *instance; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
114 |
13983
7dd7cccf0757
clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents:
12911
diff
changeset
|
115 static void cleanup_instance (void) { delete instance; instance = 0; } |
7dd7cccf0757
clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents:
12911
diff
changeset
|
116 |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
117 // The next available scope not in the free list. |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
118 scope_id next_available; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
119 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
120 // The set of scope IDs that are currently allocated. |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
121 std::set<scope_id> in_use; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
122 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
123 // The set of scope IDs that are currently available. |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
124 std::set<scope_id> free_list; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
125 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
126 scope_id do_alloc (void) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
127 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
128 scope_id retval; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
129 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
130 set_iterator p = free_list.begin (); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
131 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
132 if (p != free_list.end ()) |
10313 | 133 { |
134 retval = *p; | |
135 free_list.erase (p); | |
136 } | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
137 else |
10313 | 138 retval = next_available++; |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
139 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
140 in_use.insert (retval); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
141 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
142 return retval; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
143 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
144 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
145 void do_free (scope_id scope) |
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 set_iterator p = in_use.find (scope); |
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 if (p != in_use.end ()) |
10313 | 150 { |
151 in_use.erase (p); | |
152 free_list.insert (scope); | |
153 } | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
154 else |
10313 | 155 error ("free_scope: scope %d not found!", scope); |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
156 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
157 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
158 std::list<scope_id> do_scopes (void) const |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
159 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
160 std::list<scope_id> retval; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
161 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
162 for (set_const_iterator p = in_use.begin (); p != in_use.end (); p++) |
10313 | 163 retval.push_back (*p); |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
164 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
165 retval.sort (); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
166 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
167 return retval; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
168 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
169 }; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
170 |
9413
5cd879a0d8c4
speed-up function call by caching its name lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
9409
diff
changeset
|
171 class fcn_info; |
5cd879a0d8c4
speed-up function call by caching its name lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
9409
diff
changeset
|
172 |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
173 class |
7336 | 174 symbol_record |
175 { | |
176 public: | |
177 | |
178 // generic variable | |
179 static const unsigned int local = 1; | |
180 | |
181 // varargin, argn, .nargin., .nargout. | |
182 // (FIXME -- is this really used now?) | |
183 static const unsigned int automatic = 2; | |
184 | |
185 // formal parameter | |
186 static const unsigned int formal = 4; | |
187 | |
188 // not listed or cleared (.nargin., .nargout.) | |
189 static const unsigned int hidden = 8; | |
190 | |
191 // inherited from parent scope; not cleared at function exit | |
192 static const unsigned int inherited = 16; | |
193 | |
194 // global (redirects to global scope) | |
195 static const unsigned int global = 32; | |
196 | |
197 // not cleared at function exit | |
198 static const unsigned int persistent = 64; | |
199 | |
15236
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
200 // this symbol may NOT become a variable. |
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
201 // (symbol added to a static workspace) |
16277
8cb65fd72164
eliminate obsolete concepts of "pending local" and "forced" variables
John W. Eaton <jwe@octave.org>
parents:
15572
diff
changeset
|
202 static const unsigned int added_static = 128; |
15236
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
203 |
7336 | 204 private: |
205 | |
206 class | |
207 symbol_record_rep | |
4009 | 208 { |
7336 | 209 public: |
210 | |
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
211 symbol_record_rep (scope_id s, const std::string& nm, |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
212 const octave_value& v, unsigned int sc) |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
213 : decl_scope (s), curr_fcn (0), name (nm), value_stack (), |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
214 storage_class (sc), finfo (), valid (true), count (1) |
7336 | 215 { |
10313 | 216 value_stack.push_back (v); |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
217 } |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
218 |
16442
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
219 void assign (const octave_value& value, |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
220 context_id context = xdefault_context) |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
221 { |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
222 varref (context) = value; |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
223 } |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
224 |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
225 void assign (octave_value::assign_op op, |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
226 const std::string& type, |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
227 const std::list<octave_value_list>& idx, |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
228 const octave_value& value, |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
229 context_id context = xdefault_context) |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
230 { |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
231 varref(context).assign (op, type, idx, value); |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
232 } |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
233 |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
234 void assign (octave_value::assign_op op, const octave_value& value, |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
235 context_id context = xdefault_context) |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
236 { |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
237 varref(context).assign (op, value); |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
238 } |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
239 |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
240 void do_non_const_unary_op (octave_value::unary_op op, |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
241 context_id context = xdefault_context) |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
242 { |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
243 varref(context).do_non_const_unary_op (op); |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
244 } |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
245 |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
246 void do_non_const_unary_op (octave_value::unary_op op, |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
247 const std::string& type, |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
248 const std::list<octave_value_list>& idx, |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
249 context_id context = xdefault_context) |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
250 { |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
251 varref(context).do_non_const_unary_op (op, type, idx); |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
252 } |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
253 |
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
254 octave_value& varref (context_id context = xdefault_context) |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
255 { |
16442
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
256 // We duplicate global_varref and persistent_varref here to |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
257 // avoid calling deprecated functions. |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
258 |
10313 | 259 if (is_global ()) |
16442
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
260 { |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
261 symbol_table::global_table_iterator p |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
262 = symbol_table::global_table.find (name); |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
263 |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
264 return (p == symbol_table::global_table.end ()) |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
265 ? symbol_table::global_table[name] : p->second; |
16442
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
266 } |
10313 | 267 else if (is_persistent ()) |
16442
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
268 { |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
269 static octave_value foobar; |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
270 |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
271 symbol_table *inst |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
272 = symbol_table::get_instance (symbol_table::current_scope ()); |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
273 |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
274 return inst ? inst->do_persistent_varref (name) : foobar; |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
275 } |
10313 | 276 else |
277 { | |
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
278 if (context == xdefault_context) |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
279 context = active_context (); |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
280 |
10313 | 281 context_id n = value_stack.size (); |
282 while (n++ <= context) | |
283 value_stack.push_back (octave_value ()); | |
284 | |
285 return value_stack[context]; | |
286 } | |
7336 | 287 } |
288 | |
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
289 octave_value varval (context_id context = xdefault_context) const |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
290 { |
10313 | 291 if (is_global ()) |
292 return symbol_table::global_varval (name); | |
293 else if (is_persistent ()) | |
294 return symbol_table::persistent_varval (name); | |
295 else | |
296 { | |
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
297 if (context == xdefault_context) |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
298 context = active_context (); |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
299 |
10313 | 300 if (context < value_stack.size ()) |
301 return value_stack[context]; | |
302 else | |
303 return octave_value (); | |
304 } | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
305 } |
7336 | 306 |
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
307 void push_context (scope_id s) |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
308 { |
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
309 if (! (is_persistent () || is_global ()) |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
310 && s == scope ()) |
10313 | 311 value_stack.push_back (octave_value ()); |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
312 } |
7336 | 313 |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
314 // 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
|
315 // 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
|
316 // functions like |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
317 // |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
318 // function foo (n) |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
319 // if (n > 0) |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
320 // foo (n-1); |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
321 // else |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
322 // eval ("x = 1"); |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
323 // endif |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
324 // endfunction |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
325 // |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
326 // Here, X should only exist in the final stack frame. |
7336 | 327 |
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
328 size_t pop_context (scope_id s) |
7374 | 329 { |
10313 | 330 size_t retval = 1; |
331 | |
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
332 if (! (is_persistent () || is_global ()) |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
333 && s == scope ()) |
10313 | 334 { |
335 value_stack.pop_back (); | |
336 retval = value_stack.size (); | |
337 } | |
338 | |
339 return retval; | |
7374 | 340 } |
7336 | 341 |
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
342 void clear (void) { clear (scope ()); } |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
343 |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
344 void clear (scope_id s) |
7336 | 345 { |
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
346 if (! (is_hidden () || is_inherited ()) |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
347 && s == scope ()) |
10313 | 348 { |
349 if (is_global ()) | |
350 unmark_global (); | |
351 | |
352 if (is_persistent ()) | |
353 { | |
16442
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
354 symbol_table::persistent_assign (name, varval ()); |
10313 | 355 |
356 unmark_persistent (); | |
357 } | |
358 | |
16442
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
359 assign (octave_value ()); |
10313 | 360 } |
7336 | 361 } |
362 | |
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
363 bool is_defined (context_id context = xdefault_context) const |
7336 | 364 { |
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
365 if (context == xdefault_context) |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
366 context = active_context (); |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
367 |
10313 | 368 return varval (context).is_defined (); |
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
369 } |
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
370 |
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
371 bool is_valid (void) const |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
372 { |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
373 return valid; |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
374 } |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
375 |
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
376 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
|
377 { |
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
378 if (context == xdefault_context) |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
379 context = active_context (); |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
380 |
16277
8cb65fd72164
eliminate obsolete concepts of "pending local" and "forced" variables
John W. Eaton <jwe@octave.org>
parents:
15572
diff
changeset
|
381 return (! is_local () || is_defined (context)); |
7336 | 382 } |
383 | |
384 bool is_local (void) const { return storage_class & local; } | |
385 bool is_automatic (void) const { return storage_class & automatic; } | |
386 bool is_formal (void) const { return storage_class & formal; } | |
387 bool is_hidden (void) const { return storage_class & hidden; } | |
388 bool is_inherited (void) const { return storage_class & inherited; } | |
389 bool is_global (void) const { return storage_class & global; } | |
390 bool is_persistent (void) const { return storage_class & persistent; } | |
15236
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
391 bool is_added_static (void) const {return storage_class & added_static; } |
7336 | 392 |
393 void mark_local (void) { storage_class |= local; } | |
394 void mark_automatic (void) { storage_class |= automatic; } | |
395 void mark_formal (void) { storage_class |= formal; } | |
396 void mark_hidden (void) { storage_class |= hidden; } | |
397 void mark_inherited (void) { storage_class |= inherited; } | |
398 void mark_global (void) | |
399 { | |
10313 | 400 if (is_persistent ()) |
401 error ("can't make persistent variable %s global", name.c_str ()); | |
402 else | |
403 storage_class |= global; | |
7336 | 404 } |
405 void mark_persistent (void) | |
406 { | |
10313 | 407 if (is_global ()) |
408 error ("can't make global variable %s persistent", name.c_str ()); | |
409 else | |
410 storage_class |= persistent; | |
7336 | 411 } |
15236
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
412 void mark_added_static (void) { storage_class |= added_static; } |
7336 | 413 |
414 void unmark_local (void) { storage_class &= ~local; } | |
415 void unmark_automatic (void) { storage_class &= ~automatic; } | |
416 void unmark_formal (void) { storage_class &= ~formal; } | |
417 void unmark_hidden (void) { storage_class &= ~hidden; } | |
418 void unmark_inherited (void) { storage_class &= ~inherited; } | |
419 void unmark_global (void) { storage_class &= ~global; } | |
420 void unmark_persistent (void) { storage_class &= ~persistent; } | |
15236
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
421 void unmark_added_static (void) { storage_class &= ~added_static; } |
7336 | 422 |
423 void init_persistent (void) | |
424 { | |
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
425 if (! is_defined ()) |
10313 | 426 { |
427 mark_persistent (); | |
428 | |
16442
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
429 assign (symbol_table::persistent_varval (name)); |
10313 | 430 } |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
431 // FIXME: this causes trouble with recursive calls. |
10313 | 432 // else |
433 // error ("unable to declare existing variable persistent"); | |
7336 | 434 } |
435 | |
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
436 void invalidate (void) |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
437 { |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
438 valid = false; |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
439 } |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
440 |
7336 | 441 void erase_persistent (void) |
442 { | |
10313 | 443 unmark_persistent (); |
444 symbol_table::erase_persistent (name); | |
7336 | 445 } |
446 | |
15260
789c8c3c9af5
Export more symbols from liboctinterp.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15236
diff
changeset
|
447 OCTINTERP_API context_id active_context (void) const; |
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
448 |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
449 scope_id scope (void) const { return decl_scope; } |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
450 |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
451 void set_curr_fcn (octave_user_function *fcn) |
7336 | 452 { |
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
453 curr_fcn = fcn; |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
454 } |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
455 |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
456 symbol_record_rep *dup (scope_id new_scope) const |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
457 { |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
458 return new symbol_record_rep (new_scope, name, varval (), |
10313 | 459 storage_class); |
7336 | 460 } |
461 | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
462 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
|
463 |
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
464 scope_id decl_scope; |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
465 |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
466 octave_user_function* curr_fcn; |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
467 |
7336 | 468 std::string name; |
469 | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
470 std::deque<octave_value> value_stack; |
7336 | 471 |
472 unsigned int storage_class; | |
473 | |
9413
5cd879a0d8c4
speed-up function call by caching its name lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
9409
diff
changeset
|
474 fcn_info *finfo; |
5cd879a0d8c4
speed-up function call by caching its name lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
9409
diff
changeset
|
475 |
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
476 bool valid; |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
477 |
13985
43cc49c7abd1
Use thread-safe atomic reference counting (GCC and MSVC).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
13983
diff
changeset
|
478 octave_refcount<size_t> count; |
7336 | 479 |
480 private: | |
481 | |
482 // No copying! | |
483 | |
484 symbol_record_rep (const symbol_record_rep& ov); | |
485 | |
486 symbol_record_rep& operator = (const symbol_record_rep&); | |
487 }; | |
488 | |
489 public: | |
490 | |
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
491 symbol_record (scope_id s = xcurrent_scope, |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
492 const std::string& nm = std::string (), |
10313 | 493 const octave_value& v = octave_value (), |
494 unsigned int sc = local) | |
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
495 : rep (new symbol_record_rep (s, nm, v, sc)) { } |
7336 | 496 |
497 symbol_record (const symbol_record& sr) | |
498 : rep (sr.rep) | |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11584
diff
changeset
|
499 { |
7336 | 500 rep->count++; |
501 } | |
502 | |
503 symbol_record& operator = (const symbol_record& sr) | |
504 { | |
505 if (this != &sr) | |
10313 | 506 { |
507 if (--rep->count == 0) | |
508 delete rep; | |
509 | |
510 rep = sr.rep; | |
511 rep->count++; | |
512 } | |
7336 | 513 |
514 return *this; | |
515 } | |
516 | |
517 ~symbol_record (void) | |
518 { | |
519 if (--rep->count == 0) | |
10313 | 520 delete rep; |
7336 | 521 } |
522 | |
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
523 symbol_record dup (scope_id new_scope) const |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
524 { |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
525 return symbol_record (rep->dup (new_scope)); |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
526 } |
7336 | 527 |
14899 | 528 const std::string& name (void) const { return rep->name; } |
7336 | 529 |
16502
45ae1038ee89
allow renaming of variables in workspace viewer
John W. Eaton <jwe@octave.org>
parents:
16468
diff
changeset
|
530 void rename (const std::string& new_name) { rep->name = new_name; } |
45ae1038ee89
allow renaming of variables in workspace viewer
John W. Eaton <jwe@octave.org>
parents:
16468
diff
changeset
|
531 |
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
532 octave_value |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
533 find (const octave_value_list& args = octave_value_list ()) const; |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
534 |
16442
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
535 void assign (const octave_value& value, |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
536 context_id context = xdefault_context) |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
537 { |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
538 rep->assign (value, context); |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
539 } |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
540 |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
541 void assign (octave_value::assign_op op, |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
542 const std::string& type, |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
543 const std::list<octave_value_list>& idx, |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
544 const octave_value& value, |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
545 context_id context = xdefault_context) |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
546 { |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
547 rep->assign (op, type, idx, value, context); |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
548 } |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
549 |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
550 void assign (octave_value::assign_op op, const octave_value& value, |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
551 context_id context = xdefault_context) |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
552 { |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
553 rep->assign (op, value, context); |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
554 } |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
555 |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
556 void do_non_const_unary_op (octave_value::unary_op op) |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
557 { |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
558 rep->do_non_const_unary_op (op); |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
559 } |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
560 |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
561 void do_non_const_unary_op (octave_value::unary_op op, |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
562 const std::string& type, |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
563 const std::list<octave_value_list>& idx) |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
564 { |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
565 rep->do_non_const_unary_op (op, type, idx); |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
566 } |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
567 |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
568 // Delete when deprecated varref functions are removed. |
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
569 octave_value& varref (context_id context = xdefault_context) |
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
570 { |
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
571 return rep->varref (context); |
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
572 } |
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
573 |
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
574 octave_value varval (context_id context = xdefault_context) const |
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
575 { |
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
576 return rep->varval (context); |
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
577 } |
7336 | 578 |
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
579 void push_context (scope_id s) { rep->push_context (s); } |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
580 |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
581 size_t pop_context (scope_id s) { return rep->pop_context (s); } |
7336 | 582 |
583 void clear (void) { rep->clear (); } | |
584 | |
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
585 void clear (scope_id s) { rep->clear (s); } |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
586 |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
587 bool is_defined (context_id context = xdefault_context) const |
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
588 { |
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
589 return rep->is_defined (context); |
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
590 } |
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
591 |
16442
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
592 bool is_undefined (context_id context = xdefault_context) const |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
593 { |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
594 return ! rep->is_defined (context); |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
595 } |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
596 |
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
597 bool is_valid (void) const |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
598 { |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
599 return rep->is_valid (); |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
600 } |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
601 |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
602 bool is_variable (context_id context = xdefault_context) const |
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
603 { |
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
604 return rep->is_variable (context); |
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
605 } |
7336 | 606 |
607 bool is_local (void) const { return rep->is_local (); } | |
608 bool is_automatic (void) const { return rep->is_automatic (); } | |
609 bool is_formal (void) const { return rep->is_formal (); } | |
610 bool is_global (void) const { return rep->is_global (); } | |
611 bool is_hidden (void) const { return rep->is_hidden (); } | |
612 bool is_inherited (void) const { return rep->is_inherited (); } | |
613 bool is_persistent (void) const { return rep->is_persistent (); } | |
15236
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
614 bool is_added_static (void) const { return rep->is_added_static (); } |
7336 | 615 |
616 void mark_local (void) { rep->mark_local (); } | |
617 void mark_automatic (void) { rep->mark_automatic (); } | |
618 void mark_formal (void) { rep->mark_formal (); } | |
619 void mark_hidden (void) { rep->mark_hidden (); } | |
620 void mark_inherited (void) { rep->mark_inherited (); } | |
621 void mark_global (void) { rep->mark_global (); } | |
622 void mark_persistent (void) { rep->mark_persistent (); } | |
15236
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
623 void mark_added_static (void) { rep->mark_added_static (); } |
7336 | 624 |
625 void unmark_local (void) { rep->unmark_local (); } | |
626 void unmark_automatic (void) { rep->unmark_automatic (); } | |
627 void unmark_formal (void) { rep->unmark_formal (); } | |
628 void unmark_hidden (void) { rep->unmark_hidden (); } | |
629 void unmark_inherited (void) { rep->unmark_inherited (); } | |
630 void unmark_global (void) { rep->unmark_global (); } | |
631 void unmark_persistent (void) { rep->unmark_persistent (); } | |
15236
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
632 void unmark_added_static (void) { rep->unmark_added_static (); } |
7336 | 633 |
634 void init_persistent (void) { rep->init_persistent (); } | |
635 | |
636 void erase_persistent (void) { rep->erase_persistent (); } | |
637 | |
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
638 void invalidate (void) { rep->invalidate (); } |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
639 |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
640 context_id active_context (void) const { return rep->active_context (); } |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
641 |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
642 scope_id scope (void) const { return rep->scope (); } |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
643 |
7336 | 644 unsigned int xstorage_class (void) const { return rep->storage_class; } |
645 | |
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
646 void set_curr_fcn (octave_user_function *fcn) { rep->set_curr_fcn (fcn); } |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
647 |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
648 void |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
649 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
|
650 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
651 rep->dump (os, prefix); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
652 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
653 |
7336 | 654 private: |
655 | |
656 symbol_record_rep *rep; | |
657 | |
658 symbol_record (symbol_record_rep *new_rep) : rep (new_rep) { } | |
659 }; | |
660 | |
14912
3d3c002ccc60
Add symbol_table::symbol_record_ref
Max Brister <max@2bass.com>
parents:
14899
diff
changeset
|
661 // Always access a symbol from the current scope. |
3d3c002ccc60
Add symbol_table::symbol_record_ref
Max Brister <max@2bass.com>
parents:
14899
diff
changeset
|
662 // Useful for scripts, as they may be executed in more than one scope. |
3d3c002ccc60
Add symbol_table::symbol_record_ref
Max Brister <max@2bass.com>
parents:
14899
diff
changeset
|
663 class |
14930
7d44ed216b98
Rename symbol_table::symbol_record_ref to symbol_table::symbol_reference
Max Brister <max@2bass.com>
parents:
14913
diff
changeset
|
664 symbol_reference |
14912
3d3c002ccc60
Add symbol_table::symbol_record_ref
Max Brister <max@2bass.com>
parents:
14899
diff
changeset
|
665 { |
3d3c002ccc60
Add symbol_table::symbol_record_ref
Max Brister <max@2bass.com>
parents:
14899
diff
changeset
|
666 public: |
16442
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
667 |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
668 symbol_reference (void) : scope (-1) { } |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
669 |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
670 symbol_reference (const symbol_record& record, |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
671 scope_id curr_scope = symbol_table::current_scope ()) |
14912
3d3c002ccc60
Add symbol_table::symbol_record_ref
Max Brister <max@2bass.com>
parents:
14899
diff
changeset
|
672 : scope (curr_scope), sym (record) |
16442
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
673 { } |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
674 |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
675 symbol_reference (const symbol_reference& ref) |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
676 : scope (ref.scope), sym (ref.sym) |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
677 { } |
14912
3d3c002ccc60
Add symbol_table::symbol_record_ref
Max Brister <max@2bass.com>
parents:
14899
diff
changeset
|
678 |
14930
7d44ed216b98
Rename symbol_table::symbol_record_ref to symbol_table::symbol_reference
Max Brister <max@2bass.com>
parents:
14913
diff
changeset
|
679 symbol_reference& operator = (const symbol_reference& ref) |
14912
3d3c002ccc60
Add symbol_table::symbol_record_ref
Max Brister <max@2bass.com>
parents:
14899
diff
changeset
|
680 { |
16442
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
681 if (this != &ref) |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
682 { |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
683 scope = ref.scope; |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
684 sym = ref.sym; |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
685 } |
14912
3d3c002ccc60
Add symbol_table::symbol_record_ref
Max Brister <max@2bass.com>
parents:
14899
diff
changeset
|
686 return *this; |
3d3c002ccc60
Add symbol_table::symbol_record_ref
Max Brister <max@2bass.com>
parents:
14899
diff
changeset
|
687 } |
3d3c002ccc60
Add symbol_table::symbol_record_ref
Max Brister <max@2bass.com>
parents:
14899
diff
changeset
|
688 |
16442
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
689 bool is_black_hole (void) const { return scope < 0; } |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
690 |
14912
3d3c002ccc60
Add symbol_table::symbol_record_ref
Max Brister <max@2bass.com>
parents:
14899
diff
changeset
|
691 // The name is the same regardless of scope. |
3d3c002ccc60
Add symbol_table::symbol_record_ref
Max Brister <max@2bass.com>
parents:
14899
diff
changeset
|
692 const std::string& name (void) const { return sym.name (); } |
3d3c002ccc60
Add symbol_table::symbol_record_ref
Max Brister <max@2bass.com>
parents:
14899
diff
changeset
|
693 |
3d3c002ccc60
Add symbol_table::symbol_record_ref
Max Brister <max@2bass.com>
parents:
14899
diff
changeset
|
694 symbol_record *operator-> (void) |
3d3c002ccc60
Add symbol_table::symbol_record_ref
Max Brister <max@2bass.com>
parents:
14899
diff
changeset
|
695 { |
3d3c002ccc60
Add symbol_table::symbol_record_ref
Max Brister <max@2bass.com>
parents:
14899
diff
changeset
|
696 update (); |
3d3c002ccc60
Add symbol_table::symbol_record_ref
Max Brister <max@2bass.com>
parents:
14899
diff
changeset
|
697 return &sym; |
3d3c002ccc60
Add symbol_table::symbol_record_ref
Max Brister <max@2bass.com>
parents:
14899
diff
changeset
|
698 } |
3d3c002ccc60
Add symbol_table::symbol_record_ref
Max Brister <max@2bass.com>
parents:
14899
diff
changeset
|
699 |
14913
c7071907a641
Use symbol_record_ref instead of names in JIT
Max Brister <max@2bass.com>
parents:
14912
diff
changeset
|
700 symbol_record *operator-> (void) const |
c7071907a641
Use symbol_record_ref instead of names in JIT
Max Brister <max@2bass.com>
parents:
14912
diff
changeset
|
701 { |
c7071907a641
Use symbol_record_ref instead of names in JIT
Max Brister <max@2bass.com>
parents:
14912
diff
changeset
|
702 update (); |
c7071907a641
Use symbol_record_ref instead of names in JIT
Max Brister <max@2bass.com>
parents:
14912
diff
changeset
|
703 return &sym; |
c7071907a641
Use symbol_record_ref instead of names in JIT
Max Brister <max@2bass.com>
parents:
14912
diff
changeset
|
704 } |
c7071907a641
Use symbol_record_ref instead of names in JIT
Max Brister <max@2bass.com>
parents:
14912
diff
changeset
|
705 |
14930
7d44ed216b98
Rename symbol_table::symbol_record_ref to symbol_table::symbol_reference
Max Brister <max@2bass.com>
parents:
14913
diff
changeset
|
706 // can be used to place symbol_reference in maps, we don't overload < as |
7d44ed216b98
Rename symbol_table::symbol_record_ref to symbol_table::symbol_reference
Max Brister <max@2bass.com>
parents:
14913
diff
changeset
|
707 // it doesn't make any sense for symbol_reference |
14912
3d3c002ccc60
Add symbol_table::symbol_record_ref
Max Brister <max@2bass.com>
parents:
14899
diff
changeset
|
708 struct comparator |
3d3c002ccc60
Add symbol_table::symbol_record_ref
Max Brister <max@2bass.com>
parents:
14899
diff
changeset
|
709 { |
14930
7d44ed216b98
Rename symbol_table::symbol_record_ref to symbol_table::symbol_reference
Max Brister <max@2bass.com>
parents:
14913
diff
changeset
|
710 bool operator ()(const symbol_reference& lhs, |
7d44ed216b98
Rename symbol_table::symbol_record_ref to symbol_table::symbol_reference
Max Brister <max@2bass.com>
parents:
14913
diff
changeset
|
711 const symbol_reference& rhs) const |
14912
3d3c002ccc60
Add symbol_table::symbol_record_ref
Max Brister <max@2bass.com>
parents:
14899
diff
changeset
|
712 { |
3d3c002ccc60
Add symbol_table::symbol_record_ref
Max Brister <max@2bass.com>
parents:
14899
diff
changeset
|
713 return lhs.name () < rhs.name (); |
3d3c002ccc60
Add symbol_table::symbol_record_ref
Max Brister <max@2bass.com>
parents:
14899
diff
changeset
|
714 } |
3d3c002ccc60
Add symbol_table::symbol_record_ref
Max Brister <max@2bass.com>
parents:
14899
diff
changeset
|
715 }; |
3d3c002ccc60
Add symbol_table::symbol_record_ref
Max Brister <max@2bass.com>
parents:
14899
diff
changeset
|
716 private: |
16442
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
717 |
14913
c7071907a641
Use symbol_record_ref instead of names in JIT
Max Brister <max@2bass.com>
parents:
14912
diff
changeset
|
718 void update (void) const |
14912
3d3c002ccc60
Add symbol_table::symbol_record_ref
Max Brister <max@2bass.com>
parents:
14899
diff
changeset
|
719 { |
3d3c002ccc60
Add symbol_table::symbol_record_ref
Max Brister <max@2bass.com>
parents:
14899
diff
changeset
|
720 scope_id curr_scope = symbol_table::current_scope (); |
16442
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
721 |
14912
3d3c002ccc60
Add symbol_table::symbol_record_ref
Max Brister <max@2bass.com>
parents:
14899
diff
changeset
|
722 if (scope != curr_scope || ! sym.is_valid ()) |
3d3c002ccc60
Add symbol_table::symbol_record_ref
Max Brister <max@2bass.com>
parents:
14899
diff
changeset
|
723 { |
3d3c002ccc60
Add symbol_table::symbol_record_ref
Max Brister <max@2bass.com>
parents:
14899
diff
changeset
|
724 scope = curr_scope; |
3d3c002ccc60
Add symbol_table::symbol_record_ref
Max Brister <max@2bass.com>
parents:
14899
diff
changeset
|
725 sym = symbol_table::insert (sym.name ()); |
3d3c002ccc60
Add symbol_table::symbol_record_ref
Max Brister <max@2bass.com>
parents:
14899
diff
changeset
|
726 } |
3d3c002ccc60
Add symbol_table::symbol_record_ref
Max Brister <max@2bass.com>
parents:
14899
diff
changeset
|
727 } |
3d3c002ccc60
Add symbol_table::symbol_record_ref
Max Brister <max@2bass.com>
parents:
14899
diff
changeset
|
728 |
14913
c7071907a641
Use symbol_record_ref instead of names in JIT
Max Brister <max@2bass.com>
parents:
14912
diff
changeset
|
729 mutable scope_id scope; |
c7071907a641
Use symbol_record_ref instead of names in JIT
Max Brister <max@2bass.com>
parents:
14912
diff
changeset
|
730 mutable symbol_record sym; |
14912
3d3c002ccc60
Add symbol_table::symbol_record_ref
Max Brister <max@2bass.com>
parents:
14899
diff
changeset
|
731 }; |
3d3c002ccc60
Add symbol_table::symbol_record_ref
Max Brister <max@2bass.com>
parents:
14899
diff
changeset
|
732 |
7336 | 733 class |
734 fcn_info | |
735 { | |
736 public: | |
737 | |
738 typedef std::map<std::string, std::string> dispatch_map_type; | |
739 | |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
740 typedef std::map<scope_id, octave_value>::const_iterator |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
741 scope_val_const_iterator; |
7336 | 742 typedef std::map<scope_id, octave_value>::iterator scope_val_iterator; |
4238 | 743 |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
744 typedef std::map<std::string, octave_value>::const_iterator |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
745 str_val_const_iterator; |
7336 | 746 typedef std::map<std::string, octave_value>::iterator str_val_iterator; |
747 | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
748 typedef dispatch_map_type::const_iterator dispatch_map_const_iterator; |
7336 | 749 typedef dispatch_map_type::iterator dispatch_map_iterator; |
750 | |
751 private: | |
752 | |
753 class | |
754 fcn_info_rep | |
755 { | |
756 public: | |
757 | |
758 fcn_info_rep (const std::string& nm) | |
10313 | 759 : name (nm), subfunctions (), private_functions (), |
11584
cda4aa780d58
Another round of initialising members in the constructor initialisation list
Pascal Dupuis <Pascal.Dupuis@uclouvain.be>
parents:
11557
diff
changeset
|
760 class_constructors (), class_methods (), dispatch_map (), |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11584
diff
changeset
|
761 cmdline_function (), autoload_function (), function_on_path (), |
11584
cda4aa780d58
Another round of initialising members in the constructor initialisation list
Pascal Dupuis <Pascal.Dupuis@uclouvain.be>
parents:
11557
diff
changeset
|
762 built_in_function (), count (1) { } |
7336 | 763 |
764 octave_value load_private_function (const std::string& dir_name); | |
765 | |
766 octave_value load_class_constructor (void); | |
767 | |
768 octave_value load_class_method (const std::string& dispatch_type); | |
769 | |
9463
d34baf412786
support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
770 octave_value find (const octave_value_list& args, bool local_funcs); |
7336 | 771 |
9444
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
772 octave_value builtin_find (void); |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
773 |
7336 | 774 octave_value find_method (const std::string& dispatch_type); |
775 | |
776 octave_value find_autoload (void); | |
777 | |
778 octave_value find_user_function (void); | |
779 | |
780 bool is_user_function_defined (void) const | |
781 { | |
10313 | 782 return function_on_path.is_defined (); |
7336 | 783 } |
784 | |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
785 octave_value find_function (const octave_value_list& args, |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
786 bool local_funcs) |
7336 | 787 { |
10313 | 788 return find (args, local_funcs); |
7336 | 789 } |
790 | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
791 void lock_subfunction (scope_id scope) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
792 { |
10313 | 793 scope_val_iterator p = subfunctions.find (scope); |
794 | |
795 if (p != subfunctions.end ()) | |
796 p->second.lock (); | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
797 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
798 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
799 void unlock_subfunction (scope_id scope) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
800 { |
10313 | 801 scope_val_iterator p = subfunctions.find (scope); |
802 | |
803 if (p != subfunctions.end ()) | |
804 p->second.unlock (); | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
805 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
806 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
807 std::pair<std::string, octave_value> |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
808 subfunction_defined_in_scope (scope_id scope) const |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
809 { |
10313 | 810 scope_val_const_iterator p = subfunctions.find (scope); |
811 | |
812 return p == subfunctions.end () | |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
813 ? std::pair<std::string, octave_value> () |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
814 : std::pair<std::string, octave_value> (name, p->second); |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11584
diff
changeset
|
815 } |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
816 |
7876
8447a5024650
clear subfunctions when clearing parent function
John W. Eaton <jwe@octave.org>
parents:
7779
diff
changeset
|
817 void erase_subfunction (scope_id scope) |
8447a5024650
clear subfunctions when clearing parent function
John W. Eaton <jwe@octave.org>
parents:
7779
diff
changeset
|
818 { |
10313 | 819 scope_val_iterator p = subfunctions.find (scope); |
820 | |
821 if (p != subfunctions.end ()) | |
822 subfunctions.erase (p); | |
7876
8447a5024650
clear subfunctions when clearing parent function
John W. Eaton <jwe@octave.org>
parents:
7779
diff
changeset
|
823 } |
8447a5024650
clear subfunctions when clearing parent function
John W. Eaton <jwe@octave.org>
parents:
7779
diff
changeset
|
824 |
11445
40f311a69417
fix OO field access in subfunctions of private functions
John W. Eaton <jwe@octave.org>
parents:
11238
diff
changeset
|
825 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
|
826 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
|
827 |
7336 | 828 void install_cmdline_function (const octave_value& f) |
829 { | |
10313 | 830 cmdline_function = f; |
7336 | 831 } |
832 | |
833 void install_subfunction (const octave_value& f, scope_id scope) | |
834 { | |
10313 | 835 subfunctions[scope] = f; |
7336 | 836 } |
837 | |
838 void install_user_function (const octave_value& f) | |
839 { | |
10313 | 840 function_on_path = f; |
7336 | 841 } |
842 | |
843 void install_built_in_function (const octave_value& f) | |
844 { | |
10313 | 845 built_in_function = f; |
7336 | 846 } |
847 | |
7489
8e4592e49fa7
don't clear locked functions
John W. Eaton <jwe@octave.org>
parents:
7374
diff
changeset
|
848 template <class T> |
8e4592e49fa7
don't clear locked functions
John W. Eaton <jwe@octave.org>
parents:
7374
diff
changeset
|
849 void |
16605
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
850 clear_map (std::map<T, octave_value>& map, bool force = false) |
7336 | 851 { |
10313 | 852 typename std::map<T, octave_value>::iterator p = map.begin (); |
853 | |
854 while (p != map.end ()) | |
855 { | |
16605
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
856 if (force || ! p->second.islocked ()) |
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
857 map.erase (p++); |
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
858 else |
10313 | 859 p++; |
860 } | |
7489
8e4592e49fa7
don't clear locked functions
John W. Eaton <jwe@octave.org>
parents:
7374
diff
changeset
|
861 } |
8e4592e49fa7
don't clear locked functions
John W. Eaton <jwe@octave.org>
parents:
7374
diff
changeset
|
862 |
16605
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
863 void clear_autoload_function (bool force = false) |
7489
8e4592e49fa7
don't clear locked functions
John W. Eaton <jwe@octave.org>
parents:
7374
diff
changeset
|
864 { |
16605
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
865 if (force || ! autoload_function.islocked ()) |
10313 | 866 autoload_function = octave_value (); |
7336 | 867 } |
868 | |
15003
1f5dbfc23fc2
'clear -f' does not work for command line functions (bug #34497)
Max Brister <max@2bass.com>
parents:
14981
diff
changeset
|
869 // We also clear command line functions here, as these are both |
1f5dbfc23fc2
'clear -f' does not work for command line functions (bug #34497)
Max Brister <max@2bass.com>
parents:
14981
diff
changeset
|
870 // "user defined" |
16605
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
871 void clear_user_function (bool force = false) |
7336 | 872 { |
16605
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
873 if (force || ! function_on_path.islocked ()) |
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
874 function_on_path = octave_value (); |
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
875 |
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
876 if (force || ! cmdline_function.islocked ()) |
15003
1f5dbfc23fc2
'clear -f' does not work for command line functions (bug #34497)
Max Brister <max@2bass.com>
parents:
14981
diff
changeset
|
877 cmdline_function = octave_value (); |
7336 | 878 } |
879 | |
880 void clear_mex_function (void) | |
881 { | |
10313 | 882 if (function_on_path.is_mex_function ()) |
883 clear_user_function (); | |
7489
8e4592e49fa7
don't clear locked functions
John W. Eaton <jwe@octave.org>
parents:
7374
diff
changeset
|
884 } |
8e4592e49fa7
don't clear locked functions
John W. Eaton <jwe@octave.org>
parents:
7374
diff
changeset
|
885 |
16605
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
886 void clear (bool force = false) |
7489
8e4592e49fa7
don't clear locked functions
John W. Eaton <jwe@octave.org>
parents:
7374
diff
changeset
|
887 { |
16605
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
888 clear_map (subfunctions, force); |
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
889 clear_map (private_functions, force); |
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
890 clear_map (class_constructors, force); |
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
891 clear_map (class_methods, force); |
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
892 |
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
893 clear_autoload_function (force); |
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
894 clear_user_function (force); |
7336 | 895 } |
896 | |
897 void add_dispatch (const std::string& type, const std::string& fname) | |
898 { | |
10313 | 899 dispatch_map[type] = fname; |
7336 | 900 } |
901 | |
902 void clear_dispatch (const std::string& type) | |
903 { | |
10313 | 904 dispatch_map_iterator p = dispatch_map.find (type); |
905 | |
906 if (p != dispatch_map.end ()) | |
907 dispatch_map.erase (p); | |
7336 | 908 } |
909 | |
910 void print_dispatch (std::ostream& os) const; | |
911 | |
912 std::string help_for_dispatch (void) const; | |
913 | |
914 dispatch_map_type get_dispatch (void) const { return dispatch_map; } | |
915 | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
916 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
|
917 |
7336 | 918 std::string name; |
919 | |
920 // Scope id to function object. | |
921 std::map<scope_id, octave_value> subfunctions; | |
922 | |
923 // Directory name to function object. | |
924 std::map<std::string, octave_value> private_functions; | |
925 | |
926 // Class name to function object. | |
927 std::map<std::string, octave_value> class_constructors; | |
928 | |
929 // Dispatch type to function object. | |
930 std::map<std::string, octave_value> class_methods; | |
931 | |
932 // Legacy dispatch map (dispatch type name to function name). | |
933 dispatch_map_type dispatch_map; | |
934 | |
935 octave_value cmdline_function; | |
936 | |
937 octave_value autoload_function; | |
938 | |
939 octave_value function_on_path; | |
940 | |
941 octave_value built_in_function; | |
942 | |
13985
43cc49c7abd1
Use thread-safe atomic reference counting (GCC and MSVC).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
13983
diff
changeset
|
943 octave_refcount<size_t> count; |
7336 | 944 |
945 private: | |
946 | |
9463
d34baf412786
support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
947 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
|
948 |
9444
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
949 octave_value x_builtin_find (void); |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
950 |
7336 | 951 // No copying! |
952 | |
953 fcn_info_rep (const fcn_info_rep&); | |
954 | |
955 fcn_info_rep& operator = (const fcn_info_rep&); | |
956 }; | |
957 | |
958 public: | |
959 | |
960 fcn_info (const std::string& nm = std::string ()) | |
961 : rep (new fcn_info_rep (nm)) { } | |
962 | |
8906
ab87d08d9a1b
improve symbol inheritance for anonymous functions
John W. Eaton <jwe@octave.org>
parents:
8884
diff
changeset
|
963 fcn_info (const fcn_info& fi) : rep (fi.rep) |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11584
diff
changeset
|
964 { |
7336 | 965 rep->count++; |
966 } | |
967 | |
8906
ab87d08d9a1b
improve symbol inheritance for anonymous functions
John W. Eaton <jwe@octave.org>
parents:
8884
diff
changeset
|
968 fcn_info& operator = (const fcn_info& fi) |
7336 | 969 { |
8906
ab87d08d9a1b
improve symbol inheritance for anonymous functions
John W. Eaton <jwe@octave.org>
parents:
8884
diff
changeset
|
970 if (this != &fi) |
10313 | 971 { |
972 if (--rep->count == 0) | |
973 delete rep; | |
974 | |
975 rep = fi.rep; | |
976 rep->count++; | |
977 } | |
7336 | 978 |
979 return *this; | |
980 } | |
981 | |
982 ~fcn_info (void) | |
983 { | |
984 if (--rep->count == 0) | |
10313 | 985 delete rep; |
7336 | 986 } |
987 | |
9463
d34baf412786
support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
988 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
|
989 bool local_funcs = true) |
d34baf412786
support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
990 { |
d34baf412786
support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
991 return rep->find (args, local_funcs); |
d34baf412786
support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
992 } |
7336 | 993 |
9444
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
994 octave_value builtin_find (void) |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
995 { |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
996 return rep->builtin_find (); |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
997 } |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
998 |
7336 | 999 octave_value find_method (const std::string& dispatch_type) const |
1000 { | |
1001 return rep->find_method (dispatch_type); | |
1002 } | |
1003 | |
1004 octave_value find_built_in_function (void) const | |
1005 { | |
1006 return rep->built_in_function; | |
1007 } | |
1008 | |
12911
d6151d774283
make completion work for command-line functions
John W. Eaton <jwe@octave.org>
parents:
12130
diff
changeset
|
1009 octave_value find_cmdline_function (void) const |
d6151d774283
make completion work for command-line functions
John W. Eaton <jwe@octave.org>
parents:
12130
diff
changeset
|
1010 { |
d6151d774283
make completion work for command-line functions
John W. Eaton <jwe@octave.org>
parents:
12130
diff
changeset
|
1011 return rep->cmdline_function; |
d6151d774283
make completion work for command-line functions
John W. Eaton <jwe@octave.org>
parents:
12130
diff
changeset
|
1012 } |
d6151d774283
make completion work for command-line functions
John W. Eaton <jwe@octave.org>
parents:
12130
diff
changeset
|
1013 |
7336 | 1014 octave_value find_autoload (void) |
1015 { | |
1016 return rep->find_autoload (); | |
1017 } | |
1018 | |
1019 octave_value find_user_function (void) | |
1020 { | |
1021 return rep->find_user_function (); | |
1022 } | |
1023 | |
1024 bool is_user_function_defined (void) const | |
1025 { | |
1026 return rep->is_user_function_defined (); | |
1027 } | |
1028 | |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
1029 octave_value find_function (const octave_value_list& args |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
1030 = octave_value_list (), |
9463
d34baf412786
support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
1031 bool local_funcs = true) |
7336 | 1032 { |
9463
d34baf412786
support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
1033 return rep->find_function (args, local_funcs); |
7336 | 1034 } |
1035 | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1036 void lock_subfunction (scope_id scope) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1037 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1038 rep->lock_subfunction (scope); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1039 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1040 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1041 void unlock_subfunction (scope_id scope) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1042 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1043 rep->unlock_subfunction (scope); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1044 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1045 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1046 std::pair<std::string, octave_value> |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1047 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
|
1048 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1049 return rep->subfunction_defined_in_scope (scope); |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11584
diff
changeset
|
1050 } |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1051 |
7876
8447a5024650
clear subfunctions when clearing parent function
John W. Eaton <jwe@octave.org>
parents:
7779
diff
changeset
|
1052 void erase_subfunction (scope_id scope) |
8447a5024650
clear subfunctions when clearing parent function
John W. Eaton <jwe@octave.org>
parents:
7779
diff
changeset
|
1053 { |
8447a5024650
clear subfunctions when clearing parent function
John W. Eaton <jwe@octave.org>
parents:
7779
diff
changeset
|
1054 rep->erase_subfunction (scope); |
8447a5024650
clear subfunctions when clearing parent function
John W. Eaton <jwe@octave.org>
parents:
7779
diff
changeset
|
1055 } |
8447a5024650
clear subfunctions when clearing parent function
John W. Eaton <jwe@octave.org>
parents:
7779
diff
changeset
|
1056 |
11445
40f311a69417
fix OO field access in subfunctions of private functions
John W. Eaton <jwe@octave.org>
parents:
11238
diff
changeset
|
1057 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
|
1058 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
|
1059 { |
40f311a69417
fix OO field access in subfunctions of private functions
John W. Eaton <jwe@octave.org>
parents:
11238
diff
changeset
|
1060 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
|
1061 } |
40f311a69417
fix OO field access in subfunctions of private functions
John W. Eaton <jwe@octave.org>
parents:
11238
diff
changeset
|
1062 |
7336 | 1063 void install_cmdline_function (const octave_value& f) |
1064 { | |
1065 rep->install_cmdline_function (f); | |
1066 } | |
1067 | |
1068 void install_subfunction (const octave_value& f, scope_id scope) | |
1069 { | |
1070 rep->install_subfunction (f, scope); | |
1071 } | |
1072 | |
1073 void install_user_function (const octave_value& f) | |
1074 { | |
1075 rep->install_user_function (f); | |
1076 } | |
1077 | |
1078 void install_built_in_function (const octave_value& f) | |
1079 { | |
1080 rep->install_built_in_function (f); | |
1081 } | |
1082 | |
16605
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
1083 void clear (bool force = false) { rep->clear (force); } |
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
1084 |
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
1085 void clear_user_function (bool force = false) |
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
1086 { |
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
1087 rep->clear_user_function (force); |
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
1088 } |
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
1089 |
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
1090 void clear_autoload_function (bool force = false) |
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
1091 { |
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
1092 rep->clear_autoload_function (force); |
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
1093 } |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11584
diff
changeset
|
1094 |
7336 | 1095 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
|
1096 |
7336 | 1097 void add_dispatch (const std::string& type, const std::string& fname) |
1098 { | |
1099 rep->add_dispatch (type, fname); | |
1100 } | |
1101 | |
1102 void clear_dispatch (const std::string& type) | |
1103 { | |
1104 rep->clear_dispatch (type); | |
1105 } | |
1106 | |
1107 void print_dispatch (std::ostream& os) const | |
1108 { | |
1109 rep->print_dispatch (os); | |
1110 } | |
1111 | |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
1112 std::string help_for_dispatch (void) const |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
1113 { return rep->help_for_dispatch (); } |
7336 | 1114 |
1115 dispatch_map_type get_dispatch (void) const | |
1116 { | |
1117 return rep->get_dispatch (); | |
4009 | 1118 } |
3011 | 1119 |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1120 void |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1121 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
|
1122 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1123 rep->dump (os, prefix); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1124 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1125 |
7336 | 1126 private: |
1127 | |
1128 fcn_info_rep *rep; | |
1129 }; | |
1130 | |
1131 static scope_id global_scope (void) { return xglobal_scope; } | |
1132 static scope_id top_scope (void) { return xtop_scope; } | |
1133 | |
1134 static scope_id current_scope (void) { return xcurrent_scope; } | |
1135 | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1136 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
|
1137 |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1138 static scope_id alloc_scope (void) { return scope_id_cache::alloc (); } |
7336 | 1139 |
1140 static void set_scope (scope_id scope) | |
1141 { | |
1142 if (scope == xglobal_scope) | |
1143 error ("can't set scope to global"); | |
1144 else if (scope != xcurrent_scope) | |
1145 { | |
10313 | 1146 all_instances_iterator p = all_instances.find (scope); |
1147 | |
1148 if (p == all_instances.end ()) | |
1149 { | |
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
1150 symbol_table *inst = new symbol_table (scope); |
10313 | 1151 |
1152 if (inst) | |
1153 all_instances[scope] = instance = inst; | |
1154 } | |
1155 else | |
1156 instance = p->second; | |
1157 | |
1158 xcurrent_scope = scope; | |
1159 xcurrent_context = 0; | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1160 } |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1161 } |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1162 |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1163 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
|
1164 { |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1165 if (scope == xglobal_scope) |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1166 error ("can't set scope to global"); |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1167 else |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1168 { |
10313 | 1169 if (scope != xcurrent_scope) |
1170 { | |
1171 all_instances_iterator p = all_instances.find (scope); | |
1172 | |
1173 if (p == all_instances.end ()) | |
1174 error ("scope not found!"); | |
1175 else | |
1176 { | |
1177 instance = p->second; | |
1178 | |
1179 xcurrent_scope = scope; | |
9355
5e4da3b3747e
fix context restoration in error state
Jaroslav Hajek <highegg@gmail.com>
parents:
9315
diff
changeset
|
1180 |
5e4da3b3747e
fix context restoration in error state
Jaroslav Hajek <highegg@gmail.com>
parents:
9315
diff
changeset
|
1181 xcurrent_context = context; |
10313 | 1182 } |
1183 } | |
9355
5e4da3b3747e
fix context restoration in error state
Jaroslav Hajek <highegg@gmail.com>
parents:
9315
diff
changeset
|
1184 else |
5e4da3b3747e
fix context restoration in error state
Jaroslav Hajek <highegg@gmail.com>
parents:
9315
diff
changeset
|
1185 xcurrent_context = context; |
7336 | 1186 } |
1187 } | |
1188 | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1189 static void erase_scope (scope_id scope) |
7336 | 1190 { |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1191 assert (scope != xglobal_scope); |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1192 |
16605
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
1193 erase_subfunctions_in_scope (scope); |
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
1194 |
7336 | 1195 all_instances_iterator p = all_instances.find (scope); |
1196 | |
1197 if (p != all_instances.end ()) | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1198 { |
10313 | 1199 delete p->second; |
1200 | |
1201 all_instances.erase (p); | |
1202 | |
1203 free_scope (scope); | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1204 } |
7336 | 1205 } |
1206 | |
7876
8447a5024650
clear subfunctions when clearing parent function
John W. Eaton <jwe@octave.org>
parents:
7779
diff
changeset
|
1207 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
|
1208 { |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
1209 for (fcn_table_iterator q = fcn_table.begin (); q != fcn_table.end (); q++) |
7876
8447a5024650
clear subfunctions when clearing parent function
John W. Eaton <jwe@octave.org>
parents:
7779
diff
changeset
|
1210 q->second.erase_subfunction (scope); |
8447a5024650
clear subfunctions when clearing parent function
John W. Eaton <jwe@octave.org>
parents:
7779
diff
changeset
|
1211 } |
8447a5024650
clear subfunctions when clearing parent function
John W. Eaton <jwe@octave.org>
parents:
7779
diff
changeset
|
1212 |
11445
40f311a69417
fix OO field access in subfunctions of private functions
John W. Eaton <jwe@octave.org>
parents:
11238
diff
changeset
|
1213 static void |
40f311a69417
fix OO field access in subfunctions of private functions
John W. Eaton <jwe@octave.org>
parents:
11238
diff
changeset
|
1214 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
|
1215 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
|
1216 { |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
1217 for (fcn_table_iterator q = fcn_table.begin (); q != fcn_table.end (); q++) |
11445
40f311a69417
fix OO field access in subfunctions of private functions
John W. Eaton <jwe@octave.org>
parents:
11238
diff
changeset
|
1218 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
|
1219 } |
40f311a69417
fix OO field access in subfunctions of private functions
John W. Eaton <jwe@octave.org>
parents:
11238
diff
changeset
|
1220 |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1221 static scope_id dup_scope (scope_id scope) |
7336 | 1222 { |
1223 scope_id retval = -1; | |
1224 | |
1225 symbol_table *inst = get_instance (scope); | |
1226 | |
1227 if (inst) | |
1228 { | |
10313 | 1229 scope_id new_scope = alloc_scope (); |
1230 | |
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
1231 symbol_table *new_symbol_table = new symbol_table (scope); |
10313 | 1232 |
1233 if (new_symbol_table) | |
1234 { | |
1235 all_instances[new_scope] = new_symbol_table; | |
1236 | |
1237 inst->do_dup_scope (*new_symbol_table); | |
1238 | |
1239 retval = new_scope; | |
1240 } | |
7336 | 1241 } |
1242 | |
1243 return retval; | |
1244 } | |
1245 | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1246 static std::list<scope_id> scopes (void) |
7336 | 1247 { |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1248 return scope_id_cache::scopes (); |
7336 | 1249 } |
1250 | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1251 static symbol_record |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1252 find_symbol (const std::string& name, scope_id scope = xcurrent_scope) |
7336 | 1253 { |
1254 symbol_table *inst = get_instance (scope); | |
1255 | |
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
1256 return inst ? inst->do_find_symbol (name) : |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
1257 symbol_record (scope); |
7336 | 1258 } |
4009 | 1259 |
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
1260 static void |
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
1261 inherit (scope_id scope, scope_id donor_scope, context_id donor_context) |
7336 | 1262 { |
1263 symbol_table *inst = get_instance (scope); | |
1264 | |
1265 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
|
1266 { |
10313 | 1267 symbol_table *donor_symbol_table = get_instance (donor_scope); |
1268 | |
1269 if (donor_symbol_table) | |
1270 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
|
1271 } |
7336 | 1272 } |
1273 | |
1274 static bool at_top_level (void) { return xcurrent_scope == xtop_scope; } | |
1275 | |
1276 // Find a value corresponding to the given name in the table. | |
1277 static octave_value | |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11584
diff
changeset
|
1278 find (const std::string& name, |
9445
c5f03874ea2a
simplify symbol_table::find and associated functions
Jaroslav Hajek <highegg@gmail.com>
parents:
9444
diff
changeset
|
1279 const octave_value_list& args = octave_value_list (), |
10313 | 1280 bool skip_variables = false, |
9463
d34baf412786
support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
1281 bool local_funcs = true); |
7336 | 1282 |
9444
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
1283 static octave_value builtin_find (const std::string& name); |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
1284 |
7336 | 1285 // Insert a new name in the table. |
16320
09f0cb9cac7d
don't modify symbol table scope in the parser
John W. Eaton <jwe@octave.org>
parents:
16277
diff
changeset
|
1286 static symbol_record& insert (const std::string& name, |
09f0cb9cac7d
don't modify symbol table scope in the parser
John W. Eaton <jwe@octave.org>
parents:
16277
diff
changeset
|
1287 scope_id scope = xcurrent_scope) |
7336 | 1288 { |
1289 static symbol_record foobar; | |
1290 | |
16320
09f0cb9cac7d
don't modify symbol table scope in the parser
John W. Eaton <jwe@octave.org>
parents:
16277
diff
changeset
|
1291 symbol_table *inst = get_instance (scope); |
4009 | 1292 |
7336 | 1293 return inst ? inst->do_insert (name) : foobar; |
1294 } | |
1295 | |
16502
45ae1038ee89
allow renaming of variables in workspace viewer
John W. Eaton <jwe@octave.org>
parents:
16468
diff
changeset
|
1296 static void rename (const std::string& old_name, |
45ae1038ee89
allow renaming of variables in workspace viewer
John W. Eaton <jwe@octave.org>
parents:
16468
diff
changeset
|
1297 const std::string& new_name, |
45ae1038ee89
allow renaming of variables in workspace viewer
John W. Eaton <jwe@octave.org>
parents:
16468
diff
changeset
|
1298 scope_id scope = xcurrent_scope) |
45ae1038ee89
allow renaming of variables in workspace viewer
John W. Eaton <jwe@octave.org>
parents:
16468
diff
changeset
|
1299 { |
45ae1038ee89
allow renaming of variables in workspace viewer
John W. Eaton <jwe@octave.org>
parents:
16468
diff
changeset
|
1300 symbol_table *inst = get_instance (scope); |
45ae1038ee89
allow renaming of variables in workspace viewer
John W. Eaton <jwe@octave.org>
parents:
16468
diff
changeset
|
1301 |
45ae1038ee89
allow renaming of variables in workspace viewer
John W. Eaton <jwe@octave.org>
parents:
16468
diff
changeset
|
1302 if (inst) |
45ae1038ee89
allow renaming of variables in workspace viewer
John W. Eaton <jwe@octave.org>
parents:
16468
diff
changeset
|
1303 inst->do_rename (old_name, new_name); |
45ae1038ee89
allow renaming of variables in workspace viewer
John W. Eaton <jwe@octave.org>
parents:
16468
diff
changeset
|
1304 } |
45ae1038ee89
allow renaming of variables in workspace viewer
John W. Eaton <jwe@octave.org>
parents:
16468
diff
changeset
|
1305 |
16442
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1306 static void assign (const std::string& name, |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1307 const octave_value& value = octave_value (), |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1308 scope_id scope = xcurrent_scope, |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1309 context_id context = xdefault_context, |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1310 bool force_add = false) |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1311 { |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1312 static octave_value foobar; |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1313 |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1314 symbol_table *inst = get_instance (scope); |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1315 |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1316 if (inst) |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1317 inst->do_assign (name, value, context, force_add); |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1318 } |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1319 |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1320 // Use assign (name, value, scope, context, force_add) instead. |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1321 static octave_value& |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1322 varref (const std::string& name, scope_id scope = xcurrent_scope, |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1323 context_id context = xdefault_context, bool force_add = false) |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1324 GCC_ATTR_DEPRECATED |
7336 | 1325 { |
1326 static octave_value foobar; | |
1327 | |
1328 symbol_table *inst = get_instance (scope); | |
1329 | |
15236
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
1330 return inst ? inst->do_varref (name, context, force_add) : foobar; |
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
1331 } |
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
1332 |
16442
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1333 // Convenience function to simplify |
15236
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
1334 // octave_user_function::bind_automatic_vars |
16442
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1335 |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1336 static void force_assign (const std::string& name, |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1337 const octave_value& value = octave_value (), |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1338 scope_id scope = xcurrent_scope, |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1339 context_id context = xdefault_context) |
15236
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
1340 { |
16442
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1341 assign (name, value, scope, context, true); |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1342 } |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1343 |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1344 // Use force_assign (name, value, scope, context) instead. |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1345 static octave_value& |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1346 force_varref (const std::string& name, scope_id scope = xcurrent_scope, |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1347 context_id context = xdefault_context) GCC_ATTR_DEPRECATED |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1348 { |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1349 static octave_value foobar; |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1350 |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1351 symbol_table *inst = get_instance (scope); |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1352 |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1353 return inst ? inst->do_varref (name, context, true) : foobar; |
7336 | 1354 } |
1355 | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1356 static octave_value varval (const std::string& name, |
10313 | 1357 scope_id scope = xcurrent_scope, |
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
1358 context_id context = xdefault_context) |
7336 | 1359 { |
1360 symbol_table *inst = get_instance (scope); | |
1361 | |
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
1362 return inst ? inst->do_varval (name, context) : octave_value (); |
7336 | 1363 } |
1364 | |
16442
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1365 static void |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1366 global_assign (const std::string& name, |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1367 const octave_value& value = octave_value ()) |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1368 |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1369 { |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1370 global_table_iterator p = global_table.find (name); |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1371 |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1372 if (p == global_table.end ()) |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1373 global_table[name] = value; |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1374 else |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1375 p->second = value; |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1376 } |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1377 |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1378 // Use global_assign (name, value) instead. |
7336 | 1379 static octave_value& |
16442
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1380 global_varref (const std::string& name) GCC_ATTR_DEPRECATED |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1381 |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1382 { |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1383 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
|
1384 |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1385 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
|
1386 } |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1387 |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1388 static octave_value |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1389 global_varval (const std::string& name) |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1390 { |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1391 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
|
1392 |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1393 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
|
1394 } |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1395 |
16442
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1396 static void |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1397 top_level_assign (const std::string& name, |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1398 const octave_value& value = octave_value ()) |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1399 { |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1400 assign (name, value, top_scope (), 0); |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1401 } |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1402 |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1403 // Use top_level_assign (name, value) instead. |
10071
e42b1bbd1052
variables.cc (get_top_level_value, set_top_level_value): new functions
John W. Eaton <jwe@octave.org>
parents:
9981
diff
changeset
|
1404 static octave_value& |
16442
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1405 top_level_varref (const std::string& name) GCC_ATTR_DEPRECATED |
10071
e42b1bbd1052
variables.cc (get_top_level_value, set_top_level_value): new functions
John W. Eaton <jwe@octave.org>
parents:
9981
diff
changeset
|
1406 { |
16442
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1407 static octave_value foobar; |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1408 |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1409 symbol_table *inst = get_instance (top_scope ()); |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1410 |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1411 return inst ? inst->do_varref (name, 0, true) : foobar; |
10071
e42b1bbd1052
variables.cc (get_top_level_value, set_top_level_value): new functions
John W. Eaton <jwe@octave.org>
parents:
9981
diff
changeset
|
1412 } |
e42b1bbd1052
variables.cc (get_top_level_value, set_top_level_value): new functions
John W. Eaton <jwe@octave.org>
parents:
9981
diff
changeset
|
1413 |
e42b1bbd1052
variables.cc (get_top_level_value, set_top_level_value): new functions
John W. Eaton <jwe@octave.org>
parents:
9981
diff
changeset
|
1414 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
|
1415 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
|
1416 { |
e42b1bbd1052
variables.cc (get_top_level_value, set_top_level_value): new functions
John W. Eaton <jwe@octave.org>
parents:
9981
diff
changeset
|
1417 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
|
1418 } |
e42b1bbd1052
variables.cc (get_top_level_value, set_top_level_value): new functions
John W. Eaton <jwe@octave.org>
parents:
9981
diff
changeset
|
1419 |
16442
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1420 static void |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1421 persistent_assign (const std::string& name, |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1422 const octave_value& value = octave_value ()) |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1423 { |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1424 symbol_table *inst = get_instance (xcurrent_scope); |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1425 |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1426 if (inst) |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1427 inst->do_persistent_assign (name, value); |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1428 } |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1429 |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1430 // Use persistent_assign (name, value) instead. |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1431 static octave_value& persistent_varref (const std::string& name) |
16442
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1432 GCC_ATTR_DEPRECATED |
7336 | 1433 { |
1434 static octave_value foobar; | |
1435 | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1436 symbol_table *inst = get_instance (xcurrent_scope); |
7336 | 1437 |
1438 return inst ? inst->do_persistent_varref (name) : foobar; | |
1439 } | |
1440 | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1441 static octave_value persistent_varval (const std::string& name) |
7336 | 1442 { |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1443 symbol_table *inst = get_instance (xcurrent_scope); |
7336 | 1444 |
1445 return inst ? inst->do_persistent_varval (name) : octave_value (); | |
1446 } | |
1447 | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1448 static void erase_persistent (const std::string& name) |
7336 | 1449 { |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1450 symbol_table *inst = get_instance (xcurrent_scope); |
7336 | 1451 |
1452 if (inst) | |
1453 inst->do_erase_persistent (name); | |
1454 } | |
8 | 1455 |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1456 static bool is_variable (const std::string& name) |
7336 | 1457 { |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1458 symbol_table *inst = get_instance (xcurrent_scope); |
7336 | 1459 |
1460 return inst ? inst->do_is_variable (name) : false; | |
1461 } | |
1462 | |
1463 static bool | |
1464 is_built_in_function_name (const std::string& name) | |
1465 { | |
1466 octave_value val = find_built_in_function (name); | |
1467 | |
1468 return val.is_defined (); | |
1469 } | |
1470 | |
1471 static octave_value | |
1472 find_method (const std::string& name, const std::string& dispatch_type) | |
1473 { | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1474 fcn_table_const_iterator p = fcn_table.find (name); |
8 | 1475 |
7336 | 1476 if (p != fcn_table.end ()) |
1477 return p->second.find_method (dispatch_type); | |
1478 else | |
1479 { | |
10313 | 1480 fcn_info finfo (name); |
1481 | |
1482 octave_value fcn = finfo.find_method (dispatch_type); | |
1483 | |
1484 if (fcn.is_defined ()) | |
1485 fcn_table[name] = finfo; | |
1486 | |
1487 return fcn; | |
7336 | 1488 } |
1489 } | |
1490 | |
1491 static octave_value | |
1492 find_built_in_function (const std::string& name) | |
1493 { | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1494 fcn_table_const_iterator p = fcn_table.find (name); |
7336 | 1495 |
1496 return (p != fcn_table.end ()) | |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
1497 ? p->second.find_built_in_function () : octave_value (); |
7336 | 1498 } |
1499 | |
1500 static octave_value | |
1501 find_autoload (const std::string& name) | |
1502 { | |
1503 fcn_table_iterator p = fcn_table.find (name); | |
4913 | 1504 |
7336 | 1505 return (p != fcn_table.end ()) |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
1506 ? p->second.find_autoload () : octave_value (); |
7336 | 1507 } |
1508 | |
1509 static octave_value | |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11584
diff
changeset
|
1510 find_function (const std::string& name, |
9463
d34baf412786
support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
1511 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
|
1512 bool local_funcs = true); |
7336 | 1513 |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1514 static octave_value find_user_function (const std::string& name) |
7336 | 1515 { |
1516 fcn_table_iterator p = fcn_table.find (name); | |
1517 | |
1518 return (p != fcn_table.end ()) | |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
1519 ? p->second.find_user_function () : octave_value (); |
7336 | 1520 } |
1521 | |
1522 static void install_cmdline_function (const std::string& name, | |
10313 | 1523 const octave_value& fcn) |
7336 | 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 finfo.install_cmdline_function (fcn); | |
7336 | 1532 } |
1533 else | |
1534 { | |
10313 | 1535 fcn_info finfo (name); |
1536 | |
1537 finfo.install_cmdline_function (fcn); | |
1538 | |
1539 fcn_table[name] = finfo; | |
7336 | 1540 } |
1541 } | |
1542 | |
16605
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
1543 // Install subfunction FCN named NAME. SCOPE is the scope of the |
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
1544 // primary function corresponding to this subfunction. |
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
1545 |
7336 | 1546 static void install_subfunction (const std::string& name, |
10313 | 1547 const octave_value& fcn, |
1548 scope_id scope) | |
7336 | 1549 { |
1550 fcn_table_iterator p = fcn_table.find (name); | |
1551 | |
1552 if (p != fcn_table.end ()) | |
1553 { | |
10313 | 1554 fcn_info& finfo = p->second; |
1555 | |
1556 finfo.install_subfunction (fcn, scope); | |
7336 | 1557 } |
1558 else | |
1559 { | |
10313 | 1560 fcn_info finfo (name); |
1561 | |
1562 finfo.install_subfunction (fcn, scope); | |
1563 | |
1564 fcn_table[name] = finfo; | |
7336 | 1565 } |
1566 } | |
1567 | |
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
1568 static void install_nestfunction (const std::string& name, |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
1569 const octave_value& fcn, |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
1570 scope_id parent_scope); |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
1571 |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
1572 static void update_nest (scope_id scope) |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
1573 { |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
1574 symbol_table *inst = get_instance (scope); |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
1575 if (inst) |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
1576 inst->do_update_nest (); |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
1577 } |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
1578 |
7336 | 1579 static void install_user_function (const std::string& name, |
10313 | 1580 const octave_value& fcn) |
7336 | 1581 { |
1582 fcn_table_iterator p = fcn_table.find (name); | |
1583 | |
1584 if (p != fcn_table.end ()) | |
1585 { | |
10313 | 1586 fcn_info& finfo = p->second; |
1587 | |
1588 finfo.install_user_function (fcn); | |
7336 | 1589 } |
1590 else | |
1591 { | |
10313 | 1592 fcn_info finfo (name); |
1593 | |
1594 finfo.install_user_function (fcn); | |
1595 | |
1596 fcn_table[name] = finfo; | |
7336 | 1597 } |
1598 } | |
605 | 1599 |
7336 | 1600 static void install_built_in_function (const std::string& name, |
10313 | 1601 const octave_value& fcn) |
7336 | 1602 { |
1603 fcn_table_iterator p = fcn_table.find (name); | |
1604 | |
1605 if (p != fcn_table.end ()) | |
1606 { | |
10313 | 1607 fcn_info& finfo = p->second; |
1608 | |
1609 finfo.install_built_in_function (fcn); | |
7336 | 1610 } |
1611 else | |
1612 { | |
10313 | 1613 fcn_info finfo (name); |
1614 | |
1615 finfo.install_built_in_function (fcn); | |
1616 | |
1617 fcn_table[name] = finfo; | |
7336 | 1618 } |
1619 } | |
1620 | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1621 static void clear (const std::string& name) |
7336 | 1622 { |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1623 clear_variable (name); |
7336 | 1624 } |
1625 | |
16605
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
1626 static void clear_all (bool force = false) |
7336 | 1627 { |
1628 clear_variables (); | |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11584
diff
changeset
|
1629 |
10559
0ecbb17d130a
Clear global variables when 'clear -all' called
Rik <code@nomad.inbox5.com>
parents:
10521
diff
changeset
|
1630 clear_global_pattern ("*"); |
7336 | 1631 |
16605
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
1632 clear_functions (force); |
7336 | 1633 } |
1634 | |
9396
17af7cce7d1b
yet more unwind_protect improvements
Jaroslav Hajek <highegg@gmail.com>
parents:
9355
diff
changeset
|
1635 static void clear_variables (scope_id scope) |
7336 | 1636 { |
8282
47a3d2f829e4
clear local symbol table after parsing function
John W. Eaton <jwe@octave.org>
parents:
8123
diff
changeset
|
1637 symbol_table *inst = get_instance (scope); |
7336 | 1638 |
1639 if (inst) | |
1640 inst->do_clear_variables (); | |
1641 } | |
1642 | |
9396
17af7cce7d1b
yet more unwind_protect improvements
Jaroslav Hajek <highegg@gmail.com>
parents:
9355
diff
changeset
|
1643 // This is split for unwind_protect. |
17af7cce7d1b
yet more unwind_protect improvements
Jaroslav Hajek <highegg@gmail.com>
parents:
9355
diff
changeset
|
1644 static void clear_variables (void) |
17af7cce7d1b
yet more unwind_protect improvements
Jaroslav Hajek <highegg@gmail.com>
parents:
9355
diff
changeset
|
1645 { |
17af7cce7d1b
yet more unwind_protect improvements
Jaroslav Hajek <highegg@gmail.com>
parents:
9355
diff
changeset
|
1646 clear_variables (xcurrent_scope); |
17af7cce7d1b
yet more unwind_protect improvements
Jaroslav Hajek <highegg@gmail.com>
parents:
9355
diff
changeset
|
1647 } |
17af7cce7d1b
yet more unwind_protect improvements
Jaroslav Hajek <highegg@gmail.com>
parents:
9355
diff
changeset
|
1648 |
9240
f27a8c07f0b2
clear -classes and support.
Robert T. Short <octave@phaselockedsystems.com>
parents:
9144
diff
changeset
|
1649 static void clear_objects (scope_id scope = xcurrent_scope) |
f27a8c07f0b2
clear -classes and support.
Robert T. Short <octave@phaselockedsystems.com>
parents:
9144
diff
changeset
|
1650 { |
f27a8c07f0b2
clear -classes and support.
Robert T. Short <octave@phaselockedsystems.com>
parents:
9144
diff
changeset
|
1651 symbol_table *inst = get_instance (scope); |
f27a8c07f0b2
clear -classes and support.
Robert T. Short <octave@phaselockedsystems.com>
parents:
9144
diff
changeset
|
1652 |
f27a8c07f0b2
clear -classes and support.
Robert T. Short <octave@phaselockedsystems.com>
parents:
9144
diff
changeset
|
1653 if (inst) |
f27a8c07f0b2
clear -classes and support.
Robert T. Short <octave@phaselockedsystems.com>
parents:
9144
diff
changeset
|
1654 inst->do_clear_objects (); |
f27a8c07f0b2
clear -classes and support.
Robert T. Short <octave@phaselockedsystems.com>
parents:
9144
diff
changeset
|
1655 } |
f27a8c07f0b2
clear -classes and support.
Robert T. Short <octave@phaselockedsystems.com>
parents:
9144
diff
changeset
|
1656 |
16605
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
1657 static void clear_functions (bool force = false) |
7336 | 1658 { |
1659 for (fcn_table_iterator p = fcn_table.begin (); p != fcn_table.end (); p++) | |
16605
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
1660 p->second.clear (force); |
7336 | 1661 } |
1662 | |
1663 static void clear_function (const std::string& name) | |
1664 { | |
1665 clear_user_function (name); | |
1666 } | |
1667 | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1668 static void clear_global (const std::string& name) |
7336 | 1669 { |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1670 symbol_table *inst = get_instance (xcurrent_scope); |
7336 | 1671 |
1672 if (inst) | |
1673 inst->do_clear_global (name); | |
1674 } | |
1675 | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1676 static void clear_variable (const std::string& name) |
7336 | 1677 { |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1678 symbol_table *inst = get_instance (xcurrent_scope); |
7336 | 1679 |
1680 if (inst) | |
1681 inst->do_clear_variable (name); | |
1682 } | |
1683 | |
1684 static void clear_symbol (const std::string& name) | |
1685 { | |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
1686 // FIXME: are we supposed to do both here? |
7336 | 1687 |
1688 clear_variable (name); | |
1689 clear_function (name); | |
1690 } | |
1691 | |
1692 static void clear_function_pattern (const std::string& pat) | |
1693 { | |
1694 glob_match pattern (pat); | |
1695 | |
1696 for (fcn_table_iterator p = fcn_table.begin (); p != fcn_table.end (); p++) | |
1697 { | |
10313 | 1698 if (pattern.match (p->first)) |
1699 p->second.clear_user_function (); | |
7336 | 1700 } |
1701 } | |
1702 | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1703 static void clear_global_pattern (const std::string& pat) |
7336 | 1704 { |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1705 symbol_table *inst = get_instance (xcurrent_scope); |
4009 | 1706 |
7336 | 1707 if (inst) |
1708 inst->do_clear_global_pattern (pat); | |
1709 } | |
1710 | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1711 static void clear_variable_pattern (const std::string& pat) |
7336 | 1712 { |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1713 symbol_table *inst = get_instance (xcurrent_scope); |
7336 | 1714 |
1715 if (inst) | |
1716 inst->do_clear_variable_pattern (pat); | |
1717 } | |
1718 | |
7779
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1719 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
|
1720 { |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1721 symbol_table *inst = get_instance (xcurrent_scope); |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1722 |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1723 if (inst) |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1724 inst->do_clear_variable_regexp (pat); |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1725 } |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1726 |
7336 | 1727 static void clear_symbol_pattern (const std::string& pat) |
1728 { | |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
1729 // FIXME: are we supposed to do both here? |
7336 | 1730 |
1731 clear_variable_pattern (pat); | |
1732 clear_function_pattern (pat); | |
1733 } | |
1734 | |
1735 static void clear_user_function (const std::string& name) | |
1736 { | |
1737 fcn_table_iterator p = fcn_table.find (name); | |
1738 | |
1739 if (p != fcn_table.end ()) | |
1740 { | |
10313 | 1741 fcn_info& finfo = p->second; |
1742 | |
1743 finfo.clear_user_function (); | |
7336 | 1744 } |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
1745 // FIXME: is this necessary, or even useful? |
7336 | 1746 // else |
15466
d174210ce1ec
use ' instead of ` in error messages, warnings and most comments
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
1747 // error ("clear: no such function '%s'", name.c_str ()); |
7336 | 1748 } |
1749 | |
9958
80432f0ee895
improve octave_shlib for safer shared libs treatment
Jaroslav Hajek <highegg@gmail.com>
parents:
9639
diff
changeset
|
1750 // 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
|
1751 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
|
1752 { |
80432f0ee895
improve octave_shlib for safer shared libs treatment
Jaroslav Hajek <highegg@gmail.com>
parents:
9639
diff
changeset
|
1753 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
|
1754 |
80432f0ee895
improve octave_shlib for safer shared libs treatment
Jaroslav Hajek <highegg@gmail.com>
parents:
9639
diff
changeset
|
1755 if (p != fcn_table.end ()) |
80432f0ee895
improve octave_shlib for safer shared libs treatment
Jaroslav Hajek <highegg@gmail.com>
parents:
9639
diff
changeset
|
1756 { |
10313 | 1757 fcn_info& finfo = p->second; |
1758 | |
1759 finfo.clear_autoload_function (); | |
1760 finfo.clear_user_function (); | |
9958
80432f0ee895
improve octave_shlib for safer shared libs treatment
Jaroslav Hajek <highegg@gmail.com>
parents:
9639
diff
changeset
|
1761 } |
80432f0ee895
improve octave_shlib for safer shared libs treatment
Jaroslav Hajek <highegg@gmail.com>
parents:
9639
diff
changeset
|
1762 } |
80432f0ee895
improve octave_shlib for safer shared libs treatment
Jaroslav Hajek <highegg@gmail.com>
parents:
9639
diff
changeset
|
1763 |
7336 | 1764 static void clear_mex_functions (void) |
1765 { | |
1766 for (fcn_table_iterator p = fcn_table.begin (); p != fcn_table.end (); p++) | |
1767 { | |
10313 | 1768 fcn_info& finfo = p->second; |
1769 | |
1770 finfo.clear_mex_function (); | |
7336 | 1771 } |
1772 } | |
1773 | |
7972
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7901
diff
changeset
|
1774 static bool set_class_relationship (const std::string& sup_class, |
10313 | 1775 const std::string& inf_class); |
7972
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7901
diff
changeset
|
1776 |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7901
diff
changeset
|
1777 static bool is_superiorto (const std::string& a, const std::string& b); |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11584
diff
changeset
|
1778 |
7336 | 1779 static void alias_built_in_function (const std::string& alias, |
10313 | 1780 const std::string& name) |
7336 | 1781 { |
1782 octave_value fcn = find_built_in_function (name); | |
1783 | |
1784 if (fcn.is_defined ()) | |
1785 { | |
10313 | 1786 fcn_info finfo (alias); |
1787 | |
1788 finfo.install_built_in_function (fcn); | |
1789 | |
1790 fcn_table[alias] = finfo; | |
7336 | 1791 } |
1792 else | |
15466
d174210ce1ec
use ' instead of ` in error messages, warnings and most comments
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
1793 panic ("alias: '%s' is undefined", name.c_str ()); |
7336 | 1794 } |
1795 | |
1796 static void add_dispatch (const std::string& name, const std::string& type, | |
10313 | 1797 const std::string& fname) |
7336 | 1798 { |
1799 fcn_table_iterator p = fcn_table.find (name); | |
1800 | |
1801 if (p != fcn_table.end ()) | |
1802 { | |
10313 | 1803 fcn_info& finfo = p->second; |
1804 | |
1805 finfo.add_dispatch (type, fname); | |
7336 | 1806 } |
1807 else | |
1808 { | |
10313 | 1809 fcn_info finfo (name); |
1810 | |
1811 finfo.add_dispatch (type, fname); | |
1812 | |
1813 fcn_table[name] = finfo; | |
7336 | 1814 } |
1815 } | |
1816 | |
1817 static void clear_dispatch (const std::string& name, const std::string& type) | |
1818 { | |
1819 fcn_table_iterator p = fcn_table.find (name); | |
1820 | |
1821 if (p != fcn_table.end ()) | |
1822 { | |
10313 | 1823 fcn_info& finfo = p->second; |
1824 | |
1825 finfo.clear_dispatch (type); | |
7336 | 1826 } |
1827 } | |
1828 | |
1829 static void print_dispatch (std::ostream& os, const std::string& name) | |
1830 { | |
1831 fcn_table_iterator p = fcn_table.find (name); | |
4009 | 1832 |
7336 | 1833 if (p != fcn_table.end ()) |
1834 { | |
10313 | 1835 fcn_info& finfo = p->second; |
1836 | |
1837 finfo.print_dispatch (os); | |
7336 | 1838 } |
1839 } | |
1840 | |
1841 static fcn_info::dispatch_map_type get_dispatch (const std::string& name) | |
1842 { | |
1843 fcn_info::dispatch_map_type retval; | |
1844 | |
1845 fcn_table_iterator p = fcn_table.find (name); | |
1846 | |
1847 if (p != fcn_table.end ()) | |
1848 { | |
10313 | 1849 fcn_info& finfo = p->second; |
1850 | |
1851 retval = finfo.get_dispatch (); | |
7336 | 1852 } |
1853 | |
1854 return retval; | |
1855 } | |
1856 | |
1857 static std::string help_for_dispatch (const std::string& name) | |
1858 { | |
1859 std::string retval; | |
1860 | |
1861 fcn_table_iterator p = fcn_table.find (name); | |
1862 | |
1863 if (p != fcn_table.end ()) | |
1864 { | |
10313 | 1865 fcn_info& finfo = p->second; |
1866 | |
1867 retval = finfo.help_for_dispatch (); | |
7336 | 1868 } |
1869 | |
1870 return retval; | |
1871 } | |
1872 | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1873 static void push_context (void) |
7336 | 1874 { |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1875 if (xcurrent_scope == xglobal_scope || xcurrent_scope == xtop_scope) |
7336 | 1876 error ("invalid call to xymtab::push_context"); |
1877 else | |
1878 { | |
10313 | 1879 symbol_table *inst = get_instance (xcurrent_scope); |
1880 | |
1881 if (inst) | |
1882 inst->do_push_context (); | |
7336 | 1883 } |
1884 } | |
1885 | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1886 static void pop_context (void) |
7336 | 1887 { |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1888 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
|
1889 error ("invalid call to xymtab::pop_context"); |
7336 | 1890 else |
1891 { | |
10313 | 1892 symbol_table *inst = get_instance (xcurrent_scope); |
1893 | |
1894 if (inst) | |
1895 inst->do_pop_context (); | |
7336 | 1896 } |
1897 } | |
1898 | |
1899 // For unwind_protect. | |
1900 static void pop_context (void *) { pop_context (); } | |
1901 | |
11557
e9d72a3caa46
mark automatic variables as automatic
John W. Eaton <jwe@octave.org>
parents:
11548
diff
changeset
|
1902 static void mark_automatic (const std::string& name) |
e9d72a3caa46
mark automatic variables as automatic
John W. Eaton <jwe@octave.org>
parents:
11548
diff
changeset
|
1903 { |
e9d72a3caa46
mark automatic variables as automatic
John W. Eaton <jwe@octave.org>
parents:
11548
diff
changeset
|
1904 symbol_table *inst = get_instance (xcurrent_scope); |
e9d72a3caa46
mark automatic variables as automatic
John W. Eaton <jwe@octave.org>
parents:
11548
diff
changeset
|
1905 |
e9d72a3caa46
mark automatic variables as automatic
John W. Eaton <jwe@octave.org>
parents:
11548
diff
changeset
|
1906 if (inst) |
e9d72a3caa46
mark automatic variables as automatic
John W. Eaton <jwe@octave.org>
parents:
11548
diff
changeset
|
1907 inst->do_mark_automatic (name); |
e9d72a3caa46
mark automatic variables as automatic
John W. Eaton <jwe@octave.org>
parents:
11548
diff
changeset
|
1908 } |
e9d72a3caa46
mark automatic variables as automatic
John W. Eaton <jwe@octave.org>
parents:
11548
diff
changeset
|
1909 |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1910 static void mark_hidden (const std::string& name) |
7336 | 1911 { |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1912 symbol_table *inst = get_instance (xcurrent_scope); |
7336 | 1913 |
1914 if (inst) | |
1915 inst->do_mark_hidden (name); | |
1916 } | |
1917 | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1918 static void mark_global (const std::string& name) |
7336 | 1919 { |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1920 symbol_table *inst = get_instance (xcurrent_scope); |
7336 | 1921 |
1922 if (inst) | |
1923 inst->do_mark_global (name); | |
1924 } | |
1925 | |
15572
859c8bf6d134
Fix saved struct with function handle fails to load (bug #33857)
Max Brister <max@2bass.com>
parents:
15467
diff
changeset
|
1926 // exclude: Storage classes to exclude, you can OR them together |
7336 | 1927 static std::list<symbol_record> |
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
1928 all_variables (scope_id scope = xcurrent_scope, |
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
1929 context_id context = xdefault_context, |
15572
859c8bf6d134
Fix saved struct with function handle fails to load (bug #33857)
Max Brister <max@2bass.com>
parents:
15467
diff
changeset
|
1930 bool defined_only = true, |
859c8bf6d134
Fix saved struct with function handle fails to load (bug #33857)
Max Brister <max@2bass.com>
parents:
15467
diff
changeset
|
1931 unsigned int exclude = symbol_record::hidden) |
7336 | 1932 { |
1933 symbol_table *inst = get_instance (scope); | |
1934 | |
1935 return inst | |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
1936 ? inst->do_all_variables (context, defined_only, exclude) |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
1937 : std::list<symbol_record> (); |
7336 | 1938 } |
3011 | 1939 |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1940 static std::list<symbol_record> glob (const std::string& pattern) |
7336 | 1941 { |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1942 symbol_table *inst = get_instance (xcurrent_scope); |
7336 | 1943 |
1944 return inst ? inst->do_glob (pattern) : std::list<symbol_record> (); | |
1945 } | |
1946 | |
7779
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1947 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
|
1948 { |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1949 symbol_table *inst = get_instance (xcurrent_scope); |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1950 |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1951 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
|
1952 } |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1953 |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1954 static std::list<symbol_record> glob_variables (const std::string& pattern) |
7336 | 1955 { |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1956 symbol_table *inst = get_instance (xcurrent_scope); |
7336 | 1957 |
1958 return inst ? inst->do_glob (pattern, true) : std::list<symbol_record> (); | |
1959 } | |
1960 | |
7779
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1961 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
|
1962 { |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1963 symbol_table *inst = get_instance (xcurrent_scope); |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1964 |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1965 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
|
1966 } |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1967 |
7336 | 1968 static std::list<symbol_record> |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1969 glob_global_variables (const std::string& pattern) |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1970 { |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1971 std::list<symbol_record> retval; |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1972 |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1973 glob_match pat (pattern); |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1974 |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1975 for (global_table_const_iterator p = global_table.begin (); |
10313 | 1976 p != global_table.end (); p++) |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1977 { |
10313 | 1978 // We generate a list of symbol_record objects so that |
1979 // the results from glob_variables and glob_global_variables | |
1980 // may be handled the same way. | |
1981 | |
1982 if (pat.match (p->first)) | |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
1983 retval.push_back (symbol_record (xglobal_scope, |
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
1984 p->first, p->second, |
10313 | 1985 symbol_record::global)); |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1986 } |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1987 |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1988 return retval; |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1989 } |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1990 |
7779
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1991 static std::list<symbol_record> |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1992 regexp_global_variables (const std::string& pattern) |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1993 { |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1994 std::list<symbol_record> retval; |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1995 |
14024
fc9f204faea0
refactor regexp (bug #34440)
John W. Eaton <jwe@octave.org>
parents:
13985
diff
changeset
|
1996 ::regexp pat (pattern); |
7779
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1997 |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1998 for (global_table_const_iterator p = global_table.begin (); |
10313 | 1999 p != global_table.end (); p++) |
7779
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2000 { |
10313 | 2001 // We generate a list of symbol_record objects so that |
2002 // the results from regexp_variables and regexp_global_variables | |
2003 // may be handled the same way. | |
2004 | |
14024
fc9f204faea0
refactor regexp (bug #34440)
John W. Eaton <jwe@octave.org>
parents:
13985
diff
changeset
|
2005 if (pat.is_match (p->first)) |
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2006 retval.push_back (symbol_record (xglobal_scope, |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2007 p->first, p->second, |
10313 | 2008 symbol_record::global)); |
7779
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2009 } |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2010 |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2011 return retval; |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2012 } |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2013 |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
2014 static std::list<symbol_record> glob_variables (const string_vector& patterns) |
7336 | 2015 { |
2016 std::list<symbol_record> retval; | |
2017 | |
2018 size_t len = patterns.length (); | |
8 | 2019 |
7336 | 2020 for (size_t i = 0; i < len; i++) |
2021 { | |
10313 | 2022 std::list<symbol_record> tmp = glob_variables (patterns[i]); |
2023 | |
2024 retval.insert (retval.begin (), tmp.begin (), tmp.end ()); | |
7336 | 2025 } |
2026 | |
2027 return retval; | |
2028 } | |
2029 | |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11584
diff
changeset
|
2030 static std::list<symbol_record> regexp_variables |
7779
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2031 (const string_vector& patterns) |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2032 { |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2033 std::list<symbol_record> retval; |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2034 |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2035 size_t len = patterns.length (); |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2036 |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2037 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
|
2038 { |
10313 | 2039 std::list<symbol_record> tmp = regexp_variables (patterns[i]); |
2040 | |
2041 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
|
2042 } |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2043 |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2044 return retval; |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2045 } |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2046 |
7336 | 2047 static std::list<std::string> user_function_names (void) |
2048 { | |
2049 std::list<std::string> retval; | |
2050 | |
2051 for (fcn_table_iterator p = fcn_table.begin (); | |
10313 | 2052 p != fcn_table.end (); p++) |
7336 | 2053 { |
10313 | 2054 if (p->second.is_user_function_defined ()) |
2055 retval.push_back (p->first); | |
7336 | 2056 } |
2057 | |
2058 if (! retval.empty ()) | |
2059 retval.sort (); | |
2060 | |
2061 return retval; | |
2062 } | |
3011 | 2063 |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
2064 static std::list<std::string> global_variable_names (void) |
7336 | 2065 { |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
2066 std::list<std::string> retval; |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
2067 |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2068 for (global_table_const_iterator p = global_table.begin (); |
10313 | 2069 p != global_table.end (); p++) |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
2070 retval.push_back (p->first); |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
2071 |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
2072 retval.sort (); |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
2073 |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
2074 return retval; |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
2075 } |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
2076 |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
2077 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
|
2078 { |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
2079 symbol_table *inst = get_instance (xtop_scope); |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
2080 |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
2081 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
|
2082 } |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
2083 |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
2084 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
|
2085 { |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
2086 symbol_table *inst = get_instance (xcurrent_scope); |
7336 | 2087 |
2088 return inst ? inst->do_variable_names () : std::list<std::string> (); | |
2089 } | |
2090 | |
2091 static std::list<std::string> built_in_function_names (void) | |
2092 { | |
2093 std::list<std::string> retval; | |
2094 | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2095 for (fcn_table_const_iterator p = fcn_table.begin (); |
10313 | 2096 p != fcn_table.end (); p++) |
7336 | 2097 { |
10313 | 2098 octave_value fcn = p->second.find_built_in_function (); |
2099 | |
2100 if (fcn.is_defined ()) | |
2101 retval.push_back (p->first); | |
7336 | 2102 } |
2103 | |
2104 if (! retval.empty ()) | |
2105 retval.sort (); | |
220 | 2106 |
7336 | 2107 return retval; |
2108 } | |
2109 | |
12911
d6151d774283
make completion work for command-line functions
John W. Eaton <jwe@octave.org>
parents:
12130
diff
changeset
|
2110 static std::list<std::string> cmdline_function_names (void) |
d6151d774283
make completion work for command-line functions
John W. Eaton <jwe@octave.org>
parents:
12130
diff
changeset
|
2111 { |
d6151d774283
make completion work for command-line functions
John W. Eaton <jwe@octave.org>
parents:
12130
diff
changeset
|
2112 std::list<std::string> retval; |
d6151d774283
make completion work for command-line functions
John W. Eaton <jwe@octave.org>
parents:
12130
diff
changeset
|
2113 |
d6151d774283
make completion work for command-line functions
John W. Eaton <jwe@octave.org>
parents:
12130
diff
changeset
|
2114 for (fcn_table_const_iterator p = fcn_table.begin (); |
d6151d774283
make completion work for command-line functions
John W. Eaton <jwe@octave.org>
parents:
12130
diff
changeset
|
2115 p != fcn_table.end (); p++) |
d6151d774283
make completion work for command-line functions
John W. Eaton <jwe@octave.org>
parents:
12130
diff
changeset
|
2116 { |
d6151d774283
make completion work for command-line functions
John W. Eaton <jwe@octave.org>
parents:
12130
diff
changeset
|
2117 octave_value fcn = p->second.find_cmdline_function (); |
d6151d774283
make completion work for command-line functions
John W. Eaton <jwe@octave.org>
parents:
12130
diff
changeset
|
2118 |
d6151d774283
make completion work for command-line functions
John W. Eaton <jwe@octave.org>
parents:
12130
diff
changeset
|
2119 if (fcn.is_defined ()) |
d6151d774283
make completion work for command-line functions
John W. Eaton <jwe@octave.org>
parents:
12130
diff
changeset
|
2120 retval.push_back (p->first); |
d6151d774283
make completion work for command-line functions
John W. Eaton <jwe@octave.org>
parents:
12130
diff
changeset
|
2121 } |
d6151d774283
make completion work for command-line functions
John W. Eaton <jwe@octave.org>
parents:
12130
diff
changeset
|
2122 |
d6151d774283
make completion work for command-line functions
John W. Eaton <jwe@octave.org>
parents:
12130
diff
changeset
|
2123 if (! retval.empty ()) |
d6151d774283
make completion work for command-line functions
John W. Eaton <jwe@octave.org>
parents:
12130
diff
changeset
|
2124 retval.sort (); |
d6151d774283
make completion work for command-line functions
John W. Eaton <jwe@octave.org>
parents:
12130
diff
changeset
|
2125 |
d6151d774283
make completion work for command-line functions
John W. Eaton <jwe@octave.org>
parents:
12130
diff
changeset
|
2126 return retval; |
d6151d774283
make completion work for command-line functions
John W. Eaton <jwe@octave.org>
parents:
12130
diff
changeset
|
2127 } |
d6151d774283
make completion work for command-line functions
John W. Eaton <jwe@octave.org>
parents:
12130
diff
changeset
|
2128 |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
2129 static bool is_local_variable (const std::string& name) |
7336 | 2130 { |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
2131 if (xcurrent_scope == xglobal_scope) |
7336 | 2132 return false; |
2133 else | |
2134 { | |
10313 | 2135 symbol_table *inst = get_instance (xcurrent_scope); |
2136 | |
2137 return inst ? inst->do_is_local_variable (name) : false; | |
7336 | 2138 } |
2139 } | |
5861 | 2140 |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
2141 static bool is_global (const std::string& name) |
7336 | 2142 { |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
2143 if (xcurrent_scope == xglobal_scope) |
7336 | 2144 return true; |
2145 else | |
2146 { | |
10313 | 2147 symbol_table *inst = get_instance (xcurrent_scope); |
2148 | |
2149 return inst ? inst->do_is_global (name) : false; | |
7336 | 2150 } |
2151 } | |
3011 | 2152 |
16468
0f143f68078d
use signal/slot for updating workspace instead of using event listener
John W. Eaton <jwe@octave.org>
parents:
16442
diff
changeset
|
2153 static std::list<workspace_element> workspace_info (void) |
0f143f68078d
use signal/slot for updating workspace instead of using event listener
John W. Eaton <jwe@octave.org>
parents:
16442
diff
changeset
|
2154 { |
0f143f68078d
use signal/slot for updating workspace instead of using event listener
John W. Eaton <jwe@octave.org>
parents:
16442
diff
changeset
|
2155 symbol_table *inst = get_instance (xcurrent_scope); |
0f143f68078d
use signal/slot for updating workspace instead of using event listener
John W. Eaton <jwe@octave.org>
parents:
16442
diff
changeset
|
2156 |
0f143f68078d
use signal/slot for updating workspace instead of using event listener
John W. Eaton <jwe@octave.org>
parents:
16442
diff
changeset
|
2157 return inst |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2158 ? inst->do_workspace_info () : std::list<workspace_element> (); |
16468
0f143f68078d
use signal/slot for updating workspace instead of using event listener
John W. Eaton <jwe@octave.org>
parents:
16442
diff
changeset
|
2159 } |
0f143f68078d
use signal/slot for updating workspace instead of using event listener
John W. Eaton <jwe@octave.org>
parents:
16442
diff
changeset
|
2160 |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2161 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
|
2162 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2163 static void dump_global (std::ostream& os); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2164 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2165 static void dump_functions (std::ostream& os); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2166 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2167 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
|
2168 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2169 symbol_table *inst = get_instance (scope, false); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2170 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2171 if (inst) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2172 inst->do_cache_name (name); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2173 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2174 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2175 static void lock_subfunctions (scope_id scope = xcurrent_scope) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2176 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2177 for (fcn_table_iterator p = fcn_table.begin (); |
10313 | 2178 p != fcn_table.end (); p++) |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2179 p->second.lock_subfunction (scope); |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11584
diff
changeset
|
2180 } |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2181 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2182 static void unlock_subfunctions (scope_id scope = xcurrent_scope) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2183 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2184 for (fcn_table_iterator p = fcn_table.begin (); |
10313 | 2185 p != fcn_table.end (); p++) |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2186 p->second.unlock_subfunction (scope); |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11584
diff
changeset
|
2187 } |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2188 |
16596
645672f1c873
handle setting breakpoints in subfunctions in GUI editor
John W. Eaton <jwe@octave.org>
parents:
16502
diff
changeset
|
2189 static std::map<std::string, octave_value> |
645672f1c873
handle setting breakpoints in subfunctions in GUI editor
John W. Eaton <jwe@octave.org>
parents:
16502
diff
changeset
|
2190 subfunctions_defined_in_scope (scope_id scope = xcurrent_scope) |
645672f1c873
handle setting breakpoints in subfunctions in GUI editor
John W. Eaton <jwe@octave.org>
parents:
16502
diff
changeset
|
2191 { |
645672f1c873
handle setting breakpoints in subfunctions in GUI editor
John W. Eaton <jwe@octave.org>
parents:
16502
diff
changeset
|
2192 std::map<std::string, octave_value> retval; |
645672f1c873
handle setting breakpoints in subfunctions in GUI editor
John W. Eaton <jwe@octave.org>
parents:
16502
diff
changeset
|
2193 |
645672f1c873
handle setting breakpoints in subfunctions in GUI editor
John W. Eaton <jwe@octave.org>
parents:
16502
diff
changeset
|
2194 for (fcn_table_const_iterator p = fcn_table.begin (); |
645672f1c873
handle setting breakpoints in subfunctions in GUI editor
John W. Eaton <jwe@octave.org>
parents:
16502
diff
changeset
|
2195 p != fcn_table.end (); p++) |
645672f1c873
handle setting breakpoints in subfunctions in GUI editor
John W. Eaton <jwe@octave.org>
parents:
16502
diff
changeset
|
2196 { |
645672f1c873
handle setting breakpoints in subfunctions in GUI editor
John W. Eaton <jwe@octave.org>
parents:
16502
diff
changeset
|
2197 std::pair<std::string, octave_value> tmp |
645672f1c873
handle setting breakpoints in subfunctions in GUI editor
John W. Eaton <jwe@octave.org>
parents:
16502
diff
changeset
|
2198 = p->second.subfunction_defined_in_scope (scope); |
645672f1c873
handle setting breakpoints in subfunctions in GUI editor
John W. Eaton <jwe@octave.org>
parents:
16502
diff
changeset
|
2199 |
645672f1c873
handle setting breakpoints in subfunctions in GUI editor
John W. Eaton <jwe@octave.org>
parents:
16502
diff
changeset
|
2200 std::string nm = tmp.first; |
645672f1c873
handle setting breakpoints in subfunctions in GUI editor
John W. Eaton <jwe@octave.org>
parents:
16502
diff
changeset
|
2201 |
645672f1c873
handle setting breakpoints in subfunctions in GUI editor
John W. Eaton <jwe@octave.org>
parents:
16502
diff
changeset
|
2202 if (! nm.empty ()) |
645672f1c873
handle setting breakpoints in subfunctions in GUI editor
John W. Eaton <jwe@octave.org>
parents:
16502
diff
changeset
|
2203 retval[nm] = tmp.second; |
645672f1c873
handle setting breakpoints in subfunctions in GUI editor
John W. Eaton <jwe@octave.org>
parents:
16502
diff
changeset
|
2204 } |
645672f1c873
handle setting breakpoints in subfunctions in GUI editor
John W. Eaton <jwe@octave.org>
parents:
16502
diff
changeset
|
2205 |
645672f1c873
handle setting breakpoints in subfunctions in GUI editor
John W. Eaton <jwe@octave.org>
parents:
16502
diff
changeset
|
2206 return retval; |
645672f1c873
handle setting breakpoints in subfunctions in GUI editor
John W. Eaton <jwe@octave.org>
parents:
16502
diff
changeset
|
2207 } |
645672f1c873
handle setting breakpoints in subfunctions in GUI editor
John W. Eaton <jwe@octave.org>
parents:
16502
diff
changeset
|
2208 |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2209 static void free_scope (scope_id scope) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2210 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2211 if (scope == xglobal_scope || scope == xtop_scope) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2212 error ("can't free global or top-level scopes!"); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2213 else |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2214 symbol_table::scope_id_cache::free (scope); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2215 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2216 |
8819
96d87674b818
also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents:
8691
diff
changeset
|
2217 static void stash_dir_name_for_subfunctions (scope_id scope, |
10313 | 2218 const std::string& dir_name); |
8819
96d87674b818
also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents:
8691
diff
changeset
|
2219 |
9581
3d0d2bda3a0f
fix previous change, avoid duplicate loads of methods in descendant classes
Jaroslav Hajek <highegg@gmail.com>
parents:
9509
diff
changeset
|
2220 static void add_to_parent_map (const std::string& classname, |
10313 | 2221 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
|
2222 { |
3d0d2bda3a0f
fix previous change, avoid duplicate loads of methods in descendant classes
Jaroslav Hajek <highegg@gmail.com>
parents:
9509
diff
changeset
|
2223 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
|
2224 } |
3d0d2bda3a0f
fix previous change, avoid duplicate loads of methods in descendant classes
Jaroslav Hajek <highegg@gmail.com>
parents:
9509
diff
changeset
|
2225 |
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
|
2226 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
|
2227 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
|
2228 { |
1783b360976f
also consider parent classes when checking if class methods are out of date
John W. Eaton <jwe@octave.org>
parents:
10633
diff
changeset
|
2229 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
|
2230 |
1783b360976f
also consider parent classes when checking if class methods are out of date
John W. Eaton <jwe@octave.org>
parents:
10633
diff
changeset
|
2231 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
|
2232 |
1783b360976f
also consider parent classes when checking if class methods are out of date
John W. Eaton <jwe@octave.org>
parents:
10633
diff
changeset
|
2233 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
|
2234 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
|
2235 |
12130
3229572cbe23
symbol_table::parent_classes: also add parents of parents to the list
John W. Eaton <jwe@octave.org>
parents:
12122
diff
changeset
|
2236 for (std::list<std::string>::const_iterator lit = retval.begin (); |
3229572cbe23
symbol_table::parent_classes: also add parents of parents to the list
John W. Eaton <jwe@octave.org>
parents:
12122
diff
changeset
|
2237 lit != retval.end (); lit++) |
3229572cbe23
symbol_table::parent_classes: also add parents of parents to the list
John W. Eaton <jwe@octave.org>
parents:
12122
diff
changeset
|
2238 { |
3229572cbe23
symbol_table::parent_classes: also add parents of parents to the list
John W. Eaton <jwe@octave.org>
parents:
12122
diff
changeset
|
2239 // Search for parents of parents and append them to the list. |
3229572cbe23
symbol_table::parent_classes: also add parents of parents to the list
John W. Eaton <jwe@octave.org>
parents:
12122
diff
changeset
|
2240 |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2241 // FIXME: should we worry about a circular inheritance graph? |
12130
3229572cbe23
symbol_table::parent_classes: also add parents of parents to the list
John W. Eaton <jwe@octave.org>
parents:
12122
diff
changeset
|
2242 |
3229572cbe23
symbol_table::parent_classes: also add parents of parents to the list
John W. Eaton <jwe@octave.org>
parents:
12122
diff
changeset
|
2243 std::list<std::string> parents = parent_classes (*lit); |
3229572cbe23
symbol_table::parent_classes: also add parents of parents to the list
John W. Eaton <jwe@octave.org>
parents:
12122
diff
changeset
|
2244 |
3229572cbe23
symbol_table::parent_classes: also add parents of parents to the list
John W. Eaton <jwe@octave.org>
parents:
12122
diff
changeset
|
2245 if (! parents.empty ()) |
3229572cbe23
symbol_table::parent_classes: also add parents of parents to the list
John W. Eaton <jwe@octave.org>
parents:
12122
diff
changeset
|
2246 retval.insert (retval.end (), parents.begin (), parents.end ()); |
3229572cbe23
symbol_table::parent_classes: also add parents of parents to the list
John W. Eaton <jwe@octave.org>
parents:
12122
diff
changeset
|
2247 } |
3229572cbe23
symbol_table::parent_classes: also add parents of parents to the list
John W. Eaton <jwe@octave.org>
parents:
12122
diff
changeset
|
2248 |
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
|
2249 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
|
2250 } |
1783b360976f
also consider parent classes when checking if class methods are out of date
John W. Eaton <jwe@octave.org>
parents:
10633
diff
changeset
|
2251 |
9639
8d79f36ebdde
store scope->function pointer
Jaroslav Hajek <highegg@gmail.com>
parents:
9581
diff
changeset
|
2252 static octave_user_function *get_curr_fcn (scope_id scope = xcurrent_scope) |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2253 { |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2254 symbol_table *inst = get_instance (scope); |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2255 return inst->curr_fcn; |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2256 } |
9639
8d79f36ebdde
store scope->function pointer
Jaroslav Hajek <highegg@gmail.com>
parents:
9581
diff
changeset
|
2257 |
8d79f36ebdde
store scope->function pointer
Jaroslav Hajek <highegg@gmail.com>
parents:
9581
diff
changeset
|
2258 static void set_curr_fcn (octave_user_function *curr_fcn, |
8d79f36ebdde
store scope->function pointer
Jaroslav Hajek <highegg@gmail.com>
parents:
9581
diff
changeset
|
2259 scope_id scope = xcurrent_scope) |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2260 { |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2261 assert (scope != xtop_scope && scope != xglobal_scope); |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2262 symbol_table *inst = get_instance (scope); |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2263 // FIXME: normally, functions should not usurp each other's scope. |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2264 // If for any incredible reason this is needed, call |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2265 // set_user_function (0, scope) first. This may cause problems with |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2266 // nested functions, as the curr_fcn of symbol_records must be updated. |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2267 assert (inst->curr_fcn == 0 || curr_fcn == 0); |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2268 inst->curr_fcn = curr_fcn; |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2269 } |
9639
8d79f36ebdde
store scope->function pointer
Jaroslav Hajek <highegg@gmail.com>
parents:
9581
diff
changeset
|
2270 |
9981
692ab4eaf965
clean up top-level variables when exiting Octave
Jaroslav Hajek <highegg@gmail.com>
parents:
9958
diff
changeset
|
2271 static void cleanup (void); |
692ab4eaf965
clean up top-level variables when exiting Octave
Jaroslav Hajek <highegg@gmail.com>
parents:
9958
diff
changeset
|
2272 |
8 | 2273 private: |
2274 | |
12122
f4689107dd8c
Explicitly disallow copying in some classes.
Pascal Dupuis <Pascal.Dupuis@uclouvain.be>
parents:
11586
diff
changeset
|
2275 // No copying! |
f4689107dd8c
Explicitly disallow copying in some classes.
Pascal Dupuis <Pascal.Dupuis@uclouvain.be>
parents:
11586
diff
changeset
|
2276 |
f4689107dd8c
Explicitly disallow copying in some classes.
Pascal Dupuis <Pascal.Dupuis@uclouvain.be>
parents:
11586
diff
changeset
|
2277 symbol_table (const symbol_table&); |
f4689107dd8c
Explicitly disallow copying in some classes.
Pascal Dupuis <Pascal.Dupuis@uclouvain.be>
parents:
11586
diff
changeset
|
2278 |
f4689107dd8c
Explicitly disallow copying in some classes.
Pascal Dupuis <Pascal.Dupuis@uclouvain.be>
parents:
11586
diff
changeset
|
2279 symbol_table& operator = (const symbol_table&); |
f4689107dd8c
Explicitly disallow copying in some classes.
Pascal Dupuis <Pascal.Dupuis@uclouvain.be>
parents:
11586
diff
changeset
|
2280 |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2281 typedef std::map<std::string, symbol_record>::const_iterator |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2282 table_const_iterator; |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2283 typedef std::map<std::string, symbol_record>::iterator |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2284 table_iterator; |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2285 |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2286 typedef std::map<std::string, octave_value>::const_iterator |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2287 global_table_const_iterator; |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2288 typedef std::map<std::string, octave_value>::iterator |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2289 global_table_iterator; |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2290 |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2291 typedef std::map<std::string, octave_value>::const_iterator |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2292 persistent_table_const_iterator; |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2293 typedef std::map<std::string, octave_value>::iterator |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2294 persistent_table_iterator; |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2295 |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2296 typedef std::map<scope_id, symbol_table*>::const_iterator |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2297 all_instances_const_iterator; |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2298 typedef std::map<scope_id, symbol_table*>::iterator |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2299 all_instances_iterator; |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2300 |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2301 typedef std::map<std::string, fcn_info>::const_iterator |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2302 fcn_table_const_iterator; |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2303 typedef std::map<std::string, fcn_info>::iterator |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2304 fcn_table_iterator; |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2305 |
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2306 // The scope of this symbol table. |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2307 scope_id my_scope; |
7336 | 2308 |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2309 // 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
|
2310 // corresponding to the scope); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2311 std::string table_name; |
7336 | 2312 |
2313 // Map from symbol names to symbol info. | |
2314 std::map<std::string, symbol_record> table; | |
2315 | |
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2316 // Child nested functions. |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2317 std::vector<symbol_table*> nest_children; |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2318 |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2319 // Parent nested function (may be null). |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2320 symbol_table *nest_parent; |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2321 |
9639
8d79f36ebdde
store scope->function pointer
Jaroslav Hajek <highegg@gmail.com>
parents:
9581
diff
changeset
|
2322 // The associated user code (may be null). |
8d79f36ebdde
store scope->function pointer
Jaroslav Hajek <highegg@gmail.com>
parents:
9581
diff
changeset
|
2323 octave_user_function *curr_fcn; |
8d79f36ebdde
store scope->function pointer
Jaroslav Hajek <highegg@gmail.com>
parents:
9581
diff
changeset
|
2324 |
15236
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
2325 // If true then no variables can be added. |
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
2326 bool static_workspace; |
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
2327 |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
2328 // 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
|
2329 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
|
2330 |
7336 | 2331 // Map from names of persistent variables to values. |
2332 std::map<std::string, octave_value> persistent_table; | |
2333 | |
2334 // Pointer to symbol table for current scope (variables only). | |
2335 static symbol_table *instance; | |
3011 | 2336 |
7336 | 2337 // Map from scope id to symbol table instances. |
2338 static std::map<scope_id, symbol_table*> all_instances; | |
2339 | |
2340 // Map from function names to function info (subfunctions, private | |
2341 // functions, class constructors, class methods, etc.) | |
2342 static std::map<std::string, fcn_info> fcn_table; | |
2343 | |
7972
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7901
diff
changeset
|
2344 // 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
|
2345 // precedence. |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7901
diff
changeset
|
2346 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
|
2347 |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2348 typedef std::map<std::string, std::set<std::string> >::const_iterator |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2349 class_precedence_table_const_iterator; |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2350 typedef std::map<std::string, std::set<std::string> >::iterator |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2351 class_precedence_table_iterator; |
7972
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7901
diff
changeset
|
2352 |
9581
3d0d2bda3a0f
fix previous change, avoid duplicate loads of methods in descendant classes
Jaroslav Hajek <highegg@gmail.com>
parents:
9509
diff
changeset
|
2353 // 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
|
2354 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
|
2355 |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2356 typedef std::map<std::string, std::list<std::string> >::const_iterator |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2357 const_parent_map_iterator; |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2358 typedef std::map<std::string, std::list<std::string> >::iterator |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2359 parent_map_iterator; |
9581
3d0d2bda3a0f
fix previous change, avoid duplicate loads of methods in descendant classes
Jaroslav Hajek <highegg@gmail.com>
parents:
9509
diff
changeset
|
2360 |
7336 | 2361 static const scope_id xglobal_scope; |
2362 static const scope_id xtop_scope; | |
2363 | |
2364 static scope_id xcurrent_scope; | |
2365 | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
2366 static context_id xcurrent_context; |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
2367 |
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2368 static const context_id xdefault_context = static_cast<context_id> (-1); |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2369 |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2370 symbol_table (scope_id scope) |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2371 : my_scope (scope), table_name (), table (), nest_children (), |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2372 nest_parent (0), curr_fcn (0), static_workspace (false), |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2373 persistent_table () { } |
7336 | 2374 |
2375 ~symbol_table (void) { } | |
3011 | 2376 |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2377 static symbol_table *get_instance (scope_id scope, bool create = true) |
7336 | 2378 { |
2379 symbol_table *retval = 0; | |
2380 | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2381 bool ok = true; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2382 |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
2383 if (scope != xglobal_scope) |
7336 | 2384 { |
10313 | 2385 if (scope == xcurrent_scope) |
2386 { | |
2387 if (! instance && create) | |
2388 { | |
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2389 symbol_table *inst = new symbol_table (scope); |
10313 | 2390 |
2391 if (inst) | |
2392 { | |
2393 all_instances[scope] = instance = inst; | |
2394 | |
2395 if (scope == xtop_scope) | |
2396 instance->do_cache_name ("top-level"); | |
2397 } | |
2398 } | |
2399 | |
2400 if (! instance) | |
2401 ok = false; | |
2402 | |
2403 retval = instance; | |
2404 } | |
2405 else | |
2406 { | |
2407 all_instances_iterator p = all_instances.find (scope); | |
2408 | |
2409 if (p == all_instances.end ()) | |
2410 { | |
2411 if (create) | |
2412 { | |
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2413 retval = new symbol_table (scope); |
10313 | 2414 |
2415 if (retval) | |
2416 all_instances[scope] = retval; | |
2417 else | |
2418 ok = false; | |
2419 } | |
2420 else | |
2421 ok = false; | |
2422 } | |
2423 else | |
2424 retval = p->second; | |
2425 } | |
7336 | 2426 } |
2427 | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2428 if (! ok) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2429 error ("unable to %s symbol_table object for scope %d!", |
10313 | 2430 create ? "create" : "find", scope); |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2431 |
7336 | 2432 return retval; |
2433 } | |
2434 | |
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2435 void add_nest_child (symbol_table& st) |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2436 { |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2437 assert (!st.nest_parent); |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2438 nest_children.push_back (&st); |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2439 st.nest_parent = this; |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2440 } |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2441 |
7336 | 2442 void insert_symbol_record (const symbol_record& sr) |
2443 { | |
2444 table[sr.name ()] = sr; | |
2445 } | |
4238 | 2446 |
4913 | 2447 void |
7336 | 2448 do_dup_scope (symbol_table& new_symbol_table) const |
2449 { | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2450 for (table_const_iterator p = table.begin (); p != table.end (); p++) |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2451 new_symbol_table.insert_symbol_record (p->second.dup (new_symbol_table |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2452 .my_scope)); |
7336 | 2453 } |
2454 | |
2455 symbol_record do_find_symbol (const std::string& name) | |
2456 { | |
2457 table_iterator p = table.find (name); | |
2458 | |
2459 if (p == table.end ()) | |
2460 return do_insert (name); | |
2461 else | |
2462 return p->second; | |
2463 } | |
2464 | |
8906
ab87d08d9a1b
improve symbol inheritance for anonymous functions
John W. Eaton <jwe@octave.org>
parents:
8884
diff
changeset
|
2465 void do_inherit (symbol_table& donor_table, context_id donor_context) |
7336 | 2466 { |
8906
ab87d08d9a1b
improve symbol inheritance for anonymous functions
John W. Eaton <jwe@octave.org>
parents:
8884
diff
changeset
|
2467 for (table_iterator p = table.begin (); p != table.end (); p++) |
7336 | 2468 { |
10313 | 2469 symbol_record& sr = p->second; |
2470 | |
2471 if (! (sr.is_automatic () || sr.is_formal ())) | |
2472 { | |
2473 std::string nm = sr.name (); | |
2474 | |
2475 if (nm != "__retval__") | |
2476 { | |
2477 octave_value val = donor_table.do_varval (nm, donor_context); | |
2478 | |
2479 if (val.is_defined ()) | |
2480 { | |
16442
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2481 sr.assign (val, 0); |
10313 | 2482 |
2483 sr.mark_inherited (); | |
2484 } | |
2485 } | |
2486 } | |
7336 | 2487 } |
2488 } | |
2489 | |
9413
5cd879a0d8c4
speed-up function call by caching its name lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
9409
diff
changeset
|
2490 static fcn_info *get_fcn_info (const std::string& name) |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2491 { |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2492 fcn_table_iterator p = fcn_table.find (name); |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2493 return p != fcn_table.end () ? &p->second : 0; |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2494 } |
9413
5cd879a0d8c4
speed-up function call by caching its name lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
9409
diff
changeset
|
2495 |
7336 | 2496 octave_value |
9445
c5f03874ea2a
simplify symbol_table::find and associated functions
Jaroslav Hajek <highegg@gmail.com>
parents:
9444
diff
changeset
|
2497 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
|
2498 bool skip_variables, bool local_funcs); |
7336 | 2499 |
9444
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
2500 octave_value do_builtin_find (const std::string& name); |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
2501 |
15236
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
2502 symbol_record& do_insert (const std::string& name, bool force_add = false) |
7336 | 2503 { |
2504 table_iterator p = table.find (name); | |
2505 | |
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2506 if (p == table.end ()) |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2507 { |
15236
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
2508 symbol_record ret (my_scope, name); |
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
2509 |
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
2510 if (nest_parent && nest_parent->look_nonlocal (name, ret)) |
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
2511 return table[name] = ret; |
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2512 else |
15236
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
2513 { |
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
2514 if (static_workspace && ! force_add) |
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
2515 ret.mark_added_static (); |
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
2516 |
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
2517 return table[name] = ret; |
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
2518 } |
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2519 } |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2520 else |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2521 return p->second; |
7336 | 2522 } |
2523 | |
16502
45ae1038ee89
allow renaming of variables in workspace viewer
John W. Eaton <jwe@octave.org>
parents:
16468
diff
changeset
|
2524 void do_rename (const std::string& old_name, const std::string& new_name) |
45ae1038ee89
allow renaming of variables in workspace viewer
John W. Eaton <jwe@octave.org>
parents:
16468
diff
changeset
|
2525 { |
45ae1038ee89
allow renaming of variables in workspace viewer
John W. Eaton <jwe@octave.org>
parents:
16468
diff
changeset
|
2526 table_iterator p = table.find (old_name); |
45ae1038ee89
allow renaming of variables in workspace viewer
John W. Eaton <jwe@octave.org>
parents:
16468
diff
changeset
|
2527 |
45ae1038ee89
allow renaming of variables in workspace viewer
John W. Eaton <jwe@octave.org>
parents:
16468
diff
changeset
|
2528 if (p != table.end ()) |
45ae1038ee89
allow renaming of variables in workspace viewer
John W. Eaton <jwe@octave.org>
parents:
16468
diff
changeset
|
2529 { |
45ae1038ee89
allow renaming of variables in workspace viewer
John W. Eaton <jwe@octave.org>
parents:
16468
diff
changeset
|
2530 symbol_record sr = p->second; |
45ae1038ee89
allow renaming of variables in workspace viewer
John W. Eaton <jwe@octave.org>
parents:
16468
diff
changeset
|
2531 |
45ae1038ee89
allow renaming of variables in workspace viewer
John W. Eaton <jwe@octave.org>
parents:
16468
diff
changeset
|
2532 sr.rename (new_name); |
45ae1038ee89
allow renaming of variables in workspace viewer
John W. Eaton <jwe@octave.org>
parents:
16468
diff
changeset
|
2533 |
45ae1038ee89
allow renaming of variables in workspace viewer
John W. Eaton <jwe@octave.org>
parents:
16468
diff
changeset
|
2534 table.erase (p); |
45ae1038ee89
allow renaming of variables in workspace viewer
John W. Eaton <jwe@octave.org>
parents:
16468
diff
changeset
|
2535 |
45ae1038ee89
allow renaming of variables in workspace viewer
John W. Eaton <jwe@octave.org>
parents:
16468
diff
changeset
|
2536 table[new_name] = sr; |
45ae1038ee89
allow renaming of variables in workspace viewer
John W. Eaton <jwe@octave.org>
parents:
16468
diff
changeset
|
2537 } |
45ae1038ee89
allow renaming of variables in workspace viewer
John W. Eaton <jwe@octave.org>
parents:
16468
diff
changeset
|
2538 } |
45ae1038ee89
allow renaming of variables in workspace viewer
John W. Eaton <jwe@octave.org>
parents:
16468
diff
changeset
|
2539 |
16442
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2540 void do_assign (const std::string& name, const octave_value& value, |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2541 context_id context, bool force_add) |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2542 { |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2543 table_iterator p = table.find (name); |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2544 |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2545 if (p == table.end ()) |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2546 { |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2547 symbol_record& sr = do_insert (name, force_add); |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2548 |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2549 sr.assign (value, context); |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2550 } |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2551 else |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2552 p->second.assign (value, context); |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2553 } |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2554 |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2555 // Use do_assign (name, value, context, force_add) instead. |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2556 // Delete when deprecated varref functions are removed. |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2557 octave_value& do_varref (const std::string& name, context_id context, |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2558 bool force_add) |
7336 | 2559 { |
2560 table_iterator p = table.find (name); | |
2561 | |
2562 if (p == table.end ()) | |
2563 { | |
15236
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
2564 symbol_record& sr = do_insert (name, force_add); |
10313 | 2565 |
2566 return sr.varref (context); | |
7336 | 2567 } |
2568 else | |
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
2569 return p->second.varref (context); |
7336 | 2570 } |
4913 | 2571 |
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
2572 octave_value do_varval (const std::string& name, context_id context) const |
7336 | 2573 { |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2574 table_const_iterator p = table.find (name); |
7336 | 2575 |
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
2576 return (p != table.end ()) ? p->second.varval (context) : octave_value (); |
7336 | 2577 } |
2578 | |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2579 void do_persistent_assign (const std::string& name, const octave_value& value) |
16442
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2580 { |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2581 persistent_table_iterator p = persistent_table.find (name); |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2582 |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2583 if (p == persistent_table.end ()) |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2584 persistent_table[name] = value; |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2585 else |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2586 p->second = value; |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2587 } |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2588 |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2589 // Use do_persistent_assign (name, value) instead. |
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2590 // Delete when deprecated varref functions are removed. |
7336 | 2591 octave_value& do_persistent_varref (const std::string& name) |
2592 { | |
2593 persistent_table_iterator p = persistent_table.find (name); | |
2594 | |
2595 return (p == persistent_table.end ()) | |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2596 ? persistent_table[name] : p->second; |
7336 | 2597 } |
2598 | |
2599 octave_value do_persistent_varval (const std::string& name) | |
2600 { | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2601 persistent_table_const_iterator p = persistent_table.find (name); |
7336 | 2602 |
2603 return (p != persistent_table.end ()) ? p->second : octave_value (); | |
2604 } | |
2605 | |
2606 void do_erase_persistent (const std::string& name) | |
2607 { | |
2608 persistent_table_iterator p = persistent_table.find (name); | |
2609 | |
2610 if (p != persistent_table.end ()) | |
2611 persistent_table.erase (p); | |
2612 } | |
2613 | |
2614 bool do_is_variable (const std::string& name) const | |
2615 { | |
2616 bool retval = false; | |
2617 | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2618 table_const_iterator p = table.find (name); |
7336 | 2619 |
2620 if (p != table.end ()) | |
2621 { | |
10313 | 2622 const symbol_record& sr = p->second; |
2623 | |
2624 retval = sr.is_variable (); | |
7336 | 2625 } |
2626 | |
2627 return retval; | |
2628 } | |
2629 | |
2630 void do_push_context (void) | |
2631 { | |
2632 for (table_iterator p = table.begin (); p != table.end (); p++) | |
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2633 p->second.push_context (my_scope); |
7336 | 2634 } |
2635 | |
2636 void do_pop_context (void) | |
2637 { | |
16605
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
2638 table_iterator p = table.begin (); |
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
2639 |
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
2640 while (p != table.end ()) |
7374 | 2641 { |
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2642 if (p->second.pop_context (my_scope) == 0) |
16605
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
2643 table.erase (p++); |
10313 | 2644 else |
2645 p++; | |
7374 | 2646 } |
7336 | 2647 } |
2648 | |
2649 void do_clear_variables (void) | |
2650 { | |
2651 for (table_iterator p = table.begin (); p != table.end (); p++) | |
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2652 p->second.clear (my_scope); |
7336 | 2653 } |
2654 | |
9240
f27a8c07f0b2
clear -classes and support.
Robert T. Short <octave@phaselockedsystems.com>
parents:
9144
diff
changeset
|
2655 void do_clear_objects (void) |
f27a8c07f0b2
clear -classes and support.
Robert T. Short <octave@phaselockedsystems.com>
parents:
9144
diff
changeset
|
2656 { |
f27a8c07f0b2
clear -classes and support.
Robert T. Short <octave@phaselockedsystems.com>
parents:
9144
diff
changeset
|
2657 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
|
2658 { |
10313 | 2659 symbol_record& sr = p->second; |
16442
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2660 octave_value val = sr.varval (); |
14846
460a3c6d8bf1
maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists.
Rik <octave@nomad.inbox5.com>
parents:
14544
diff
changeset
|
2661 if (val.is_object ()) |
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2662 p->second.clear (my_scope); |
9240
f27a8c07f0b2
clear -classes and support.
Robert T. Short <octave@phaselockedsystems.com>
parents:
9144
diff
changeset
|
2663 } |
f27a8c07f0b2
clear -classes and support.
Robert T. Short <octave@phaselockedsystems.com>
parents:
9144
diff
changeset
|
2664 } |
f27a8c07f0b2
clear -classes and support.
Robert T. Short <octave@phaselockedsystems.com>
parents:
9144
diff
changeset
|
2665 |
7336 | 2666 void do_clear_global (const std::string& name) |
2667 { | |
2668 table_iterator p = table.find (name); | |
4913 | 2669 |
7336 | 2670 if (p != table.end ()) |
2671 { | |
10313 | 2672 symbol_record& sr = p->second; |
2673 | |
2674 if (sr.is_global ()) | |
9315
73e36b147e45
properly clear global variables
Jaroslav Hajek <highegg@gmail.com>
parents:
9260
diff
changeset
|
2675 sr.unmark_global (); |
7336 | 2676 } |
9315
73e36b147e45
properly clear global variables
Jaroslav Hajek <highegg@gmail.com>
parents:
9260
diff
changeset
|
2677 |
73e36b147e45
properly clear global variables
Jaroslav Hajek <highegg@gmail.com>
parents:
9260
diff
changeset
|
2678 global_table_iterator q = global_table.find (name); |
73e36b147e45
properly clear global variables
Jaroslav Hajek <highegg@gmail.com>
parents:
9260
diff
changeset
|
2679 |
73e36b147e45
properly clear global variables
Jaroslav Hajek <highegg@gmail.com>
parents:
9260
diff
changeset
|
2680 if (q != global_table.end ()) |
73e36b147e45
properly clear global variables
Jaroslav Hajek <highegg@gmail.com>
parents:
9260
diff
changeset
|
2681 global_table.erase (q); |
73e36b147e45
properly clear global variables
Jaroslav Hajek <highegg@gmail.com>
parents:
9260
diff
changeset
|
2682 |
7336 | 2683 } |
2684 | |
2685 void do_clear_variable (const std::string& name) | |
2686 { | |
2687 table_iterator p = table.find (name); | |
2688 | |
2689 if (p != table.end ()) | |
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2690 p->second.clear (my_scope); |
7336 | 2691 } |
2692 | |
2693 void do_clear_global_pattern (const std::string& pat) | |
2694 { | |
2695 glob_match pattern (pat); | |
2696 | |
2697 for (table_iterator p = table.begin (); p != table.end (); p++) | |
2698 { | |
10313 | 2699 symbol_record& sr = p->second; |
2700 | |
2701 if (sr.is_global () && pattern.match (sr.name ())) | |
9315
73e36b147e45
properly clear global variables
Jaroslav Hajek <highegg@gmail.com>
parents:
9260
diff
changeset
|
2702 sr.unmark_global (); |
7336 | 2703 } |
9315
73e36b147e45
properly clear global variables
Jaroslav Hajek <highegg@gmail.com>
parents:
9260
diff
changeset
|
2704 |
16605
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
2705 global_table_iterator q = global_table.begin (); |
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
2706 |
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
2707 while (q != global_table.end ()) |
9315
73e36b147e45
properly clear global variables
Jaroslav Hajek <highegg@gmail.com>
parents:
9260
diff
changeset
|
2708 { |
10313 | 2709 if (pattern.match (q->first)) |
16605
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
2710 global_table.erase (q++); |
11548
50a7935f2512
Don't invalidate iterators when calling std::map::erase, found by cppcheck
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11523
diff
changeset
|
2711 else |
50a7935f2512
Don't invalidate iterators when calling std::map::erase, found by cppcheck
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11523
diff
changeset
|
2712 q++; |
9315
73e36b147e45
properly clear global variables
Jaroslav Hajek <highegg@gmail.com>
parents:
9260
diff
changeset
|
2713 } |
73e36b147e45
properly clear global variables
Jaroslav Hajek <highegg@gmail.com>
parents:
9260
diff
changeset
|
2714 |
73e36b147e45
properly clear global variables
Jaroslav Hajek <highegg@gmail.com>
parents:
9260
diff
changeset
|
2715 |
7336 | 2716 } |
2717 | |
2718 void do_clear_variable_pattern (const std::string& pat) | |
2719 { | |
2720 glob_match pattern (pat); | |
2721 | |
2722 for (table_iterator p = table.begin (); p != table.end (); p++) | |
2723 { | |
10313 | 2724 symbol_record& sr = p->second; |
2725 | |
2726 if (sr.is_defined () || sr.is_global ()) | |
2727 { | |
2728 if (pattern.match (sr.name ())) | |
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2729 sr.clear (my_scope); |
10313 | 2730 } |
7336 | 2731 } |
2732 } | |
2733 | |
7779
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2734 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
|
2735 { |
14024
fc9f204faea0
refactor regexp (bug #34440)
John W. Eaton <jwe@octave.org>
parents:
13985
diff
changeset
|
2736 ::regexp pattern (pat); |
7779
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2737 |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2738 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
|
2739 { |
10313 | 2740 symbol_record& sr = p->second; |
2741 | |
2742 if (sr.is_defined () || sr.is_global ()) | |
2743 { | |
14024
fc9f204faea0
refactor regexp (bug #34440)
John W. Eaton <jwe@octave.org>
parents:
13985
diff
changeset
|
2744 if (pattern.is_match (sr.name ())) |
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2745 sr.clear (my_scope); |
10313 | 2746 } |
7779
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2747 } |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2748 } |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2749 |
11557
e9d72a3caa46
mark automatic variables as automatic
John W. Eaton <jwe@octave.org>
parents:
11548
diff
changeset
|
2750 void do_mark_automatic (const std::string& name) |
e9d72a3caa46
mark automatic variables as automatic
John W. Eaton <jwe@octave.org>
parents:
11548
diff
changeset
|
2751 { |
e9d72a3caa46
mark automatic variables as automatic
John W. Eaton <jwe@octave.org>
parents:
11548
diff
changeset
|
2752 do_insert (name).mark_automatic (); |
e9d72a3caa46
mark automatic variables as automatic
John W. Eaton <jwe@octave.org>
parents:
11548
diff
changeset
|
2753 } |
e9d72a3caa46
mark automatic variables as automatic
John W. Eaton <jwe@octave.org>
parents:
11548
diff
changeset
|
2754 |
7336 | 2755 void do_mark_hidden (const std::string& name) |
2756 { | |
10633
d022061c288d
symbol_table minor improvements
Jaroslav Hajek <highegg@gmail.com>
parents:
10559
diff
changeset
|
2757 do_insert (name).mark_hidden (); |
7336 | 2758 } |
2759 | |
2760 void do_mark_global (const std::string& name) | |
2761 { | |
10633
d022061c288d
symbol_table minor improvements
Jaroslav Hajek <highegg@gmail.com>
parents:
10559
diff
changeset
|
2762 do_insert (name).mark_global (); |
7336 | 2763 } |
2764 | |
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
2765 std::list<symbol_record> |
15572
859c8bf6d134
Fix saved struct with function handle fails to load (bug #33857)
Max Brister <max@2bass.com>
parents:
15467
diff
changeset
|
2766 do_all_variables (context_id context, bool defined_only, |
859c8bf6d134
Fix saved struct with function handle fails to load (bug #33857)
Max Brister <max@2bass.com>
parents:
15467
diff
changeset
|
2767 unsigned int exclude) const |
7336 | 2768 { |
2769 std::list<symbol_record> retval; | |
2770 | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2771 for (table_const_iterator p = table.begin (); p != table.end (); p++) |
7336 | 2772 { |
10313 | 2773 const symbol_record& sr = p->second; |
2774 | |
15572
859c8bf6d134
Fix saved struct with function handle fails to load (bug #33857)
Max Brister <max@2bass.com>
parents:
15467
diff
changeset
|
2775 if ((defined_only && ! sr.is_defined (context)) |
859c8bf6d134
Fix saved struct with function handle fails to load (bug #33857)
Max Brister <max@2bass.com>
parents:
15467
diff
changeset
|
2776 || (sr.xstorage_class () & exclude)) |
10313 | 2777 continue; |
2778 | |
2779 retval.push_back (sr); | |
7336 | 2780 } |
2781 | |
2782 return retval; | |
2783 } | |
2784 | |
2785 std::list<symbol_record> do_glob (const std::string& pattern, | |
10313 | 2786 bool vars_only = false) const |
7336 | 2787 { |
2788 std::list<symbol_record> retval; | |
2789 | |
2790 glob_match pat (pattern); | |
2791 | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2792 for (table_const_iterator p = table.begin (); p != table.end (); p++) |
7336 | 2793 { |
10313 | 2794 if (pat.match (p->first)) |
2795 { | |
2796 const symbol_record& sr = p->second; | |
2797 | |
2798 if (vars_only && ! sr.is_variable ()) | |
2799 continue; | |
2800 | |
2801 retval.push_back (sr); | |
2802 } | |
7336 | 2803 } |
2804 | |
2805 return retval; | |
2806 } | |
2807 | |
7779
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2808 std::list<symbol_record> do_regexp (const std::string& pattern, |
10313 | 2809 bool vars_only = false) const |
7779
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2810 { |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2811 std::list<symbol_record> retval; |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2812 |
14024
fc9f204faea0
refactor regexp (bug #34440)
John W. Eaton <jwe@octave.org>
parents:
13985
diff
changeset
|
2813 ::regexp pat (pattern); |
7779
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2814 |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2815 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
|
2816 { |
14024
fc9f204faea0
refactor regexp (bug #34440)
John W. Eaton <jwe@octave.org>
parents:
13985
diff
changeset
|
2817 if (pat.is_match (p->first)) |
10313 | 2818 { |
2819 const symbol_record& sr = p->second; | |
2820 | |
2821 if (vars_only && ! sr.is_variable ()) | |
2822 continue; | |
2823 | |
2824 retval.push_back (sr); | |
2825 } | |
7779
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2826 } |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2827 |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2828 return retval; |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2829 } |
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2830 |
7336 | 2831 std::list<std::string> do_variable_names (void) |
2832 { | |
2833 std::list<std::string> retval; | |
2834 | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2835 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
|
2836 { |
10313 | 2837 if (p->second.is_variable ()) |
2838 retval.push_back (p->first); | |
9260
9c2349a51218
properly unmark forced variables
John W. Eaton <jwe@octave.org>
parents:
9240
diff
changeset
|
2839 } |
7336 | 2840 |
2841 retval.sort (); | |
2842 | |
2843 return retval; | |
2844 } | |
2845 | |
2846 bool do_is_local_variable (const std::string& name) const | |
2847 { | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2848 table_const_iterator p = table.find (name); |
7336 | 2849 |
2850 return (p != table.end () | |
10313 | 2851 && ! p->second.is_global () |
2852 && p->second.is_defined ()); | |
7336 | 2853 } |
2854 | |
2855 bool do_is_global (const std::string& name) const | |
2856 { | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2857 table_const_iterator p = table.find (name); |
7336 | 2858 |
2859 return p != table.end () && p->second.is_global (); | |
2860 } | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2861 |
16468
0f143f68078d
use signal/slot for updating workspace instead of using event listener
John W. Eaton <jwe@octave.org>
parents:
16442
diff
changeset
|
2862 std::list<workspace_element> do_workspace_info (void) const; |
0f143f68078d
use signal/slot for updating workspace instead of using event listener
John W. Eaton <jwe@octave.org>
parents:
16442
diff
changeset
|
2863 |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2864 void do_dump (std::ostream& os); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2865 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2866 void do_cache_name (const std::string& name) { table_name = name; } |
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2867 |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2868 void do_update_nest (void); |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2869 |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2870 bool look_nonlocal (const std::string& name, symbol_record& result) |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2871 { |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2872 table_iterator p = table.find (name); |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2873 if (p == table.end ()) |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2874 { |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2875 if (nest_parent) |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2876 return nest_parent->look_nonlocal (name, result); |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2877 } |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2878 else if (! p->second.is_automatic ()) |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2879 { |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2880 result = p->second; |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2881 return true; |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2882 } |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2883 |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2884 return false; |
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2885 } |
3011 | 2886 }; |
2790 | 2887 |
9450
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9446
diff
changeset
|
2888 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
|
2889 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
|
2890 bool check_relative = true); |
9450
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9446
diff
changeset
|
2891 |
10087
090173f2db40
improve overload dispatching of built-in classes
Jaroslav Hajek <highegg@gmail.com>
parents:
10071
diff
changeset
|
2892 extern OCTINTERP_API std::string |
090173f2db40
improve overload dispatching of built-in classes
Jaroslav Hajek <highegg@gmail.com>
parents:
10071
diff
changeset
|
2893 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
|
2894 extern OCTINTERP_API std::string |
10321
97b4bd6f0925
partially rewrite function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
10313
diff
changeset
|
2895 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
|
2896 |
8 | 2897 #endif |