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