Mercurial > octave
annotate src/symtab.cc @ 9444:0c785ad961fa
improve behavior of builtin
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 21 Jul 2009 12:43:33 -0400 |
parents | 8f9d8776d11c |
children | c5f03874ea2a |
rev | line source |
---|---|
1 | 1 /* |
2 | |
7017 | 3 Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, |
8920 | 4 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 John W. Eaton |
7336 | 5 |
1 | 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. | |
1 | 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/>. | |
1 | 21 |
22 */ | |
23 | |
240 | 24 #ifdef HAVE_CONFIG_H |
1192 | 25 #include <config.h> |
1 | 26 #endif |
27 | |
7336 | 28 #include "oct-env.h" |
29 #include "oct-time.h" | |
30 #include "file-ops.h" | |
31 #include "file-stat.h" | |
1755 | 32 |
3308 | 33 #include "defun.h" |
7336 | 34 #include "dirfns.h" |
35 #include "input.h" | |
36 #include "load-path.h" | |
1755 | 37 #include "symtab.h" |
7336 | 38 #include "ov-fcn.h" |
8819
96d87674b818
also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents:
8785
diff
changeset
|
39 #include "ov-usr-fcn.h" |
7336 | 40 #include "pager.h" |
41 #include "parse.h" | |
42 #include "pt-arg-list.h" | |
43 #include "toplev.h" | |
44 #include "unwind-prot.h" | |
1 | 45 #include "utils.h" |
8123
eb2beef9a9ff
clear breakpoints is function found to be out of date
David Bateman <dbateman@free.fr>
parents:
8082
diff
changeset
|
46 #include "debug.h" |
7336 | 47 |
48 symbol_table *symbol_table::instance = 0; | |
1 | 49 |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
50 symbol_table::scope_id_cache *symbol_table::scope_id_cache::instance = 0; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
51 |
7336 | 52 std::map<symbol_table::scope_id, symbol_table*> symbol_table::all_instances; |
4913 | 53 |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7745
diff
changeset
|
54 std::map<std::string, octave_value> symbol_table::global_table; |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7745
diff
changeset
|
55 |
7336 | 56 std::map<std::string, symbol_table::fcn_info> symbol_table::fcn_table; |
4913 | 57 |
7972
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
58 std::map<std::string, std::set<std::string> > symbol_table::class_precedence_table; |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
59 |
7336 | 60 const symbol_table::scope_id symbol_table::xglobal_scope = 0; |
61 const symbol_table::scope_id symbol_table::xtop_scope = 1; | |
4238 | 62 |
7336 | 63 symbol_table::scope_id symbol_table::xcurrent_scope = 1; |
3308 | 64 |
7336 | 65 symbol_table::scope_id symbol_table::xparent_scope = -1; |
66 | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7745
diff
changeset
|
67 symbol_table::context_id symbol_table::xcurrent_context = 0; |
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7745
diff
changeset
|
68 |
7336 | 69 // Should Octave always check to see if function files have changed |
70 // since they were last compiled? | |
71 static int Vignore_function_time_stamp = 1; | |
3355 | 72 |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
73 void |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
74 symbol_table::symbol_record::symbol_record_rep::dump |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
75 (std::ostream& os, const std::string& prefix) const |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
76 { |
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
77 octave_value val = varval (xcurrent_context); |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
78 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
79 os << prefix << name; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
80 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
81 if (val.is_defined ()) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
82 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
83 os << " [" |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
84 << (is_local () ? "l" : "") |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
85 << (is_automatic () ? "a" : "") |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
86 << (is_formal () ? "f" : "") |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
87 << (is_hidden () ? "h" : "") |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
88 << (is_inherited () ? "i" : "") |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
89 << (is_global () ? "g" : "") |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
90 << (is_persistent () ? "p" : "") |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
91 << "] "; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
92 val.dump (os); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
93 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
94 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
95 os << "\n"; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
96 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
97 |
7336 | 98 octave_value |
99 symbol_table::symbol_record::find (tree_argument_list *args, | |
100 const string_vector& arg_names, | |
101 octave_value_list& evaluated_args, | |
102 bool& args_evaluated) const | |
103 { | |
104 octave_value retval; | |
3355 | 105 |
7336 | 106 if (is_global ()) |
9413
5cd879a0d8c4
speed-up function call by caching its name lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
9151
diff
changeset
|
107 retval = symbol_table::global_varref (name ()); |
7336 | 108 else |
109 { | |
9413
5cd879a0d8c4
speed-up function call by caching its name lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
9151
diff
changeset
|
110 retval = varval (); |
7336 | 111 |
9413
5cd879a0d8c4
speed-up function call by caching its name lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
9151
diff
changeset
|
112 if (retval.is_undefined ()) |
5cd879a0d8c4
speed-up function call by caching its name lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
9151
diff
changeset
|
113 { |
5cd879a0d8c4
speed-up function call by caching its name lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
9151
diff
changeset
|
114 // Use cached fcn_info pointer if possible. |
5cd879a0d8c4
speed-up function call by caching its name lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
9151
diff
changeset
|
115 if (rep->finfo) |
5cd879a0d8c4
speed-up function call by caching its name lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
9151
diff
changeset
|
116 retval = rep->finfo->find (args, arg_names, |
5cd879a0d8c4
speed-up function call by caching its name lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
9151
diff
changeset
|
117 evaluated_args, args_evaluated); |
5cd879a0d8c4
speed-up function call by caching its name lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
9151
diff
changeset
|
118 else |
5cd879a0d8c4
speed-up function call by caching its name lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
9151
diff
changeset
|
119 { |
5cd879a0d8c4
speed-up function call by caching its name lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
9151
diff
changeset
|
120 retval = symbol_table::find_function (name (), args, arg_names, |
5cd879a0d8c4
speed-up function call by caching its name lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
9151
diff
changeset
|
121 evaluated_args, args_evaluated); |
5cd879a0d8c4
speed-up function call by caching its name lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
9151
diff
changeset
|
122 |
5cd879a0d8c4
speed-up function call by caching its name lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
9151
diff
changeset
|
123 if (retval.is_defined ()) |
5cd879a0d8c4
speed-up function call by caching its name lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
9151
diff
changeset
|
124 rep->finfo = get_fcn_info (name ()); |
5cd879a0d8c4
speed-up function call by caching its name lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
9151
diff
changeset
|
125 } |
5cd879a0d8c4
speed-up function call by caching its name lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
9151
diff
changeset
|
126 } |
7336 | 127 } |
128 | |
9413
5cd879a0d8c4
speed-up function call by caching its name lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
9151
diff
changeset
|
129 return retval; |
3355 | 130 } |
131 | |
7336 | 132 // Check the load path to see if file that defined this is still |
133 // visible. If the file is no longer visible, then erase the | |
134 // definition and move on. If the file is visible, then we also | |
135 // need to check to see whether the file has changed since the the | |
136 // function was loaded/parsed. However, this check should only | |
137 // happen once per prompt (for files found from relative path | |
138 // elements, we also check if the working directory has changed | |
139 // since the last time the function was loaded/parsed). | |
140 // | |
141 // FIXME -- perhaps this should be done for all loaded functions when | |
142 // the prompt is printed or the directory has changed, and then we | |
143 // would not check for it when finding symbol definitions. | |
3355 | 144 |
7336 | 145 static inline bool |
7745
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
146 load_out_of_date_fcn (const std::string& ff, const std::string& dir_name, |
9151 | 147 octave_value& function, |
148 const std::string& dispatch_type = std::string ()) | |
7745
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
149 { |
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
150 bool retval = false; |
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
151 |
9151 | 152 octave_function *fcn = load_fcn_from_file (ff, dir_name, dispatch_type); |
7745
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
153 |
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
154 if (fcn) |
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
155 { |
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
156 retval = true; |
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
157 |
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
158 function = octave_value (fcn); |
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
159 } |
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
160 else |
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
161 function = octave_value (); |
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
162 |
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
163 return retval; |
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
164 } |
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
165 |
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
166 static inline bool |
8123
eb2beef9a9ff
clear breakpoints is function found to be out of date
David Bateman <dbateman@free.fr>
parents:
8082
diff
changeset
|
167 out_of_date_check_internal (octave_function *fcn, octave_value& function, |
7942
db6478d9c669
out_of_date_check_internal: make it work for class methods
John W. Eaton <jwe@octave.org>
parents:
7901
diff
changeset
|
168 const std::string& dispatch_type = std::string ()) |
1 | 169 { |
3013 | 170 bool retval = false; |
2949 | 171 |
7336 | 172 if (fcn) |
220 | 173 { |
7336 | 174 // FIXME -- we need to handle nested functions properly here. |
4914 | 175 |
7336 | 176 if (! fcn->is_nested_function ()) |
177 { | |
178 std::string ff = fcn->fcn_file_name (); | |
4914 | 179 |
7336 | 180 if (! ff.empty ()) |
181 { | |
182 octave_time tc = fcn->time_checked (); | |
4913 | 183 |
7336 | 184 bool relative = fcn->is_relative (); |
3013 | 185 |
7336 | 186 if (tc < Vlast_prompt_time |
187 || (relative && tc < Vlast_chdir_time)) | |
4913 | 188 { |
8123
eb2beef9a9ff
clear breakpoints is function found to be out of date
David Bateman <dbateman@free.fr>
parents:
8082
diff
changeset
|
189 bool clear_breakpoints = false; |
7336 | 190 std::string nm = fcn->name (); |
4914 | 191 |
7336 | 192 int nm_len = nm.length (); |
4913 | 193 |
7336 | 194 std::string file; |
195 std::string dir_name; | |
4913 | 196 |
7336 | 197 if (octave_env::absolute_pathname (nm) |
198 && ((nm_len > 4 && (nm.substr (nm_len-4) == ".oct" | |
199 || nm.substr (nm_len-4) == ".mex")) | |
9074
46a0e6e9e446
fix invalid subscript in symtab.cc
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
200 || (nm_len > 2 && nm.substr (nm_len-2) == ".m"))) |
7336 | 201 file = nm; |
202 else | |
7745
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
203 { |
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
204 // We don't want to make this an absolute name, |
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
205 // because load_fcn_file looks at the name to |
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
206 // decide whether it came from a relative lookup. |
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
207 |
8082
163d20e4d39c
symtab.cc (out_of_date_check_internal): check for method, then regular function
John W. Eaton <jwe@octave.org>
parents:
8021
diff
changeset
|
208 if (! dispatch_type.empty ()) |
8155
344c9b6532a2
symtab.cc (out_of_date_check_internal): fix order of arguments in call to load_path::find_method
John W. Eaton <jwe@octave.org>
parents:
8146
diff
changeset
|
209 file = load_path::find_method (dispatch_type, nm, |
7942
db6478d9c669
out_of_date_check_internal: make it work for class methods
John W. Eaton <jwe@octave.org>
parents:
7901
diff
changeset
|
210 dir_name); |
8082
163d20e4d39c
symtab.cc (out_of_date_check_internal): check for method, then regular function
John W. Eaton <jwe@octave.org>
parents:
8021
diff
changeset
|
211 |
163d20e4d39c
symtab.cc (out_of_date_check_internal): check for method, then regular function
John W. Eaton <jwe@octave.org>
parents:
8021
diff
changeset
|
212 if (file.empty ()) |
163d20e4d39c
symtab.cc (out_of_date_check_internal): check for method, then regular function
John W. Eaton <jwe@octave.org>
parents:
8021
diff
changeset
|
213 file = load_path::find_fcn (nm, dir_name); |
7745
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
214 } |
4913 | 215 |
7336 | 216 if (file.empty ()) |
217 { | |
218 // Can't see this function from current | |
219 // directory, so we should clear it. | |
195 | 220 |
7336 | 221 function = octave_value (); |
8123
eb2beef9a9ff
clear breakpoints is function found to be out of date
David Bateman <dbateman@free.fr>
parents:
8082
diff
changeset
|
222 |
eb2beef9a9ff
clear breakpoints is function found to be out of date
David Bateman <dbateman@free.fr>
parents:
8082
diff
changeset
|
223 clear_breakpoints = true; |
7336 | 224 } |
225 else if (same_file (file, ff)) | |
226 { | |
7745
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
227 // Same file. If it is out of date, then reload it. |
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
228 |
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
229 octave_time ottp = fcn->time_parsed (); |
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
230 time_t tp = ottp.unix_time (); |
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
231 |
7336 | 232 fcn->mark_fcn_file_up_to_date (octave_time ()); |
1 | 233 |
7336 | 234 if (! (Vignore_function_time_stamp == 2 |
235 || (Vignore_function_time_stamp | |
236 && fcn->is_system_fcn_file ()))) | |
237 { | |
238 file_stat fs (ff); | |
572 | 239 |
7336 | 240 if (fs) |
241 { | |
242 if (fs.is_newer (tp)) | |
8123
eb2beef9a9ff
clear breakpoints is function found to be out of date
David Bateman <dbateman@free.fr>
parents:
8082
diff
changeset
|
243 { |
eb2beef9a9ff
clear breakpoints is function found to be out of date
David Bateman <dbateman@free.fr>
parents:
8082
diff
changeset
|
244 retval = load_out_of_date_fcn (ff, dir_name, |
9151 | 245 function, |
246 dispatch_type); | |
8123
eb2beef9a9ff
clear breakpoints is function found to be out of date
David Bateman <dbateman@free.fr>
parents:
8082
diff
changeset
|
247 |
eb2beef9a9ff
clear breakpoints is function found to be out of date
David Bateman <dbateman@free.fr>
parents:
8082
diff
changeset
|
248 clear_breakpoints = true; |
eb2beef9a9ff
clear breakpoints is function found to be out of date
David Bateman <dbateman@free.fr>
parents:
8082
diff
changeset
|
249 } |
7336 | 250 } |
251 else | |
8123
eb2beef9a9ff
clear breakpoints is function found to be out of date
David Bateman <dbateman@free.fr>
parents:
8082
diff
changeset
|
252 { |
eb2beef9a9ff
clear breakpoints is function found to be out of date
David Bateman <dbateman@free.fr>
parents:
8082
diff
changeset
|
253 function = octave_value (); |
eb2beef9a9ff
clear breakpoints is function found to be out of date
David Bateman <dbateman@free.fr>
parents:
8082
diff
changeset
|
254 |
eb2beef9a9ff
clear breakpoints is function found to be out of date
David Bateman <dbateman@free.fr>
parents:
8082
diff
changeset
|
255 clear_breakpoints = true; |
eb2beef9a9ff
clear breakpoints is function found to be out of date
David Bateman <dbateman@free.fr>
parents:
8082
diff
changeset
|
256 } |
6829 | 257 } |
258 } | |
7745
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
259 else |
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
260 { |
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
261 // Not the same file, so load the new file in |
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
262 // place of the old. |
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
263 |
9151 | 264 retval = load_out_of_date_fcn (file, dir_name, function, |
265 dispatch_type); | |
8123
eb2beef9a9ff
clear breakpoints is function found to be out of date
David Bateman <dbateman@free.fr>
parents:
8082
diff
changeset
|
266 |
eb2beef9a9ff
clear breakpoints is function found to be out of date
David Bateman <dbateman@free.fr>
parents:
8082
diff
changeset
|
267 clear_breakpoints = true; |
7745
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
268 } |
8123
eb2beef9a9ff
clear breakpoints is function found to be out of date
David Bateman <dbateman@free.fr>
parents:
8082
diff
changeset
|
269 |
eb2beef9a9ff
clear breakpoints is function found to be out of date
David Bateman <dbateman@free.fr>
parents:
8082
diff
changeset
|
270 // If the function has been replaced then clear any |
eb2beef9a9ff
clear breakpoints is function found to be out of date
David Bateman <dbateman@free.fr>
parents:
8082
diff
changeset
|
271 // breakpoints associated with it |
eb2beef9a9ff
clear breakpoints is function found to be out of date
David Bateman <dbateman@free.fr>
parents:
8082
diff
changeset
|
272 if (clear_breakpoints) |
eb2beef9a9ff
clear breakpoints is function found to be out of date
David Bateman <dbateman@free.fr>
parents:
8082
diff
changeset
|
273 bp_table::remove_all_breakpoints_in_file (nm, true); |
6829 | 274 } |
275 } | |
4009 | 276 } |
277 } | |
278 | |
279 return retval; | |
280 } | |
281 | |
8123
eb2beef9a9ff
clear breakpoints is function found to be out of date
David Bateman <dbateman@free.fr>
parents:
8082
diff
changeset
|
282 static inline bool |
eb2beef9a9ff
clear breakpoints is function found to be out of date
David Bateman <dbateman@free.fr>
parents:
8082
diff
changeset
|
283 out_of_date_check_internal (octave_value& function, |
eb2beef9a9ff
clear breakpoints is function found to be out of date
David Bateman <dbateman@free.fr>
parents:
8082
diff
changeset
|
284 const std::string& dispatch_type = std::string ()) |
eb2beef9a9ff
clear breakpoints is function found to be out of date
David Bateman <dbateman@free.fr>
parents:
8082
diff
changeset
|
285 { |
eb2beef9a9ff
clear breakpoints is function found to be out of date
David Bateman <dbateman@free.fr>
parents:
8082
diff
changeset
|
286 return out_of_date_check_internal (function.function_value (true), |
eb2beef9a9ff
clear breakpoints is function found to be out of date
David Bateman <dbateman@free.fr>
parents:
8082
diff
changeset
|
287 function, dispatch_type); |
eb2beef9a9ff
clear breakpoints is function found to be out of date
David Bateman <dbateman@free.fr>
parents:
8082
diff
changeset
|
288 } |
eb2beef9a9ff
clear breakpoints is function found to be out of date
David Bateman <dbateman@free.fr>
parents:
8082
diff
changeset
|
289 |
4009 | 290 bool |
7336 | 291 out_of_date_check (octave_value& function) |
4009 | 292 { |
7336 | 293 return out_of_date_check_internal (function); |
294 } | |
4009 | 295 |
8123
eb2beef9a9ff
clear breakpoints is function found to be out of date
David Bateman <dbateman@free.fr>
parents:
8082
diff
changeset
|
296 bool |
eb2beef9a9ff
clear breakpoints is function found to be out of date
David Bateman <dbateman@free.fr>
parents:
8082
diff
changeset
|
297 out_of_date_check (octave_function* fcn) |
eb2beef9a9ff
clear breakpoints is function found to be out of date
David Bateman <dbateman@free.fr>
parents:
8082
diff
changeset
|
298 { |
eb2beef9a9ff
clear breakpoints is function found to be out of date
David Bateman <dbateman@free.fr>
parents:
8082
diff
changeset
|
299 octave_value function; |
eb2beef9a9ff
clear breakpoints is function found to be out of date
David Bateman <dbateman@free.fr>
parents:
8082
diff
changeset
|
300 return out_of_date_check_internal (fcn, function); |
eb2beef9a9ff
clear breakpoints is function found to be out of date
David Bateman <dbateman@free.fr>
parents:
8082
diff
changeset
|
301 } |
eb2beef9a9ff
clear breakpoints is function found to be out of date
David Bateman <dbateman@free.fr>
parents:
8082
diff
changeset
|
302 |
7336 | 303 octave_value |
304 symbol_table::fcn_info::fcn_info_rep::load_private_function | |
305 (const std::string& dir_name) | |
306 { | |
307 octave_value retval; | |
308 | |
309 std::string file_name = load_path::find_private_fcn (dir_name, name); | |
310 | |
311 if (! file_name.empty ()) | |
4009 | 312 { |
8781
f57c9fdb6836
stash directory name when loading private function
John W. Eaton <jwe@octave.org>
parents:
8691
diff
changeset
|
313 octave_function *fcn = load_fcn_from_file (file_name, dir_name); |
4009 | 314 |
7336 | 315 if (fcn) |
4009 | 316 { |
8785
70f5a0375afd
oct-map.h: fix think-o in previous change
John W. Eaton <jwe@octave.org>
parents:
8781
diff
changeset
|
317 std::string class_name; |
70f5a0375afd
oct-map.h: fix think-o in previous change
John W. Eaton <jwe@octave.org>
parents:
8781
diff
changeset
|
318 |
70f5a0375afd
oct-map.h: fix think-o in previous change
John W. Eaton <jwe@octave.org>
parents:
8781
diff
changeset
|
319 size_t pos = dir_name.find_last_of (file_ops::dir_sep_chars ()); |
70f5a0375afd
oct-map.h: fix think-o in previous change
John W. Eaton <jwe@octave.org>
parents:
8781
diff
changeset
|
320 |
70f5a0375afd
oct-map.h: fix think-o in previous change
John W. Eaton <jwe@octave.org>
parents:
8781
diff
changeset
|
321 if (pos != std::string::npos) |
70f5a0375afd
oct-map.h: fix think-o in previous change
John W. Eaton <jwe@octave.org>
parents:
8781
diff
changeset
|
322 { |
70f5a0375afd
oct-map.h: fix think-o in previous change
John W. Eaton <jwe@octave.org>
parents:
8781
diff
changeset
|
323 std::string tmp = dir_name.substr (pos+1); |
70f5a0375afd
oct-map.h: fix think-o in previous change
John W. Eaton <jwe@octave.org>
parents:
8781
diff
changeset
|
324 |
70f5a0375afd
oct-map.h: fix think-o in previous change
John W. Eaton <jwe@octave.org>
parents:
8781
diff
changeset
|
325 if (tmp[0] == '@') |
70f5a0375afd
oct-map.h: fix think-o in previous change
John W. Eaton <jwe@octave.org>
parents:
8781
diff
changeset
|
326 class_name = tmp.substr (1); |
70f5a0375afd
oct-map.h: fix think-o in previous change
John W. Eaton <jwe@octave.org>
parents:
8781
diff
changeset
|
327 } |
70f5a0375afd
oct-map.h: fix think-o in previous change
John W. Eaton <jwe@octave.org>
parents:
8781
diff
changeset
|
328 |
70f5a0375afd
oct-map.h: fix think-o in previous change
John W. Eaton <jwe@octave.org>
parents:
8781
diff
changeset
|
329 fcn->mark_as_private_function (class_name); |
70f5a0375afd
oct-map.h: fix think-o in previous change
John W. Eaton <jwe@octave.org>
parents:
8781
diff
changeset
|
330 |
7336 | 331 retval = octave_value (fcn); |
4009 | 332 |
7336 | 333 private_functions[dir_name] = retval; |
4009 | 334 } |
335 } | |
336 | |
337 return retval; | |
338 } | |
339 | |
7336 | 340 octave_value |
341 symbol_table::fcn_info::fcn_info_rep::load_class_constructor (void) | |
4009 | 342 { |
7336 | 343 octave_value retval; |
344 | |
345 std::string dir_name; | |
4009 | 346 |
7336 | 347 std::string file_name = load_path::find_method (name, name, dir_name); |
348 | |
349 if (! file_name.empty ()) | |
4009 | 350 { |
7336 | 351 octave_function *fcn = load_fcn_from_file (file_name, dir_name, name); |
4009 | 352 |
7336 | 353 if (fcn) |
4009 | 354 { |
7336 | 355 retval = octave_value (fcn); |
356 | |
357 class_constructors[name] = retval; | |
358 } | |
359 } | |
360 | |
361 return retval; | |
362 } | |
363 | |
364 octave_value | |
365 symbol_table::fcn_info::fcn_info_rep::load_class_method | |
366 (const std::string& dispatch_type) | |
367 { | |
368 octave_value retval; | |
4009 | 369 |
8162
293c4b5fe33d
symtab.cc (symbol_table::fcn_info::fcn_info_rep::load_class_method): Call load_class_constructor if name and dispatch_type are the same.
John W. Eaton <jwe@octave.org>
parents:
8161
diff
changeset
|
370 if (name == dispatch_type) |
293c4b5fe33d
symtab.cc (symbol_table::fcn_info::fcn_info_rep::load_class_method): Call load_class_constructor if name and dispatch_type are the same.
John W. Eaton <jwe@octave.org>
parents:
8161
diff
changeset
|
371 retval = load_class_constructor (); |
293c4b5fe33d
symtab.cc (symbol_table::fcn_info::fcn_info_rep::load_class_method): Call load_class_constructor if name and dispatch_type are the same.
John W. Eaton <jwe@octave.org>
parents:
8161
diff
changeset
|
372 else |
7336 | 373 { |
8162
293c4b5fe33d
symtab.cc (symbol_table::fcn_info::fcn_info_rep::load_class_method): Call load_class_constructor if name and dispatch_type are the same.
John W. Eaton <jwe@octave.org>
parents:
8161
diff
changeset
|
374 std::string dir_name; |
293c4b5fe33d
symtab.cc (symbol_table::fcn_info::fcn_info_rep::load_class_method): Call load_class_constructor if name and dispatch_type are the same.
John W. Eaton <jwe@octave.org>
parents:
8161
diff
changeset
|
375 |
293c4b5fe33d
symtab.cc (symbol_table::fcn_info::fcn_info_rep::load_class_method): Call load_class_constructor if name and dispatch_type are the same.
John W. Eaton <jwe@octave.org>
parents:
8161
diff
changeset
|
376 std::string file_name = load_path::find_method (dispatch_type, name, |
293c4b5fe33d
symtab.cc (symbol_table::fcn_info::fcn_info_rep::load_class_method): Call load_class_constructor if name and dispatch_type are the same.
John W. Eaton <jwe@octave.org>
parents:
8161
diff
changeset
|
377 dir_name); |
4009 | 378 |
8162
293c4b5fe33d
symtab.cc (symbol_table::fcn_info::fcn_info_rep::load_class_method): Call load_class_constructor if name and dispatch_type are the same.
John W. Eaton <jwe@octave.org>
parents:
8161
diff
changeset
|
379 if (! file_name.empty ()) |
7336 | 380 { |
8162
293c4b5fe33d
symtab.cc (symbol_table::fcn_info::fcn_info_rep::load_class_method): Call load_class_constructor if name and dispatch_type are the same.
John W. Eaton <jwe@octave.org>
parents:
8161
diff
changeset
|
381 octave_function *fcn = load_fcn_from_file (file_name, dir_name, |
293c4b5fe33d
symtab.cc (symbol_table::fcn_info::fcn_info_rep::load_class_method): Call load_class_constructor if name and dispatch_type are the same.
John W. Eaton <jwe@octave.org>
parents:
8161
diff
changeset
|
382 dispatch_type); |
7336 | 383 |
8162
293c4b5fe33d
symtab.cc (symbol_table::fcn_info::fcn_info_rep::load_class_method): Call load_class_constructor if name and dispatch_type are the same.
John W. Eaton <jwe@octave.org>
parents:
8161
diff
changeset
|
384 if (fcn) |
293c4b5fe33d
symtab.cc (symbol_table::fcn_info::fcn_info_rep::load_class_method): Call load_class_constructor if name and dispatch_type are the same.
John W. Eaton <jwe@octave.org>
parents:
8161
diff
changeset
|
385 { |
293c4b5fe33d
symtab.cc (symbol_table::fcn_info::fcn_info_rep::load_class_method): Call load_class_constructor if name and dispatch_type are the same.
John W. Eaton <jwe@octave.org>
parents:
8161
diff
changeset
|
386 retval = octave_value (fcn); |
293c4b5fe33d
symtab.cc (symbol_table::fcn_info::fcn_info_rep::load_class_method): Call load_class_constructor if name and dispatch_type are the same.
John W. Eaton <jwe@octave.org>
parents:
8161
diff
changeset
|
387 |
293c4b5fe33d
symtab.cc (symbol_table::fcn_info::fcn_info_rep::load_class_method): Call load_class_constructor if name and dispatch_type are the same.
John W. Eaton <jwe@octave.org>
parents:
8161
diff
changeset
|
388 class_methods[dispatch_type] = retval; |
293c4b5fe33d
symtab.cc (symbol_table::fcn_info::fcn_info_rep::load_class_method): Call load_class_constructor if name and dispatch_type are the same.
John W. Eaton <jwe@octave.org>
parents:
8161
diff
changeset
|
389 } |
4009 | 390 } |
391 } | |
392 | |
393 return retval; | |
394 } | |
395 | |
7336 | 396 void |
397 symbol_table::fcn_info::fcn_info_rep::print_dispatch (std::ostream& os) const | |
1 | 398 { |
7336 | 399 if (dispatch_map.empty ()) |
400 os << "dispatch: " << name << " is not overloaded" << std::endl; | |
401 else | |
402 { | |
403 os << "Overloaded function " << name << ":\n\n"; | |
404 | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
405 for (dispatch_map_const_iterator p = dispatch_map.begin (); |
7336 | 406 p != dispatch_map.end (); p++) |
407 os << " " << name << " (" << p->first << ", ...) -> " | |
408 << p->second << " (" << p->first << ", ...)\n"; | |
3013 | 409 |
7336 | 410 os << std::endl; |
411 } | |
412 } | |
413 | |
414 std::string | |
415 symbol_table::fcn_info::fcn_info_rep::help_for_dispatch (void) const | |
416 { | |
417 std::string retval; | |
418 | |
419 if (! dispatch_map.empty ()) | |
1 | 420 { |
7336 | 421 retval = "Overloaded function:\n\n"; |
422 | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
423 for (dispatch_map_const_iterator p = dispatch_map.begin (); |
7336 | 424 p != dispatch_map.end (); p++) |
425 retval += " " + p->second + " (" + p->first + ", ...)\n\n"; | |
426 } | |
427 | |
428 return retval; | |
429 } | |
430 | |
7972
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
431 static std::string |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
432 get_dispatch_type (const octave_value_list& evaluated_args) |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
433 { |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
434 std::string dispatch_type; |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
435 |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
436 int n = evaluated_args.length (); |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
437 |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
438 if (n > 0) |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
439 { |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
440 // Find first object, if any. |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
441 |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
442 int i; |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
443 |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
444 for (i = 0; i < n; i++) |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
445 { |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
446 octave_value arg = evaluated_args(i); |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
447 |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
448 if (arg.is_object ()) |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
449 { |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
450 dispatch_type = arg.class_name (); |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
451 break; |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
452 } |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
453 } |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
454 |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
455 for (int j = i+1; j < n; j++) |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
456 { |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
457 octave_value arg = evaluated_args(j); |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
458 |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
459 if (arg.is_object ()) |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
460 { |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
461 std::string cname = arg.class_name (); |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
462 |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
463 // Only switch to type of ARG if it is marked superior |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
464 // to the current DISPATCH_TYPE. |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
465 if (! symbol_table::is_superiorto (dispatch_type, cname) |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
466 && symbol_table::is_superiorto (cname, dispatch_type)) |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
467 dispatch_type = cname; |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
468 } |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
469 } |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
470 |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
471 if (dispatch_type.empty ()) |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
472 { |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
473 // No object found, so use class of first argument. |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
474 |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
475 dispatch_type = evaluated_args(0).class_name (); |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
476 } |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
477 } |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
478 |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
479 return dispatch_type; |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
480 } |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
481 |
7336 | 482 // Find the definition of NAME according to the following precedence |
483 // list: | |
484 // | |
485 // variable | |
486 // subfunction | |
487 // private function | |
488 // class constructor | |
489 // class method | |
490 // legacy dispatch | |
491 // command-line function | |
492 // autoload function | |
493 // function on the path | |
494 // built-in function | |
3013 | 495 |
7336 | 496 // Notes: |
497 // | |
498 // FIXME -- we need to evaluate the argument list to determine the | |
499 // dispatch type. The method used here works (pass in the args, pass | |
500 // out the evaluated args and a flag saying whether the evaluation was | |
501 // needed), but it seems a bit inelegant. We do need to save the | |
502 // evaluated args in some way to avoid evaluating them multiple times. | |
503 // Maybe evaluated args could be attached to the tree_argument_list | |
504 // object? Then the argument list could be evaluated outside of this | |
505 // function and we could elimnate the arg_names, evaluated_args, and | |
506 // args_evaluated arguments. We would still want to avoid computing | |
507 // the dispatch type unless it is needed, so the args should be passed | |
508 // rather than the dispatch type. But the arguments will need to be | |
509 // evaluated no matter what, so evaluating them beforehand should be | |
510 // OK. If the evaluated arguments are attached to args, then we would | |
511 // need to determine the appropriate place(s) to clear them (for | |
512 // example, before returning from tree_index_expression::rvalue). | |
513 | |
514 octave_value | |
515 symbol_table::fcn_info::fcn_info_rep::find | |
516 (tree_argument_list *args, const string_vector& arg_names, | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7745
diff
changeset
|
517 octave_value_list& evaluated_args, bool& args_evaluated) |
7336 | 518 { |
8691
7838271ee25c
symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call
John W. Eaton <jwe@octave.org>
parents:
8580
diff
changeset
|
519 octave_value retval = xfind (args, arg_names, evaluated_args, args_evaluated); |
7838271ee25c
symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call
John W. Eaton <jwe@octave.org>
parents:
8580
diff
changeset
|
520 |
7838271ee25c
symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call
John W. Eaton <jwe@octave.org>
parents:
8580
diff
changeset
|
521 if (! retval.is_defined ()) |
7838271ee25c
symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call
John W. Eaton <jwe@octave.org>
parents:
8580
diff
changeset
|
522 { |
7838271ee25c
symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call
John W. Eaton <jwe@octave.org>
parents:
8580
diff
changeset
|
523 // It is possible that the user created a file on the fly since |
7838271ee25c
symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call
John W. Eaton <jwe@octave.org>
parents:
8580
diff
changeset
|
524 // the last prompt or chdir, so try updating the load path and |
7838271ee25c
symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call
John W. Eaton <jwe@octave.org>
parents:
8580
diff
changeset
|
525 // searching again. |
7838271ee25c
symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call
John W. Eaton <jwe@octave.org>
parents:
8580
diff
changeset
|
526 |
7838271ee25c
symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call
John W. Eaton <jwe@octave.org>
parents:
8580
diff
changeset
|
527 load_path::update (); |
7336 | 528 |
8691
7838271ee25c
symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call
John W. Eaton <jwe@octave.org>
parents:
8580
diff
changeset
|
529 retval = xfind (args, arg_names, evaluated_args, args_evaluated); |
7838271ee25c
symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call
John W. Eaton <jwe@octave.org>
parents:
8580
diff
changeset
|
530 } |
7838271ee25c
symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call
John W. Eaton <jwe@octave.org>
parents:
8580
diff
changeset
|
531 |
7838271ee25c
symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call
John W. Eaton <jwe@octave.org>
parents:
8580
diff
changeset
|
532 return retval; |
7838271ee25c
symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call
John W. Eaton <jwe@octave.org>
parents:
8580
diff
changeset
|
533 } |
7838271ee25c
symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call
John W. Eaton <jwe@octave.org>
parents:
8580
diff
changeset
|
534 |
7838271ee25c
symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call
John W. Eaton <jwe@octave.org>
parents:
8580
diff
changeset
|
535 octave_value |
7838271ee25c
symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call
John W. Eaton <jwe@octave.org>
parents:
8580
diff
changeset
|
536 symbol_table::fcn_info::fcn_info_rep::xfind |
7838271ee25c
symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call
John W. Eaton <jwe@octave.org>
parents:
8580
diff
changeset
|
537 (tree_argument_list *args, const string_vector& arg_names, |
7838271ee25c
symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call
John W. Eaton <jwe@octave.org>
parents:
8580
diff
changeset
|
538 octave_value_list& evaluated_args, bool& args_evaluated) |
7838271ee25c
symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call
John W. Eaton <jwe@octave.org>
parents:
8580
diff
changeset
|
539 { |
7336 | 540 // Subfunction. I think it only makes sense to check for |
541 // subfunctions if we are currently executing a function defined | |
542 // from a .m file. | |
543 | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7745
diff
changeset
|
544 scope_val_iterator r = subfunctions.find (xcurrent_scope); |
7336 | 545 |
7968
0d607e8dbbfa
eliminate curr_parent_function; fix subfunction lookup
John W. Eaton <jwe@octave.org>
parents:
7942
diff
changeset
|
546 octave_function *curr_fcn = 0; |
0d607e8dbbfa
eliminate curr_parent_function; fix subfunction lookup
John W. Eaton <jwe@octave.org>
parents:
7942
diff
changeset
|
547 |
7336 | 548 if (r != subfunctions.end ()) |
549 { | |
550 // FIXME -- out-of-date check here. | |
551 | |
552 return r->second; | |
553 } | |
7968
0d607e8dbbfa
eliminate curr_parent_function; fix subfunction lookup
John W. Eaton <jwe@octave.org>
parents:
7942
diff
changeset
|
554 else |
7336 | 555 { |
7968
0d607e8dbbfa
eliminate curr_parent_function; fix subfunction lookup
John W. Eaton <jwe@octave.org>
parents:
7942
diff
changeset
|
556 curr_fcn = octave_call_stack::current (); |
7336 | 557 |
7968
0d607e8dbbfa
eliminate curr_parent_function; fix subfunction lookup
John W. Eaton <jwe@octave.org>
parents:
7942
diff
changeset
|
558 if (curr_fcn) |
0d607e8dbbfa
eliminate curr_parent_function; fix subfunction lookup
John W. Eaton <jwe@octave.org>
parents:
7942
diff
changeset
|
559 { |
0d607e8dbbfa
eliminate curr_parent_function; fix subfunction lookup
John W. Eaton <jwe@octave.org>
parents:
7942
diff
changeset
|
560 scope_id pscope = curr_fcn->parent_fcn_scope (); |
7336 | 561 |
7968
0d607e8dbbfa
eliminate curr_parent_function; fix subfunction lookup
John W. Eaton <jwe@octave.org>
parents:
7942
diff
changeset
|
562 if (pscope > 0) |
0d607e8dbbfa
eliminate curr_parent_function; fix subfunction lookup
John W. Eaton <jwe@octave.org>
parents:
7942
diff
changeset
|
563 { |
0d607e8dbbfa
eliminate curr_parent_function; fix subfunction lookup
John W. Eaton <jwe@octave.org>
parents:
7942
diff
changeset
|
564 r = subfunctions.find (pscope); |
7336 | 565 |
7968
0d607e8dbbfa
eliminate curr_parent_function; fix subfunction lookup
John W. Eaton <jwe@octave.org>
parents:
7942
diff
changeset
|
566 if (r != subfunctions.end ()) |
0d607e8dbbfa
eliminate curr_parent_function; fix subfunction lookup
John W. Eaton <jwe@octave.org>
parents:
7942
diff
changeset
|
567 { |
0d607e8dbbfa
eliminate curr_parent_function; fix subfunction lookup
John W. Eaton <jwe@octave.org>
parents:
7942
diff
changeset
|
568 // FIXME -- out-of-date check here. |
0d607e8dbbfa
eliminate curr_parent_function; fix subfunction lookup
John W. Eaton <jwe@octave.org>
parents:
7942
diff
changeset
|
569 |
0d607e8dbbfa
eliminate curr_parent_function; fix subfunction lookup
John W. Eaton <jwe@octave.org>
parents:
7942
diff
changeset
|
570 return r->second; |
0d607e8dbbfa
eliminate curr_parent_function; fix subfunction lookup
John W. Eaton <jwe@octave.org>
parents:
7942
diff
changeset
|
571 } |
0d607e8dbbfa
eliminate curr_parent_function; fix subfunction lookup
John W. Eaton <jwe@octave.org>
parents:
7942
diff
changeset
|
572 } |
1 | 573 } |
574 } | |
3013 | 575 |
7336 | 576 // Private function. |
1 | 577 |
7968
0d607e8dbbfa
eliminate curr_parent_function; fix subfunction lookup
John W. Eaton <jwe@octave.org>
parents:
7942
diff
changeset
|
578 if (! curr_fcn) |
0d607e8dbbfa
eliminate curr_parent_function; fix subfunction lookup
John W. Eaton <jwe@octave.org>
parents:
7942
diff
changeset
|
579 curr_fcn = octave_call_stack::current (); |
1 | 580 |
7336 | 581 if (curr_fcn) |
582 { | |
583 std::string dir_name = curr_fcn->dir_name (); | |
1 | 584 |
7336 | 585 if (! dir_name.empty ()) |
586 { | |
587 str_val_iterator q = private_functions.find (dir_name); | |
4913 | 588 |
7336 | 589 if (q == private_functions.end ()) |
590 { | |
591 octave_value val = load_private_function (dir_name); | |
4913 | 592 |
7336 | 593 if (val.is_defined ()) |
594 return val; | |
595 } | |
596 else | |
4913 | 597 { |
7336 | 598 octave_value& fval = q->second; |
4913 | 599 |
7336 | 600 if (fval.is_defined ()) |
601 out_of_date_check_internal (fval); | |
4913 | 602 |
7336 | 603 if (fval.is_defined ()) |
604 return fval; | |
605 else | |
606 { | |
607 octave_value val = load_private_function (dir_name); | |
4913 | 608 |
7336 | 609 if (val.is_defined ()) |
610 return val; | |
4913 | 611 } |
612 } | |
613 } | |
614 } | |
615 | |
7336 | 616 // Class constructors. The class name and function name are the same. |
4913 | 617 |
7336 | 618 str_val_iterator q = class_constructors.find (name); |
4913 | 619 |
7336 | 620 if (q == class_constructors.end ()) |
621 { | |
622 octave_value val = load_class_constructor (); | |
3013 | 623 |
7336 | 624 if (val.is_defined ()) |
625 return val; | |
626 } | |
627 else | |
1 | 628 { |
7336 | 629 octave_value& fval = q->second; |
3013 | 630 |
7336 | 631 if (fval.is_defined ()) |
7942
db6478d9c669
out_of_date_check_internal: make it work for class methods
John W. Eaton <jwe@octave.org>
parents:
7901
diff
changeset
|
632 out_of_date_check_internal (fval, name); |
867 | 633 |
7336 | 634 if (fval.is_defined ()) |
635 return fval; | |
636 else | |
637 { | |
638 octave_value val = load_class_constructor (); | |
867 | 639 |
7336 | 640 if (val.is_defined ()) |
641 return val; | |
1 | 642 } |
643 } | |
1755 | 644 |
7336 | 645 // Class methods. |
1 | 646 |
7336 | 647 if (args_evaluated || (args && args->length () > 0)) |
648 { | |
649 if (! args_evaluated) | |
650 evaluated_args = args->convert_to_const_vector (); | |
3013 | 651 |
7336 | 652 if (! error_state) |
653 { | |
654 int n = evaluated_args.length (); | |
655 | |
656 if (n > 0 && ! args_evaluated) | |
657 evaluated_args.stash_name_tags (arg_names); | |
658 | |
659 args_evaluated = true; | |
660 | |
7972
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
661 if (n > 0) |
7336 | 662 { |
7972
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
663 std::string dispatch_type = get_dispatch_type (evaluated_args); |
3013 | 664 |
7972
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
665 octave_value fcn = find_method (dispatch_type); |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
666 |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
667 if (fcn.is_defined ()) |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
668 return fcn; |
7336 | 669 } |
670 } | |
671 else | |
672 return octave_value (); | |
3013 | 673 } |
674 | |
7336 | 675 // Legacy dispatch. We just check args_evaluated here because the |
676 // actual evaluation will have happened already when searching for | |
677 // class methods. | |
678 | |
679 if (args_evaluated && ! dispatch_map.empty ()) | |
680 { | |
8580
188d38a553c7
further indexing optimization touches
Jaroslav Hajek <highegg@gmail.com>
parents:
8162
diff
changeset
|
681 std::string dispatch_type = |
188d38a553c7
further indexing optimization touches
Jaroslav Hajek <highegg@gmail.com>
parents:
8162
diff
changeset
|
682 const_cast<const octave_value_list&>(evaluated_args)(0).type_name (); |
7336 | 683 |
684 std::string fname; | |
685 | |
686 dispatch_map_iterator p = dispatch_map.find (dispatch_type); | |
687 | |
688 if (p == dispatch_map.end ()) | |
689 p = dispatch_map.find ("any"); | |
3013 | 690 |
7336 | 691 if (p != dispatch_map.end ()) |
692 { | |
693 fname = p->second; | |
694 | |
695 octave_value fcn | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7745
diff
changeset
|
696 = symbol_table::find_function (fname, evaluated_args); |
7336 | 697 |
698 if (fcn.is_defined ()) | |
699 return fcn; | |
700 } | |
701 } | |
702 | |
703 // Command-line function. | |
704 | |
705 if (cmdline_function.is_defined ()) | |
706 return cmdline_function; | |
707 | |
708 // Autoload? | |
3013 | 709 |
7336 | 710 octave_value fcn = find_autoload (); |
711 | |
712 if (fcn.is_defined ()) | |
713 return fcn; | |
714 | |
715 // Function on the path. | |
716 | |
717 fcn = find_user_function (); | |
718 | |
719 if (fcn.is_defined ()) | |
720 return fcn; | |
721 | |
8691
7838271ee25c
symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call
John W. Eaton <jwe@octave.org>
parents:
8580
diff
changeset
|
722 // Built-in function (might be undefined). |
3145 | 723 |
8691
7838271ee25c
symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call
John W. Eaton <jwe@octave.org>
parents:
8580
diff
changeset
|
724 return built_in_function; |
3013 | 725 } |
1 | 726 |
9444
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
727 // Find the definition of NAME according to the following precedence |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
728 // list: |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
729 // |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
730 // built-in function |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
731 // function on the path |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
732 // autoload function |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
733 // command-line function |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
734 // private function |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
735 // subfunction |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
736 |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
737 // This function is used to implement the "builtin" function, which |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
738 // searches for "built-in" functions. In Matlab, "builtin" only |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
739 // returns functions that are actually built-in to the interpreter. |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
740 // But since the list of built-in functions is different in Octave and |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
741 // Matlab, we also search up the precedence list until we find |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
742 // something that matches. Note that we are only searching by name, |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
743 // so class methods, constructors, and legacy dispatch functions are |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
744 // skipped. |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
745 |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
746 octave_value |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
747 symbol_table::fcn_info::fcn_info_rep::builtin_find (void) |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
748 { |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
749 octave_value retval = x_builtin_find (); |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
750 |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
751 if (! retval.is_defined ()) |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
752 { |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
753 // It is possible that the user created a file on the fly since |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
754 // the last prompt or chdir, so try updating the load path and |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
755 // searching again. |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
756 |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
757 load_path::update (); |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
758 |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
759 retval = x_builtin_find (); |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
760 } |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
761 |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
762 return retval; |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
763 } |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
764 |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
765 octave_value |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
766 symbol_table::fcn_info::fcn_info_rep::x_builtin_find (void) |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
767 { |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
768 // Built-in function. |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
769 if (built_in_function.is_defined ()) |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
770 return built_in_function; |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
771 |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
772 // Function on the path. |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
773 |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
774 octave_value fcn = find_user_function (); |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
775 |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
776 if (fcn.is_defined ()) |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
777 return fcn; |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
778 |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
779 // Autoload? |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
780 |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
781 fcn = find_autoload (); |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
782 |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
783 if (fcn.is_defined ()) |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
784 return fcn; |
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 // Command-line function. |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
787 |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
788 if (cmdline_function.is_defined ()) |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
789 return cmdline_function; |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
790 |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
791 // Private function. |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
792 |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
793 octave_function *curr_fcn = octave_call_stack::current (); |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
794 |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
795 if (curr_fcn) |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
796 { |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
797 std::string dir_name = curr_fcn->dir_name (); |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
798 |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
799 if (! dir_name.empty ()) |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
800 { |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
801 str_val_iterator q = private_functions.find (dir_name); |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
802 |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
803 if (q == private_functions.end ()) |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
804 { |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
805 octave_value val = load_private_function (dir_name); |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
806 |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
807 if (val.is_defined ()) |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
808 return val; |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
809 } |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
810 else |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
811 { |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
812 octave_value& fval = q->second; |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
813 |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
814 if (fval.is_defined ()) |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
815 out_of_date_check_internal (fval); |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
816 |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
817 if (fval.is_defined ()) |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
818 return fval; |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
819 else |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
820 { |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
821 octave_value val = load_private_function (dir_name); |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
822 |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
823 if (val.is_defined ()) |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
824 return val; |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
825 } |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
826 } |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
827 } |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
828 } |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
829 |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
830 // Subfunction. I think it only makes sense to check for |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
831 // subfunctions if we are currently executing a function defined |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
832 // from a .m file. |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
833 |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
834 scope_val_iterator r = subfunctions.find (xcurrent_scope); |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
835 |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
836 if (r != subfunctions.end ()) |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
837 { |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
838 // FIXME -- out-of-date check here. |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
839 |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
840 return r->second; |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
841 } |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
842 else if (curr_fcn) |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
843 { |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
844 scope_id pscope = curr_fcn->parent_fcn_scope (); |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
845 |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
846 if (pscope > 0) |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
847 { |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
848 r = subfunctions.find (pscope); |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
849 |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
850 if (r != subfunctions.end ()) |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
851 { |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
852 // FIXME -- out-of-date check here. |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
853 |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
854 return r->second; |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
855 } |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
856 } |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
857 } |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
858 |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
859 return octave_value (); |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
860 } |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
861 |
7336 | 862 octave_value |
863 symbol_table::fcn_info::fcn_info_rep::find_method (const std::string& dispatch_type) | |
4913 | 864 { |
7336 | 865 octave_value retval; |
4913 | 866 |
7336 | 867 str_val_iterator q = class_methods.find (dispatch_type); |
4913 | 868 |
7336 | 869 if (q == class_methods.end ()) |
870 { | |
871 octave_value val = load_class_method (dispatch_type); | |
4913 | 872 |
7336 | 873 if (val.is_defined ()) |
874 return val; | |
875 } | |
876 else | |
877 { | |
878 octave_value& fval = q->second; | |
4913 | 879 |
7336 | 880 if (fval.is_defined ()) |
7942
db6478d9c669
out_of_date_check_internal: make it work for class methods
John W. Eaton <jwe@octave.org>
parents:
7901
diff
changeset
|
881 out_of_date_check_internal (fval, dispatch_type); |
7336 | 882 |
883 if (fval.is_defined ()) | |
884 return fval; | |
4913 | 885 else |
886 { | |
7336 | 887 octave_value val = load_class_method (dispatch_type); |
888 | |
889 if (val.is_defined ()) | |
890 return val; | |
4913 | 891 } |
892 } | |
893 | |
7336 | 894 return retval; |
4913 | 895 } |
896 | |
7336 | 897 octave_value |
898 symbol_table::fcn_info::fcn_info_rep::find_autoload (void) | |
4913 | 899 { |
7336 | 900 octave_value retval; |
4913 | 901 |
7336 | 902 // Autoloaded function. |
4913 | 903 |
7336 | 904 if (autoload_function.is_defined ()) |
905 out_of_date_check_internal (autoload_function); | |
4913 | 906 |
7336 | 907 if (! autoload_function.is_defined ()) |
908 { | |
909 std::string file_name = lookup_autoload (name); | |
4913 | 910 |
7336 | 911 if (! file_name.empty ()) |
912 { | |
8007
a2ab20ba78f7
make file_ops a proper singleton class
John W. Eaton <jwe@octave.org>
parents:
7972
diff
changeset
|
913 size_t pos = file_name.find_last_of (file_ops::dir_sep_chars ()); |
4913 | 914 |
7336 | 915 std::string dir_name = file_name.substr (0, pos); |
4913 | 916 |
7336 | 917 octave_function *fcn = load_fcn_from_file (file_name, dir_name, |
918 "", name, true); | |
4913 | 919 |
7336 | 920 if (fcn) |
921 autoload_function = octave_value (fcn); | |
922 } | |
4913 | 923 } |
924 | |
7336 | 925 return autoload_function; |
926 } | |
4914 | 927 |
7336 | 928 octave_value |
929 symbol_table::fcn_info::fcn_info_rep::find_user_function (void) | |
930 { | |
931 // Function on the path. | |
4913 | 932 |
7336 | 933 if (function_on_path.is_defined ()) |
934 out_of_date_check_internal (function_on_path); | |
4913 | 935 |
7336 | 936 if (! function_on_path.is_defined ()) |
937 { | |
938 std::string dir_name; | |
4913 | 939 |
7336 | 940 std::string file_name = load_path::find_fcn (name, dir_name); |
4913 | 941 |
7336 | 942 if (! file_name.empty ()) |
943 { | |
944 octave_function *fcn = load_fcn_from_file (file_name, dir_name); | |
4913 | 945 |
7336 | 946 if (fcn) |
947 function_on_path = octave_value (fcn); | |
4913 | 948 } |
949 } | |
950 | |
7336 | 951 return function_on_path; |
952 } | |
953 | |
7972
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
954 // Insert INF_CLASS in the set of class names that are considered |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
955 // inferior to SUP_CLASS. Return FALSE if INF_CLASS is currently |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
956 // marked as superior to SUP_CLASS. |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
957 |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
958 bool |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
959 symbol_table::set_class_relationship (const std::string& sup_class, |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
960 const std::string& inf_class) |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
961 { |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
962 class_precedence_table_const_iterator p |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
963 = class_precedence_table.find (inf_class); |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
964 |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
965 if (p != class_precedence_table.end ()) |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
966 { |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
967 const std::set<std::string>& inferior_classes = p->second; |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
968 |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
969 std::set<std::string>::const_iterator q |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
970 = inferior_classes.find (sup_class); |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
971 |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
972 if (q != inferior_classes.end ()) |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
973 return false; |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
974 } |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
975 |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
976 class_precedence_table[sup_class].insert (inf_class); |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
977 |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
978 return true; |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
979 } |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
980 |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
981 // Has class A been marked as superior to class B? Also returns |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
982 // TRUE if B has been marked as inferior to A, since we only keep |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
983 // one table, and convert inferiort information to a superiorto |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
984 // relationship. Two calls are required to determine whether there |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
985 // is no relationship between two classes: |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
986 // |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
987 // if (symbol_table::is_superiorto (a, b)) |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
988 // // A is superior to B, or B has been marked inferior to A. |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
989 // else if (symbol_table::is_superiorto (b, a)) |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
990 // // B is superior to A, or A has been marked inferior to B. |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
991 // else |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
992 // // No relation. |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
993 |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
994 bool |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
995 symbol_table::is_superiorto (const std::string& a, const std::string& b) |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
996 { |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
997 bool retval = false; |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
998 |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
999 class_precedence_table_const_iterator p = class_precedence_table.find (a); |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
1000 |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
1001 if (p != class_precedence_table.end ()) |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
1002 { |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
1003 const std::set<std::string>& inferior_classes = p->second; |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
1004 std::set<std::string>::const_iterator q = inferior_classes.find (b); |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
1005 |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
1006 if (q != inferior_classes.end ()) |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
1007 retval = true; |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
1008 } |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
1009 |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
1010 return retval; |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
1011 } |
5bf4e2c13ed8
make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
1012 |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1013 static std::string |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1014 fcn_file_name (const octave_value& fcn) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1015 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1016 const octave_function *f = fcn.function_value (); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1017 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1018 return f ? f->fcn_file_name () : std::string (); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1019 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1020 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1021 void |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1022 symbol_table::fcn_info::fcn_info_rep::dump |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1023 (std::ostream& os, const std::string& prefix) const |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1024 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1025 os << prefix << name |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1026 << " [" |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1027 << (cmdline_function.is_defined () ? "c" : "") |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1028 << (built_in_function.is_defined () ? "b" : "") |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1029 << "]\n"; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1030 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1031 std::string tprefix = prefix + " "; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1032 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1033 if (autoload_function.is_defined ()) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1034 os << tprefix << "autoload: " |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1035 << fcn_file_name (autoload_function) << "\n"; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1036 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1037 if (function_on_path.is_defined ()) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1038 os << tprefix << "function from path: " |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1039 << fcn_file_name (function_on_path) << "\n"; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1040 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1041 if (! subfunctions.empty ()) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1042 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1043 for (scope_val_const_iterator p = subfunctions.begin (); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1044 p != subfunctions.end (); p++) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1045 os << tprefix << "subfunction: " << fcn_file_name (p->second) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1046 << " [" << p->first << "]\n"; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1047 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1048 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1049 if (! private_functions.empty ()) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1050 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1051 for (str_val_const_iterator p = private_functions.begin (); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1052 p != private_functions.end (); p++) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1053 os << tprefix << "private: " << fcn_file_name (p->second) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1054 << " [" << p->first << "]\n"; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1055 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1056 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1057 if (! class_constructors.empty ()) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1058 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1059 for (str_val_const_iterator p = class_constructors.begin (); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1060 p != class_constructors.end (); p++) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1061 os << tprefix << "constructor: " << fcn_file_name (p->second) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1062 << " [" << p->first << "]\n"; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1063 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1064 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1065 if (! class_methods.empty ()) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1066 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1067 for (str_val_const_iterator p = class_methods.begin (); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1068 p != class_methods.end (); p++) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1069 os << tprefix << "method: " << fcn_file_name (p->second) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1070 << " [" << p->first << "]\n"; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1071 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1072 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1073 if (! dispatch_map.empty ()) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1074 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1075 for (dispatch_map_const_iterator p = dispatch_map.begin (); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1076 p != dispatch_map.end (); p++) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1077 os << tprefix << "dispatch: " << fcn_file_name (p->second) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1078 << " [" << p->first << "]\n"; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1079 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1080 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1081 |
7336 | 1082 octave_value |
1083 symbol_table::fcn_info::find (tree_argument_list *args, | |
1084 const string_vector& arg_names, | |
1085 octave_value_list& evaluated_args, | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7745
diff
changeset
|
1086 bool& args_evaluated) |
7336 | 1087 { |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7745
diff
changeset
|
1088 return rep->find (args, arg_names, evaluated_args, args_evaluated); |
7336 | 1089 } |
1090 | |
1091 octave_value | |
1092 symbol_table::find (const std::string& name, tree_argument_list *args, | |
1093 const string_vector& arg_names, | |
1094 octave_value_list& evaluated_args, bool& args_evaluated, | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7745
diff
changeset
|
1095 bool skip_variables) |
7336 | 1096 { |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7745
diff
changeset
|
1097 symbol_table *inst = get_instance (xcurrent_scope); |
7336 | 1098 |
1099 return inst | |
1100 ? inst->do_find (name, args, arg_names, evaluated_args, | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7745
diff
changeset
|
1101 args_evaluated, skip_variables) |
7336 | 1102 : octave_value (); |
1103 } | |
1104 | |
1105 octave_value | |
9444
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
1106 symbol_table::builtin_find (const std::string& name) |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
1107 { |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
1108 symbol_table *inst = get_instance (xcurrent_scope); |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
1109 |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
1110 return inst ? inst->do_builtin_find (name) : octave_value (); |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
1111 } |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
1112 |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
1113 octave_value |
7336 | 1114 symbol_table::find_function (const std::string& name, tree_argument_list *args, |
1115 const string_vector& arg_names, | |
1116 octave_value_list& evaluated_args, | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7745
diff
changeset
|
1117 bool& args_evaluated) |
7336 | 1118 { |
7818
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1119 octave_value retval; |
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1120 |
8161 | 1121 if (! name.empty () && name[0] == '@') |
8160
436438954797
Check for class specific methods in symbol_table::find_function
David Bateman <dbateman@free.fr>
parents:
8155
diff
changeset
|
1122 { |
8161 | 1123 // Look for a class specific function. |
8160
436438954797
Check for class specific methods in symbol_table::find_function
David Bateman <dbateman@free.fr>
parents:
8155
diff
changeset
|
1124 std::string dispatch_type = |
8161 | 1125 name.substr (1, name.find_first_of (file_ops::dir_sep_str ()) - 1); |
1126 | |
8160
436438954797
Check for class specific methods in symbol_table::find_function
David Bateman <dbateman@free.fr>
parents:
8155
diff
changeset
|
1127 std::string method = |
8161 | 1128 name.substr (name.find_last_of (file_ops::dir_sep_str ()) + 1, |
8160
436438954797
Check for class specific methods in symbol_table::find_function
David Bateman <dbateman@free.fr>
parents:
8155
diff
changeset
|
1129 std::string::npos); |
436438954797
Check for class specific methods in symbol_table::find_function
David Bateman <dbateman@free.fr>
parents:
8155
diff
changeset
|
1130 |
436438954797
Check for class specific methods in symbol_table::find_function
David Bateman <dbateman@free.fr>
parents:
8155
diff
changeset
|
1131 retval = find_method (method, dispatch_type); |
436438954797
Check for class specific methods in symbol_table::find_function
David Bateman <dbateman@free.fr>
parents:
8155
diff
changeset
|
1132 } |
7818
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1133 else |
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1134 { |
8160
436438954797
Check for class specific methods in symbol_table::find_function
David Bateman <dbateman@free.fr>
parents:
8155
diff
changeset
|
1135 size_t pos = name.find_first_of (Vfilemarker); |
436438954797
Check for class specific methods in symbol_table::find_function
David Bateman <dbateman@free.fr>
parents:
8155
diff
changeset
|
1136 |
436438954797
Check for class specific methods in symbol_table::find_function
David Bateman <dbateman@free.fr>
parents:
8155
diff
changeset
|
1137 if (pos == std::string::npos) |
8161 | 1138 retval = find (name, args, arg_names, evaluated_args, |
1139 args_evaluated, true); | |
8160
436438954797
Check for class specific methods in symbol_table::find_function
David Bateman <dbateman@free.fr>
parents:
8155
diff
changeset
|
1140 else |
7818
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1141 { |
8161 | 1142 std::string fcn_scope = name.substr (0, pos); |
8160
436438954797
Check for class specific methods in symbol_table::find_function
David Bateman <dbateman@free.fr>
parents:
8155
diff
changeset
|
1143 scope_id stored_scope = xcurrent_scope; |
436438954797
Check for class specific methods in symbol_table::find_function
David Bateman <dbateman@free.fr>
parents:
8155
diff
changeset
|
1144 xcurrent_scope = xtop_scope; |
436438954797
Check for class specific methods in symbol_table::find_function
David Bateman <dbateman@free.fr>
parents:
8155
diff
changeset
|
1145 octave_value parent = find_function (name.substr(0, pos)); |
8161 | 1146 |
8160
436438954797
Check for class specific methods in symbol_table::find_function
David Bateman <dbateman@free.fr>
parents:
8155
diff
changeset
|
1147 if (parent.is_defined ()) |
7818
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1148 { |
8160
436438954797
Check for class specific methods in symbol_table::find_function
David Bateman <dbateman@free.fr>
parents:
8155
diff
changeset
|
1149 octave_function *parent_fcn = parent.function_value (); |
8161 | 1150 |
8160
436438954797
Check for class specific methods in symbol_table::find_function
David Bateman <dbateman@free.fr>
parents:
8155
diff
changeset
|
1151 if (parent_fcn) |
436438954797
Check for class specific methods in symbol_table::find_function
David Bateman <dbateman@free.fr>
parents:
8155
diff
changeset
|
1152 { |
436438954797
Check for class specific methods in symbol_table::find_function
David Bateman <dbateman@free.fr>
parents:
8155
diff
changeset
|
1153 xcurrent_scope = parent_fcn->scope (); |
8161 | 1154 |
8160
436438954797
Check for class specific methods in symbol_table::find_function
David Bateman <dbateman@free.fr>
parents:
8155
diff
changeset
|
1155 if (xcurrent_scope > 1) |
436438954797
Check for class specific methods in symbol_table::find_function
David Bateman <dbateman@free.fr>
parents:
8155
diff
changeset
|
1156 retval = find_function (name.substr (pos + 1), args, |
436438954797
Check for class specific methods in symbol_table::find_function
David Bateman <dbateman@free.fr>
parents:
8155
diff
changeset
|
1157 arg_names, evaluated_args, |
436438954797
Check for class specific methods in symbol_table::find_function
David Bateman <dbateman@free.fr>
parents:
8155
diff
changeset
|
1158 args_evaluated); |
436438954797
Check for class specific methods in symbol_table::find_function
David Bateman <dbateman@free.fr>
parents:
8155
diff
changeset
|
1159 } |
7818
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1160 } |
8161 | 1161 |
8160
436438954797
Check for class specific methods in symbol_table::find_function
David Bateman <dbateman@free.fr>
parents:
8155
diff
changeset
|
1162 xcurrent_scope = stored_scope; |
7818
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1163 } |
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1164 } |
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1165 |
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
1166 return retval; |
4913 | 1167 } |
1168 | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1169 void |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1170 symbol_table::dump (std::ostream& os, scope_id scope) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1171 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1172 if (scope == xglobal_scope) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1173 dump_global (os); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1174 else |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1175 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1176 symbol_table *inst = get_instance (scope, false); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1177 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1178 if (inst) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1179 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1180 os << "*** dumping symbol table scope " << scope |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1181 << " (" << inst->table_name << ")\n\n"; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1182 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1183 std::map<std::string, octave_value> sfuns |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1184 = symbol_table::subfunctions_defined_in_scope (scope); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1185 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1186 if (! sfuns.empty ()) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1187 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1188 os << " subfunctions defined in this scope:\n"; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1189 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1190 for (std::map<std::string, octave_value>::const_iterator p = sfuns.begin (); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1191 p != sfuns.end (); p++) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1192 os << " " << p->first << "\n"; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1193 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1194 os << "\n"; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1195 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1196 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1197 inst->do_dump (os); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1198 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1199 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1200 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1201 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1202 void |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1203 symbol_table::dump_global (std::ostream& os) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1204 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1205 if (! global_table.empty ()) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1206 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1207 os << "*** dumping global symbol table\n\n"; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1208 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1209 for (global_table_const_iterator p = global_table.begin (); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1210 p != global_table.end (); p++) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1211 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1212 std::string nm = p->first; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1213 octave_value val = p->second; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1214 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1215 os << " " << nm << " "; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1216 val.dump (os); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1217 os << "\n"; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1218 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1219 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1220 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1221 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1222 void |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1223 symbol_table::dump_functions (std::ostream& os) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1224 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1225 if (! fcn_table.empty ()) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1226 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1227 os << "*** dumping globally visible functions from symbol table\n" |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1228 << " (c=commandline, b=built-in)\n\n"; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1229 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1230 for (fcn_table_const_iterator p = fcn_table.begin (); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1231 p != fcn_table.end (); p++) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1232 p->second.dump (os, " "); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1233 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1234 os << "\n"; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1235 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1236 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1237 |
8819
96d87674b818
also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents:
8785
diff
changeset
|
1238 void |
96d87674b818
also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents:
8785
diff
changeset
|
1239 symbol_table::stash_dir_name_for_subfunctions (scope_id scope, |
96d87674b818
also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents:
8785
diff
changeset
|
1240 const std::string& dir_name) |
96d87674b818
also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents:
8785
diff
changeset
|
1241 { |
96d87674b818
also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents:
8785
diff
changeset
|
1242 // FIXME -- is this the best way to do this? Maybe it would be |
96d87674b818
also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents:
8785
diff
changeset
|
1243 // better if we had a map from scope to list of subfunctions |
96d87674b818
also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents:
8785
diff
changeset
|
1244 // stored with the function. Do we? |
96d87674b818
also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents:
8785
diff
changeset
|
1245 |
96d87674b818
also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents:
8785
diff
changeset
|
1246 for (fcn_table_const_iterator p = fcn_table.begin (); |
96d87674b818
also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents:
8785
diff
changeset
|
1247 p != fcn_table.end (); p++) |
96d87674b818
also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents:
8785
diff
changeset
|
1248 { |
96d87674b818
also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents:
8785
diff
changeset
|
1249 std::pair<std::string, octave_value> tmp |
96d87674b818
also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents:
8785
diff
changeset
|
1250 = p->second.subfunction_defined_in_scope (scope); |
96d87674b818
also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents:
8785
diff
changeset
|
1251 |
96d87674b818
also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents:
8785
diff
changeset
|
1252 std::string nm = tmp.first; |
96d87674b818
also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents:
8785
diff
changeset
|
1253 |
96d87674b818
also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents:
8785
diff
changeset
|
1254 if (! nm.empty ()) |
96d87674b818
also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents:
8785
diff
changeset
|
1255 { |
96d87674b818
also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents:
8785
diff
changeset
|
1256 octave_value& fcn = tmp.second; |
96d87674b818
also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents:
8785
diff
changeset
|
1257 |
96d87674b818
also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents:
8785
diff
changeset
|
1258 octave_user_function *f = fcn.user_function_value (); |
96d87674b818
also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents:
8785
diff
changeset
|
1259 |
96d87674b818
also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents:
8785
diff
changeset
|
1260 if (f) |
96d87674b818
also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents:
8785
diff
changeset
|
1261 f->stash_dir_name (dir_name); |
96d87674b818
also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents:
8785
diff
changeset
|
1262 } |
96d87674b818
also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents:
8785
diff
changeset
|
1263 } |
96d87674b818
also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents:
8785
diff
changeset
|
1264 } |
96d87674b818
also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents:
8785
diff
changeset
|
1265 |
7336 | 1266 octave_value |
1267 symbol_table::do_find (const std::string& name, tree_argument_list *args, | |
1268 const string_vector& arg_names, | |
1269 octave_value_list& evaluated_args, | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7745
diff
changeset
|
1270 bool& args_evaluated, bool skip_variables) |
3013 | 1271 { |
7336 | 1272 octave_value retval; |
4913 | 1273 |
7336 | 1274 // Variable. |
4913 | 1275 |
7336 | 1276 if (! skip_variables) |
3013 | 1277 { |
7336 | 1278 table_iterator p = table.find (name); |
3013 | 1279 |
7336 | 1280 if (p != table.end ()) |
1281 { | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1282 symbol_record sr = p->second; |
3013 | 1283 |
7336 | 1284 // FIXME -- should we be using something other than varref here? |
5005 | 1285 |
7336 | 1286 if (sr.is_global ()) |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7745
diff
changeset
|
1287 return symbol_table::global_varref (name); |
7336 | 1288 else |
1289 { | |
1290 octave_value& val = sr.varref (); | |
4913 | 1291 |
7336 | 1292 if (val.is_defined ()) |
1293 return val; | |
1294 } | |
1295 } | |
1296 } | |
4913 | 1297 |
7336 | 1298 fcn_table_iterator p = fcn_table.find (name); |
4913 | 1299 |
7336 | 1300 if (p != fcn_table.end ()) |
8146
a9ec011ead94
make dispatch work with feval
John W. Eaton <jwe@octave.org>
parents:
8123
diff
changeset
|
1301 return p->second.find (args, arg_names, evaluated_args, args_evaluated); |
3013 | 1302 else |
1303 { | |
7336 | 1304 fcn_info finfo (name); |
1305 | |
1306 octave_value fcn = finfo.find (args, arg_names, evaluated_args, | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7745
diff
changeset
|
1307 args_evaluated); |
3013 | 1308 |
7336 | 1309 if (fcn.is_defined ()) |
1310 fcn_table[name] = finfo; | |
3013 | 1311 |
7336 | 1312 return fcn; |
3013 | 1313 } |
1314 | |
7336 | 1315 return retval; |
605 | 1316 } |
1317 | |
9444
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
1318 octave_value |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
1319 symbol_table::do_builtin_find (const std::string& name) |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
1320 { |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
1321 octave_value retval; |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
1322 |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
1323 fcn_table_iterator p = fcn_table.find (name); |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
1324 |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
1325 if (p != fcn_table.end ()) |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
1326 return p->second.builtin_find (); |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
1327 else |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
1328 { |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
1329 fcn_info finfo (name); |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
1330 |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
1331 octave_value fcn = finfo.builtin_find (); |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
1332 |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
1333 if (fcn.is_defined ()) |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
1334 fcn_table[name] = finfo; |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
1335 |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
1336 return fcn; |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
1337 } |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
1338 |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
1339 return retval; |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
1340 } |
0c785ad961fa
improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents:
9443
diff
changeset
|
1341 |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1342 void |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1343 symbol_table::do_dump (std::ostream& os) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1344 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1345 if (! persistent_table.empty ()) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1346 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1347 os << " persistent variables in this scope:\n\n"; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1348 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1349 for (persistent_table_const_iterator p = persistent_table.begin (); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1350 p != persistent_table.end (); p++) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1351 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1352 std::string nm = p->first; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1353 octave_value val = p->second; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1354 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1355 os << " " << nm << " "; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1356 val.dump (os); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1357 os << "\n"; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1358 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1359 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1360 os << "\n"; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1361 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1362 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1363 if (! table.empty ()) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1364 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1365 os << " other symbols in this scope (l=local; a=auto; f=formal\n" |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1366 << " h=hidden; i=inherited; g=global; p=persistent)\n\n"; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1367 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1368 for (table_const_iterator p = table.begin (); p != table.end (); p++) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1369 p->second.dump (os, " "); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1370 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1371 os << "\n"; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1372 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1373 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1374 |
7336 | 1375 DEFUN (ignore_function_time_stamp, args, nargout, |
1376 "-*- texinfo -*-\n\ | |
1377 @deftypefn {Built-in Function} {@var{val} =} ignore_function_time_stamp ()\n\ | |
1378 @deftypefnx {Built-in Function} {@var{old_val} =} ignore_function_time_stamp (@var{new_val})\n\ | |
1379 Query or set the internal variable that controls whether Octave checks\n\ | |
1380 the time stamp on files each time it looks up functions defined in\n\ | |
1381 function files. If the internal variable is set to @code{\"system\"},\n\ | |
1382 Octave will not automatically recompile function files in subdirectories of\n\ | |
1383 @file{@var{octave-home}/lib/@var{version}} if they have changed since\n\ | |
1384 they were last compiled, but will recompile other function files in the\n\ | |
1385 search path if they change. If set to @code{\"all\"}, Octave will not\n\ | |
1386 recompile any function files unless their definitions are removed with\n\ | |
1387 @code{clear}. If set to \"none\", Octave will always check time stamps\n\ | |
1388 on files to determine whether functions defined in function files\n\ | |
1389 need to recompiled.\n\ | |
1390 @end deftypefn") | |
220 | 1391 { |
7336 | 1392 octave_value retval; |
220 | 1393 |
7336 | 1394 if (nargout > 0) |
5861 | 1395 { |
7336 | 1396 switch (Vignore_function_time_stamp) |
5861 | 1397 { |
7336 | 1398 case 1: |
1399 retval = "system"; | |
1400 break; | |
5861 | 1401 |
7336 | 1402 case 2: |
1403 retval = "all"; | |
1404 break; | |
5861 | 1405 |
7336 | 1406 default: |
1407 retval = "none"; | |
1408 break; | |
5861 | 1409 } |
1410 } | |
1411 | |
7336 | 1412 int nargin = args.length (); |
5861 | 1413 |
7336 | 1414 if (nargin == 1) |
3013 | 1415 { |
7336 | 1416 std::string sval = args(0).string_value (); |
1 | 1417 |
7336 | 1418 if (! error_state) |
1419 { | |
1420 if (sval == "all") | |
1421 Vignore_function_time_stamp = 2; | |
1422 else if (sval == "system") | |
1423 Vignore_function_time_stamp = 1; | |
1424 else if (sval == "none") | |
1425 Vignore_function_time_stamp = 0; | |
1426 else | |
1427 error ("ignore_function_time_stamp: expecting argument to be \"all\", \"system\", or \"none\""); | |
1428 } | |
1429 else | |
1430 error ("ignore_function_time_stamp: expecting argument to be character string"); | |
1431 } | |
1432 else if (nargin > 1) | |
1433 print_usage (); | |
4238 | 1434 |
7336 | 1435 return retval; |
3308 | 1436 } |
1437 | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1438 DEFUN (__current_scope__, , , |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1439 "-*- texinfo -*-\n\ |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1440 @deftypefn {Built-in Function} {[@var{scope}, @var{context}]} __dump_symtab_info__ ()\n\ |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1441 Undocumented internal function.\n\ |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1442 @end deftypefn") |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1443 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1444 octave_value_list retval; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1445 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1446 retval(1) = symbol_table::current_context (); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1447 retval(0) = symbol_table::current_scope (); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1448 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1449 return retval; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1450 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1451 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1452 DEFUN (__dump_symtab_info__, args, , |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1453 "-*- texinfo -*-\n\ |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1454 @deftypefn {Built-in Function} {} __dump_symtab_info__ ()\n\ |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1455 @deftypefnx {Built-in Function} {} __dump_symtab_info__ (@var{scope})\n\ |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1456 @deftypefnx {Built-in Function} {} __dump_symtab_info__ (\"scopes\")\n\ |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1457 @deftypefnx {Built-in Function} {} __dump_symtab_info__ (\"functions\")\n\ |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1458 Undocumented internal function.\n\ |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1459 @end deftypefn") |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1460 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1461 octave_value retval; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1462 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1463 int nargin = args.length (); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1464 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1465 if (nargin == 0) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1466 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1467 symbol_table::dump_functions (octave_stdout); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1468 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1469 symbol_table::dump_global (octave_stdout); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1470 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1471 std::list<symbol_table::scope_id> lst = symbol_table::scopes (); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1472 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1473 for (std::list<symbol_table::scope_id>::const_iterator p = lst.begin (); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1474 p != lst.end (); p++) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1475 symbol_table::dump (octave_stdout, *p); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1476 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1477 else if (nargin == 1) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1478 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1479 octave_value arg = args(0); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1480 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1481 if (arg.is_string ()) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1482 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1483 std::string s_arg = arg.string_value (); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1484 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1485 if (s_arg == "scopes") |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1486 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1487 std::list<symbol_table::scope_id> lst = symbol_table::scopes (); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1488 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1489 RowVector v (lst.size ()); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1490 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1491 octave_idx_type k = 0; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1492 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1493 for (std::list<symbol_table::scope_id>::const_iterator p = lst.begin (); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1494 p != lst.end (); p++) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1495 v.xelem (k++) = *p; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1496 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1497 retval = v; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1498 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1499 else if (s_arg == "functions") |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1500 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1501 symbol_table::dump_functions (octave_stdout); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1502 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1503 else |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1504 error ("__dump_symtab_info__: expecting \"functions\" or \"scopes\""); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1505 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1506 else |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1507 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1508 int s = arg.int_value (); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1509 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1510 if (! error_state) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1511 symbol_table::dump (octave_stdout, s); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1512 else |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1513 error ("__dump_symtab_info__: expecting string or scope id"); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1514 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1515 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1516 else |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1517 print_usage (); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1518 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1519 return retval; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1520 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1521 |
7437 | 1522 #if 0 |
1523 | |
1524 // FIXME -- should we have functions like this in Octave? | |
1525 | |
1526 DEFUN (set_variable, args, , "set_variable (NAME, VALUE)") | |
1527 { | |
1528 octave_value retval; | |
1529 | |
1530 if (args.length () == 2) | |
1531 { | |
1532 std::string name = args(0).string_value (); | |
1533 | |
1534 if (! error_state) | |
1535 symbol_table::varref (name) = args(1); | |
1536 else | |
1537 error ("set_variable: expecting variable name as first argument"); | |
1538 } | |
1539 else | |
1540 print_usage (); | |
1541 | |
1542 return retval; | |
1543 } | |
1544 | |
1545 DEFUN (variable_value, args, , "VALUE = variable_value (NAME)") | |
1546 { | |
1547 octave_value retval; | |
1548 | |
1549 if (args.length () == 1) | |
1550 { | |
1551 std::string name = args(0).string_value (); | |
1552 | |
1553 if (! error_state) | |
1554 { | |
1555 retval = symbol_table::varval (name); | |
1556 | |
1557 if (retval.is_undefined ()) | |
1558 error ("variable_value: `%s' is not a variable in the current scope", | |
1559 name.c_str ()); | |
1560 } | |
1561 else | |
1562 error ("variable_value: expecting variable name as first argument"); | |
1563 } | |
1564 else | |
1565 print_usage (); | |
1566 | |
1567 return retval; | |
1568 } | |
1569 #endif | |
1570 | |
1 | 1571 /* |
1572 ;;; Local Variables: *** | |
1573 ;;; mode: C++ *** | |
1574 ;;; End: *** | |
1575 */ |