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