octave: src/symtab.cc comparison

also consider parent classes when checking if class methods are out of date

comparison

equal deleted inserted replaced

-:110e570e5f8d
+:1783b360976f
 // We don't want to make this an absolute name,
 // 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_method (dispatch_type, nm,
+{
-dir_name);
+file = load_path::find_method (dispatch_type, nm,
+dir_name);
+if (file.empty ())
+{
+const std::list<std::string>& plist
+= symbol_table::parent_classes (dispatch_type);
+std::list<std::string>::const_iterator it
+= plist.begin ();
+while (it != plist.end ())
+{
+file = load_path::find_method (*it, nm, dir_name);
+if (! file.empty ())
+break;
+it++;
+}
+}
+}
 // Maybe it's an autoload?
 if (file.empty ())
 file = lookup_autoload (nm);
 if (retval.is_undefined ())
 {
 // Search parent classes
-const_parent_map_iterator r = parent_map.find (dispatch_type);
+const std::list<std::string>& plist = parent_classes (dispatch_type);
-if (r != parent_map.end ())
+std::list<std::string>::const_iterator it = plist.begin ();
+while (it != plist.end ())
 {
-const std::list<std::string>& plist = r->second;
+retval = find_method (*it);
-std::list<std::string>::const_iterator it = plist.begin ();
+if (retval.is_defined ())
-while (it != plist.end ())
 {
-retval = find_method (*it);
+class_methods[dispatch_type] = retval;
+break;
-if (retval.is_defined ())
-{
-class_methods[dispatch_type] = retval;
-break;
-}
-it++;
 }
+it++;
 }
 }
 }
 return retval;

Mercurial > octave