Mercurial > hg > octave-lyh

diff src/load-path.cc @ 9581:3d0d2bda3a0f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix previous change, avoid duplicate loads of methods in descendant classes
author Jaroslav Hajek <highegg@gmail.com>
date Thu, 27 Aug 2009 16:08:23 +0200
parents 0c7d84a65386
children d6b2b708b6b0
line wrap: on
line diff
--- a/src/load-path.cc
+++ b/src/load-path.cc
@@ -512,7 +512,6 @@
   fcn_map.clear ();
   private_fcn_map.clear ();
   method_map.clear ();
-  parent_map.clear ();
 
   do_append (".", false);
 }
@@ -1017,29 +1016,7 @@
 
       const_fcn_map_iterator p = m.find (meth);
 
-      if (p == m.end ())
-	{
-	  // Look in parent classes.
-
-	  const_parent_map_iterator r = parent_map.find (class_name);
-
-	  if (r != parent_map.end ())
-	    {
-	      const std::list<std::string>& plist = r->second;
-	      std::list<std::string>::const_iterator it = plist.begin ();
-
-	      while (it != plist.end ())
-		{
-		  retval = do_find_method (*it, meth, dir_name, type);
-
-		  if (retval != "")
-		    break;
-
-		  it++;
-		}
-	    }
-	}
-      else
+      if (p != m.end ())
 	{
 	  const file_info_list_type& file_info_list = p->second;
 
@@ -1598,13 +1575,6 @@
 }
 
 void
-load_path::do_add_to_parent_map (const std::string& classname,
-				 const std::list<std::string>& parent_list) const
-{
-  parent_map[classname] = parent_list;
-}
-
-void
 load_path::add_to_fcn_map (const dir_info& di, bool at_end) const
 {
   std::string dir_name = di.dir_name;