azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove traces of class object constraints feature from parser, frontend, tests and psi

Browse Source
This commit is contained in:
Pavel V. Talanov
2015-04-01 16:29:21 +03:00
parent 5fe8bb4a92
commit a986d913c3
34 changed files with 35 additions and 731 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/checker/MultipleBounds.kt
+2 -13
View File
@@ -17,10 +17,7 @@ class D() {
class Test1<T : A>()
where
T : B,
<error>B</error> : T, // error
<error>class object T : A</error>,
<error>class object T : B</error>,
<error>class object <error>B</error> : T</error>
<error>B</error> : T // error
{
fun test(t : T) {
@@ -49,10 +46,7 @@ class Y<<error>T</error> : <warning>Foo</warning>> where T : <warning>Bar<Foo></
fun <T : A> test2(t : T)
where
T : B,
<error>B</error> : T,
<error>class object <error>B</error> : T</error>,
<error>class object T : B</error>,
<error>class object T : A</error>
<error>B</error> : T
{
<error>T</error>.<error>foo</error>()
<error>T</error>.<error>bar</error>()
@@ -64,9 +58,4 @@ val t1 = test2<<error>A</error>>(A())
val t2 = test2<<error>B</error>>(C())
val t3 = test2<C>(C())
class Test<T>
where
<error>class object T : <error>Foo</error></error>,
<error>class object T : A</error> {}
val <T, B : T> x : Int = 0