KT-274 Enumeration.iterator()

compiler/tests/org/jetbrains/jet/codegen/ForTestCompileStdlib.java

@@ -29,6 +29,9 @@ import java.util.jar.JarOutputStream;
 public class ForTestCompileStdlib {
     private static File stdlibJarFile;
 
+    private ForTestCompileStdlib() {
+    }
+
     private static File doCompile() throws Exception {
         File tmpDir = JetTestUtils.tmpDir("stdlibjar");
 

compiler/tests/org/jetbrains/jet/codegen/StdlibTest.java

@@ -85,7 +85,7 @@ public class StdlibTest extends CodegenTestCase {
     }
 
     public void testKt274 () {
-//        blackBoxFile("regressions/kt274.kt");
+        blackBoxFile("regressions/kt274.kt");
     }
 
     //from ClassGenTest

stdlib/ktSrc/Standard.kt

@@ -20,7 +20,7 @@ inline fun <T> java.util.Iterator<T>.iterator() = this
 /*
 Helper to make java.util.Enumeration usable in for
 */
-inline fun <T> java.util.Enumeration<T>.iterator(): Iterator<T> = object: Iterator<T> {
+fun <erased T> java.util.Enumeration<T>.iterator(): Iterator<T> = object: Iterator<T> {
   override val hasNext: Boolean
     get() = hasMoreElements()
 

testlib/test/EnymerationIteratorTest.kt

@@ -0,0 +1,18 @@
+
+import java.util.Vector
+import junit.framework.TestCase
+import stdhack.test.assertEquals
+
+class EnumerationIteratorTest() : TestCase() {
+    fun testIteration () {
+        val v = Vector<Int>()
+        for(i in 1..5)
+            v.add(i)
+
+        var sum = 0
+        for(k in v.elements())
+            sum += k
+
+        assertEquals(15, sum)
+    }
+}