Changeset 2305 for cobra/trunk/Source/Boxes.cobra

Timestamp:

03/10/10 06:47:00 (2 years ago)

Author:

Chuck.Esterbrook

Message:

Fixed: The compiler does not find valid extension methods in some circumstances.

Files:

• cobra/trunk/Source/Boxes.cobra (modified) (2 diffs)

cobra/trunk/Source/Boxes.cobra

@@ -835 +835 @@
         Returns true if this type is a construction of the given generic type def, even going more than level deep through `genericDef`.
         """
+        # TODO: can this implementation be replaced by:
+        # return .constructedTypeOf(box) is not nil
         if .genericDef is nil
             return false
@@ -1764 +1766 @@
                     if box.isDescendantOf(cto) and .declForName(name)
                         return .constructedTypeFor(cto.genericParams).declForName(name)
+            else if .isGeneric
+                # Example:
+                # this == Extension of IEnumerable<of T>
+                # box == X implements IEnumerable<of int>
+                # name == 'toList'
+                # The IEnumerable<of T> has .genericDef IEnumerable<>
+                # The X's IEnumerable<of int> has .genericDef IEnumerable<>
+                # Note that X and the Extension are not directly connected.
+                # Only by tracing up to the generic def IEnumerable<> do they "connect".
+                # see cobra/Tests/420-extensions/400-extend-generics/220-extend-ancestor-interface.cobra
+                constructed = box.constructedTypeOf(_extendedBox.genericDef to !)
+                if constructed, return .extensionMemberFor(constructed, name)
         return nil
-            
+
     def memberForName(name as String) as IMember?
         result = base.memberForName(name)
-        if result is nil
-            result = .extendedBox.memberForName(name)
+        if result is nil, result = .extendedBox.memberForName(name)
         return result