Merge remote branch 'origin/master'

2012-01-20 20:21:25 +01:00
parent 35a1240dc7 53f7c9d007
commit 5add400e5e
29 changed files with 176 additions and 52 deletions
@@ -1,6 +1,5 @@
 package mask

-import std.io.*
 import java.io.*
 import java.util.*
 import java.util.Iterator as It
@@ -1,6 +1,5 @@
 package mask

-import std.io.*
 import java.io.*
 import java.util.*

@@ -1,6 +1,5 @@
 package mask

-import std.io.*
 import java.io.*
 import java.util.*

@@ -1,4 +1,3 @@
-import std.io.*
 import std.util.*
 import java.io.*
 import java.util.*
@@ -1,7 +1,5 @@
 package Smoke

-import std.io.*
-
 fun main(args: Array<String>) {
    print(args)
 }
@@ -8,4 +8,6 @@ fun test(s: String?) {
   val e: String = <!TYPE_MISMATCH!>s?.length<!> ?: "empty"
   val <!UNUSED_VARIABLE!>f<!>: Int = s?.length ?: b ?: 1
   val <!UNUSED_VARIABLE!>g<!>: Int? = e? startsWith("s")?.length
-}
+}
+
+fun String.startsWith(<!UNUSED_PARAMETER!>s<!>: String): Boolean = true
@@ -0,0 +1,16 @@
+//KT-1078 Problem with visibility in do-while
+
+package kt1078
+
+fun test() : B {
+    do {
+        val x = foo()
+    } while(x.bar()) // x is not visible here!
+    return B()
+}
+
+class B() {
+    fun bar() = true
+}
+
+fun foo() = B()