Merge branch 'master' of ssh://git.labs.intellij.net/jet

2011-10-24 18:54:35 +04:00
parent 9122bb373f b837a1ac14
commit 000086555b
94 changed files with 1561 additions and 263 deletions
@@ -88,7 +88,8 @@ class MyCollection2(): Iterable<Int> {
        var k : Int = 5

        override fun next() : Int = k--
-        override fun hasNext() = k > 0
+        override val hasNext : Boolean
+          get() = k > 0
    }
 }

@@ -99,7 +100,8 @@ class MyCollection3() {
        var k : Int = 5

        fun next() : Int? = k--
-        fun hasNext() = k > 0
+        val hasNext : Boolean
+            get() = k > 0
    }
 }