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