Mercurial > octave-nkf
annotate src/symtab.cc @ 7901:3e4c9b69069d
call stack changes
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 08 Jul 2008 12:00:32 -0400 |
parents | 5640a70cbab1 |
children | db6478d9c669 |
rev | line source |
---|---|
1 | 1 /* |
2 | |
7017 | 3 Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, |
4 2002, 2003, 2004, 2005, 2006, 2007 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" |
39 #include "pager.h" | |
40 #include "parse.h" | |
41 #include "pt-arg-list.h" | |
42 #include "toplev.h" | |
43 #include "unwind-prot.h" | |
1 | 44 #include "utils.h" |
7336 | 45 |
46 symbol_table *symbol_table::instance = 0; | |
1 | 47 |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
48 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
|
49 |
7336 | 50 std::map<symbol_table::scope_id, symbol_table*> symbol_table::all_instances; |
4913 | 51 |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7745
diff
changeset
|
52 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
|
53 |
7336 | 54 std::map<std::string, symbol_table::fcn_info> symbol_table::fcn_table; |
4913 | 55 |
7336 | 56 const symbol_table::scope_id symbol_table::xglobal_scope = 0; |
57 const symbol_table::scope_id symbol_table::xtop_scope = 1; | |
4238 | 58 |
7336 | 59 symbol_table::scope_id symbol_table::xcurrent_scope = 1; |
3308 | 60 |
7336 | 61 symbol_table::scope_id symbol_table::xparent_scope = -1; |
62 | |
63 std::deque<symbol_table::scope_id> symbol_table::scope_stack; | |
4238 | 64 |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7745
diff
changeset
|
65 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
|
66 |
7336 | 67 // Should Octave always check to see if function files have changed |
68 // since they were last compiled? | |
69 static int Vignore_function_time_stamp = 1; | |
3355 | 70 |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
71 void |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
72 symbol_table::symbol_record::symbol_record_rep::dump |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
73 (std::ostream& os, const std::string& prefix) const |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
74 { |
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
75 octave_value val = varval (xcurrent_context); |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
76 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
77 os << prefix << name; |
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 if (val.is_defined ()) |
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 os << " [" |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
82 << (is_local () ? "l" : "") |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
83 << (is_automatic () ? "a" : "") |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
84 << (is_formal () ? "f" : "") |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
85 << (is_hidden () ? "h" : "") |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
86 << (is_inherited () ? "i" : "") |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
87 << (is_global () ? "g" : "") |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
88 << (is_persistent () ? "p" : "") |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
89 << "] "; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
90 val.dump (os); |
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 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
93 os << "\n"; |
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 |
7336 | 96 octave_value |
97 symbol_table::symbol_record::find (tree_argument_list *args, | |
98 const string_vector& arg_names, | |
99 octave_value_list& evaluated_args, | |
100 bool& args_evaluated) const | |
101 { | |
102 octave_value retval; | |
3355 | 103 |
7336 | 104 if (is_global ()) |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7745
diff
changeset
|
105 return symbol_table::global_varref (name ()); |
7336 | 106 else |
107 { | |
108 octave_value val = varval (); | |
109 | |
110 if (val.is_defined ()) | |
111 return val; | |
112 } | |
113 | |
114 return symbol_table::find_function (name (), args, arg_names, | |
115 evaluated_args, args_evaluated); | |
3355 | 116 } |
117 | |
7336 | 118 // Check the load path to see if file that defined this is still |
119 // visible. If the file is no longer visible, then erase the | |
120 // definition and move on. If the file is visible, then we also | |
121 // need to check to see whether the file has changed since the the | |
122 // function was loaded/parsed. However, this check should only | |
123 // happen once per prompt (for files found from relative path | |
124 // elements, we also check if the working directory has changed | |
125 // since the last time the function was loaded/parsed). | |
126 // | |
127 // FIXME -- perhaps this should be done for all loaded functions when | |
128 // the prompt is printed or the directory has changed, and then we | |
129 // would not check for it when finding symbol definitions. | |
3355 | 130 |
7336 | 131 static inline bool |
7745
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
132 load_out_of_date_fcn (const std::string& ff, const std::string& dir_name, |
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
133 octave_value& function) |
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
134 { |
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
135 bool retval = false; |
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
136 |
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
137 octave_function *fcn = load_fcn_from_file (ff, dir_name); |
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
138 |
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
139 if (fcn) |
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
140 { |
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
141 retval = true; |
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
142 |
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
143 function = octave_value (fcn); |
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
144 } |
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
145 else |
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
146 function = octave_value (); |
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
147 |
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
148 return retval; |
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 |
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
151 static inline bool |
7336 | 152 out_of_date_check_internal (octave_value& function) |
1 | 153 { |
3013 | 154 bool retval = false; |
2949 | 155 |
7336 | 156 octave_function *fcn = function.function_value (true); |
5861 | 157 |
7336 | 158 if (fcn) |
220 | 159 { |
7336 | 160 // FIXME -- we need to handle nested functions properly here. |
4914 | 161 |
7336 | 162 if (! fcn->is_nested_function ()) |
163 { | |
164 std::string ff = fcn->fcn_file_name (); | |
4914 | 165 |
7336 | 166 if (! ff.empty ()) |
167 { | |
168 octave_time tc = fcn->time_checked (); | |
4913 | 169 |
7336 | 170 bool relative = fcn->is_relative (); |
3013 | 171 |
7336 | 172 if (tc < Vlast_prompt_time |
173 || (relative && tc < Vlast_chdir_time)) | |
4913 | 174 { |
7336 | 175 std::string nm = fcn->name (); |
4914 | 176 |
7336 | 177 int nm_len = nm.length (); |
4913 | 178 |
7336 | 179 std::string file; |
180 std::string dir_name; | |
4913 | 181 |
7336 | 182 if (octave_env::absolute_pathname (nm) |
183 && ((nm_len > 4 && (nm.substr (nm_len-4) == ".oct" | |
184 || nm.substr (nm_len-4) == ".mex")) | |
185 || (nm_len > 2 && nm.substr (nm_len-4) == ".m"))) | |
186 file = nm; | |
187 else | |
7745
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
188 { |
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
189 // FIXME -- this lookup is not right since it doesn't |
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
190 // account for dispatch type. |
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
191 |
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
192 // 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
|
193 // 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
|
194 // 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
|
195 |
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
196 file = load_path::find_fcn (nm, dir_name); |
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
197 } |
4913 | 198 |
7336 | 199 if (file.empty ()) |
200 { | |
201 // Can't see this function from current | |
202 // directory, so we should clear it. | |
195 | 203 |
7336 | 204 function = octave_value (); |
205 } | |
206 else if (same_file (file, ff)) | |
207 { | |
7745
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
208 // 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
|
209 |
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
210 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
|
211 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
|
212 |
7336 | 213 fcn->mark_fcn_file_up_to_date (octave_time ()); |
1 | 214 |
7336 | 215 if (! (Vignore_function_time_stamp == 2 |
216 || (Vignore_function_time_stamp | |
217 && fcn->is_system_fcn_file ()))) | |
218 { | |
219 file_stat fs (ff); | |
572 | 220 |
7336 | 221 if (fs) |
222 { | |
223 if (fs.is_newer (tp)) | |
7745
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
224 retval = load_out_of_date_fcn (ff, dir_name, |
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
225 function); |
7336 | 226 } |
227 else | |
228 function = octave_value (); | |
6829 | 229 } |
230 } | |
7745
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
231 else |
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
232 { |
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
233 // 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
|
234 // place of the old. |
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
235 |
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
236 retval = load_out_of_date_fcn (file, dir_name, function); |
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7437
diff
changeset
|
237 } |
6829 | 238 } |
239 } | |
4009 | 240 } |
241 } | |
242 | |
243 return retval; | |
244 } | |
245 | |
246 bool | |
7336 | 247 out_of_date_check (octave_value& function) |
4009 | 248 { |
7336 | 249 return out_of_date_check_internal (function); |
250 } | |
4009 | 251 |
7336 | 252 octave_value |
253 symbol_table::fcn_info::fcn_info_rep::load_private_function | |
254 (const std::string& dir_name) | |
255 { | |
256 octave_value retval; | |
257 | |
258 std::string file_name = load_path::find_private_fcn (dir_name, name); | |
259 | |
260 if (! file_name.empty ()) | |
4009 | 261 { |
7336 | 262 octave_function *fcn = load_fcn_from_file (file_name); |
4009 | 263 |
7336 | 264 if (fcn) |
4009 | 265 { |
7336 | 266 retval = octave_value (fcn); |
4009 | 267 |
7336 | 268 private_functions[dir_name] = retval; |
4009 | 269 } |
270 } | |
271 | |
272 return retval; | |
273 } | |
274 | |
7336 | 275 octave_value |
276 symbol_table::fcn_info::fcn_info_rep::load_class_constructor (void) | |
4009 | 277 { |
7336 | 278 octave_value retval; |
279 | |
280 std::string dir_name; | |
4009 | 281 |
7336 | 282 std::string file_name = load_path::find_method (name, name, dir_name); |
283 | |
284 if (! file_name.empty ()) | |
4009 | 285 { |
7336 | 286 octave_function *fcn = load_fcn_from_file (file_name, dir_name, name); |
4009 | 287 |
7336 | 288 if (fcn) |
4009 | 289 { |
7336 | 290 retval = octave_value (fcn); |
291 | |
292 class_constructors[name] = retval; | |
293 } | |
294 } | |
295 | |
296 return retval; | |
297 } | |
298 | |
299 octave_value | |
300 symbol_table::fcn_info::fcn_info_rep::load_class_method | |
301 (const std::string& dispatch_type) | |
302 { | |
303 octave_value retval; | |
4009 | 304 |
7336 | 305 std::string dir_name; |
306 | |
307 std::string file_name = load_path::find_method (dispatch_type, name, dir_name); | |
4009 | 308 |
7336 | 309 if (! file_name.empty ()) |
310 { | |
311 octave_function *fcn = load_fcn_from_file (file_name, dir_name, | |
312 dispatch_type); | |
4009 | 313 |
7336 | 314 if (fcn) |
315 { | |
316 retval = octave_value (fcn); | |
317 | |
318 class_methods[dispatch_type] = retval; | |
4009 | 319 } |
320 } | |
321 | |
322 return retval; | |
323 } | |
324 | |
7336 | 325 void |
326 symbol_table::fcn_info::fcn_info_rep::print_dispatch (std::ostream& os) const | |
1 | 327 { |
7336 | 328 if (dispatch_map.empty ()) |
329 os << "dispatch: " << name << " is not overloaded" << std::endl; | |
330 else | |
331 { | |
332 os << "Overloaded function " << name << ":\n\n"; | |
333 | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
334 for (dispatch_map_const_iterator p = dispatch_map.begin (); |
7336 | 335 p != dispatch_map.end (); p++) |
336 os << " " << name << " (" << p->first << ", ...) -> " | |
337 << p->second << " (" << p->first << ", ...)\n"; | |
3013 | 338 |
7336 | 339 os << std::endl; |
340 } | |
341 } | |
342 | |
343 std::string | |
344 symbol_table::fcn_info::fcn_info_rep::help_for_dispatch (void) const | |
345 { | |
346 std::string retval; | |
347 | |
348 if (! dispatch_map.empty ()) | |
1 | 349 { |
7336 | 350 retval = "Overloaded function:\n\n"; |
351 | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
352 for (dispatch_map_const_iterator p = dispatch_map.begin (); |
7336 | 353 p != dispatch_map.end (); p++) |
354 retval += " " + p->second + " (" + p->first + ", ...)\n\n"; | |
355 } | |
356 | |
357 return retval; | |
358 } | |
359 | |
360 // Find the definition of NAME according to the following precedence | |
361 // list: | |
362 // | |
363 // variable | |
364 // subfunction | |
365 // private function | |
366 // class constructor | |
367 // class method | |
368 // legacy dispatch | |
369 // command-line function | |
370 // autoload function | |
371 // function on the path | |
372 // built-in function | |
3013 | 373 |
7336 | 374 // Notes: |
375 // | |
376 // FIXME -- we need to evaluate the argument list to determine the | |
377 // dispatch type. The method used here works (pass in the args, pass | |
378 // out the evaluated args and a flag saying whether the evaluation was | |
379 // needed), but it seems a bit inelegant. We do need to save the | |
380 // evaluated args in some way to avoid evaluating them multiple times. | |
381 // Maybe evaluated args could be attached to the tree_argument_list | |
382 // object? Then the argument list could be evaluated outside of this | |
383 // function and we could elimnate the arg_names, evaluated_args, and | |
384 // args_evaluated arguments. We would still want to avoid computing | |
385 // the dispatch type unless it is needed, so the args should be passed | |
386 // rather than the dispatch type. But the arguments will need to be | |
387 // evaluated no matter what, so evaluating them beforehand should be | |
388 // OK. If the evaluated arguments are attached to args, then we would | |
389 // need to determine the appropriate place(s) to clear them (for | |
390 // example, before returning from tree_index_expression::rvalue). | |
391 | |
392 octave_value | |
393 symbol_table::fcn_info::fcn_info_rep::find | |
394 (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
|
395 octave_value_list& evaluated_args, bool& args_evaluated) |
7336 | 396 { |
397 static bool deja_vu = false; | |
398 | |
399 // Subfunction. I think it only makes sense to check for | |
400 // subfunctions if we are currently executing a function defined | |
401 // from a .m file. | |
402 | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7745
diff
changeset
|
403 scope_val_iterator r = subfunctions.find (xcurrent_scope); |
7336 | 404 |
405 if (r != subfunctions.end ()) | |
406 { | |
407 // FIXME -- out-of-date check here. | |
408 | |
409 return r->second; | |
410 } | |
411 else if (curr_parent_function) | |
412 { | |
413 scope_id pscope = curr_parent_function->scope (); | |
414 | |
415 r = subfunctions.find (pscope); | |
416 | |
417 if (r != subfunctions.end ()) | |
1 | 418 { |
7336 | 419 // FIXME -- out-of-date check here. |
420 | |
421 return r->second; | |
1 | 422 } |
423 } | |
3013 | 424 |
7336 | 425 // Private function. |
1 | 426 |
7336 | 427 octave_function *curr_fcn = octave_call_stack::current (); |
1 | 428 |
7336 | 429 if (curr_fcn) |
430 { | |
431 std::string dir_name = curr_fcn->dir_name (); | |
1 | 432 |
7336 | 433 if (! dir_name.empty ()) |
434 { | |
435 str_val_iterator q = private_functions.find (dir_name); | |
4913 | 436 |
7336 | 437 if (q == private_functions.end ()) |
438 { | |
439 octave_value val = load_private_function (dir_name); | |
4913 | 440 |
7336 | 441 if (val.is_defined ()) |
442 return val; | |
443 } | |
444 else | |
4913 | 445 { |
7336 | 446 octave_value& fval = q->second; |
4913 | 447 |
7336 | 448 if (fval.is_defined ()) |
449 out_of_date_check_internal (fval); | |
4913 | 450 |
7336 | 451 if (fval.is_defined ()) |
452 return fval; | |
453 else | |
454 { | |
455 octave_value val = load_private_function (dir_name); | |
4913 | 456 |
7336 | 457 if (val.is_defined ()) |
458 return val; | |
4913 | 459 } |
460 } | |
461 } | |
462 } | |
463 | |
7336 | 464 // Class constructors. The class name and function name are the same. |
4913 | 465 |
7336 | 466 str_val_iterator q = class_constructors.find (name); |
4913 | 467 |
7336 | 468 if (q == class_constructors.end ()) |
469 { | |
470 octave_value val = load_class_constructor (); | |
3013 | 471 |
7336 | 472 if (val.is_defined ()) |
473 return val; | |
474 } | |
475 else | |
1 | 476 { |
7336 | 477 octave_value& fval = q->second; |
3013 | 478 |
7336 | 479 if (fval.is_defined ()) |
480 out_of_date_check_internal (fval); | |
867 | 481 |
7336 | 482 if (fval.is_defined ()) |
483 return fval; | |
484 else | |
485 { | |
486 octave_value val = load_class_constructor (); | |
867 | 487 |
7336 | 488 if (val.is_defined ()) |
489 return val; | |
1 | 490 } |
491 } | |
1755 | 492 |
7336 | 493 // Class methods. |
1 | 494 |
7336 | 495 if (args_evaluated || (args && args->length () > 0)) |
496 { | |
497 if (! args_evaluated) | |
498 evaluated_args = args->convert_to_const_vector (); | |
3013 | 499 |
7336 | 500 if (! error_state) |
501 { | |
502 int n = evaluated_args.length (); | |
503 | |
504 if (n > 0 && ! args_evaluated) | |
505 evaluated_args.stash_name_tags (arg_names); | |
506 | |
507 args_evaluated = true; | |
508 | |
509 // FIXME -- need to handle precedence. | |
3013 | 510 |
7336 | 511 std::string dispatch_type = evaluated_args(0).class_name (); |
3013 | 512 |
7336 | 513 for (int i = 1; i < n; i++) |
514 { | |
515 octave_value arg = evaluated_args(i); | |
3013 | 516 |
7336 | 517 if (arg.is_object ()) |
518 { | |
519 dispatch_type = arg.class_name (); | |
520 break; | |
521 } | |
522 } | |
3013 | 523 |
7336 | 524 octave_value fcn = find_method (dispatch_type); |
525 | |
526 if (fcn.is_defined ()) | |
527 return fcn; | |
528 } | |
529 else | |
530 return octave_value (); | |
3013 | 531 } |
532 | |
7336 | 533 // Legacy dispatch. We just check args_evaluated here because the |
534 // actual evaluation will have happened already when searching for | |
535 // class methods. | |
536 | |
537 if (args_evaluated && ! dispatch_map.empty ()) | |
538 { | |
539 std::string dispatch_type = evaluated_args(0).type_name (); | |
540 | |
541 std::string fname; | |
542 | |
543 dispatch_map_iterator p = dispatch_map.find (dispatch_type); | |
544 | |
545 if (p == dispatch_map.end ()) | |
546 p = dispatch_map.find ("any"); | |
3013 | 547 |
7336 | 548 if (p != dispatch_map.end ()) |
549 { | |
550 fname = p->second; | |
551 | |
552 octave_value fcn | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7745
diff
changeset
|
553 = symbol_table::find_function (fname, evaluated_args); |
7336 | 554 |
555 if (fcn.is_defined ()) | |
556 return fcn; | |
557 } | |
558 } | |
559 | |
560 // Command-line function. | |
561 | |
562 if (cmdline_function.is_defined ()) | |
563 return cmdline_function; | |
564 | |
565 // Autoload? | |
3013 | 566 |
7336 | 567 octave_value fcn = find_autoload (); |
568 | |
569 if (fcn.is_defined ()) | |
570 return fcn; | |
571 | |
572 // Function on the path. | |
573 | |
574 fcn = find_user_function (); | |
575 | |
576 if (fcn.is_defined ()) | |
577 return fcn; | |
578 | |
579 // Built-in function. | |
580 | |
581 if (built_in_function.is_defined ()) | |
582 return built_in_function; | |
3013 | 583 |
7336 | 584 // At this point, we failed to find anything. It is possible that |
585 // the user created a file on the fly since the last prompt or | |
586 // chdir, so try updating the load path and searching again. | |
587 | |
588 octave_value retval; | |
3145 | 589 |
7336 | 590 if (! deja_vu) |
591 { | |
592 load_path::update (); | |
593 | |
594 deja_vu = true; | |
595 | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7745
diff
changeset
|
596 retval = find (args, arg_names, evaluated_args, args_evaluated); |
7336 | 597 } |
598 | |
599 deja_vu = false; | |
600 | |
601 return retval; | |
3013 | 602 } |
1 | 603 |
7336 | 604 octave_value |
605 symbol_table::fcn_info::fcn_info_rep::find_method (const std::string& dispatch_type) | |
4913 | 606 { |
7336 | 607 octave_value retval; |
4913 | 608 |
7336 | 609 str_val_iterator q = class_methods.find (dispatch_type); |
4913 | 610 |
7336 | 611 if (q == class_methods.end ()) |
612 { | |
613 octave_value val = load_class_method (dispatch_type); | |
4913 | 614 |
7336 | 615 if (val.is_defined ()) |
616 return val; | |
617 } | |
618 else | |
619 { | |
620 octave_value& fval = q->second; | |
4913 | 621 |
7336 | 622 if (fval.is_defined ()) |
623 out_of_date_check_internal (fval); | |
624 | |
625 if (fval.is_defined ()) | |
626 return fval; | |
4913 | 627 else |
628 { | |
7336 | 629 octave_value val = load_class_method (dispatch_type); |
630 | |
631 if (val.is_defined ()) | |
632 return val; | |
4913 | 633 } |
634 } | |
635 | |
7336 | 636 return retval; |
4913 | 637 } |
638 | |
7336 | 639 octave_value |
640 symbol_table::fcn_info::fcn_info_rep::find_autoload (void) | |
4913 | 641 { |
7336 | 642 octave_value retval; |
4913 | 643 |
7336 | 644 // Autoloaded function. |
4913 | 645 |
7336 | 646 if (autoload_function.is_defined ()) |
647 out_of_date_check_internal (autoload_function); | |
4913 | 648 |
7336 | 649 if (! autoload_function.is_defined ()) |
650 { | |
651 std::string file_name = lookup_autoload (name); | |
4913 | 652 |
7336 | 653 if (! file_name.empty ()) |
654 { | |
655 size_t pos = file_name.find_last_of (file_ops::dir_sep_chars); | |
4913 | 656 |
7336 | 657 std::string dir_name = file_name.substr (0, pos); |
4913 | 658 |
7336 | 659 octave_function *fcn = load_fcn_from_file (file_name, dir_name, |
660 "", name, true); | |
4913 | 661 |
7336 | 662 if (fcn) |
663 autoload_function = octave_value (fcn); | |
664 } | |
4913 | 665 } |
666 | |
7336 | 667 return autoload_function; |
668 } | |
4914 | 669 |
7336 | 670 octave_value |
671 symbol_table::fcn_info::fcn_info_rep::find_user_function (void) | |
672 { | |
673 // Function on the path. | |
4913 | 674 |
7336 | 675 if (function_on_path.is_defined ()) |
676 out_of_date_check_internal (function_on_path); | |
4913 | 677 |
7336 | 678 if (! function_on_path.is_defined ()) |
679 { | |
680 std::string dir_name; | |
4913 | 681 |
7336 | 682 std::string file_name = load_path::find_fcn (name, dir_name); |
4913 | 683 |
7336 | 684 if (! file_name.empty ()) |
685 { | |
686 octave_function *fcn = load_fcn_from_file (file_name, dir_name); | |
4913 | 687 |
7336 | 688 if (fcn) |
689 function_on_path = octave_value (fcn); | |
4913 | 690 } |
691 } | |
692 | |
7336 | 693 return function_on_path; |
694 } | |
695 | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
696 static std::string |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
697 fcn_file_name (const octave_value& fcn) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
698 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
699 const octave_function *f = fcn.function_value (); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
700 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
701 return f ? f->fcn_file_name () : std::string (); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
702 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
703 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
704 void |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
705 symbol_table::fcn_info::fcn_info_rep::dump |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
706 (std::ostream& os, const std::string& prefix) const |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
707 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
708 os << prefix << name |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
709 << " [" |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
710 << (cmdline_function.is_defined () ? "c" : "") |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
711 << (built_in_function.is_defined () ? "b" : "") |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
712 << "]\n"; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
713 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
714 std::string tprefix = prefix + " "; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
715 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
716 if (autoload_function.is_defined ()) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
717 os << tprefix << "autoload: " |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
718 << fcn_file_name (autoload_function) << "\n"; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
719 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
720 if (function_on_path.is_defined ()) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
721 os << tprefix << "function from path: " |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
722 << fcn_file_name (function_on_path) << "\n"; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
723 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
724 if (! subfunctions.empty ()) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
725 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
726 for (scope_val_const_iterator p = subfunctions.begin (); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
727 p != subfunctions.end (); p++) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
728 os << tprefix << "subfunction: " << fcn_file_name (p->second) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
729 << " [" << p->first << "]\n"; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
730 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
731 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
732 if (! private_functions.empty ()) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
733 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
734 for (str_val_const_iterator p = private_functions.begin (); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
735 p != private_functions.end (); p++) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
736 os << tprefix << "private: " << fcn_file_name (p->second) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
737 << " [" << p->first << "]\n"; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
738 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
739 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
740 if (! class_constructors.empty ()) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
741 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
742 for (str_val_const_iterator p = class_constructors.begin (); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
743 p != class_constructors.end (); p++) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
744 os << tprefix << "constructor: " << fcn_file_name (p->second) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
745 << " [" << p->first << "]\n"; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
746 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
747 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
748 if (! class_methods.empty ()) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
749 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
750 for (str_val_const_iterator p = class_methods.begin (); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
751 p != class_methods.end (); p++) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
752 os << tprefix << "method: " << fcn_file_name (p->second) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
753 << " [" << p->first << "]\n"; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
754 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
755 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
756 if (! dispatch_map.empty ()) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
757 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
758 for (dispatch_map_const_iterator p = dispatch_map.begin (); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
759 p != dispatch_map.end (); p++) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
760 os << tprefix << "dispatch: " << fcn_file_name (p->second) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
761 << " [" << p->first << "]\n"; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
762 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
763 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
764 |
7336 | 765 octave_value |
766 symbol_table::fcn_info::find (tree_argument_list *args, | |
767 const string_vector& arg_names, | |
768 octave_value_list& evaluated_args, | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7745
diff
changeset
|
769 bool& args_evaluated) |
7336 | 770 { |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7745
diff
changeset
|
771 return rep->find (args, arg_names, evaluated_args, args_evaluated); |
7336 | 772 } |
773 | |
774 octave_value | |
775 symbol_table::find (const std::string& name, tree_argument_list *args, | |
776 const string_vector& arg_names, | |
777 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
|
778 bool skip_variables) |
7336 | 779 { |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7745
diff
changeset
|
780 symbol_table *inst = get_instance (xcurrent_scope); |
7336 | 781 |
782 return inst | |
783 ? 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
|
784 args_evaluated, skip_variables) |
7336 | 785 : octave_value (); |
786 } | |
787 | |
788 octave_value | |
789 symbol_table::find_function (const std::string& name, tree_argument_list *args, | |
790 const string_vector& arg_names, | |
791 octave_value_list& evaluated_args, | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7745
diff
changeset
|
792 bool& args_evaluated) |
7336 | 793 { |
7818
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
794 octave_value retval; |
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
795 size_t pos = name.find_first_of (Vfilemarker); |
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
796 |
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
797 if (pos == NPOS) |
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
798 retval = find (name, args, arg_names, evaluated_args, args_evaluated, true); |
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
799 else |
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
800 { |
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
801 std::string fcn_scope = name.substr(0, pos); |
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
802 scope_id stored_scope = xcurrent_scope; |
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
803 xcurrent_scope = xtop_scope; |
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
804 octave_value parent = find_function (name.substr(0, pos)); |
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
805 if (parent.is_defined ()) |
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
806 { |
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
807 octave_function *parent_fcn = parent.function_value (); |
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
808 if (parent_fcn) |
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
809 { |
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
810 xcurrent_scope = parent_fcn->scope (); |
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
811 if (xcurrent_scope > 1) |
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
812 retval = find_function (name.substr (pos + 1), args, arg_names, |
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
813 evaluated_args, args_evaluated); |
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
814 } |
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
815 } |
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
816 xcurrent_scope = stored_scope; |
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
817 } |
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
818 |
5640a70cbab1
Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents:
7767
diff
changeset
|
819 return retval; |
4913 | 820 } |
821 | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
822 void |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
823 symbol_table::dump (std::ostream& os, scope_id scope) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
824 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
825 if (scope == xglobal_scope) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
826 dump_global (os); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
827 else |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
828 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
829 symbol_table *inst = get_instance (scope, false); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
830 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
831 if (inst) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
832 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
833 os << "*** dumping symbol table scope " << scope |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
834 << " (" << inst->table_name << ")\n\n"; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
835 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
836 std::map<std::string, octave_value> sfuns |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
837 = symbol_table::subfunctions_defined_in_scope (scope); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
838 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
839 if (! sfuns.empty ()) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
840 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
841 os << " subfunctions defined in this scope:\n"; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
842 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
843 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
|
844 p != sfuns.end (); p++) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
845 os << " " << p->first << "\n"; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
846 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
847 os << "\n"; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
848 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
849 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
850 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
851 inst->do_dump (os); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
852 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
853 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
854 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
855 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
856 void |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
857 symbol_table::dump_global (std::ostream& os) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
858 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
859 if (! global_table.empty ()) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
860 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
861 os << "*** dumping global symbol table\n\n"; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
862 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
863 for (global_table_const_iterator p = global_table.begin (); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
864 p != global_table.end (); p++) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
865 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
866 std::string nm = p->first; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
867 octave_value val = p->second; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
868 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
869 os << " " << nm << " "; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
870 val.dump (os); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
871 os << "\n"; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
872 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
873 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
874 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
875 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
876 void |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
877 symbol_table::dump_functions (std::ostream& os) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
878 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
879 if (! fcn_table.empty ()) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
880 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
881 os << "*** dumping globally visible functions from symbol table\n" |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
882 << " (c=commandline, b=built-in)\n\n"; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
883 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
884 for (fcn_table_const_iterator p = fcn_table.begin (); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
885 p != fcn_table.end (); p++) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
886 p->second.dump (os, " "); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
887 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
888 os << "\n"; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
889 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
890 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
891 |
7336 | 892 octave_value |
893 symbol_table::do_find (const std::string& name, tree_argument_list *args, | |
894 const string_vector& arg_names, | |
895 octave_value_list& evaluated_args, | |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7745
diff
changeset
|
896 bool& args_evaluated, bool skip_variables) |
3013 | 897 { |
7336 | 898 octave_value retval; |
4913 | 899 |
7336 | 900 // Variable. |
4913 | 901 |
7336 | 902 if (! skip_variables) |
3013 | 903 { |
7336 | 904 table_iterator p = table.find (name); |
3013 | 905 |
7336 | 906 if (p != table.end ()) |
907 { | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
908 symbol_record sr = p->second; |
3013 | 909 |
7336 | 910 // FIXME -- should we be using something other than varref here? |
5005 | 911 |
7336 | 912 if (sr.is_global ()) |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7745
diff
changeset
|
913 return symbol_table::global_varref (name); |
7336 | 914 else |
915 { | |
916 octave_value& val = sr.varref (); | |
4913 | 917 |
7336 | 918 if (val.is_defined ()) |
919 return val; | |
920 } | |
921 } | |
922 } | |
4913 | 923 |
7336 | 924 fcn_table_iterator p = fcn_table.find (name); |
4913 | 925 |
7336 | 926 if (p != fcn_table.end ()) |
927 { | |
928 evaluated_args = octave_value_list (); | |
929 args_evaluated = false; | |
3013 | 930 |
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7745
diff
changeset
|
931 return p->second.find (args, arg_names, evaluated_args, args_evaluated); |
3013 | 932 } |
933 else | |
934 { | |
7336 | 935 fcn_info finfo (name); |
936 | |
937 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
|
938 args_evaluated); |
3013 | 939 |
7336 | 940 if (fcn.is_defined ()) |
941 fcn_table[name] = finfo; | |
3013 | 942 |
7336 | 943 return fcn; |
3013 | 944 } |
945 | |
7336 | 946 return retval; |
605 | 947 } |
948 | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
949 void |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
950 symbol_table::do_dump (std::ostream& os) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
951 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
952 if (! persistent_table.empty ()) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
953 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
954 os << " persistent variables in this scope:\n\n"; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
955 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
956 for (persistent_table_const_iterator p = persistent_table.begin (); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
957 p != persistent_table.end (); p++) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
958 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
959 std::string nm = p->first; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
960 octave_value val = p->second; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
961 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
962 os << " " << nm << " "; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
963 val.dump (os); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
964 os << "\n"; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
965 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
966 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
967 os << "\n"; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
968 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
969 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
970 if (! table.empty ()) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
971 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
972 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
|
973 << " 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
|
974 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
975 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
|
976 p->second.dump (os, " "); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
977 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
978 os << "\n"; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
979 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
980 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
981 |
7336 | 982 DEFUN (ignore_function_time_stamp, args, nargout, |
983 "-*- texinfo -*-\n\ | |
984 @deftypefn {Built-in Function} {@var{val} =} ignore_function_time_stamp ()\n\ | |
985 @deftypefnx {Built-in Function} {@var{old_val} =} ignore_function_time_stamp (@var{new_val})\n\ | |
986 Query or set the internal variable that controls whether Octave checks\n\ | |
987 the time stamp on files each time it looks up functions defined in\n\ | |
988 function files. If the internal variable is set to @code{\"system\"},\n\ | |
989 Octave will not automatically recompile function files in subdirectories of\n\ | |
990 @file{@var{octave-home}/lib/@var{version}} if they have changed since\n\ | |
991 they were last compiled, but will recompile other function files in the\n\ | |
992 search path if they change. If set to @code{\"all\"}, Octave will not\n\ | |
993 recompile any function files unless their definitions are removed with\n\ | |
994 @code{clear}. If set to \"none\", Octave will always check time stamps\n\ | |
995 on files to determine whether functions defined in function files\n\ | |
996 need to recompiled.\n\ | |
997 @end deftypefn") | |
220 | 998 { |
7336 | 999 octave_value retval; |
220 | 1000 |
7336 | 1001 if (nargout > 0) |
5861 | 1002 { |
7336 | 1003 switch (Vignore_function_time_stamp) |
5861 | 1004 { |
7336 | 1005 case 1: |
1006 retval = "system"; | |
1007 break; | |
5861 | 1008 |
7336 | 1009 case 2: |
1010 retval = "all"; | |
1011 break; | |
5861 | 1012 |
7336 | 1013 default: |
1014 retval = "none"; | |
1015 break; | |
5861 | 1016 } |
1017 } | |
1018 | |
7336 | 1019 int nargin = args.length (); |
5861 | 1020 |
7336 | 1021 if (nargin == 1) |
3013 | 1022 { |
7336 | 1023 std::string sval = args(0).string_value (); |
1 | 1024 |
7336 | 1025 if (! error_state) |
1026 { | |
1027 if (sval == "all") | |
1028 Vignore_function_time_stamp = 2; | |
1029 else if (sval == "system") | |
1030 Vignore_function_time_stamp = 1; | |
1031 else if (sval == "none") | |
1032 Vignore_function_time_stamp = 0; | |
1033 else | |
1034 error ("ignore_function_time_stamp: expecting argument to be \"all\", \"system\", or \"none\""); | |
1035 } | |
1036 else | |
1037 error ("ignore_function_time_stamp: expecting argument to be character string"); | |
1038 } | |
1039 else if (nargin > 1) | |
1040 print_usage (); | |
4238 | 1041 |
7336 | 1042 return retval; |
3308 | 1043 } |
1044 | |
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1045 DEFUN (__current_scope__, , , |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1046 "-*- texinfo -*-\n\ |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1047 @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
|
1048 Undocumented internal function.\n\ |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1049 @end deftypefn") |
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 octave_value_list retval; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1052 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1053 retval(1) = symbol_table::current_context (); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1054 retval(0) = symbol_table::current_scope (); |
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 return retval; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1057 } |
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 DEFUN (__dump_symtab_info__, args, , |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1060 "-*- texinfo -*-\n\ |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1061 @deftypefn {Built-in Function} {} __dump_symtab_info__ ()\n\ |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1062 @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
|
1063 @deftypefnx {Built-in Function} {} __dump_symtab_info__ (\"scopes\")\n\ |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1064 @deftypefnx {Built-in Function} {} __dump_symtab_info__ (\"functions\")\n\ |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1065 Undocumented internal function.\n\ |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1066 @end deftypefn") |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1067 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1068 octave_value retval; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1069 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1070 int nargin = args.length (); |
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 if (nargin == 0) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1073 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1074 symbol_table::dump_functions (octave_stdout); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1075 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1076 symbol_table::dump_global (octave_stdout); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1077 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1078 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
|
1079 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1080 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
|
1081 p != lst.end (); p++) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1082 symbol_table::dump (octave_stdout, *p); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1083 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1084 else if (nargin == 1) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1085 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1086 octave_value arg = args(0); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1087 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1088 if (arg.is_string ()) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1089 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1090 std::string s_arg = arg.string_value (); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1091 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1092 if (s_arg == "scopes") |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1093 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1094 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
|
1095 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1096 RowVector v (lst.size ()); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1097 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1098 octave_idx_type k = 0; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1099 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1100 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
|
1101 p != lst.end (); p++) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1102 v.xelem (k++) = *p; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1103 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1104 retval = v; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1105 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1106 else if (s_arg == "functions") |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1107 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1108 symbol_table::dump_functions (octave_stdout); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1109 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1110 else |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1111 error ("__dump_symtab_info__: expecting \"functions\" or \"scopes\""); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1112 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1113 else |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1114 { |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1115 int s = arg.int_value (); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1116 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1117 if (! error_state) |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1118 symbol_table::dump (octave_stdout, s); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1119 else |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1120 error ("__dump_symtab_info__: expecting string or scope id"); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1121 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1122 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1123 else |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1124 print_usage (); |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1125 |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1126 return retval; |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1127 } |
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7752
diff
changeset
|
1128 |
7437 | 1129 #if 0 |
1130 | |
1131 // FIXME -- should we have functions like this in Octave? | |
1132 | |
1133 DEFUN (set_variable, args, , "set_variable (NAME, VALUE)") | |
1134 { | |
1135 octave_value retval; | |
1136 | |
1137 if (args.length () == 2) | |
1138 { | |
1139 std::string name = args(0).string_value (); | |
1140 | |
1141 if (! error_state) | |
1142 symbol_table::varref (name) = args(1); | |
1143 else | |
1144 error ("set_variable: expecting variable name as first argument"); | |
1145 } | |
1146 else | |
1147 print_usage (); | |
1148 | |
1149 return retval; | |
1150 } | |
1151 | |
1152 DEFUN (variable_value, args, , "VALUE = variable_value (NAME)") | |
1153 { | |
1154 octave_value retval; | |
1155 | |
1156 if (args.length () == 1) | |
1157 { | |
1158 std::string name = args(0).string_value (); | |
1159 | |
1160 if (! error_state) | |
1161 { | |
1162 retval = symbol_table::varval (name); | |
1163 | |
1164 if (retval.is_undefined ()) | |
1165 error ("variable_value: `%s' is not a variable in the current scope", | |
1166 name.c_str ()); | |
1167 } | |
1168 else | |
1169 error ("variable_value: expecting variable name as first argument"); | |
1170 } | |
1171 else | |
1172 print_usage (); | |
1173 | |
1174 return retval; | |
1175 } | |
1176 #endif | |
1177 | |
1 | 1178 /* |
1179 ;;; Local Variables: *** | |
1180 ;;; mode: C++ *** | |
1181 ;;; End: *** | |
1182 */ |