octave-nkf: src/load-path.cc comparison

Partial implementation of derived classes using the old form with "@" files.

author	rtshort@smoketree.phaselocked.com
date	Tue, 24 Mar 2009 11:29:53 -0400
parents	eb63fbe60fab
children	9b12ed1fbbbd

comparison

equal deleted inserted replaced

-:da58ec8f62e8
+:f914834836e7
 {
 dir_info_list.clear ();
 fcn_map.clear ();
 private_fcn_map.clear ();
 method_map.clear ();
+parent_map.clear ();
 do_append (".", false);
 }
 static std::list<std::string>
 {
 const fcn_map_type& m = q->second;
 const_fcn_map_iterator p = m.find (meth);
-if (p != m.end ())
+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
 	{
 	  const file_info_list_type& file_info_list = p->second;
 	  for (const_file_info_list_iterator i = file_info_list.begin ();
 	       i != file_info_list.end ();
 }
 os << "\n";
 #endif
+}
+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
 {

Mercurial > octave-nkf