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