Mercurial > hg > octave-lyh
annotate libinterp/corefcn/symtab.h @ 16940:99122191d3dd
maint: Rename regexp.h to lo-regexp.h, regexp.cc to lo-regexp.cc in liboctave.
Remove namespace hit with regexp.cc in libinterp/corefcn.
* liboctave/util/lo-regexp.cc: Renamed from regexp.cc.
* liboctave/util/lo-regexp.h: Renamed from regexp.h.
* liboctave/util/module.mk: Add files to build system.
* libinterp/corefcn/regexp.cc, libinterp/corefcn/symtab.h,
libinterp/corefcn/variables.cc: Update #include stmts to new name.
| author | Rik <rik@octave.org> |
|---|---|
| date | Tue, 09 Jul 2013 16:47:57 -0700 |
| parents | 68fc671a9339 |
| children |
| rev | line source |
|---|---|
| 8 | 1 /* |
| 2 | |
|
14138
72c96de7a403
maint: update copyright notices for 2012
John W. Eaton <jwe@octave.org>
parents:
14024
diff
changeset
|
3 Copyright (C) 1993-2012 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 ()) |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
265 ? symbol_table::global_table[name] : p->second; |
|
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 } |
| 431 // FIXME -- this causes trouble with recursive calls. | |
| 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 | |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
740 typedef std::map<scope_id, octave_value>::const_iterator scope_val_const_iterator; |
| 7336 | 741 typedef std::map<scope_id, octave_value>::iterator scope_val_iterator; |
| 4238 | 742 |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
743 typedef std::map<std::string, octave_value>::const_iterator str_val_const_iterator; |
| 7336 | 744 typedef std::map<std::string, octave_value>::iterator str_val_iterator; |
| 745 | |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
746 typedef dispatch_map_type::const_iterator dispatch_map_const_iterator; |
| 7336 | 747 typedef dispatch_map_type::iterator dispatch_map_iterator; |
| 748 | |
| 749 private: | |
| 750 | |
| 751 class | |
| 752 fcn_info_rep | |
| 753 { | |
| 754 public: | |
| 755 | |
| 756 fcn_info_rep (const std::string& nm) | |
| 10313 | 757 : 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
|
758 class_constructors (), class_methods (), dispatch_map (), |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11584
diff
changeset
|
759 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
|
760 built_in_function (), count (1) { } |
| 7336 | 761 |
| 762 octave_value load_private_function (const std::string& dir_name); | |
| 763 | |
| 764 octave_value load_class_constructor (void); | |
| 765 | |
| 766 octave_value load_class_method (const std::string& dispatch_type); | |
| 767 | |
|
9463
d34baf412786
support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
768 octave_value find (const octave_value_list& args, bool local_funcs); |
| 7336 | 769 |
|
9444
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
770 octave_value builtin_find (void); |
|
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
771 |
| 7336 | 772 octave_value find_method (const std::string& dispatch_type); |
| 773 | |
| 774 octave_value find_autoload (void); | |
| 775 | |
| 776 octave_value find_user_function (void); | |
| 777 | |
| 778 bool is_user_function_defined (void) const | |
| 779 { | |
| 10313 | 780 return function_on_path.is_defined (); |
| 7336 | 781 } |
| 782 | |
|
9463
d34baf412786
support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
783 octave_value find_function (const octave_value_list& args, bool local_funcs) |
| 7336 | 784 { |
| 10313 | 785 return find (args, local_funcs); |
| 7336 | 786 } |
| 787 | |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
788 void lock_subfunction (scope_id scope) |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
789 { |
| 10313 | 790 scope_val_iterator p = subfunctions.find (scope); |
| 791 | |
| 792 if (p != subfunctions.end ()) | |
| 793 p->second.lock (); | |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
794 } |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
795 |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
796 void unlock_subfunction (scope_id scope) |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
797 { |
| 10313 | 798 scope_val_iterator p = subfunctions.find (scope); |
| 799 | |
| 800 if (p != subfunctions.end ()) | |
| 801 p->second.unlock (); | |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
802 } |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
803 |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
804 std::pair<std::string, octave_value> |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
805 subfunction_defined_in_scope (scope_id scope) const |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
806 { |
| 10313 | 807 scope_val_const_iterator p = subfunctions.find (scope); |
| 808 | |
| 809 return p == subfunctions.end () | |
| 810 ? std::pair<std::string, octave_value> () | |
| 811 : 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
|
812 } |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
813 |
|
7876
8447a5024650
clear subfunctions when clearing parent function
John W. Eaton <jwe@octave.org>
parents:
7779
diff
changeset
|
814 void erase_subfunction (scope_id scope) |
|
8447a5024650
clear subfunctions when clearing parent function
John W. Eaton <jwe@octave.org>
parents:
7779
diff
changeset
|
815 { |
| 10313 | 816 scope_val_iterator p = subfunctions.find (scope); |
| 817 | |
| 818 if (p != subfunctions.end ()) | |
| 819 subfunctions.erase (p); | |
|
7876
8447a5024650
clear subfunctions when clearing parent function
John W. Eaton <jwe@octave.org>
parents:
7779
diff
changeset
|
820 } |
|
8447a5024650
clear subfunctions when clearing parent function
John W. Eaton <jwe@octave.org>
parents:
7779
diff
changeset
|
821 |
|
11445
40f311a69417
fix OO field access in subfunctions of private functions
John W. Eaton <jwe@octave.org>
parents:
11238
diff
changeset
|
822 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
|
823 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
|
824 |
| 7336 | 825 void install_cmdline_function (const octave_value& f) |
| 826 { | |
| 10313 | 827 cmdline_function = f; |
| 7336 | 828 } |
| 829 | |
| 830 void install_subfunction (const octave_value& f, scope_id scope) | |
| 831 { | |
| 10313 | 832 subfunctions[scope] = f; |
| 7336 | 833 } |
| 834 | |
| 835 void install_user_function (const octave_value& f) | |
| 836 { | |
| 10313 | 837 function_on_path = f; |
| 7336 | 838 } |
| 839 | |
| 840 void install_built_in_function (const octave_value& f) | |
| 841 { | |
| 10313 | 842 built_in_function = f; |
| 7336 | 843 } |
| 844 | |
|
7489
8e4592e49fa7
don't clear locked functions
John W. Eaton <jwe@octave.org>
parents:
7374
diff
changeset
|
845 template <class T> |
|
8e4592e49fa7
don't clear locked functions
John W. Eaton <jwe@octave.org>
parents:
7374
diff
changeset
|
846 void |
|
16605
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
847 clear_map (std::map<T, octave_value>& map, bool force = false) |
| 7336 | 848 { |
| 10313 | 849 typename std::map<T, octave_value>::iterator p = map.begin (); |
| 850 | |
| 851 while (p != map.end ()) | |
| 852 { | |
|
16605
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
853 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
|
854 map.erase (p++); |
|
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
855 else |
| 10313 | 856 p++; |
| 857 } | |
|
7489
8e4592e49fa7
don't clear locked functions
John W. Eaton <jwe@octave.org>
parents:
7374
diff
changeset
|
858 } |
|
8e4592e49fa7
don't clear locked functions
John W. Eaton <jwe@octave.org>
parents:
7374
diff
changeset
|
859 |
|
16605
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
860 void clear_autoload_function (bool force = false) |
|
7489
8e4592e49fa7
don't clear locked functions
John W. Eaton <jwe@octave.org>
parents:
7374
diff
changeset
|
861 { |
|
16605
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
862 if (force || ! autoload_function.islocked ()) |
| 10313 | 863 autoload_function = octave_value (); |
| 7336 | 864 } |
| 865 | |
|
15003
1f5dbfc23fc2
'clear -f' does not work for command line functions (bug #34497)
Max Brister <max@2bass.com>
parents:
14981
diff
changeset
|
866 // 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
|
867 // "user defined" |
|
16605
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
868 void clear_user_function (bool force = false) |
| 7336 | 869 { |
|
16605
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
870 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
|
871 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
|
872 |
|
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
873 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
|
874 cmdline_function = octave_value (); |
| 7336 | 875 } |
| 876 | |
| 877 void clear_mex_function (void) | |
| 878 { | |
| 10313 | 879 if (function_on_path.is_mex_function ()) |
| 880 clear_user_function (); | |
|
7489
8e4592e49fa7
don't clear locked functions
John W. Eaton <jwe@octave.org>
parents:
7374
diff
changeset
|
881 } |
|
8e4592e49fa7
don't clear locked functions
John W. Eaton <jwe@octave.org>
parents:
7374
diff
changeset
|
882 |
|
16605
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
883 void clear (bool force = false) |
|
7489
8e4592e49fa7
don't clear locked functions
John W. Eaton <jwe@octave.org>
parents:
7374
diff
changeset
|
884 { |
|
16605
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
885 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
|
886 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
|
887 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
|
888 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
|
889 |
|
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
890 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
|
891 clear_user_function (force); |
| 7336 | 892 } |
| 893 | |
| 894 void add_dispatch (const std::string& type, const std::string& fname) | |
| 895 { | |
| 10313 | 896 dispatch_map[type] = fname; |
| 7336 | 897 } |
| 898 | |
| 899 void clear_dispatch (const std::string& type) | |
| 900 { | |
| 10313 | 901 dispatch_map_iterator p = dispatch_map.find (type); |
| 902 | |
| 903 if (p != dispatch_map.end ()) | |
| 904 dispatch_map.erase (p); | |
| 7336 | 905 } |
| 906 | |
| 907 void print_dispatch (std::ostream& os) const; | |
| 908 | |
| 909 std::string help_for_dispatch (void) const; | |
| 910 | |
| 911 dispatch_map_type get_dispatch (void) const { return dispatch_map; } | |
| 912 | |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
913 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
|
914 |
| 7336 | 915 std::string name; |
| 916 | |
| 917 // Scope id to function object. | |
| 918 std::map<scope_id, octave_value> subfunctions; | |
| 919 | |
| 920 // Directory name to function object. | |
| 921 std::map<std::string, octave_value> private_functions; | |
| 922 | |
| 923 // Class name to function object. | |
| 924 std::map<std::string, octave_value> class_constructors; | |
| 925 | |
| 926 // Dispatch type to function object. | |
| 927 std::map<std::string, octave_value> class_methods; | |
| 928 | |
| 929 // Legacy dispatch map (dispatch type name to function name). | |
| 930 dispatch_map_type dispatch_map; | |
| 931 | |
| 932 octave_value cmdline_function; | |
| 933 | |
| 934 octave_value autoload_function; | |
| 935 | |
| 936 octave_value function_on_path; | |
| 937 | |
| 938 octave_value built_in_function; | |
| 939 | |
|
13985
43cc49c7abd1
Use thread-safe atomic reference counting (GCC and MSVC).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
13983
diff
changeset
|
940 octave_refcount<size_t> count; |
| 7336 | 941 |
| 942 private: | |
| 943 | |
|
9463
d34baf412786
support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
944 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
|
945 |
|
9444
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
946 octave_value x_builtin_find (void); |
|
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
947 |
| 7336 | 948 // No copying! |
| 949 | |
| 950 fcn_info_rep (const fcn_info_rep&); | |
| 951 | |
| 952 fcn_info_rep& operator = (const fcn_info_rep&); | |
| 953 }; | |
| 954 | |
| 955 public: | |
| 956 | |
| 957 fcn_info (const std::string& nm = std::string ()) | |
| 958 : rep (new fcn_info_rep (nm)) { } | |
| 959 | |
|
8906
ab87d08d9a1b
improve symbol inheritance for anonymous functions
John W. Eaton <jwe@octave.org>
parents:
8884
diff
changeset
|
960 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
|
961 { |
| 7336 | 962 rep->count++; |
| 963 } | |
| 964 | |
|
8906
ab87d08d9a1b
improve symbol inheritance for anonymous functions
John W. Eaton <jwe@octave.org>
parents:
8884
diff
changeset
|
965 fcn_info& operator = (const fcn_info& fi) |
| 7336 | 966 { |
|
8906
ab87d08d9a1b
improve symbol inheritance for anonymous functions
John W. Eaton <jwe@octave.org>
parents:
8884
diff
changeset
|
967 if (this != &fi) |
| 10313 | 968 { |
| 969 if (--rep->count == 0) | |
| 970 delete rep; | |
| 971 | |
| 972 rep = fi.rep; | |
| 973 rep->count++; | |
| 974 } | |
| 7336 | 975 |
| 976 return *this; | |
| 977 } | |
| 978 | |
| 979 ~fcn_info (void) | |
| 980 { | |
| 981 if (--rep->count == 0) | |
| 10313 | 982 delete rep; |
| 7336 | 983 } |
| 984 | |
|
9463
d34baf412786
support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
985 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
|
986 bool local_funcs = true) |
|
d34baf412786
support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
987 { |
|
d34baf412786
support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
988 return rep->find (args, local_funcs); |
|
d34baf412786
support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
989 } |
| 7336 | 990 |
|
9444
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
991 octave_value builtin_find (void) |
|
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
992 { |
|
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
993 return rep->builtin_find (); |
|
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
994 } |
|
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
995 |
| 7336 | 996 octave_value find_method (const std::string& dispatch_type) const |
| 997 { | |
| 998 return rep->find_method (dispatch_type); | |
| 999 } | |
| 1000 | |
| 1001 octave_value find_built_in_function (void) const | |
| 1002 { | |
| 1003 return rep->built_in_function; | |
| 1004 } | |
| 1005 | |
|
12911
d6151d774283
make completion work for command-line functions
John W. Eaton <jwe@octave.org>
parents:
12130
diff
changeset
|
1006 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
|
1007 { |
|
d6151d774283
make completion work for command-line functions
John W. Eaton <jwe@octave.org>
parents:
12130
diff
changeset
|
1008 return rep->cmdline_function; |
|
d6151d774283
make completion work for command-line functions
John W. Eaton <jwe@octave.org>
parents:
12130
diff
changeset
|
1009 } |
|
d6151d774283
make completion work for command-line functions
John W. Eaton <jwe@octave.org>
parents:
12130
diff
changeset
|
1010 |
| 7336 | 1011 octave_value find_autoload (void) |
| 1012 { | |
| 1013 return rep->find_autoload (); | |
| 1014 } | |
| 1015 | |
| 1016 octave_value find_user_function (void) | |
| 1017 { | |
| 1018 return rep->find_user_function (); | |
| 1019 } | |
| 1020 | |
| 1021 bool is_user_function_defined (void) const | |
| 1022 { | |
| 1023 return rep->is_user_function_defined (); | |
| 1024 } | |
| 1025 | |
|
9463
d34baf412786
support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
1026 octave_value find_function (const octave_value_list& args = octave_value_list (), |
|
d34baf412786
support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
1027 bool local_funcs = true) |
| 7336 | 1028 { |
|
9463
d34baf412786
support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
1029 return rep->find_function (args, local_funcs); |
| 7336 | 1030 } |
| 1031 | |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1032 void lock_subfunction (scope_id scope) |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1033 { |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1034 rep->lock_subfunction (scope); |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1035 } |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1036 |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1037 void unlock_subfunction (scope_id scope) |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1038 { |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1039 rep->unlock_subfunction (scope); |
|
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 |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1042 std::pair<std::string, octave_value> |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1043 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
|
1044 { |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1045 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
|
1046 } |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1047 |
|
7876
8447a5024650
clear subfunctions when clearing parent function
John W. Eaton <jwe@octave.org>
parents:
7779
diff
changeset
|
1048 void erase_subfunction (scope_id scope) |
|
8447a5024650
clear subfunctions when clearing parent function
John W. Eaton <jwe@octave.org>
parents:
7779
diff
changeset
|
1049 { |
|
8447a5024650
clear subfunctions when clearing parent function
John W. Eaton <jwe@octave.org>
parents:
7779
diff
changeset
|
1050 rep->erase_subfunction (scope); |
|
8447a5024650
clear subfunctions when clearing parent function
John W. Eaton <jwe@octave.org>
parents:
7779
diff
changeset
|
1051 } |
|
8447a5024650
clear subfunctions when clearing parent function
John W. Eaton <jwe@octave.org>
parents:
7779
diff
changeset
|
1052 |
|
11445
40f311a69417
fix OO field access in subfunctions of private functions
John W. Eaton <jwe@octave.org>
parents:
11238
diff
changeset
|
1053 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
|
1054 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
|
1055 { |
|
40f311a69417
fix OO field access in subfunctions of private functions
John W. Eaton <jwe@octave.org>
parents:
11238
diff
changeset
|
1056 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
|
1057 } |
|
40f311a69417
fix OO field access in subfunctions of private functions
John W. Eaton <jwe@octave.org>
parents:
11238
diff
changeset
|
1058 |
| 7336 | 1059 void install_cmdline_function (const octave_value& f) |
| 1060 { | |
| 1061 rep->install_cmdline_function (f); | |
| 1062 } | |
| 1063 | |
| 1064 void install_subfunction (const octave_value& f, scope_id scope) | |
| 1065 { | |
| 1066 rep->install_subfunction (f, scope); | |
| 1067 } | |
| 1068 | |
| 1069 void install_user_function (const octave_value& f) | |
| 1070 { | |
| 1071 rep->install_user_function (f); | |
| 1072 } | |
| 1073 | |
| 1074 void install_built_in_function (const octave_value& f) | |
| 1075 { | |
| 1076 rep->install_built_in_function (f); | |
| 1077 } | |
| 1078 | |
|
16605
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
1079 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
|
1080 |
|
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
1081 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
|
1082 { |
|
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
1083 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
|
1084 } |
|
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
1085 |
|
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
1086 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
|
1087 { |
|
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
1088 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
|
1089 } |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11584
diff
changeset
|
1090 |
| 7336 | 1091 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
|
1092 |
| 7336 | 1093 void add_dispatch (const std::string& type, const std::string& fname) |
| 1094 { | |
| 1095 rep->add_dispatch (type, fname); | |
| 1096 } | |
| 1097 | |
| 1098 void clear_dispatch (const std::string& type) | |
| 1099 { | |
| 1100 rep->clear_dispatch (type); | |
| 1101 } | |
| 1102 | |
| 1103 void print_dispatch (std::ostream& os) const | |
| 1104 { | |
| 1105 rep->print_dispatch (os); | |
| 1106 } | |
| 1107 | |
| 1108 std::string help_for_dispatch (void) const { return rep->help_for_dispatch (); } | |
| 1109 | |
| 1110 dispatch_map_type get_dispatch (void) const | |
| 1111 { | |
| 1112 return rep->get_dispatch (); | |
| 4009 | 1113 } |
| 3011 | 1114 |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1115 void |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1116 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
|
1117 { |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1118 rep->dump (os, prefix); |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1119 } |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1120 |
| 7336 | 1121 private: |
| 1122 | |
| 1123 fcn_info_rep *rep; | |
| 1124 }; | |
| 1125 | |
| 1126 static scope_id global_scope (void) { return xglobal_scope; } | |
| 1127 static scope_id top_scope (void) { return xtop_scope; } | |
| 1128 | |
| 1129 static scope_id current_scope (void) { return xcurrent_scope; } | |
| 1130 | |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1131 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
|
1132 |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1133 static scope_id alloc_scope (void) { return scope_id_cache::alloc (); } |
| 7336 | 1134 |
| 1135 static void set_scope (scope_id scope) | |
| 1136 { | |
| 1137 if (scope == xglobal_scope) | |
| 1138 error ("can't set scope to global"); | |
| 1139 else if (scope != xcurrent_scope) | |
| 1140 { | |
| 10313 | 1141 all_instances_iterator p = all_instances.find (scope); |
| 1142 | |
| 1143 if (p == all_instances.end ()) | |
| 1144 { | |
|
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
1145 symbol_table *inst = new symbol_table (scope); |
| 10313 | 1146 |
| 1147 if (inst) | |
| 1148 all_instances[scope] = instance = inst; | |
| 1149 } | |
| 1150 else | |
| 1151 instance = p->second; | |
| 1152 | |
| 1153 xcurrent_scope = scope; | |
| 1154 xcurrent_context = 0; | |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1155 } |
|
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1156 } |
|
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1157 |
|
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1158 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
|
1159 { |
|
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1160 if (scope == xglobal_scope) |
|
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1161 error ("can't set scope to global"); |
|
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1162 else |
|
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1163 { |
| 10313 | 1164 if (scope != xcurrent_scope) |
| 1165 { | |
| 1166 all_instances_iterator p = all_instances.find (scope); | |
| 1167 | |
| 1168 if (p == all_instances.end ()) | |
| 1169 error ("scope not found!"); | |
| 1170 else | |
| 1171 { | |
| 1172 instance = p->second; | |
| 1173 | |
| 1174 xcurrent_scope = scope; | |
|
9355
5e4da3b3747e
fix context restoration in error state
Jaroslav Hajek <highegg@gmail.com>
parents:
9315
diff
changeset
|
1175 |
|
5e4da3b3747e
fix context restoration in error state
Jaroslav Hajek <highegg@gmail.com>
parents:
9315
diff
changeset
|
1176 xcurrent_context = context; |
| 10313 | 1177 } |
| 1178 } | |
|
9355
5e4da3b3747e
fix context restoration in error state
Jaroslav Hajek <highegg@gmail.com>
parents:
9315
diff
changeset
|
1179 else |
|
5e4da3b3747e
fix context restoration in error state
Jaroslav Hajek <highegg@gmail.com>
parents:
9315
diff
changeset
|
1180 xcurrent_context = context; |
| 7336 | 1181 } |
| 1182 } | |
| 1183 | |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1184 static void erase_scope (scope_id scope) |
| 7336 | 1185 { |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1186 assert (scope != xglobal_scope); |
|
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1187 |
|
16605
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
1188 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
|
1189 |
| 7336 | 1190 all_instances_iterator p = all_instances.find (scope); |
| 1191 | |
| 1192 if (p != all_instances.end ()) | |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1193 { |
| 10313 | 1194 delete p->second; |
| 1195 | |
| 1196 all_instances.erase (p); | |
| 1197 | |
| 1198 free_scope (scope); | |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1199 } |
| 7336 | 1200 } |
| 1201 | |
|
7876
8447a5024650
clear subfunctions when clearing parent function
John W. Eaton <jwe@octave.org>
parents:
7779
diff
changeset
|
1202 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
|
1203 { |
|
8447a5024650
clear subfunctions when clearing parent function
John W. Eaton <jwe@octave.org>
parents:
7779
diff
changeset
|
1204 for (fcn_table_iterator q = fcn_table.begin (); |
| 10313 | 1205 q != fcn_table.end (); q++) |
|
7876
8447a5024650
clear subfunctions when clearing parent function
John W. Eaton <jwe@octave.org>
parents:
7779
diff
changeset
|
1206 q->second.erase_subfunction (scope); |
|
8447a5024650
clear subfunctions when clearing parent function
John W. Eaton <jwe@octave.org>
parents:
7779
diff
changeset
|
1207 } |
|
8447a5024650
clear subfunctions when clearing parent function
John W. Eaton <jwe@octave.org>
parents:
7779
diff
changeset
|
1208 |
|
11445
40f311a69417
fix OO field access in subfunctions of private functions
John W. Eaton <jwe@octave.org>
parents:
11238
diff
changeset
|
1209 static void |
|
40f311a69417
fix OO field access in subfunctions of private functions
John W. Eaton <jwe@octave.org>
parents:
11238
diff
changeset
|
1210 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
|
1211 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
|
1212 { |
|
40f311a69417
fix OO field access in subfunctions of private functions
John W. Eaton <jwe@octave.org>
parents:
11238
diff
changeset
|
1213 for (fcn_table_iterator q = fcn_table.begin (); |
|
40f311a69417
fix OO field access in subfunctions of private functions
John W. Eaton <jwe@octave.org>
parents:
11238
diff
changeset
|
1214 q != fcn_table.end (); q++) |
|
40f311a69417
fix OO field access in subfunctions of private functions
John W. Eaton <jwe@octave.org>
parents:
11238
diff
changeset
|
1215 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
|
1216 } |
|
40f311a69417
fix OO field access in subfunctions of private functions
John W. Eaton <jwe@octave.org>
parents:
11238
diff
changeset
|
1217 |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1218 static scope_id dup_scope (scope_id scope) |
| 7336 | 1219 { |
| 1220 scope_id retval = -1; | |
| 1221 | |
| 1222 symbol_table *inst = get_instance (scope); | |
| 1223 | |
| 1224 if (inst) | |
| 1225 { | |
| 10313 | 1226 scope_id new_scope = alloc_scope (); |
| 1227 | |
|
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
1228 symbol_table *new_symbol_table = new symbol_table (scope); |
| 10313 | 1229 |
| 1230 if (new_symbol_table) | |
| 1231 { | |
| 1232 all_instances[new_scope] = new_symbol_table; | |
| 1233 | |
| 1234 inst->do_dup_scope (*new_symbol_table); | |
| 1235 | |
| 1236 retval = new_scope; | |
| 1237 } | |
| 7336 | 1238 } |
| 1239 | |
| 1240 return retval; | |
| 1241 } | |
| 1242 | |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1243 static std::list<scope_id> scopes (void) |
| 7336 | 1244 { |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1245 return scope_id_cache::scopes (); |
| 7336 | 1246 } |
| 1247 | |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1248 static symbol_record |
|
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1249 find_symbol (const std::string& name, scope_id scope = xcurrent_scope) |
| 7336 | 1250 { |
| 1251 symbol_table *inst = get_instance (scope); | |
| 1252 | |
|
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
1253 return inst ? inst->do_find_symbol (name) : |
|
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
1254 symbol_record (scope); |
| 7336 | 1255 } |
| 4009 | 1256 |
|
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
1257 static void |
|
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
1258 inherit (scope_id scope, scope_id donor_scope, context_id donor_context) |
| 7336 | 1259 { |
| 1260 symbol_table *inst = get_instance (scope); | |
| 1261 | |
| 1262 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
|
1263 { |
| 10313 | 1264 symbol_table *donor_symbol_table = get_instance (donor_scope); |
| 1265 | |
| 1266 if (donor_symbol_table) | |
| 1267 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
|
1268 } |
| 7336 | 1269 } |
| 1270 | |
| 1271 static bool at_top_level (void) { return xcurrent_scope == xtop_scope; } | |
| 1272 | |
| 1273 // Find a value corresponding to the given name in the table. | |
| 1274 static octave_value | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11584
diff
changeset
|
1275 find (const std::string& name, |
|
9445
c5f03874ea2a
simplify symbol_table::find and associated functions
Jaroslav Hajek <highegg@gmail.com>
parents:
9444
diff
changeset
|
1276 const octave_value_list& args = octave_value_list (), |
| 10313 | 1277 bool skip_variables = false, |
|
9463
d34baf412786
support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
1278 bool local_funcs = true); |
| 7336 | 1279 |
|
9444
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
1280 static octave_value builtin_find (const std::string& name); |
|
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
1281 |
| 7336 | 1282 // 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
|
1283 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
|
1284 scope_id scope = xcurrent_scope) |
| 7336 | 1285 { |
| 1286 static symbol_record foobar; | |
| 1287 | |
|
16320
09f0cb9cac7d
don't modify symbol table scope in the parser
John W. Eaton <jwe@octave.org>
parents:
16277
diff
changeset
|
1288 symbol_table *inst = get_instance (scope); |
| 4009 | 1289 |
| 7336 | 1290 return inst ? inst->do_insert (name) : foobar; |
| 1291 } | |
| 1292 | |
|
16502
45ae1038ee89
allow renaming of variables in workspace viewer
John W. Eaton <jwe@octave.org>
parents:
16468
diff
changeset
|
1293 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
|
1294 const std::string& new_name, |
|
45ae1038ee89
allow renaming of variables in workspace viewer
John W. Eaton <jwe@octave.org>
parents:
16468
diff
changeset
|
1295 scope_id scope = xcurrent_scope) |
|
45ae1038ee89
allow renaming of variables in workspace viewer
John W. Eaton <jwe@octave.org>
parents:
16468
diff
changeset
|
1296 { |
|
45ae1038ee89
allow renaming of variables in workspace viewer
John W. Eaton <jwe@octave.org>
parents:
16468
diff
changeset
|
1297 symbol_table *inst = get_instance (scope); |
|
45ae1038ee89
allow renaming of variables in workspace viewer
John W. Eaton <jwe@octave.org>
parents:
16468
diff
changeset
|
1298 |
|
45ae1038ee89
allow renaming of variables in workspace viewer
John W. Eaton <jwe@octave.org>
parents:
16468
diff
changeset
|
1299 if (inst) |
|
45ae1038ee89
allow renaming of variables in workspace viewer
John W. Eaton <jwe@octave.org>
parents:
16468
diff
changeset
|
1300 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
|
1301 } |
|
45ae1038ee89
allow renaming of variables in workspace viewer
John W. Eaton <jwe@octave.org>
parents:
16468
diff
changeset
|
1302 |
|
16442
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1303 static void assign (const std::string& name, |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1304 const octave_value& value = octave_value (), |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1305 scope_id scope = xcurrent_scope, |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1306 context_id context = xdefault_context, |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1307 bool force_add = false) |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1308 { |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1309 static octave_value foobar; |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1310 |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1311 symbol_table *inst = get_instance (scope); |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1312 |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1313 if (inst) |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1314 inst->do_assign (name, value, context, force_add); |
|
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 |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1317 // 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
|
1318 static octave_value& |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1319 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
|
1320 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
|
1321 GCC_ATTR_DEPRECATED |
| 7336 | 1322 { |
| 1323 static octave_value foobar; | |
| 1324 | |
| 1325 symbol_table *inst = get_instance (scope); | |
| 1326 | |
|
15236
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
1327 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
|
1328 } |
|
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
1329 |
|
16442
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1330 // Convenience function to simplify |
|
15236
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
1331 // octave_user_function::bind_automatic_vars |
|
16442
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1332 |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1333 static void force_assign (const std::string& name, |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1334 const octave_value& value = octave_value (), |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1335 scope_id scope = xcurrent_scope, |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1336 context_id context = xdefault_context) |
|
15236
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
1337 { |
|
16442
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1338 assign (name, value, scope, context, true); |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1339 } |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1340 |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1341 // Use force_assign (name, value, scope, context) instead. |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1342 static octave_value& |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1343 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
|
1344 context_id context = xdefault_context) GCC_ATTR_DEPRECATED |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1345 { |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1346 static octave_value foobar; |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1347 |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1348 symbol_table *inst = get_instance (scope); |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1349 |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1350 return inst ? inst->do_varref (name, context, true) : foobar; |
| 7336 | 1351 } |
| 1352 | |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1353 static octave_value varval (const std::string& name, |
| 10313 | 1354 scope_id scope = xcurrent_scope, |
|
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
1355 context_id context = xdefault_context) |
| 7336 | 1356 { |
| 1357 symbol_table *inst = get_instance (scope); | |
| 1358 | |
|
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
1359 return inst ? inst->do_varval (name, context) : octave_value (); |
| 7336 | 1360 } |
| 1361 | |
|
16442
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1362 static void |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1363 global_assign (const std::string& name, |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1364 const octave_value& value = octave_value ()) |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1365 |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1366 { |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1367 global_table_iterator p = global_table.find (name); |
|
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 if (p == global_table.end ()) |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1370 global_table[name] = value; |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1371 else |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1372 p->second = value; |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1373 } |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1374 |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1375 // Use global_assign (name, value) instead. |
| 7336 | 1376 static octave_value& |
|
16442
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1377 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
|
1378 |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1379 { |
|
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1380 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
|
1381 |
|
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1382 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
|
1383 } |
|
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 static octave_value |
|
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1386 global_varval (const std::string& name) |
|
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1387 { |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1388 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
|
1389 |
|
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1390 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
|
1391 } |
|
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1392 |
|
16442
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1393 static void |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1394 top_level_assign (const std::string& name, |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1395 const octave_value& value = octave_value ()) |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1396 { |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1397 assign (name, value, top_scope (), 0); |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1398 } |
|
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 // 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
|
1401 static octave_value& |
|
16442
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1402 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
|
1403 { |
|
16442
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1404 static octave_value foobar; |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1405 |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1406 symbol_table *inst = get_instance (top_scope ()); |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1407 |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1408 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
|
1409 } |
|
e42b1bbd1052
variables.cc (get_top_level_value, set_top_level_value): new functions
John W. Eaton <jwe@octave.org>
parents:
9981
diff
changeset
|
1410 |
|
e42b1bbd1052
variables.cc (get_top_level_value, set_top_level_value): new functions
John W. Eaton <jwe@octave.org>
parents:
9981
diff
changeset
|
1411 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
|
1412 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
|
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 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
|
1415 } |
|
e42b1bbd1052
variables.cc (get_top_level_value, set_top_level_value): new functions
John W. Eaton <jwe@octave.org>
parents:
9981
diff
changeset
|
1416 |
|
16442
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1417 static void |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1418 persistent_assign (const std::string& name, |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1419 const octave_value& value = octave_value ()) |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1420 { |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1421 symbol_table *inst = get_instance (xcurrent_scope); |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1422 |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1423 if (inst) |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1424 inst->do_persistent_assign (name, value); |
|
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 |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
1427 // Use persistent_assign (name, value) instead. |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1428 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
|
1429 GCC_ATTR_DEPRECATED |
| 7336 | 1430 { |
| 1431 static octave_value foobar; | |
| 1432 | |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1433 symbol_table *inst = get_instance (xcurrent_scope); |
| 7336 | 1434 |
| 1435 return inst ? inst->do_persistent_varref (name) : foobar; | |
| 1436 } | |
| 1437 | |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1438 static octave_value persistent_varval (const std::string& name) |
| 7336 | 1439 { |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1440 symbol_table *inst = get_instance (xcurrent_scope); |
| 7336 | 1441 |
| 1442 return inst ? inst->do_persistent_varval (name) : octave_value (); | |
| 1443 } | |
| 1444 | |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1445 static void erase_persistent (const std::string& name) |
| 7336 | 1446 { |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1447 symbol_table *inst = get_instance (xcurrent_scope); |
| 7336 | 1448 |
| 1449 if (inst) | |
| 1450 inst->do_erase_persistent (name); | |
| 1451 } | |
| 8 | 1452 |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1453 static bool is_variable (const std::string& name) |
| 7336 | 1454 { |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1455 symbol_table *inst = get_instance (xcurrent_scope); |
| 7336 | 1456 |
| 1457 return inst ? inst->do_is_variable (name) : false; | |
| 1458 } | |
| 1459 | |
| 1460 static bool | |
| 1461 is_built_in_function_name (const std::string& name) | |
| 1462 { | |
| 1463 octave_value val = find_built_in_function (name); | |
| 1464 | |
| 1465 return val.is_defined (); | |
| 1466 } | |
| 1467 | |
| 1468 static octave_value | |
| 1469 find_method (const std::string& name, const std::string& dispatch_type) | |
| 1470 { | |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1471 fcn_table_const_iterator p = fcn_table.find (name); |
| 8 | 1472 |
| 7336 | 1473 if (p != fcn_table.end ()) |
| 1474 return p->second.find_method (dispatch_type); | |
| 1475 else | |
| 1476 { | |
| 10313 | 1477 fcn_info finfo (name); |
| 1478 | |
| 1479 octave_value fcn = finfo.find_method (dispatch_type); | |
| 1480 | |
| 1481 if (fcn.is_defined ()) | |
| 1482 fcn_table[name] = finfo; | |
| 1483 | |
| 1484 return fcn; | |
| 7336 | 1485 } |
| 1486 } | |
| 1487 | |
| 1488 static octave_value | |
| 1489 find_built_in_function (const std::string& name) | |
| 1490 { | |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1491 fcn_table_const_iterator p = fcn_table.find (name); |
| 7336 | 1492 |
| 1493 return (p != fcn_table.end ()) | |
| 1494 ? p->second.find_built_in_function () : octave_value (); | |
| 1495 } | |
| 1496 | |
| 1497 static octave_value | |
| 1498 find_autoload (const std::string& name) | |
| 1499 { | |
| 1500 fcn_table_iterator p = fcn_table.find (name); | |
| 4913 | 1501 |
| 7336 | 1502 return (p != fcn_table.end ()) |
| 1503 ? p->second.find_autoload () : octave_value (); | |
| 1504 } | |
| 1505 | |
| 1506 static octave_value | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11584
diff
changeset
|
1507 find_function (const std::string& name, |
|
9463
d34baf412786
support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
1508 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
|
1509 bool local_funcs = true); |
| 7336 | 1510 |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1511 static octave_value find_user_function (const std::string& name) |
| 7336 | 1512 { |
| 1513 fcn_table_iterator p = fcn_table.find (name); | |
| 1514 | |
| 1515 return (p != fcn_table.end ()) | |
| 1516 ? p->second.find_user_function () : octave_value (); | |
| 1517 } | |
| 1518 | |
| 1519 static void install_cmdline_function (const std::string& name, | |
| 10313 | 1520 const octave_value& fcn) |
| 7336 | 1521 { |
| 1522 fcn_table_iterator p = fcn_table.find (name); | |
| 1523 | |
| 1524 if (p != fcn_table.end ()) | |
| 1525 { | |
| 10313 | 1526 fcn_info& finfo = p->second; |
| 1527 | |
| 1528 finfo.install_cmdline_function (fcn); | |
| 7336 | 1529 } |
| 1530 else | |
| 1531 { | |
| 10313 | 1532 fcn_info finfo (name); |
| 1533 | |
| 1534 finfo.install_cmdline_function (fcn); | |
| 1535 | |
| 1536 fcn_table[name] = finfo; | |
| 7336 | 1537 } |
| 1538 } | |
| 1539 | |
|
16605
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
1540 // 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
|
1541 // 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
|
1542 |
| 7336 | 1543 static void install_subfunction (const std::string& name, |
| 10313 | 1544 const octave_value& fcn, |
| 1545 scope_id scope) | |
| 7336 | 1546 { |
| 1547 fcn_table_iterator p = fcn_table.find (name); | |
| 1548 | |
| 1549 if (p != fcn_table.end ()) | |
| 1550 { | |
| 10313 | 1551 fcn_info& finfo = p->second; |
| 1552 | |
| 1553 finfo.install_subfunction (fcn, scope); | |
| 7336 | 1554 } |
| 1555 else | |
| 1556 { | |
| 10313 | 1557 fcn_info finfo (name); |
| 1558 | |
| 1559 finfo.install_subfunction (fcn, scope); | |
| 1560 | |
| 1561 fcn_table[name] = finfo; | |
| 7336 | 1562 } |
| 1563 } | |
| 1564 | |
|
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
1565 static void install_nestfunction (const std::string& name, |
|
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
1566 const octave_value& fcn, |
|
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
1567 scope_id parent_scope); |
|
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
1568 |
|
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
1569 static void update_nest (scope_id scope) |
|
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
1570 { |
|
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
1571 symbol_table *inst = get_instance (scope); |
|
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
1572 if (inst) |
|
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
1573 inst->do_update_nest (); |
|
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
1574 } |
|
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
1575 |
| 7336 | 1576 static void install_user_function (const std::string& name, |
| 10313 | 1577 const octave_value& fcn) |
| 7336 | 1578 { |
| 1579 fcn_table_iterator p = fcn_table.find (name); | |
| 1580 | |
| 1581 if (p != fcn_table.end ()) | |
| 1582 { | |
| 10313 | 1583 fcn_info& finfo = p->second; |
| 1584 | |
| 1585 finfo.install_user_function (fcn); | |
| 7336 | 1586 } |
| 1587 else | |
| 1588 { | |
| 10313 | 1589 fcn_info finfo (name); |
| 1590 | |
| 1591 finfo.install_user_function (fcn); | |
| 1592 | |
| 1593 fcn_table[name] = finfo; | |
| 7336 | 1594 } |
| 1595 } | |
| 605 | 1596 |
| 7336 | 1597 static void install_built_in_function (const std::string& name, |
| 10313 | 1598 const octave_value& fcn) |
| 7336 | 1599 { |
| 1600 fcn_table_iterator p = fcn_table.find (name); | |
| 1601 | |
| 1602 if (p != fcn_table.end ()) | |
| 1603 { | |
| 10313 | 1604 fcn_info& finfo = p->second; |
| 1605 | |
| 1606 finfo.install_built_in_function (fcn); | |
| 7336 | 1607 } |
| 1608 else | |
| 1609 { | |
| 10313 | 1610 fcn_info finfo (name); |
| 1611 | |
| 1612 finfo.install_built_in_function (fcn); | |
| 1613 | |
| 1614 fcn_table[name] = finfo; | |
| 7336 | 1615 } |
| 1616 } | |
| 1617 | |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1618 static void clear (const std::string& name) |
| 7336 | 1619 { |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1620 clear_variable (name); |
| 7336 | 1621 } |
| 1622 | |
|
16605
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
1623 static void clear_all (bool force = false) |
| 7336 | 1624 { |
| 1625 clear_variables (); | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11584
diff
changeset
|
1626 |
|
10559
0ecbb17d130a
Clear global variables when 'clear -all' called
Rik <code@nomad.inbox5.com>
parents:
10521
diff
changeset
|
1627 clear_global_pattern ("*"); |
| 7336 | 1628 |
|
16605
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
1629 clear_functions (force); |
| 7336 | 1630 } |
| 1631 | |
|
9396
17af7cce7d1b
yet more unwind_protect improvements
Jaroslav Hajek <highegg@gmail.com>
parents:
9355
diff
changeset
|
1632 static void clear_variables (scope_id scope) |
| 7336 | 1633 { |
|
8282
47a3d2f829e4
clear local symbol table after parsing function
John W. Eaton <jwe@octave.org>
parents:
8123
diff
changeset
|
1634 symbol_table *inst = get_instance (scope); |
| 7336 | 1635 |
| 1636 if (inst) | |
| 1637 inst->do_clear_variables (); | |
| 1638 } | |
| 1639 | |
|
9396
17af7cce7d1b
yet more unwind_protect improvements
Jaroslav Hajek <highegg@gmail.com>
parents:
9355
diff
changeset
|
1640 // This is split for unwind_protect. |
|
17af7cce7d1b
yet more unwind_protect improvements
Jaroslav Hajek <highegg@gmail.com>
parents:
9355
diff
changeset
|
1641 static void clear_variables (void) |
|
17af7cce7d1b
yet more unwind_protect improvements
Jaroslav Hajek <highegg@gmail.com>
parents:
9355
diff
changeset
|
1642 { |
|
17af7cce7d1b
yet more unwind_protect improvements
Jaroslav Hajek <highegg@gmail.com>
parents:
9355
diff
changeset
|
1643 clear_variables (xcurrent_scope); |
|
17af7cce7d1b
yet more unwind_protect improvements
Jaroslav Hajek <highegg@gmail.com>
parents:
9355
diff
changeset
|
1644 } |
|
17af7cce7d1b
yet more unwind_protect improvements
Jaroslav Hajek <highegg@gmail.com>
parents:
9355
diff
changeset
|
1645 |
|
9240
f27a8c07f0b2
clear -classes and support.
Robert T. Short <octave@phaselockedsystems.com>
parents:
9144
diff
changeset
|
1646 static void clear_objects (scope_id scope = xcurrent_scope) |
|
f27a8c07f0b2
clear -classes and support.
Robert T. Short <octave@phaselockedsystems.com>
parents:
9144
diff
changeset
|
1647 { |
|
f27a8c07f0b2
clear -classes and support.
Robert T. Short <octave@phaselockedsystems.com>
parents:
9144
diff
changeset
|
1648 symbol_table *inst = get_instance (scope); |
|
f27a8c07f0b2
clear -classes and support.
Robert T. Short <octave@phaselockedsystems.com>
parents:
9144
diff
changeset
|
1649 |
|
f27a8c07f0b2
clear -classes and support.
Robert T. Short <octave@phaselockedsystems.com>
parents:
9144
diff
changeset
|
1650 if (inst) |
|
f27a8c07f0b2
clear -classes and support.
Robert T. Short <octave@phaselockedsystems.com>
parents:
9144
diff
changeset
|
1651 inst->do_clear_objects (); |
|
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 |
|
16605
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
1654 static void clear_functions (bool force = false) |
| 7336 | 1655 { |
| 1656 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
|
1657 p->second.clear (force); |
| 7336 | 1658 } |
| 1659 | |
| 1660 static void clear_function (const std::string& name) | |
| 1661 { | |
| 1662 clear_user_function (name); | |
| 1663 } | |
| 1664 | |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1665 static void clear_global (const std::string& name) |
| 7336 | 1666 { |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1667 symbol_table *inst = get_instance (xcurrent_scope); |
| 7336 | 1668 |
| 1669 if (inst) | |
| 1670 inst->do_clear_global (name); | |
| 1671 } | |
| 1672 | |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1673 static void clear_variable (const std::string& name) |
| 7336 | 1674 { |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1675 symbol_table *inst = get_instance (xcurrent_scope); |
| 7336 | 1676 |
| 1677 if (inst) | |
| 1678 inst->do_clear_variable (name); | |
| 1679 } | |
| 1680 | |
| 1681 static void clear_symbol (const std::string& name) | |
| 1682 { | |
| 1683 // FIXME -- are we supposed to do both here? | |
| 1684 | |
| 1685 clear_variable (name); | |
| 1686 clear_function (name); | |
| 1687 } | |
| 1688 | |
| 1689 static void clear_function_pattern (const std::string& pat) | |
| 1690 { | |
| 1691 glob_match pattern (pat); | |
| 1692 | |
| 1693 for (fcn_table_iterator p = fcn_table.begin (); p != fcn_table.end (); p++) | |
| 1694 { | |
| 10313 | 1695 if (pattern.match (p->first)) |
| 1696 p->second.clear_user_function (); | |
| 7336 | 1697 } |
| 1698 } | |
| 1699 | |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1700 static void clear_global_pattern (const std::string& pat) |
| 7336 | 1701 { |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1702 symbol_table *inst = get_instance (xcurrent_scope); |
| 4009 | 1703 |
| 7336 | 1704 if (inst) |
| 1705 inst->do_clear_global_pattern (pat); | |
| 1706 } | |
| 1707 | |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1708 static void clear_variable_pattern (const std::string& pat) |
| 7336 | 1709 { |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1710 symbol_table *inst = get_instance (xcurrent_scope); |
| 7336 | 1711 |
| 1712 if (inst) | |
| 1713 inst->do_clear_variable_pattern (pat); | |
| 1714 } | |
| 1715 | |
|
7779
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1716 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
|
1717 { |
|
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1718 symbol_table *inst = get_instance (xcurrent_scope); |
|
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1719 |
|
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1720 if (inst) |
|
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1721 inst->do_clear_variable_regexp (pat); |
|
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 |
| 7336 | 1724 static void clear_symbol_pattern (const std::string& pat) |
| 1725 { | |
| 1726 // FIXME -- are we supposed to do both here? | |
| 1727 | |
| 1728 clear_variable_pattern (pat); | |
| 1729 clear_function_pattern (pat); | |
| 1730 } | |
| 1731 | |
| 1732 static void clear_user_function (const std::string& name) | |
| 1733 { | |
| 1734 fcn_table_iterator p = fcn_table.find (name); | |
| 1735 | |
| 1736 if (p != fcn_table.end ()) | |
| 1737 { | |
| 10313 | 1738 fcn_info& finfo = p->second; |
| 1739 | |
| 1740 finfo.clear_user_function (); | |
| 7336 | 1741 } |
| 1742 // FIXME -- is this necessary, or even useful? | |
| 1743 // else | |
|
15466
d174210ce1ec
use ' instead of ` in error messages, warnings and most comments
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
1744 // error ("clear: no such function '%s'", name.c_str ()); |
| 7336 | 1745 } |
| 1746 | |
|
9958
80432f0ee895
improve octave_shlib for safer shared libs treatment
Jaroslav Hajek <highegg@gmail.com>
parents:
9639
diff
changeset
|
1747 // 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
|
1748 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
|
1749 { |
|
80432f0ee895
improve octave_shlib for safer shared libs treatment
Jaroslav Hajek <highegg@gmail.com>
parents:
9639
diff
changeset
|
1750 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
|
1751 |
|
80432f0ee895
improve octave_shlib for safer shared libs treatment
Jaroslav Hajek <highegg@gmail.com>
parents:
9639
diff
changeset
|
1752 if (p != fcn_table.end ()) |
|
80432f0ee895
improve octave_shlib for safer shared libs treatment
Jaroslav Hajek <highegg@gmail.com>
parents:
9639
diff
changeset
|
1753 { |
| 10313 | 1754 fcn_info& finfo = p->second; |
| 1755 | |
| 1756 finfo.clear_autoload_function (); | |
| 1757 finfo.clear_user_function (); | |
|
9958
80432f0ee895
improve octave_shlib for safer shared libs treatment
Jaroslav Hajek <highegg@gmail.com>
parents:
9639
diff
changeset
|
1758 } |
|
80432f0ee895
improve octave_shlib for safer shared libs treatment
Jaroslav Hajek <highegg@gmail.com>
parents:
9639
diff
changeset
|
1759 } |
|
80432f0ee895
improve octave_shlib for safer shared libs treatment
Jaroslav Hajek <highegg@gmail.com>
parents:
9639
diff
changeset
|
1760 |
| 7336 | 1761 static void clear_mex_functions (void) |
| 1762 { | |
| 1763 for (fcn_table_iterator p = fcn_table.begin (); p != fcn_table.end (); p++) | |
| 1764 { | |
| 10313 | 1765 fcn_info& finfo = p->second; |
| 1766 | |
| 1767 finfo.clear_mex_function (); | |
| 7336 | 1768 } |
| 1769 } | |
| 1770 | |
|
7972
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7901
diff
changeset
|
1771 static bool set_class_relationship (const std::string& sup_class, |
| 10313 | 1772 const std::string& inf_class); |
|
7972
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7901
diff
changeset
|
1773 |
|
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7901
diff
changeset
|
1774 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
|
1775 |
| 7336 | 1776 static void alias_built_in_function (const std::string& alias, |
| 10313 | 1777 const std::string& name) |
| 7336 | 1778 { |
| 1779 octave_value fcn = find_built_in_function (name); | |
| 1780 | |
| 1781 if (fcn.is_defined ()) | |
| 1782 { | |
| 10313 | 1783 fcn_info finfo (alias); |
| 1784 | |
| 1785 finfo.install_built_in_function (fcn); | |
| 1786 | |
| 1787 fcn_table[alias] = finfo; | |
| 7336 | 1788 } |
| 1789 else | |
|
15466
d174210ce1ec
use ' instead of ` in error messages, warnings and most comments
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
1790 panic ("alias: '%s' is undefined", name.c_str ()); |
| 7336 | 1791 } |
| 1792 | |
| 1793 static void add_dispatch (const std::string& name, const std::string& type, | |
| 10313 | 1794 const std::string& fname) |
| 7336 | 1795 { |
| 1796 fcn_table_iterator p = fcn_table.find (name); | |
| 1797 | |
| 1798 if (p != fcn_table.end ()) | |
| 1799 { | |
| 10313 | 1800 fcn_info& finfo = p->second; |
| 1801 | |
| 1802 finfo.add_dispatch (type, fname); | |
| 7336 | 1803 } |
| 1804 else | |
| 1805 { | |
| 10313 | 1806 fcn_info finfo (name); |
| 1807 | |
| 1808 finfo.add_dispatch (type, fname); | |
| 1809 | |
| 1810 fcn_table[name] = finfo; | |
| 7336 | 1811 } |
| 1812 } | |
| 1813 | |
| 1814 static void clear_dispatch (const std::string& name, const std::string& type) | |
| 1815 { | |
| 1816 fcn_table_iterator p = fcn_table.find (name); | |
| 1817 | |
| 1818 if (p != fcn_table.end ()) | |
| 1819 { | |
| 10313 | 1820 fcn_info& finfo = p->second; |
| 1821 | |
| 1822 finfo.clear_dispatch (type); | |
| 7336 | 1823 } |
| 1824 } | |
| 1825 | |
| 1826 static void print_dispatch (std::ostream& os, const std::string& name) | |
| 1827 { | |
| 1828 fcn_table_iterator p = fcn_table.find (name); | |
| 4009 | 1829 |
| 7336 | 1830 if (p != fcn_table.end ()) |
| 1831 { | |
| 10313 | 1832 fcn_info& finfo = p->second; |
| 1833 | |
| 1834 finfo.print_dispatch (os); | |
| 7336 | 1835 } |
| 1836 } | |
| 1837 | |
| 1838 static fcn_info::dispatch_map_type get_dispatch (const std::string& name) | |
| 1839 { | |
| 1840 fcn_info::dispatch_map_type retval; | |
| 1841 | |
| 1842 fcn_table_iterator p = fcn_table.find (name); | |
| 1843 | |
| 1844 if (p != fcn_table.end ()) | |
| 1845 { | |
| 10313 | 1846 fcn_info& finfo = p->second; |
| 1847 | |
| 1848 retval = finfo.get_dispatch (); | |
| 7336 | 1849 } |
| 1850 | |
| 1851 return retval; | |
| 1852 } | |
| 1853 | |
| 1854 static std::string help_for_dispatch (const std::string& name) | |
| 1855 { | |
| 1856 std::string retval; | |
| 1857 | |
| 1858 fcn_table_iterator p = fcn_table.find (name); | |
| 1859 | |
| 1860 if (p != fcn_table.end ()) | |
| 1861 { | |
| 10313 | 1862 fcn_info& finfo = p->second; |
| 1863 | |
| 1864 retval = finfo.help_for_dispatch (); | |
| 7336 | 1865 } |
| 1866 | |
| 1867 return retval; | |
| 1868 } | |
| 1869 | |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1870 static void push_context (void) |
| 7336 | 1871 { |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1872 if (xcurrent_scope == xglobal_scope || xcurrent_scope == xtop_scope) |
| 7336 | 1873 error ("invalid call to xymtab::push_context"); |
| 1874 else | |
| 1875 { | |
| 10313 | 1876 symbol_table *inst = get_instance (xcurrent_scope); |
| 1877 | |
| 1878 if (inst) | |
| 1879 inst->do_push_context (); | |
| 7336 | 1880 } |
| 1881 } | |
| 1882 | |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1883 static void pop_context (void) |
| 7336 | 1884 { |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1885 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
|
1886 error ("invalid call to xymtab::pop_context"); |
| 7336 | 1887 else |
| 1888 { | |
| 10313 | 1889 symbol_table *inst = get_instance (xcurrent_scope); |
| 1890 | |
| 1891 if (inst) | |
| 1892 inst->do_pop_context (); | |
| 7336 | 1893 } |
| 1894 } | |
| 1895 | |
| 1896 // For unwind_protect. | |
| 1897 static void pop_context (void *) { pop_context (); } | |
| 1898 | |
|
11557
e9d72a3caa46
mark automatic variables as automatic
John W. Eaton <jwe@octave.org>
parents:
11548
diff
changeset
|
1899 static void mark_automatic (const std::string& name) |
|
e9d72a3caa46
mark automatic variables as automatic
John W. Eaton <jwe@octave.org>
parents:
11548
diff
changeset
|
1900 { |
|
e9d72a3caa46
mark automatic variables as automatic
John W. Eaton <jwe@octave.org>
parents:
11548
diff
changeset
|
1901 symbol_table *inst = get_instance (xcurrent_scope); |
|
e9d72a3caa46
mark automatic variables as automatic
John W. Eaton <jwe@octave.org>
parents:
11548
diff
changeset
|
1902 |
|
e9d72a3caa46
mark automatic variables as automatic
John W. Eaton <jwe@octave.org>
parents:
11548
diff
changeset
|
1903 if (inst) |
|
e9d72a3caa46
mark automatic variables as automatic
John W. Eaton <jwe@octave.org>
parents:
11548
diff
changeset
|
1904 inst->do_mark_automatic (name); |
|
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 |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1907 static void mark_hidden (const std::string& name) |
| 7336 | 1908 { |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1909 symbol_table *inst = get_instance (xcurrent_scope); |
| 7336 | 1910 |
| 1911 if (inst) | |
| 1912 inst->do_mark_hidden (name); | |
| 1913 } | |
| 1914 | |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1915 static void mark_global (const std::string& name) |
| 7336 | 1916 { |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1917 symbol_table *inst = get_instance (xcurrent_scope); |
| 7336 | 1918 |
| 1919 if (inst) | |
| 1920 inst->do_mark_global (name); | |
| 1921 } | |
| 1922 | |
|
15572
859c8bf6d134
Fix saved struct with function handle fails to load (bug #33857)
Max Brister <max@2bass.com>
parents:
15467
diff
changeset
|
1923 // exclude: Storage classes to exclude, you can OR them together |
| 7336 | 1924 static std::list<symbol_record> |
|
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
1925 all_variables (scope_id scope = xcurrent_scope, |
|
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
1926 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
|
1927 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
|
1928 unsigned int exclude = symbol_record::hidden) |
| 7336 | 1929 { |
| 1930 symbol_table *inst = get_instance (scope); | |
| 1931 | |
| 1932 return inst | |
|
15572
859c8bf6d134
Fix saved struct with function handle fails to load (bug #33857)
Max Brister <max@2bass.com>
parents:
15467
diff
changeset
|
1933 ? inst->do_all_variables (context, defined_only, exclude) |
|
859c8bf6d134
Fix saved struct with function handle fails to load (bug #33857)
Max Brister <max@2bass.com>
parents:
15467
diff
changeset
|
1934 : std::list<symbol_record> (); |
| 7336 | 1935 } |
| 3011 | 1936 |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1937 static std::list<symbol_record> glob (const std::string& pattern) |
| 7336 | 1938 { |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1939 symbol_table *inst = get_instance (xcurrent_scope); |
| 7336 | 1940 |
| 1941 return inst ? inst->do_glob (pattern) : std::list<symbol_record> (); | |
| 1942 } | |
| 1943 | |
|
7779
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1944 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
|
1945 { |
|
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1946 symbol_table *inst = get_instance (xcurrent_scope); |
|
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1947 |
|
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1948 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
|
1949 } |
|
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1950 |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1951 static std::list<symbol_record> glob_variables (const std::string& pattern) |
| 7336 | 1952 { |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1953 symbol_table *inst = get_instance (xcurrent_scope); |
| 7336 | 1954 |
| 1955 return inst ? inst->do_glob (pattern, true) : std::list<symbol_record> (); | |
| 1956 } | |
| 1957 | |
|
7779
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1958 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
|
1959 { |
|
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1960 symbol_table *inst = get_instance (xcurrent_scope); |
|
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1961 |
|
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1962 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
|
1963 } |
|
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1964 |
| 7336 | 1965 static std::list<symbol_record> |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1966 glob_global_variables (const std::string& pattern) |
|
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1967 { |
|
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1968 std::list<symbol_record> retval; |
|
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1969 |
|
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1970 glob_match pat (pattern); |
|
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1971 |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
1972 for (global_table_const_iterator p = global_table.begin (); |
| 10313 | 1973 p != global_table.end (); p++) |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1974 { |
| 10313 | 1975 // We generate a list of symbol_record objects so that |
| 1976 // the results from glob_variables and glob_global_variables | |
| 1977 // may be handled the same way. | |
| 1978 | |
| 1979 if (pat.match (p->first)) | |
|
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
1980 retval.push_back (symbol_record (xglobal_scope, |
|
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
1981 p->first, p->second, |
| 10313 | 1982 symbol_record::global)); |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1983 } |
|
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1984 |
|
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
1985 return retval; |
|
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 |
|
7779
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1988 static std::list<symbol_record> |
|
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1989 regexp_global_variables (const std::string& pattern) |
|
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1990 { |
|
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1991 std::list<symbol_record> retval; |
|
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1992 |
|
14024
fc9f204faea0
refactor regexp (bug #34440)
John W. Eaton <jwe@octave.org>
parents:
13985
diff
changeset
|
1993 ::regexp pat (pattern); |
|
7779
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1994 |
|
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1995 for (global_table_const_iterator p = global_table.begin (); |
| 10313 | 1996 p != global_table.end (); p++) |
|
7779
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1997 { |
| 10313 | 1998 // We generate a list of symbol_record objects so that |
| 1999 // the results from regexp_variables and regexp_global_variables | |
| 2000 // may be handled the same way. | |
| 2001 | |
|
14024
fc9f204faea0
refactor regexp (bug #34440)
John W. Eaton <jwe@octave.org>
parents:
13985
diff
changeset
|
2002 if (pat.is_match (p->first)) |
|
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2003 retval.push_back (symbol_record (xglobal_scope, |
|
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2004 p->first, p->second, |
| 10313 | 2005 symbol_record::global)); |
|
7779
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2006 } |
|
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2007 |
|
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2008 return retval; |
|
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 |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
2011 static std::list<symbol_record> glob_variables (const string_vector& patterns) |
| 7336 | 2012 { |
| 2013 std::list<symbol_record> retval; | |
| 2014 | |
| 2015 size_t len = patterns.length (); | |
| 8 | 2016 |
| 7336 | 2017 for (size_t i = 0; i < len; i++) |
| 2018 { | |
| 10313 | 2019 std::list<symbol_record> tmp = glob_variables (patterns[i]); |
| 2020 | |
| 2021 retval.insert (retval.begin (), tmp.begin (), tmp.end ()); | |
| 7336 | 2022 } |
| 2023 | |
| 2024 return retval; | |
| 2025 } | |
| 2026 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11584
diff
changeset
|
2027 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
|
2028 (const string_vector& patterns) |
|
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2029 { |
|
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2030 std::list<symbol_record> retval; |
|
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2031 |
|
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2032 size_t len = patterns.length (); |
|
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2033 |
|
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2034 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
|
2035 { |
| 10313 | 2036 std::list<symbol_record> tmp = regexp_variables (patterns[i]); |
| 2037 | |
| 2038 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
|
2039 } |
|
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2040 |
|
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2041 return retval; |
|
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 |
| 7336 | 2044 static std::list<std::string> user_function_names (void) |
| 2045 { | |
| 2046 std::list<std::string> retval; | |
| 2047 | |
| 2048 for (fcn_table_iterator p = fcn_table.begin (); | |
| 10313 | 2049 p != fcn_table.end (); p++) |
| 7336 | 2050 { |
| 10313 | 2051 if (p->second.is_user_function_defined ()) |
| 2052 retval.push_back (p->first); | |
| 7336 | 2053 } |
| 2054 | |
| 2055 if (! retval.empty ()) | |
| 2056 retval.sort (); | |
| 2057 | |
| 2058 return retval; | |
| 2059 } | |
| 3011 | 2060 |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
2061 static std::list<std::string> global_variable_names (void) |
| 7336 | 2062 { |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
2063 std::list<std::string> retval; |
|
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
2064 |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2065 for (global_table_const_iterator p = global_table.begin (); |
| 10313 | 2066 p != global_table.end (); p++) |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
2067 retval.push_back (p->first); |
|
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
2068 |
|
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
2069 retval.sort (); |
|
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
2070 |
|
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
2071 return retval; |
|
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
2072 } |
|
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 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
|
2075 { |
|
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
2076 symbol_table *inst = get_instance (xtop_scope); |
|
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
2077 |
|
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
2078 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
|
2079 } |
|
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 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
|
2082 { |
|
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
2083 symbol_table *inst = get_instance (xcurrent_scope); |
| 7336 | 2084 |
| 2085 return inst ? inst->do_variable_names () : std::list<std::string> (); | |
| 2086 } | |
| 2087 | |
| 2088 static std::list<std::string> built_in_function_names (void) | |
| 2089 { | |
| 2090 std::list<std::string> retval; | |
| 2091 | |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2092 for (fcn_table_const_iterator p = fcn_table.begin (); |
| 10313 | 2093 p != fcn_table.end (); p++) |
| 7336 | 2094 { |
| 10313 | 2095 octave_value fcn = p->second.find_built_in_function (); |
| 2096 | |
| 2097 if (fcn.is_defined ()) | |
| 2098 retval.push_back (p->first); | |
| 7336 | 2099 } |
| 2100 | |
| 2101 if (! retval.empty ()) | |
| 2102 retval.sort (); | |
| 220 | 2103 |
| 7336 | 2104 return retval; |
| 2105 } | |
| 2106 | |
|
12911
d6151d774283
make completion work for command-line functions
John W. Eaton <jwe@octave.org>
parents:
12130
diff
changeset
|
2107 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
|
2108 { |
|
d6151d774283
make completion work for command-line functions
John W. Eaton <jwe@octave.org>
parents:
12130
diff
changeset
|
2109 std::list<std::string> retval; |
|
d6151d774283
make completion work for command-line functions
John W. Eaton <jwe@octave.org>
parents:
12130
diff
changeset
|
2110 |
|
d6151d774283
make completion work for command-line functions
John W. Eaton <jwe@octave.org>
parents:
12130
diff
changeset
|
2111 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
|
2112 p != fcn_table.end (); p++) |
|
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 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
|
2115 |
|
d6151d774283
make completion work for command-line functions
John W. Eaton <jwe@octave.org>
parents:
12130
diff
changeset
|
2116 if (fcn.is_defined ()) |
|
d6151d774283
make completion work for command-line functions
John W. Eaton <jwe@octave.org>
parents:
12130
diff
changeset
|
2117 retval.push_back (p->first); |
|
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 |
|
d6151d774283
make completion work for command-line functions
John W. Eaton <jwe@octave.org>
parents:
12130
diff
changeset
|
2120 if (! retval.empty ()) |
|
d6151d774283
make completion work for command-line functions
John W. Eaton <jwe@octave.org>
parents:
12130
diff
changeset
|
2121 retval.sort (); |
|
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 return retval; |
|
d6151d774283
make completion work for command-line functions
John W. Eaton <jwe@octave.org>
parents:
12130
diff
changeset
|
2124 } |
|
d6151d774283
make completion work for command-line functions
John W. Eaton <jwe@octave.org>
parents:
12130
diff
changeset
|
2125 |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
2126 static bool is_local_variable (const std::string& name) |
| 7336 | 2127 { |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
2128 if (xcurrent_scope == xglobal_scope) |
| 7336 | 2129 return false; |
| 2130 else | |
| 2131 { | |
| 10313 | 2132 symbol_table *inst = get_instance (xcurrent_scope); |
| 2133 | |
| 2134 return inst ? inst->do_is_local_variable (name) : false; | |
| 7336 | 2135 } |
| 2136 } | |
| 5861 | 2137 |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
2138 static bool is_global (const std::string& name) |
| 7336 | 2139 { |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
2140 if (xcurrent_scope == xglobal_scope) |
| 7336 | 2141 return true; |
| 2142 else | |
| 2143 { | |
| 10313 | 2144 symbol_table *inst = get_instance (xcurrent_scope); |
| 2145 | |
| 2146 return inst ? inst->do_is_global (name) : false; | |
| 7336 | 2147 } |
| 2148 } | |
| 3011 | 2149 |
|
16468
0f143f68078d
use signal/slot for updating workspace instead of using event listener
John W. Eaton <jwe@octave.org>
parents:
16442
diff
changeset
|
2150 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
|
2151 { |
|
0f143f68078d
use signal/slot for updating workspace instead of using event listener
John W. Eaton <jwe@octave.org>
parents:
16442
diff
changeset
|
2152 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
|
2153 |
|
0f143f68078d
use signal/slot for updating workspace instead of using event listener
John W. Eaton <jwe@octave.org>
parents:
16442
diff
changeset
|
2154 return inst |
|
0f143f68078d
use signal/slot for updating workspace instead of using event listener
John W. Eaton <jwe@octave.org>
parents:
16442
diff
changeset
|
2155 ? inst->do_workspace_info () : std::list<workspace_element> (); |
|
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 |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2158 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
|
2159 |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2160 static void dump_global (std::ostream& os); |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2161 |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2162 static void dump_functions (std::ostream& os); |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2163 |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2164 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
|
2165 { |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2166 symbol_table *inst = get_instance (scope, false); |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2167 |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2168 if (inst) |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2169 inst->do_cache_name (name); |
|
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 |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2172 static void lock_subfunctions (scope_id scope = xcurrent_scope) |
|
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 for (fcn_table_iterator p = fcn_table.begin (); |
| 10313 | 2175 p != fcn_table.end (); p++) |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2176 p->second.lock_subfunction (scope); |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11584
diff
changeset
|
2177 } |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2178 |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2179 static void unlock_subfunctions (scope_id scope = xcurrent_scope) |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2180 { |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2181 for (fcn_table_iterator p = fcn_table.begin (); |
| 10313 | 2182 p != fcn_table.end (); p++) |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2183 p->second.unlock_subfunction (scope); |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11584
diff
changeset
|
2184 } |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2185 |
|
16596
645672f1c873
handle setting breakpoints in subfunctions in GUI editor
John W. Eaton <jwe@octave.org>
parents:
16502
diff
changeset
|
2186 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
|
2187 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
|
2188 { |
|
645672f1c873
handle setting breakpoints in subfunctions in GUI editor
John W. Eaton <jwe@octave.org>
parents:
16502
diff
changeset
|
2189 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
|
2190 |
|
645672f1c873
handle setting breakpoints in subfunctions in GUI editor
John W. Eaton <jwe@octave.org>
parents:
16502
diff
changeset
|
2191 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
|
2192 p != fcn_table.end (); p++) |
|
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 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
|
2195 = 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
|
2196 |
|
645672f1c873
handle setting breakpoints in subfunctions in GUI editor
John W. Eaton <jwe@octave.org>
parents:
16502
diff
changeset
|
2197 std::string nm = tmp.first; |
|
645672f1c873
handle setting breakpoints in subfunctions in GUI editor
John W. Eaton <jwe@octave.org>
parents:
16502
diff
changeset
|
2198 |
|
645672f1c873
handle setting breakpoints in subfunctions in GUI editor
John W. Eaton <jwe@octave.org>
parents:
16502
diff
changeset
|
2199 if (! nm.empty ()) |
|
645672f1c873
handle setting breakpoints in subfunctions in GUI editor
John W. Eaton <jwe@octave.org>
parents:
16502
diff
changeset
|
2200 retval[nm] = tmp.second; |
|
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 |
|
645672f1c873
handle setting breakpoints in subfunctions in GUI editor
John W. Eaton <jwe@octave.org>
parents:
16502
diff
changeset
|
2203 return retval; |
|
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 |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2206 static void free_scope (scope_id scope) |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2207 { |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2208 if (scope == xglobal_scope || scope == xtop_scope) |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2209 error ("can't free global or top-level scopes!"); |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2210 else |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2211 symbol_table::scope_id_cache::free (scope); |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2212 } |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2213 |
|
8819
96d87674b818
also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents:
8691
diff
changeset
|
2214 static void stash_dir_name_for_subfunctions (scope_id scope, |
| 10313 | 2215 const std::string& dir_name); |
|
8819
96d87674b818
also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents:
8691
diff
changeset
|
2216 |
|
9581
3d0d2bda3a0f
fix previous change, avoid duplicate loads of methods in descendant classes
Jaroslav Hajek <highegg@gmail.com>
parents:
9509
diff
changeset
|
2217 static void add_to_parent_map (const std::string& classname, |
| 10313 | 2218 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
|
2219 { |
|
3d0d2bda3a0f
fix previous change, avoid duplicate loads of methods in descendant classes
Jaroslav Hajek <highegg@gmail.com>
parents:
9509
diff
changeset
|
2220 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
|
2221 } |
|
3d0d2bda3a0f
fix previous change, avoid duplicate loads of methods in descendant classes
Jaroslav Hajek <highegg@gmail.com>
parents:
9509
diff
changeset
|
2222 |
|
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
|
2223 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
|
2224 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
|
2225 { |
|
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 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
|
2227 |
|
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 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
|
2229 |
|
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 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
|
2231 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
|
2232 |
|
12130
3229572cbe23
symbol_table::parent_classes: also add parents of parents to the list
John W. Eaton <jwe@octave.org>
parents:
12122
diff
changeset
|
2233 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
|
2234 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
|
2235 { |
|
3229572cbe23
symbol_table::parent_classes: also add parents of parents to the list
John W. Eaton <jwe@octave.org>
parents:
12122
diff
changeset
|
2236 // 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
|
2237 |
|
3229572cbe23
symbol_table::parent_classes: also add parents of parents to the list
John W. Eaton <jwe@octave.org>
parents:
12122
diff
changeset
|
2238 // FIXME -- should we worry about a circular inheritance graph? |
|
3229572cbe23
symbol_table::parent_classes: also add parents of parents to the list
John W. Eaton <jwe@octave.org>
parents:
12122
diff
changeset
|
2239 |
|
3229572cbe23
symbol_table::parent_classes: also add parents of parents to the list
John W. Eaton <jwe@octave.org>
parents:
12122
diff
changeset
|
2240 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
|
2241 |
|
3229572cbe23
symbol_table::parent_classes: also add parents of parents to the list
John W. Eaton <jwe@octave.org>
parents:
12122
diff
changeset
|
2242 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
|
2243 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
|
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 |
|
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
|
2246 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
|
2247 } |
|
1783b360976f
also consider parent classes when checking if class methods are out of date
John W. Eaton <jwe@octave.org>
parents:
10633
diff
changeset
|
2248 |
|
9639
8d79f36ebdde
store scope->function pointer
Jaroslav Hajek <highegg@gmail.com>
parents:
9581
diff
changeset
|
2249 static octave_user_function *get_curr_fcn (scope_id scope = xcurrent_scope) |
|
8d79f36ebdde
store scope->function pointer
Jaroslav Hajek <highegg@gmail.com>
parents:
9581
diff
changeset
|
2250 { |
|
8d79f36ebdde
store scope->function pointer
Jaroslav Hajek <highegg@gmail.com>
parents:
9581
diff
changeset
|
2251 symbol_table *inst = get_instance (scope); |
|
8d79f36ebdde
store scope->function pointer
Jaroslav Hajek <highegg@gmail.com>
parents:
9581
diff
changeset
|
2252 return inst->curr_fcn; |
|
8d79f36ebdde
store scope->function pointer
Jaroslav Hajek <highegg@gmail.com>
parents:
9581
diff
changeset
|
2253 } |
|
8d79f36ebdde
store scope->function pointer
Jaroslav Hajek <highegg@gmail.com>
parents:
9581
diff
changeset
|
2254 |
|
8d79f36ebdde
store scope->function pointer
Jaroslav Hajek <highegg@gmail.com>
parents:
9581
diff
changeset
|
2255 static void set_curr_fcn (octave_user_function *curr_fcn, |
|
8d79f36ebdde
store scope->function pointer
Jaroslav Hajek <highegg@gmail.com>
parents:
9581
diff
changeset
|
2256 scope_id scope = xcurrent_scope) |
|
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 assert (scope != xtop_scope && scope != xglobal_scope); |
|
8d79f36ebdde
store scope->function pointer
Jaroslav Hajek <highegg@gmail.com>
parents:
9581
diff
changeset
|
2259 symbol_table *inst = get_instance (scope); |
|
8d79f36ebdde
store scope->function pointer
Jaroslav Hajek <highegg@gmail.com>
parents:
9581
diff
changeset
|
2260 // FIXME: normally, functions should not usurp each other's scope. |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11584
diff
changeset
|
2261 // If for any incredible reason this is needed, call |
|
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2262 // set_user_function (0, scope) first. This may cause problems with |
|
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2263 // nested functions, as the curr_fcn of symbol_records must be updated. |
|
9639
8d79f36ebdde
store scope->function pointer
Jaroslav Hajek <highegg@gmail.com>
parents:
9581
diff
changeset
|
2264 assert (inst->curr_fcn == 0 || curr_fcn == 0); |
|
8d79f36ebdde
store scope->function pointer
Jaroslav Hajek <highegg@gmail.com>
parents:
9581
diff
changeset
|
2265 inst->curr_fcn = curr_fcn; |
|
8d79f36ebdde
store scope->function pointer
Jaroslav Hajek <highegg@gmail.com>
parents:
9581
diff
changeset
|
2266 } |
|
8d79f36ebdde
store scope->function pointer
Jaroslav Hajek <highegg@gmail.com>
parents:
9581
diff
changeset
|
2267 |
|
9981
692ab4eaf965
clean up top-level variables when exiting Octave
Jaroslav Hajek <highegg@gmail.com>
parents:
9958
diff
changeset
|
2268 static void cleanup (void); |
|
692ab4eaf965
clean up top-level variables when exiting Octave
Jaroslav Hajek <highegg@gmail.com>
parents:
9958
diff
changeset
|
2269 |
| 8 | 2270 private: |
| 2271 | |
|
12122
f4689107dd8c
Explicitly disallow copying in some classes.
Pascal Dupuis <Pascal.Dupuis@uclouvain.be>
parents:
11586
diff
changeset
|
2272 // No copying! |
|
f4689107dd8c
Explicitly disallow copying in some classes.
Pascal Dupuis <Pascal.Dupuis@uclouvain.be>
parents:
11586
diff
changeset
|
2273 |
|
f4689107dd8c
Explicitly disallow copying in some classes.
Pascal Dupuis <Pascal.Dupuis@uclouvain.be>
parents:
11586
diff
changeset
|
2274 symbol_table (const symbol_table&); |
|
f4689107dd8c
Explicitly disallow copying in some classes.
Pascal Dupuis <Pascal.Dupuis@uclouvain.be>
parents:
11586
diff
changeset
|
2275 |
|
f4689107dd8c
Explicitly disallow copying in some classes.
Pascal Dupuis <Pascal.Dupuis@uclouvain.be>
parents:
11586
diff
changeset
|
2276 symbol_table& operator = (const symbol_table&); |
|
f4689107dd8c
Explicitly disallow copying in some classes.
Pascal Dupuis <Pascal.Dupuis@uclouvain.be>
parents:
11586
diff
changeset
|
2277 |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2278 typedef std::map<std::string, symbol_record>::const_iterator table_const_iterator; |
| 7336 | 2279 typedef std::map<std::string, symbol_record>::iterator table_iterator; |
| 2280 | |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2281 typedef std::map<std::string, octave_value>::const_iterator global_table_const_iterator; |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
2282 typedef std::map<std::string, octave_value>::iterator global_table_iterator; |
|
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
2283 |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2284 typedef std::map<std::string, octave_value>::const_iterator persistent_table_const_iterator; |
| 7336 | 2285 typedef std::map<std::string, octave_value>::iterator persistent_table_iterator; |
| 2286 | |
| 2287 typedef std::map<scope_id, symbol_table*>::const_iterator all_instances_const_iterator; | |
| 2288 typedef std::map<scope_id, symbol_table*>::iterator all_instances_iterator; | |
| 2289 | |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2290 typedef std::map<std::string, fcn_info>::const_iterator fcn_table_const_iterator; |
| 7336 | 2291 typedef std::map<std::string, fcn_info>::iterator fcn_table_iterator; |
|
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2292 |
|
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2293 // The scope of this symbol table. |
|
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2294 scope_id my_scope; |
| 7336 | 2295 |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2296 // 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
|
2297 // corresponding to the scope); |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2298 std::string table_name; |
| 7336 | 2299 |
| 2300 // Map from symbol names to symbol info. | |
| 2301 std::map<std::string, symbol_record> table; | |
| 2302 | |
|
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2303 // Child nested functions. |
|
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2304 std::vector<symbol_table*> nest_children; |
|
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2305 |
|
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2306 // Parent nested function (may be null). |
|
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2307 symbol_table *nest_parent; |
|
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2308 |
|
9639
8d79f36ebdde
store scope->function pointer
Jaroslav Hajek <highegg@gmail.com>
parents:
9581
diff
changeset
|
2309 // The associated user code (may be null). |
|
8d79f36ebdde
store scope->function pointer
Jaroslav Hajek <highegg@gmail.com>
parents:
9581
diff
changeset
|
2310 octave_user_function *curr_fcn; |
|
8d79f36ebdde
store scope->function pointer
Jaroslav Hajek <highegg@gmail.com>
parents:
9581
diff
changeset
|
2311 |
|
15236
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
2312 // 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
|
2313 bool static_workspace; |
|
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
2314 |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
2315 // 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
|
2316 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
|
2317 |
| 7336 | 2318 // Map from names of persistent variables to values. |
| 2319 std::map<std::string, octave_value> persistent_table; | |
| 2320 | |
| 2321 // Pointer to symbol table for current scope (variables only). | |
| 2322 static symbol_table *instance; | |
| 3011 | 2323 |
| 7336 | 2324 // Map from scope id to symbol table instances. |
| 2325 static std::map<scope_id, symbol_table*> all_instances; | |
| 2326 | |
| 2327 // Map from function names to function info (subfunctions, private | |
| 2328 // functions, class constructors, class methods, etc.) | |
| 2329 static std::map<std::string, fcn_info> fcn_table; | |
| 2330 | |
|
7972
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7901
diff
changeset
|
2331 // 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
|
2332 // precedence. |
|
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7901
diff
changeset
|
2333 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
|
2334 |
|
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7901
diff
changeset
|
2335 typedef std::map<std::string, std::set<std::string> >::const_iterator class_precedence_table_const_iterator; |
|
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7901
diff
changeset
|
2336 typedef std::map<std::string, std::set<std::string> >::iterator class_precedence_table_iterator; |
|
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7901
diff
changeset
|
2337 |
|
9581
3d0d2bda3a0f
fix previous change, avoid duplicate loads of methods in descendant classes
Jaroslav Hajek <highegg@gmail.com>
parents:
9509
diff
changeset
|
2338 // 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
|
2339 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
|
2340 |
|
3d0d2bda3a0f
fix previous change, avoid duplicate loads of methods in descendant classes
Jaroslav Hajek <highegg@gmail.com>
parents:
9509
diff
changeset
|
2341 typedef std::map<std::string, std::list<std::string> >::const_iterator const_parent_map_iterator; |
|
3d0d2bda3a0f
fix previous change, avoid duplicate loads of methods in descendant classes
Jaroslav Hajek <highegg@gmail.com>
parents:
9509
diff
changeset
|
2342 typedef std::map<std::string, std::list<std::string> >::iterator parent_map_iterator; |
|
3d0d2bda3a0f
fix previous change, avoid duplicate loads of methods in descendant classes
Jaroslav Hajek <highegg@gmail.com>
parents:
9509
diff
changeset
|
2343 |
| 7336 | 2344 static const scope_id xglobal_scope; |
| 2345 static const scope_id xtop_scope; | |
| 2346 | |
| 2347 static scope_id xcurrent_scope; | |
| 2348 | |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
2349 static context_id xcurrent_context; |
|
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
2350 |
|
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2351 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
|
2352 |
|
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2353 symbol_table (scope_id scope) |
|
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2354 : my_scope (scope), table_name (), table (), nest_children (), nest_parent (0), |
|
15236
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
2355 curr_fcn (0), static_workspace (false), persistent_table () { } |
| 7336 | 2356 |
| 2357 ~symbol_table (void) { } | |
| 3011 | 2358 |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2359 static symbol_table *get_instance (scope_id scope, bool create = true) |
| 7336 | 2360 { |
| 2361 symbol_table *retval = 0; | |
| 2362 | |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2363 bool ok = true; |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2364 |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
2365 if (scope != xglobal_scope) |
| 7336 | 2366 { |
| 10313 | 2367 if (scope == xcurrent_scope) |
| 2368 { | |
| 2369 if (! instance && create) | |
| 2370 { | |
|
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2371 symbol_table *inst = new symbol_table (scope); |
| 10313 | 2372 |
| 2373 if (inst) | |
| 2374 { | |
| 2375 all_instances[scope] = instance = inst; | |
| 2376 | |
| 2377 if (scope == xtop_scope) | |
| 2378 instance->do_cache_name ("top-level"); | |
| 2379 } | |
| 2380 } | |
| 2381 | |
| 2382 if (! instance) | |
| 2383 ok = false; | |
| 2384 | |
| 2385 retval = instance; | |
| 2386 } | |
| 2387 else | |
| 2388 { | |
| 2389 all_instances_iterator p = all_instances.find (scope); | |
| 2390 | |
| 2391 if (p == all_instances.end ()) | |
| 2392 { | |
| 2393 if (create) | |
| 2394 { | |
|
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2395 retval = new symbol_table (scope); |
| 10313 | 2396 |
| 2397 if (retval) | |
| 2398 all_instances[scope] = retval; | |
| 2399 else | |
| 2400 ok = false; | |
| 2401 } | |
| 2402 else | |
| 2403 ok = false; | |
| 2404 } | |
| 2405 else | |
| 2406 retval = p->second; | |
| 2407 } | |
| 7336 | 2408 } |
| 2409 | |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2410 if (! ok) |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2411 error ("unable to %s symbol_table object for scope %d!", |
| 10313 | 2412 create ? "create" : "find", scope); |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2413 |
| 7336 | 2414 return retval; |
| 2415 } | |
| 2416 | |
|
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2417 void add_nest_child (symbol_table& st) |
|
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2418 { |
|
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2419 assert (!st.nest_parent); |
|
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2420 nest_children.push_back (&st); |
|
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2421 st.nest_parent = this; |
|
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2422 } |
|
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2423 |
| 7336 | 2424 void insert_symbol_record (const symbol_record& sr) |
| 2425 { | |
| 2426 table[sr.name ()] = sr; | |
| 2427 } | |
| 4238 | 2428 |
| 4913 | 2429 void |
| 7336 | 2430 do_dup_scope (symbol_table& new_symbol_table) const |
| 2431 { | |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2432 for (table_const_iterator p = table.begin (); p != table.end (); p++) |
|
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2433 new_symbol_table.insert_symbol_record (p->second.dup (new_symbol_table.my_scope)); |
| 7336 | 2434 } |
| 2435 | |
| 2436 symbol_record do_find_symbol (const std::string& name) | |
| 2437 { | |
| 2438 table_iterator p = table.find (name); | |
| 2439 | |
| 2440 if (p == table.end ()) | |
| 2441 return do_insert (name); | |
| 2442 else | |
| 2443 return p->second; | |
| 2444 } | |
| 2445 | |
|
8906
ab87d08d9a1b
improve symbol inheritance for anonymous functions
John W. Eaton <jwe@octave.org>
parents:
8884
diff
changeset
|
2446 void do_inherit (symbol_table& donor_table, context_id donor_context) |
| 7336 | 2447 { |
|
8906
ab87d08d9a1b
improve symbol inheritance for anonymous functions
John W. Eaton <jwe@octave.org>
parents:
8884
diff
changeset
|
2448 for (table_iterator p = table.begin (); p != table.end (); p++) |
| 7336 | 2449 { |
| 10313 | 2450 symbol_record& sr = p->second; |
| 2451 | |
| 2452 if (! (sr.is_automatic () || sr.is_formal ())) | |
| 2453 { | |
| 2454 std::string nm = sr.name (); | |
| 2455 | |
| 2456 if (nm != "__retval__") | |
| 2457 { | |
| 2458 octave_value val = donor_table.do_varval (nm, donor_context); | |
| 2459 | |
| 2460 if (val.is_defined ()) | |
| 2461 { | |
|
16442
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2462 sr.assign (val, 0); |
| 10313 | 2463 |
| 2464 sr.mark_inherited (); | |
| 2465 } | |
| 2466 } | |
| 2467 } | |
| 7336 | 2468 } |
| 2469 } | |
| 2470 | |
|
9413
5cd879a0d8c4
speed-up function call by caching its name lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
9409
diff
changeset
|
2471 static fcn_info *get_fcn_info (const std::string& name) |
|
5cd879a0d8c4
speed-up function call by caching its name lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
9409
diff
changeset
|
2472 { |
|
5cd879a0d8c4
speed-up function call by caching its name lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
9409
diff
changeset
|
2473 fcn_table_iterator p = fcn_table.find (name); |
|
5cd879a0d8c4
speed-up function call by caching its name lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
9409
diff
changeset
|
2474 return p != fcn_table.end () ? &p->second : 0; |
|
5cd879a0d8c4
speed-up function call by caching its name lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
9409
diff
changeset
|
2475 } |
|
5cd879a0d8c4
speed-up function call by caching its name lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
9409
diff
changeset
|
2476 |
| 7336 | 2477 octave_value |
|
9445
c5f03874ea2a
simplify symbol_table::find and associated functions
Jaroslav Hajek <highegg@gmail.com>
parents:
9444
diff
changeset
|
2478 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
|
2479 bool skip_variables, bool local_funcs); |
| 7336 | 2480 |
|
9444
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
2481 octave_value do_builtin_find (const std::string& name); |
|
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
2482 |
|
15236
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
2483 symbol_record& do_insert (const std::string& name, bool force_add = false) |
| 7336 | 2484 { |
| 2485 table_iterator p = table.find (name); | |
| 2486 | |
|
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2487 if (p == table.end ()) |
|
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2488 { |
|
15236
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
2489 symbol_record ret (my_scope, name); |
|
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
2490 |
|
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
2491 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
|
2492 return table[name] = ret; |
|
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2493 else |
|
15236
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
2494 { |
|
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
2495 if (static_workspace && ! force_add) |
|
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
2496 ret.mark_added_static (); |
|
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
2497 |
|
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
2498 return table[name] = ret; |
|
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
2499 } |
|
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2500 } |
|
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2501 else |
|
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2502 return p->second; |
| 7336 | 2503 } |
| 2504 | |
|
16502
45ae1038ee89
allow renaming of variables in workspace viewer
John W. Eaton <jwe@octave.org>
parents:
16468
diff
changeset
|
2505 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
|
2506 { |
|
45ae1038ee89
allow renaming of variables in workspace viewer
John W. Eaton <jwe@octave.org>
parents:
16468
diff
changeset
|
2507 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
|
2508 |
|
45ae1038ee89
allow renaming of variables in workspace viewer
John W. Eaton <jwe@octave.org>
parents:
16468
diff
changeset
|
2509 if (p != table.end ()) |
|
45ae1038ee89
allow renaming of variables in workspace viewer
John W. Eaton <jwe@octave.org>
parents:
16468
diff
changeset
|
2510 { |
|
45ae1038ee89
allow renaming of variables in workspace viewer
John W. Eaton <jwe@octave.org>
parents:
16468
diff
changeset
|
2511 symbol_record sr = p->second; |
|
45ae1038ee89
allow renaming of variables in workspace viewer
John W. Eaton <jwe@octave.org>
parents:
16468
diff
changeset
|
2512 |
|
45ae1038ee89
allow renaming of variables in workspace viewer
John W. Eaton <jwe@octave.org>
parents:
16468
diff
changeset
|
2513 sr.rename (new_name); |
|
45ae1038ee89
allow renaming of variables in workspace viewer
John W. Eaton <jwe@octave.org>
parents:
16468
diff
changeset
|
2514 |
|
45ae1038ee89
allow renaming of variables in workspace viewer
John W. Eaton <jwe@octave.org>
parents:
16468
diff
changeset
|
2515 table.erase (p); |
|
45ae1038ee89
allow renaming of variables in workspace viewer
John W. Eaton <jwe@octave.org>
parents:
16468
diff
changeset
|
2516 |
|
45ae1038ee89
allow renaming of variables in workspace viewer
John W. Eaton <jwe@octave.org>
parents:
16468
diff
changeset
|
2517 table[new_name] = sr; |
|
45ae1038ee89
allow renaming of variables in workspace viewer
John W. Eaton <jwe@octave.org>
parents:
16468
diff
changeset
|
2518 } |
|
45ae1038ee89
allow renaming of variables in workspace viewer
John W. Eaton <jwe@octave.org>
parents:
16468
diff
changeset
|
2519 } |
|
45ae1038ee89
allow renaming of variables in workspace viewer
John W. Eaton <jwe@octave.org>
parents:
16468
diff
changeset
|
2520 |
|
16442
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2521 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
|
2522 context_id context, bool force_add) |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2523 { |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2524 table_iterator p = table.find (name); |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2525 |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2526 if (p == table.end ()) |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2527 { |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2528 symbol_record& sr = do_insert (name, force_add); |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2529 |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2530 sr.assign (value, context); |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2531 } |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2532 else |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2533 p->second.assign (value, context); |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2534 } |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2535 |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2536 // 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
|
2537 // Delete when deprecated varref functions are removed. |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2538 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
|
2539 bool force_add) |
| 7336 | 2540 { |
| 2541 table_iterator p = table.find (name); | |
| 2542 | |
| 2543 if (p == table.end ()) | |
| 2544 { | |
|
15236
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
2545 symbol_record& sr = do_insert (name, force_add); |
| 10313 | 2546 |
| 2547 return sr.varref (context); | |
| 7336 | 2548 } |
| 2549 else | |
|
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
2550 return p->second.varref (context); |
| 7336 | 2551 } |
| 4913 | 2552 |
|
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
2553 octave_value do_varval (const std::string& name, context_id context) const |
| 7336 | 2554 { |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2555 table_const_iterator p = table.find (name); |
| 7336 | 2556 |
|
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
2557 return (p != table.end ()) ? p->second.varval (context) : octave_value (); |
| 7336 | 2558 } |
| 2559 | |
|
16442
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2560 void do_persistent_assign (const std::string& name, |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2561 const octave_value& value) |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2562 { |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2563 persistent_table_iterator p = persistent_table.find (name); |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2564 |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2565 if (p == persistent_table.end ()) |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2566 persistent_table[name] = value; |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2567 else |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2568 p->second = value; |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2569 } |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2570 |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2571 // Use do_persistent_assign (name, value) instead. |
|
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2572 // Delete when deprecated varref functions are removed. |
| 7336 | 2573 octave_value& do_persistent_varref (const std::string& name) |
| 2574 { | |
| 2575 persistent_table_iterator p = persistent_table.find (name); | |
| 2576 | |
| 2577 return (p == persistent_table.end ()) | |
| 2578 ? persistent_table[name] : p->second; | |
| 2579 } | |
| 2580 | |
| 2581 octave_value do_persistent_varval (const std::string& name) | |
| 2582 { | |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2583 persistent_table_const_iterator p = persistent_table.find (name); |
| 7336 | 2584 |
| 2585 return (p != persistent_table.end ()) ? p->second : octave_value (); | |
| 2586 } | |
| 2587 | |
| 2588 void do_erase_persistent (const std::string& name) | |
| 2589 { | |
| 2590 persistent_table_iterator p = persistent_table.find (name); | |
| 2591 | |
| 2592 if (p != persistent_table.end ()) | |
| 2593 persistent_table.erase (p); | |
| 2594 } | |
| 2595 | |
| 2596 bool do_is_variable (const std::string& name) const | |
| 2597 { | |
| 2598 bool retval = false; | |
| 2599 | |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2600 table_const_iterator p = table.find (name); |
| 7336 | 2601 |
| 2602 if (p != table.end ()) | |
| 2603 { | |
| 10313 | 2604 const symbol_record& sr = p->second; |
| 2605 | |
| 2606 retval = sr.is_variable (); | |
| 7336 | 2607 } |
| 2608 | |
| 2609 return retval; | |
| 2610 } | |
| 2611 | |
| 2612 void do_push_context (void) | |
| 2613 { | |
| 2614 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
|
2615 p->second.push_context (my_scope); |
| 7336 | 2616 } |
| 2617 | |
| 2618 void do_pop_context (void) | |
| 2619 { | |
|
16605
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
2620 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
|
2621 |
|
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
2622 while (p != table.end ()) |
| 7374 | 2623 { |
|
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2624 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
|
2625 table.erase (p++); |
| 10313 | 2626 else |
| 2627 p++; | |
| 7374 | 2628 } |
| 7336 | 2629 } |
| 2630 | |
| 2631 void do_clear_variables (void) | |
| 2632 { | |
| 2633 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
|
2634 p->second.clear (my_scope); |
| 7336 | 2635 } |
| 2636 | |
|
9240
f27a8c07f0b2
clear -classes and support.
Robert T. Short <octave@phaselockedsystems.com>
parents:
9144
diff
changeset
|
2637 void do_clear_objects (void) |
|
f27a8c07f0b2
clear -classes and support.
Robert T. Short <octave@phaselockedsystems.com>
parents:
9144
diff
changeset
|
2638 { |
|
f27a8c07f0b2
clear -classes and support.
Robert T. Short <octave@phaselockedsystems.com>
parents:
9144
diff
changeset
|
2639 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
|
2640 { |
| 10313 | 2641 symbol_record& sr = p->second; |
|
16442
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16320
diff
changeset
|
2642 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
|
2643 if (val.is_object ()) |
|
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2644 p->second.clear (my_scope); |
|
9240
f27a8c07f0b2
clear -classes and support.
Robert T. Short <octave@phaselockedsystems.com>
parents:
9144
diff
changeset
|
2645 } |
|
f27a8c07f0b2
clear -classes and support.
Robert T. Short <octave@phaselockedsystems.com>
parents:
9144
diff
changeset
|
2646 } |
|
f27a8c07f0b2
clear -classes and support.
Robert T. Short <octave@phaselockedsystems.com>
parents:
9144
diff
changeset
|
2647 |
| 7336 | 2648 void do_clear_global (const std::string& name) |
| 2649 { | |
| 2650 table_iterator p = table.find (name); | |
| 4913 | 2651 |
| 7336 | 2652 if (p != table.end ()) |
| 2653 { | |
| 10313 | 2654 symbol_record& sr = p->second; |
| 2655 | |
| 2656 if (sr.is_global ()) | |
|
9315
73e36b147e45
properly clear global variables
Jaroslav Hajek <highegg@gmail.com>
parents:
9260
diff
changeset
|
2657 sr.unmark_global (); |
| 7336 | 2658 } |
|
9315
73e36b147e45
properly clear global variables
Jaroslav Hajek <highegg@gmail.com>
parents:
9260
diff
changeset
|
2659 |
|
73e36b147e45
properly clear global variables
Jaroslav Hajek <highegg@gmail.com>
parents:
9260
diff
changeset
|
2660 global_table_iterator q = global_table.find (name); |
|
73e36b147e45
properly clear global variables
Jaroslav Hajek <highegg@gmail.com>
parents:
9260
diff
changeset
|
2661 |
|
73e36b147e45
properly clear global variables
Jaroslav Hajek <highegg@gmail.com>
parents:
9260
diff
changeset
|
2662 if (q != global_table.end ()) |
|
73e36b147e45
properly clear global variables
Jaroslav Hajek <highegg@gmail.com>
parents:
9260
diff
changeset
|
2663 global_table.erase (q); |
|
73e36b147e45
properly clear global variables
Jaroslav Hajek <highegg@gmail.com>
parents:
9260
diff
changeset
|
2664 |
| 7336 | 2665 } |
| 2666 | |
| 2667 void do_clear_variable (const std::string& name) | |
| 2668 { | |
| 2669 table_iterator p = table.find (name); | |
| 2670 | |
| 2671 if (p != table.end ()) | |
|
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2672 p->second.clear (my_scope); |
| 7336 | 2673 } |
| 2674 | |
| 2675 void do_clear_global_pattern (const std::string& pat) | |
| 2676 { | |
| 2677 glob_match pattern (pat); | |
| 2678 | |
| 2679 for (table_iterator p = table.begin (); p != table.end (); p++) | |
| 2680 { | |
| 10313 | 2681 symbol_record& sr = p->second; |
| 2682 | |
| 2683 if (sr.is_global () && pattern.match (sr.name ())) | |
|
9315
73e36b147e45
properly clear global variables
Jaroslav Hajek <highegg@gmail.com>
parents:
9260
diff
changeset
|
2684 sr.unmark_global (); |
| 7336 | 2685 } |
|
9315
73e36b147e45
properly clear global variables
Jaroslav Hajek <highegg@gmail.com>
parents:
9260
diff
changeset
|
2686 |
|
16605
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
2687 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
|
2688 |
|
2f8fb02a6c31
erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents:
16596
diff
changeset
|
2689 while (q != global_table.end ()) |
|
9315
73e36b147e45
properly clear global variables
Jaroslav Hajek <highegg@gmail.com>
parents:
9260
diff
changeset
|
2690 { |
| 10313 | 2691 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
|
2692 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
|
2693 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
|
2694 q++; |
|
9315
73e36b147e45
properly clear global variables
Jaroslav Hajek <highegg@gmail.com>
parents:
9260
diff
changeset
|
2695 } |
|
73e36b147e45
properly clear global variables
Jaroslav Hajek <highegg@gmail.com>
parents:
9260
diff
changeset
|
2696 |
|
73e36b147e45
properly clear global variables
Jaroslav Hajek <highegg@gmail.com>
parents:
9260
diff
changeset
|
2697 |
| 7336 | 2698 } |
| 2699 | |
| 2700 void do_clear_variable_pattern (const std::string& pat) | |
| 2701 { | |
| 2702 glob_match pattern (pat); | |
| 2703 | |
| 2704 for (table_iterator p = table.begin (); p != table.end (); p++) | |
| 2705 { | |
| 10313 | 2706 symbol_record& sr = p->second; |
| 2707 | |
| 2708 if (sr.is_defined () || sr.is_global ()) | |
| 2709 { | |
| 2710 if (pattern.match (sr.name ())) | |
|
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2711 sr.clear (my_scope); |
| 10313 | 2712 } |
| 7336 | 2713 } |
| 2714 } | |
| 2715 | |
|
7779
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2716 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
|
2717 { |
|
14024
fc9f204faea0
refactor regexp (bug #34440)
John W. Eaton <jwe@octave.org>
parents:
13985
diff
changeset
|
2718 ::regexp pattern (pat); |
|
7779
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2719 |
|
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2720 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
|
2721 { |
| 10313 | 2722 symbol_record& sr = p->second; |
| 2723 | |
| 2724 if (sr.is_defined () || sr.is_global ()) | |
| 2725 { | |
|
14024
fc9f204faea0
refactor regexp (bug #34440)
John W. Eaton <jwe@octave.org>
parents:
13985
diff
changeset
|
2726 if (pattern.is_match (sr.name ())) |
|
14544
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2727 sr.clear (my_scope); |
| 10313 | 2728 } |
|
7779
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2729 } |
|
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2730 } |
|
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2731 |
|
11557
e9d72a3caa46
mark automatic variables as automatic
John W. Eaton <jwe@octave.org>
parents:
11548
diff
changeset
|
2732 void do_mark_automatic (const std::string& name) |
|
e9d72a3caa46
mark automatic variables as automatic
John W. Eaton <jwe@octave.org>
parents:
11548
diff
changeset
|
2733 { |
|
e9d72a3caa46
mark automatic variables as automatic
John W. Eaton <jwe@octave.org>
parents:
11548
diff
changeset
|
2734 do_insert (name).mark_automatic (); |
|
e9d72a3caa46
mark automatic variables as automatic
John W. Eaton <jwe@octave.org>
parents:
11548
diff
changeset
|
2735 } |
|
e9d72a3caa46
mark automatic variables as automatic
John W. Eaton <jwe@octave.org>
parents:
11548
diff
changeset
|
2736 |
| 7336 | 2737 void do_mark_hidden (const std::string& name) |
| 2738 { | |
|
10633
d022061c288d
symbol_table minor improvements
Jaroslav Hajek <highegg@gmail.com>
parents:
10559
diff
changeset
|
2739 do_insert (name).mark_hidden (); |
| 7336 | 2740 } |
| 2741 | |
| 2742 void do_mark_global (const std::string& name) | |
| 2743 { | |
|
10633
d022061c288d
symbol_table minor improvements
Jaroslav Hajek <highegg@gmail.com>
parents:
10559
diff
changeset
|
2744 do_insert (name).mark_global (); |
| 7336 | 2745 } |
| 2746 | |
|
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
2747 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
|
2748 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
|
2749 unsigned int exclude) const |
| 7336 | 2750 { |
| 2751 std::list<symbol_record> retval; | |
| 2752 | |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2753 for (table_const_iterator p = table.begin (); p != table.end (); p++) |
| 7336 | 2754 { |
| 10313 | 2755 const symbol_record& sr = p->second; |
| 2756 | |
|
15572
859c8bf6d134
Fix saved struct with function handle fails to load (bug #33857)
Max Brister <max@2bass.com>
parents:
15467
diff
changeset
|
2757 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
|
2758 || (sr.xstorage_class () & exclude)) |
| 10313 | 2759 continue; |
| 2760 | |
| 2761 retval.push_back (sr); | |
| 7336 | 2762 } |
| 2763 | |
| 2764 return retval; | |
| 2765 } | |
| 2766 | |
| 2767 std::list<symbol_record> do_glob (const std::string& pattern, | |
| 10313 | 2768 bool vars_only = false) const |
| 7336 | 2769 { |
| 2770 std::list<symbol_record> retval; | |
| 2771 | |
| 2772 glob_match pat (pattern); | |
| 2773 | |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2774 for (table_const_iterator p = table.begin (); p != table.end (); p++) |
| 7336 | 2775 { |
| 10313 | 2776 if (pat.match (p->first)) |
| 2777 { | |
| 2778 const symbol_record& sr = p->second; | |
| 2779 | |
| 2780 if (vars_only && ! sr.is_variable ()) | |
| 2781 continue; | |
| 2782 | |
| 2783 retval.push_back (sr); | |
| 2784 } | |
| 7336 | 2785 } |
| 2786 | |
| 2787 return retval; | |
| 2788 } | |
| 2789 | |
|
7779
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2790 std::list<symbol_record> do_regexp (const std::string& pattern, |
| 10313 | 2791 bool vars_only = false) const |
|
7779
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2792 { |
|
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2793 std::list<symbol_record> retval; |
|
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2794 |
|
14024
fc9f204faea0
refactor regexp (bug #34440)
John W. Eaton <jwe@octave.org>
parents:
13985
diff
changeset
|
2795 ::regexp pat (pattern); |
|
7779
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2796 |
|
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2797 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
|
2798 { |
|
14024
fc9f204faea0
refactor regexp (bug #34440)
John W. Eaton <jwe@octave.org>
parents:
13985
diff
changeset
|
2799 if (pat.is_match (p->first)) |
| 10313 | 2800 { |
| 2801 const symbol_record& sr = p->second; | |
| 2802 | |
| 2803 if (vars_only && ! sr.is_variable ()) | |
| 2804 continue; | |
| 2805 | |
| 2806 retval.push_back (sr); | |
| 2807 } | |
|
7779
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2808 } |
|
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2809 |
|
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2810 return retval; |
|
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2811 } |
|
791231dac333
Add regexp matching to Fwho and Fclear
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
2812 |
| 7336 | 2813 std::list<std::string> do_variable_names (void) |
| 2814 { | |
| 2815 std::list<std::string> retval; | |
| 2816 | |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2817 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
|
2818 { |
| 10313 | 2819 if (p->second.is_variable ()) |
| 2820 retval.push_back (p->first); | |
|
9260
9c2349a51218
properly unmark forced variables
John W. Eaton <jwe@octave.org>
parents:
9240
diff
changeset
|
2821 } |
| 7336 | 2822 |
| 2823 retval.sort (); | |
| 2824 | |
| 2825 return retval; | |
| 2826 } | |
| 2827 | |
| 2828 bool do_is_local_variable (const std::string& name) const | |
| 2829 { | |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2830 table_const_iterator p = table.find (name); |
| 7336 | 2831 |
| 2832 return (p != table.end () | |
| 10313 | 2833 && ! p->second.is_global () |
| 2834 && p->second.is_defined ()); | |
| 7336 | 2835 } |
| 2836 | |
| 2837 bool do_is_global (const std::string& name) const | |
| 2838 { | |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2839 table_const_iterator p = table.find (name); |
| 7336 | 2840 |
| 2841 return p != table.end () && p->second.is_global (); | |
| 2842 } | |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2843 |
|
16468
0f143f68078d
use signal/slot for updating workspace instead of using event listener
John W. Eaton <jwe@octave.org>
parents:
16442
diff
changeset
|
2844 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
|
2845 |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2846 void do_dump (std::ostream& os); |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2847 |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
2848 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
|
2849 |
|
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2850 void do_update_nest (void); |
|
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2851 |
|
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2852 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
|
2853 { |
|
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2854 table_iterator p = table.find (name); |
|
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2855 if (p == table.end ()) |
|
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2856 { |
|
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2857 if (nest_parent) |
|
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2858 return nest_parent->look_nonlocal (name, result); |
|
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2859 } |
|
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2860 else if (! p->second.is_automatic ()) |
|
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2861 { |
|
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2862 result = p->second; |
|
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2863 return true; |
|
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2864 } |
|
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2865 |
|
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2866 return false; |
|
be18c9e359bf
Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
2867 } |
| 3011 | 2868 }; |
| 2790 | 2869 |
|
9450
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9446
diff
changeset
|
2870 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
|
2871 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
|
2872 bool check_relative = true); |
|
9450
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9446
diff
changeset
|
2873 |
|
10087
090173f2db40
improve overload dispatching of built-in classes
Jaroslav Hajek <highegg@gmail.com>
parents:
10071
diff
changeset
|
2874 extern OCTINTERP_API std::string |
|
090173f2db40
improve overload dispatching of built-in classes
Jaroslav Hajek <highegg@gmail.com>
parents:
10071
diff
changeset
|
2875 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
|
2876 extern OCTINTERP_API std::string |
|
10321
97b4bd6f0925
partially rewrite function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
10313
diff
changeset
|
2877 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
|
2878 |
| 8 | 2879 #endif |