Mercurial > octave-nkf
comparison src/symtab.cc @ 9151:d8f9588c6ba1
object exemplars
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 23 Apr 2009 16:05:52 -0400 |
parents | c6463412aebb |
children | 5cd879a0d8c4 |
comparison
equal
deleted
inserted
replaced
9150:e716cafee800 | 9151:d8f9588c6ba1 |
---|---|
130 // the prompt is printed or the directory has changed, and then we | 130 // the prompt is printed or the directory has changed, and then we |
131 // would not check for it when finding symbol definitions. | 131 // would not check for it when finding symbol definitions. |
132 | 132 |
133 static inline bool | 133 static inline bool |
134 load_out_of_date_fcn (const std::string& ff, const std::string& dir_name, | 134 load_out_of_date_fcn (const std::string& ff, const std::string& dir_name, |
135 octave_value& function) | 135 octave_value& function, |
136 const std::string& dispatch_type = std::string ()) | |
136 { | 137 { |
137 bool retval = false; | 138 bool retval = false; |
138 | 139 |
139 octave_function *fcn = load_fcn_from_file (ff, dir_name); | 140 octave_function *fcn = load_fcn_from_file (ff, dir_name, dispatch_type); |
140 | 141 |
141 if (fcn) | 142 if (fcn) |
142 { | 143 { |
143 retval = true; | 144 retval = true; |
144 | 145 |
227 if (fs) | 228 if (fs) |
228 { | 229 { |
229 if (fs.is_newer (tp)) | 230 if (fs.is_newer (tp)) |
230 { | 231 { |
231 retval = load_out_of_date_fcn (ff, dir_name, | 232 retval = load_out_of_date_fcn (ff, dir_name, |
232 function); | 233 function, |
234 dispatch_type); | |
233 | 235 |
234 clear_breakpoints = true; | 236 clear_breakpoints = true; |
235 } | 237 } |
236 } | 238 } |
237 else | 239 else |
245 else | 247 else |
246 { | 248 { |
247 // Not the same file, so load the new file in | 249 // Not the same file, so load the new file in |
248 // place of the old. | 250 // place of the old. |
249 | 251 |
250 retval = load_out_of_date_fcn (file, dir_name, function); | 252 retval = load_out_of_date_fcn (file, dir_name, function, |
253 dispatch_type); | |
251 | 254 |
252 clear_breakpoints = true; | 255 clear_breakpoints = true; |
253 } | 256 } |
254 | 257 |
255 // If the function has been replaced then clear any | 258 // If the function has been replaced then clear any |