Mercurial > octave-nkf

changeset 8082:163d20e4d39c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
symtab.cc (out_of_date_check_internal): check for method, then regular function
author John W. Eaton <jwe@octave.org>
date Wed, 03 Sep 2008 11:20:25 -0400
parents b1634dd9ebe7
children 16ab78b816bc
files src/ChangeLog src/symtab.cc
diffstat 2 files changed, 9 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Tue Sep 02 20:31:28 2008 -0400
+++ b/src/ChangeLog	Wed Sep 03 11:20:25 2008 -0400
@@ -1,3 +1,8 @@
+2008-09-03  John W. Eaton  <jwe@octave.org>
+
+	* symtab.cc (out_of_date_check_internal): If dispatch type is set,
+	check for method.  If that fails, check for regular function. 
+
 2008-09-02  Michael Goffioul  <michael.goffioul@gmail.com>
 
 	* graphics.cc (hggroup::update_axis_limits): Also reacts on
--- a/src/symtab.cc	Tue Sep 02 20:31:28 2008 -0400
+++ b/src/symtab.cc	Wed Sep 03 11:20:25 2008 -0400
@@ -193,11 +193,12 @@
 		      // because load_fcn_file looks at the name to
 		      // decide whether it came from a relative lookup.
 
-		      if (dispatch_type.empty ())
-			file = load_path::find_fcn (nm, dir_name);
-		      else
+		      if (! dispatch_type.empty ())
 			file = load_path::find_method (nm, dispatch_type,
 						       dir_name);
+
+		      if (file.empty ())
+			file = load_path::find_fcn (nm, dir_name);
 		    }
 
 		  if (file.empty ())