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

fix tests in org.jetbrains.kotlin.checkers

Browse Source
This commit is contained in:
Michael Nedzelsky
2015-09-03 15:25:57 +03:00
parent a3f22939f1
commit bc5c9065d2
2821 changed files with 12932 additions and 12960 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/compiledKotlin/class/ClassMemberConflict.txt
Vendored
+28 -28
View File
@@ -1,66 +1,66 @@
package test
internal final class ConstructorTypeParamClassObjectConflict</*0*/ test> {
public final class ConstructorTypeParamClassObjectConflict</*0*/ test> {
/*primary*/ public constructor ConstructorTypeParamClassObjectConflict</*0*/ test>()
internal final val some: kotlin.Int = 12
internal final fun <get-some>(): kotlin.Int
public final val some: kotlin.Int = 12
public final fun <get-some>(): kotlin.Int
public companion object Companion {
/*primary*/ private constructor Companion()
internal final val test: kotlin.Int = 12
internal final fun <get-test>(): kotlin.Int
public final val test: kotlin.Int = 12
public final fun <get-test>(): kotlin.Int
}
}
internal final class ConstructorTypeParamClassObjectTypeConflict</*0*/ test> {
public final class ConstructorTypeParamClassObjectTypeConflict</*0*/ test> {
/*primary*/ public constructor ConstructorTypeParamClassObjectTypeConflict</*0*/ test>()
internal final val some: test?
internal final fun <get-some>(): test?
public final val some: test?
public final fun <get-some>(): test?
public companion object Companion {
/*primary*/ private constructor Companion()
internal interface test {
public interface test {
}
}
}
internal final class TestClassObjectAndClassConflict {
public final class TestClassObjectAndClassConflict {
/*primary*/ public constructor TestClassObjectAndClassConflict()
internal final val bla: kotlin.String = "More"
internal final fun <get-bla>(): kotlin.String
internal final val some: kotlin.String = "More"
internal final fun <get-some>(): kotlin.String
public final val bla: kotlin.String = "More"
public final fun <get-bla>(): kotlin.String
public final val some: kotlin.String = "More"
public final fun <get-some>(): kotlin.String
public companion object Companion {
/*primary*/ private constructor Companion()
internal final val bla: kotlin.Int = 12
internal final fun <get-bla>(): kotlin.Int
public final val bla: kotlin.Int = 12
public final fun <get-bla>(): kotlin.Int
}
}
internal final class TestConstructorParamClassObjectConflict {
public final class TestConstructorParamClassObjectConflict {
/*primary*/ public constructor TestConstructorParamClassObjectConflict(/*0*/ test: kotlin.String)
internal final val some: kotlin.String
internal final fun <get-some>(): kotlin.String
public final val some: kotlin.String
public final fun <get-some>(): kotlin.String
public companion object Companion {
/*primary*/ private constructor Companion()
internal final val test: kotlin.Int = 12
internal final fun <get-test>(): kotlin.Int
public final val test: kotlin.Int = 12
public final fun <get-test>(): kotlin.Int
}
}
internal final class TestConstructorValClassObjectConflict {
public final class TestConstructorValClassObjectConflict {
/*primary*/ public constructor TestConstructorValClassObjectConflict(/*0*/ test: kotlin.String)
internal final val some: kotlin.String
internal final fun <get-some>(): kotlin.String
internal final val test: kotlin.String
internal final fun <get-test>(): kotlin.String
public final val some: kotlin.String
public final fun <get-some>(): kotlin.String
public final val test: kotlin.String
public final fun <get-test>(): kotlin.String
public companion object Companion {
/*primary*/ private constructor Companion()
internal final val test: kotlin.Int = 12
internal final fun <get-test>(): kotlin.Int
public final val test: kotlin.Int = 12
public final fun <get-test>(): kotlin.Int
}
}