Changeset 2305

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.

Location:

cobra/trunk

Files:

• Source/Boxes.cobra (modified) (2 diffs)
• Source/NameSpace.cobra (modified) (1 diff)
• Tests/420-extensions/400-extend-generics/220-extend-ancestor-interface.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
 

cobra/trunk/Source/NameSpace.cobra

@@ -1 @@
-interface INameSpaceMember
-    inherits IMember, ISyntaxNode
+interface INameSpaceMember inherits IMember, ISyntaxNode
     """
     Anything that can be a member of a namespace should implement INameSpaceMember.

cobra/trunk/Tests/420-extensions/400-extend-generics/220-extend-ancestor-interface.cobra

@@ -1 @@
-# Invoke a method in an extension of a generic, ancestor interface.
-# In this case, the class is Dictionary<of TKey, TValue>.KeyCollection
-# and the extension method is declared on IEnumerable<of TKey> which KeyCollection implements.
-
-# Then do it again for Dictionary<of TKey, TValue>.ValueCollection
-# Note that it implement IEnumerable<of TValue> which is using the *2nd* generic parameter, not the first.
-
 class Test
 
     def main
+        .test1
+        .test2
+        
+    def test1
+        # Invoke a method in an extension of a generic, ancestor interface.
+        # In this case, the class is Dictionary<of TKey, TValue>.KeyCollection
+        # and the extension method is declared on IEnumerable<of TKey> which KeyCollection implements.
+
+        # Then do it again for Dictionary<of TKey, TValue>.ValueCollection
+        # Note that it implement IEnumerable<of TValue> which is using the *2nd* generic parameter, not the first.
         d = {'x': 1, 'y': 1}
 
@@ -18 +21 @@
             assert value == 1
         assert (for value in d.values.toList get value) == [1, 1]
+
+    def test2
+        x = X()
+        .takeEnum(x)
+        y = x.toList  # previously broken. Cobra would not find the extension method.
+        assert y == List<of int>(x)
+        assert y == [1, 2, 3]
+
+    def takeEnum(e as IEnumerable<of int>)
+        assert e.toList is not e
+        assert e.toList == List<of int>(e)
+
+
+class X implements IEnumerable<of int>
+
+    def getEnumerator as IEnumerator<of int>
+        return [1, 2, 3].getEnumerator
+
+    def getEnumerator as System.Collections.IEnumerator
+        implements System.Collections.IEnumerable
+        return .getEnumerator