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

This commit is contained in:
Nikolay Krasko
2011-11-25 17:43:09 +04:00
30 changed files with 244 additions and 166 deletions
@@ -50,7 +50,7 @@ class MyTest() {
i = <!UNUSED_VALUE!>456<!>;
}
fun testWhile(a : Any?, b : Any?) {
fun testWhile() {
var a : Any? = true
var b : Any? = 34
while (a is Any) {
@@ -139,4 +139,4 @@ fun testBackingFieldsNotMarked() {
}
}
fun doSmth(i : Int) {}
fun doSmth(i : Int) {}
@@ -0,0 +1 @@
fun box() = if(Array<Int>(10) is Array<java.lang.Integer>) "OK" else "fail"
@@ -0,0 +1,15 @@
namespace name
class Test() {
var i = 5
val ten = 10.lng
fun Long.t() = this.int + i++ + ++i
fun tt() = ten.t()
}
fun box() : String {
var m = Test()
return if((m.i)++ == 5 && ++(m.i) == 7 && m.tt() == 26) "OK" else "fail"
}