changeset 11319:f8e97e9a9301

avoid reparsing files after errors
author John W. Eaton <jwe@octave.org>
date Tue, 07 Dec 2010 15:30:17 -0500
parents d7ea780b036f
children baeeb6bc6afe
files src/ChangeLog src/symtab.cc
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Tue Dec 07 13:24:20 2010 -0500
+++ b/src/ChangeLog	Tue Dec 07 15:30:17 2010 -0500
@@ -1,3 +1,8 @@
+2010-12-07  John W. Eaton  <jwe@octave.org>
+
+	* symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): If an
+	error occurred during the first call to xfind, don't try again.
+
 2010-12-07  John W. Eaton  <jwe@octave.org>
 
 	* oct-parse.yy (case_list): Also accept default_case by itself.
--- a/src/symtab.cc	Tue Dec 07 13:24:20 2010 -0500
+++ b/src/symtab.cc	Tue Dec 07 15:30:17 2010 -0500
@@ -575,7 +575,7 @@
 {
   octave_value retval = xfind (args, local_funcs);
 
-  if (! retval.is_defined ())
+  if (! (error_state || retval.is_defined ()))
     {
       // It is possible that the user created a file on the fly since
       // the last prompt or chdir, so try updating the load path and