Merge remote branch 'origin/master'

This commit is contained in:
Dmitry Jemerov
2011-05-30 16:29:39 +04:00
16 changed files with 142 additions and 39 deletions
+19
View File
@@ -20,3 +20,22 @@ fun foo() : Unit {
<error>this</error>
this<error>@a</error>
}
namespace closures {
class A(val a:Int) {
class B() {
val x = this@B : B
val y = this@A : A
val z = this : B
val Int.xx = this : Int
fun Char.xx() {
this : Char
val a = {Double.() => this : Double + this@xx : Char}
val b = @a{Double.() => this@a : Double + this@xx : Char}
val c = @a{() => <error>this@a</error> + this@xx : Char}
return (@a{Double.() => this@a : Double + this@xx : Char})
}
}
}
}
@@ -33,6 +33,12 @@ class Test() {
var <info>v5</info> : Int <info>get</info>() = 1; <info>set</info>(x){$v5 = x}
var <info>v6</info> : Int <info>get</info>() = $v6 + 1; <info>set</info>(x){}
val v7 : Int <info>abstract</info> <info>get</info>
var v8 : Int <info>abstract</info> <info>get</info> <info>abstract</info> <info>set</info>
var <info>v9</info> : Int <info>abstract</info> <info>set</info>
var <info>v10</info> : Int <info>abstract</info> <info>get</info>
}
<info>open</info> class Super(i : Int)
@@ -0,0 +1,4 @@
class XXX {
val a : Int abstract get
}
+2
View File
@@ -8,6 +8,8 @@ namespace qualified_this {
~xx~val Int.xx = `xx`this : Int
~xx()~fun Int.xx() {
`xx()`this : Int
val a = {Int.() => `xx()`this`xx()`@xx + this}
}
}
}