From 5d8de8fbd22a8e3d757c180294ab12c1309eb7e7 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 9 Aug 2012 17:21:25 +0400 Subject: [PATCH] KT-2596 Can't use iterator in for-loop #KT-2596 fixed --- compiler/testData/codegen/regressions/kt2596.kt | 7 +++++++ compiler/tests/org/jetbrains/jet/codegen/StdlibTest.java | 4 ++++ libraries/stdlib/src/kotlin/Standard.kt | 5 ----- 3 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 compiler/testData/codegen/regressions/kt2596.kt diff --git a/compiler/testData/codegen/regressions/kt2596.kt b/compiler/testData/codegen/regressions/kt2596.kt new file mode 100644 index 00000000000..e5311df8a4e --- /dev/null +++ b/compiler/testData/codegen/regressions/kt2596.kt @@ -0,0 +1,7 @@ +fun box(): String { + val iterator: Iterator = (0..0).iterator() + for (i in iterator) { + return "OK" + } + return "fail" +} \ No newline at end of file diff --git a/compiler/tests/org/jetbrains/jet/codegen/StdlibTest.java b/compiler/tests/org/jetbrains/jet/codegen/StdlibTest.java index a361663913d..7f26e004cf7 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/StdlibTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/StdlibTest.java @@ -373,4 +373,8 @@ public class StdlibTest extends CodegenTestCase { public void testKt2246() { blackBoxFile("regressions/kt2246.kt"); } + + public void testKt2596() { + blackBoxFile("regressions/kt2596.kt"); + } } diff --git a/libraries/stdlib/src/kotlin/Standard.kt b/libraries/stdlib/src/kotlin/Standard.kt index dd388800575..b8e8a1c90bc 100644 --- a/libraries/stdlib/src/kotlin/Standard.kt +++ b/libraries/stdlib/src/kotlin/Standard.kt @@ -5,11 +5,6 @@ import java.util.Collection import java.util.HashSet import java.util.LinkedList -/** -Helper to make jet.Iterator usable in for -*/ -public inline fun Iterator.iterator() : Iterator = this - /** Helper to make java.util.Iterator usable in for */