Merge remote branch 'origin/master'

Conflicts: idea/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java idea/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java
2011-09-05 18:15:43 +04:00
parent 8c35668bfa 234eafb0c1
commit 5d2672f29a
37 changed files with 909 additions and 153 deletions
@@ -0,0 +1,114 @@
+fun box() : String {
+    var sum : Int = 0
+    var i = 0
+
+    val c6 = MyCollection4()
+    sum = 0
+    for (el in c6) {
+        sum = sum + el
+    }
+    if(sum != 15) return "c6 failed"
+
+    val c5 = MyCollection3()
+    sum = 0
+    for (el in c5) {
+        sum = sum + (el ?: 0)
+    }
+    if(sum != 15) return "c5 failed"
+
+    val c1: java.lang.Iterable<Int> = MyCollection1()
+    sum = 0
+    for (el in c1) {
+        sum = sum + el
+    }
+    if(sum != 15) return "c1 failed"
+
+    val c2 = MyCollection1()
+    sum = 0
+    for (el in c2) {
+        sum = sum + el
+    }
+    if(sum != 15) return "c2 failed"
+
+    val c3: Iterable<Int> = MyCollection2()
+    sum = 0
+    for (el in c3) {
+        sum = sum + el
+    }
+    if(sum != 15) return "c3 failed"
+
+    val c4 = MyCollection2()
+    sum = 0
+    for (el in c4) {
+        sum = sum + el
+    }
+    if(sum != 15) return "c4 failed"
+
+    val a : Array<Int> = Array<Int> (5)
+    for(el in 0..4) {
+       a[i] = i++
+    }
+    sum = 0
+    for (el in a) {
+        sum = sum + el
+    }
+    if(sum != 10) return "a failed"
+
+    val b : Array<Int?> = Array<Int?> (5)
+    i = 0
+    while(i < 5) {
+       b[i] = i++
+    }
+    sum = 0
+    for (el in b) {
+        sum = sum + (el ?: 0)
+    }
+    System.out?.println(sum)
+    if(sum != 10) return "b failed"
+
+    return "OK"
+}
+
+class MyCollection1(): java.lang.Iterable<Int> {
+    fun iterator(): java.util.Iterator<Int> = MyIterator()
+
+    class MyIterator(): java.util.Iterator<Int> {
+        var k : Int = 5
+
+        fun next() : Int = k--
+        fun hasNext() = k > 0
+    }
+}
+
+class MyCollection2(): Iterable<Int> {
+    fun iterator(): Iterator<Int> = MyIterator()
+
+    class MyIterator(): Iterator<Int> {
+        var k : Int = 5
+
+        fun next() : Int = k--
+        fun hasNext() = k > 0
+    }
+}
+
+class MyCollection3() {
+    fun iterator() = MyIterator()
+
+    class MyIterator() {
+        var k : Int = 5
+
+        fun next() : Int? = k--
+        fun hasNext() = k > 0
+    }
+}
+
+class MyCollection4() {
+    fun iterator() = MyIterator()
+
+    class MyIterator() {
+        var k : Int = 5
+
+        fun next() : Int = k--
+        fun hasNext() = k > 0
+    }
+}
@@ -0,0 +1,9 @@
+fun isDigit(a: Int) : String {
+    val aa = java.util.ArrayList<Int> ()
+    aa.add(239)
+
+    if(a in aa) return "array list"
+    if(a in 0..9)  return "digit"
+    if(a !in 0..100) return "not small"
+    return "something"
+}
@@ -1,4 +1,11 @@
-fun isDigit(a: Int) = when(a) {
-  in 0..9 => "digit"
-  else => "something"
+fun isDigit(a: Int) : String {
+    val aa = java.util.ArrayList<Int> ()
+    aa.add(239)
+
+    return when(a) {
+      in aa => "array list"
+      in 0..9 => "digit"
+     !in 0..100 => "not small"
+      else => "something"
+    }
 }
@@ -0,0 +1,41 @@
+fun main(args: Array<String>?) {
+    val y: Unit = () //do not compile
+    A<Unit>()        //do not compile
+    C<Unit>(())      //do not compile
+        //do not compile
+    System.out?.println(fff<Unit>(()))  //do not compile
+    System.out?.println(id<Unit>(y))  //do not compile
+    System.out?.println(fff<Unit>(id<Unit>(y)) == id<Unit>(foreach(Array<Int>(0),{(e : Int) : Unit => })))  //do not compile
+}
+class A<T>()
+
+class C<T>(val value: T) {
+    fun foo(): T = value
+}
+
+fun <T> fff(x: T) : T { return x }
+
+fun <T> id(value: T): T = value
+
+fun foreach(array: Array<Int>?, action: fun(Int): Unit) {
+    for (el in array) {
+       action(el) //exception through compilation (see below)
+    }
+}
+
+fun almostFilter(array: Array<Int>, action: fun(Int): Int) {
+    for (el in array) {
+       action(el)
+    }
+}
+
+fun box() : String {
+    val a = Array<Int> (3)
+    a[0] = 0
+    a[1] = 1
+    a[2] = 2
+    foreach(a, { (el : Int) : Unit => System.out?.println(el) })
+    almostFilter(a, { (el : Int) : Int => el })
+    main(null)
+    return "OK"
+}
@@ -0,0 +1,35 @@
+namespace x
+
+class Outer(val name: String) {
+    class Inner() {
+        val me = name
+
+        class object {
+           fun bar() = "bar"
+        }
+    }
+
+    class object {
+        class StaticInner() {
+            class object {
+                fun f() = "oo"
+            }
+        }
+    }
+}
+
+fun box (): String {
+    val inner  = Outer("mama").Inner() //verify error
+    if(inner.me != "mama")
+        return "fail"
+
+    val outer = Outer ("papa")
+    val inner2 = outer.Inner ()
+    if(inner2.me != "papa")
+        return "fail"
+
+    if(Outer.StaticInner.f() != "oo" )
+        return "fail"
+
+    return "OK"
+}
@@ -39,6 +39,11 @@ fun t3 () : Boolean {
    if(d.isT(10))     return false
    if(!d.isT(null))  return false

+    val f = B<java.lang.String?>()
+    if(!f.isT("aaa")) return false
+    if(f.isT(10))     return false
+    if(!f.isT(null))  return false
+
    val c = B<Int>()
    if(c.isT("aaa")) return false
    if(!c.isT(10))   return false
@@ -0,0 +1,29 @@
+class A() {
+    var xi = 0
+    var xin : Int? = 0
+    var xinn : Int? = null
+
+    var xl = 0.lng
+    var xln : Long? = 0.lng
+    var xlnn : Long? = null
+
+    var xb = 0.byt
+    var xbn : Long? = 0.byt
+    var xbnn : Long? = null
+
+    var xf = 0.flt
+    var xfn : Float? = 0.flt
+    var xfnn : Float? = null
+
+    var xd = 0.dbl
+    var xdn : Double? = 0.dbl
+    var xdnn : Double? = null
+
+    var xs = 0.sht
+    var xsn : Short? = 0.sht
+    var xsnn : Short? = null
+}
+
+fun box() : String {
+    return "OK"
+}