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

Fix type alias problems after rebase.

Browse Source
This commit is contained in:
Stanislav Erokhin
2016-06-09 15:51:34 +03:00
parent db3e0798c8
commit 53bf720503
6 changed files with 32 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/typealias/typeAliasShouldExpandToClass.txt
Vendored
+6 -6
View File
@@ -3,15 +3,15 @@ package
public typealias ToFun1 = () -> kotlin.Unit
public typealias ToFun2</*0*/ T> = (T) -> kotlin.Unit
public typealias ToTypeParam1</*0*/ T> = T
public typealias ToTypeParam2</*0*/ T> = ToTypeParam1<T> [= T]
public typealias ToTypeParam3</*0*/ T1, /*1*/ T2> = ToTypeParam2<T1> [= T1]
public typealias ToTypeParam4 = ToTypeParam1<kotlin.Any> [= kotlin.Any]
public typealias ToTypeParam2</*0*/ T> = ToTypeParam1<T>
public typealias ToTypeParam3</*0*/ T1, /*1*/ T2> = ToTypeParam2<T1>
public typealias ToTypeParam4 = ToTypeParam1<kotlin.Any>
public final class Outer {
public typealias ToTypeParam1</*0*/ T> = T
public typealias ToTypeParam2</*0*/ T> = Outer.ToTypeParam1<T> [= T]
public typealias ToTypeParam3</*0*/ T1, /*1*/ T2> = Outer.ToTypeParam2<T1> [= T1]
public typealias ToTypeParam4 = Outer.ToTypeParam1<kotlin.Any> [= kotlin.Any]
public typealias ToTypeParam2</*0*/ T> = Outer.ToTypeParam1<T>
public typealias ToTypeParam3</*0*/ T1, /*1*/ T2> = Outer.ToTypeParam2<T1>
public typealias ToTypeParam4 = Outer.ToTypeParam1<kotlin.Any>
public constructor Outer()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/typealiasExpandingToDynamic.kt
Vendored
+3 -3
View File
@@ -1,6 +1,6 @@
typealias Dyn = <!TYPEALIAS_SHOULD_EXPAND_TO_CLASS!>dynamic<!>
typealias Dyn2 = <!TYPEALIAS_SHOULD_EXPAND_TO_CLASS!>Dyn<!>
typealias Dyn3 = <!TYPEALIAS_SHOULD_EXPAND_TO_CLASS!>Dyn2<!>
typealias Dyn2 = Dyn
typealias Dyn3 = Dyn2
typealias Type<T> = <!TYPEALIAS_SHOULD_EXPAND_TO_CLASS!>T<!>
typealias Dyn4 = <!TYPEALIAS_SHOULD_EXPAND_TO_CLASS!>Type<Dyn><!>
typealias Dyn4 = Type<Dyn>
compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/typealiasExpandingToDynamic.txt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
package
public typealias Dyn = dynamic
public typealias Dyn = [ERROR : dynamic type in wrong context]
public typealias Dyn2 = Dyn
public typealias Dyn3 = Dyn2
public typealias Dyn4 = Type<Dyn>