Erroneous fix reverted. Test added

2011-10-24 11:34:07 +04:00
parent 2010d770b5
commit 292a41ec15
2 changed files with 13 additions and 6 deletions
@@ -119,12 +119,6 @@ public class LabelResolver {
            else if (declarationDescriptor instanceof FunctionDescriptor) {
                FunctionDescriptor functionDescriptor = (FunctionDescriptor) declarationDescriptor;
                thisReceiver = functionDescriptor.getReceiverParameter();
-                if(!thisReceiver.exists()) {
-                    DeclarationDescriptor containingDeclaration = functionDescriptor.getContainingDeclaration();
-                    if(containingDeclaration instanceof ClassDescriptor) {
-                        thisReceiver = ((ClassDescriptor)containingDeclaration).getImplicitReceiver();
-                    }
-                }
            }
            else {
                throw new UnsupportedOperationException(); // TODO
@@ -0,0 +1,13 @@
+trait Iterator<out T> {
+ fun next() : T
+ val hasNext : Boolean
+
+ fun <R> map(transform: fun(element: T) : R) : Iterator<R> =
+    object : Iterator<R> {
+      override fun next() : R = transform(<!NO_THIS!>this@map<!>.next())
+
+      override val hasNext : Boolean
+        // There's no 'this' associated with the map() function, only this of the Iterator class
+        get() = <!NO_THIS!>this@map<!>.hasNext
+    }
+}