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