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

Copy compileTimeInitializer for const property descriptor

Browse Source 
#KT-15802 Fixed
This commit is contained in:
Mikhail Zarechenskiy
2017-02-06 17:27:57 +03:00
parent 81c3edfc00
commit 655cf82534
26 changed files with 115 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/scopes/inheritance/statics/jjkj.txt
Vendored
+2 -2
View File
@@ -9,7 +9,7 @@ public open class C : I {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
// Static members
public const final override /*1*/ /*fake_override*/ val a: kotlin.Int
public const final override /*1*/ /*fake_override*/ val a: kotlin.Int = 1
public/*package*/ final var b: kotlin.Int
public/*package*/ open fun bar(): kotlin.Unit
}
@@ -21,7 +21,7 @@ public open class D : K {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
// Static members
public const final override /*1*/ /*fake_override*/ val a: kotlin.Int
public const final override /*1*/ /*fake_override*/ val a: kotlin.Int = 1
public/*package*/ final override /*1*/ /*fake_override*/ var b: kotlin.Int
public/*package*/ final var c: kotlin.Int
public/*package*/ open override /*1*/ /*fake_override*/ fun bar(): kotlin.Unit
compiler/testData/diagnostics/tests/scopes/inheritance/statics/nameClash0.txt
Vendored
+1 -1
View File
@@ -27,7 +27,7 @@ public open class E : A, B {
public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
// Static members
public const final override /*1*/ /*fake_override*/ val field: kotlin.Int
public const final override /*1*/ /*fake_override*/ val field: kotlin.Int = 1
public const final override /*1*/ /*fake_override*/ val field: kotlin.String
}
compiler/testData/diagnostics/tests/scopes/inheritance/statics/nameClash1.txt
Vendored
+1 -1
View File
@@ -27,7 +27,7 @@ public open class E : A, B {
public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
// Static members
public const final override /*1*/ /*fake_override*/ val field: kotlin.Int
public const final override /*1*/ /*fake_override*/ val field: kotlin.Int = 1
public const final override /*1*/ /*fake_override*/ val field: kotlin.String
}
compiler/testData/diagnostics/tests/scopes/inheritance/statics/nameClash2.txt
Vendored
+3 -3
View File
@@ -26,7 +26,7 @@ public interface C : A {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
// Static members
public const final override /*1*/ /*fake_override*/ val field: kotlin.Int
public const final override /*1*/ /*fake_override*/ val field: kotlin.Int = 1
}
public interface D : B {
@@ -45,7 +45,7 @@ public open class E : C, D {
public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
// Static members
public const final override /*1*/ /*fake_override*/ val field: kotlin.Int
public const final override /*1*/ /*fake_override*/ val field: kotlin.Int = 1
public const final override /*1*/ /*fake_override*/ val field: kotlin.String
}
@@ -56,7 +56,7 @@ public open class EE : E {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
// Static members
public const final override /*1*/ /*fake_override*/ val field: kotlin.Int
public const final override /*1*/ /*fake_override*/ val field: kotlin.Int = 1
public const final override /*1*/ /*fake_override*/ val field: kotlin.String
}
compiler/testData/diagnostics/tests/scopes/inheritance/statics/oneInterfaceManyTimes.txt
Vendored
+2 -2
View File
@@ -9,7 +9,7 @@ public open class C : I {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
// Static members
public const final override /*1*/ /*fake_override*/ val a: kotlin.Int
public const final override /*1*/ /*fake_override*/ val a: kotlin.Int = 1
public/*package*/ final var b: kotlin.Int
public/*package*/ open fun bar(): kotlin.Unit
}
@@ -21,7 +21,7 @@ public open class D : K, I {
public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
// Static members
public const final override /*2*/ /*fake_override*/ val a: kotlin.Int
public const final override /*2*/ /*fake_override*/ val a: kotlin.Int = 1
public/*package*/ final override /*1*/ /*fake_override*/ var b: kotlin.Int
public/*package*/ final var c: kotlin.Int
public/*package*/ open override /*1*/ /*fake_override*/ fun bar(): kotlin.Unit