-
Notifications
You must be signed in to change notification settings - Fork 5.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Resolve static enum members from compiled Java
For static members, a corresponding package is now created for every enum, as it's done for every other class. All static members of enum classes are resolved into the package, EXCEPT its enum entries, valueOf() and values() methods, which are put into the enum's class descriptor.
- Loading branch information
Showing
8 changed files
with
80 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -24,6 +24,3 @@ public trait CustomAnnotation : java.lang.Object { | |
public constructor MyTest() | ||
} | ||
} | ||
|
||
package CustomAnnotation { | ||
} |
12 changes: 12 additions & 0 deletions
12
compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
package test; | ||
|
||
public enum StaticMembersInEnum { | ||
ENTRY; | ||
|
||
public static void foo() { } | ||
public static void values(int x) { } | ||
public static void valueOf(int x) { } | ||
|
||
public static int STATIC_FIELD = 42; | ||
public static final StaticMembersInEnum CONSTANT = ENTRY; | ||
} |
22 changes: 22 additions & 0 deletions
22
compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
package test | ||
|
||
public final enum class StaticMembersInEnum : jet.Enum<test.StaticMembersInEnum> { | ||
private constructor StaticMembersInEnum() | ||
public final override /*1*/ /*fake_override*/ fun name() : jet.String | ||
public final override /*1*/ /*fake_override*/ fun ordinal() : jet.Int | ||
|
||
public class object <class-object-for-StaticMembersInEnum> { | ||
private constructor <class-object-for-StaticMembersInEnum>() | ||
public final val ENTRY : test.StaticMembersInEnum | ||
public final fun valueOf(/*0*/ value : jet.String) : test.StaticMembersInEnum | ||
public final fun values() : jet.Array<test.StaticMembersInEnum> | ||
} | ||
} | ||
|
||
package StaticMembersInEnum { | ||
public val CONSTANT : test.StaticMembersInEnum | ||
public var STATIC_FIELD : jet.Int | ||
public open fun foo() : Unit | ||
public open fun valueOf(/*0*/ p0 : jet.Int) : Unit | ||
public open fun values(/*0*/ p0 : jet.Int) : Unit | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters