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

Not writing fake parameters of enum constructors to generic signature.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-12-20 21:23:10 +04:00
parent 2daf9a10d0
commit e3a30b10a9
13 changed files with 75 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java
+1 -1
View File
@@ -322,7 +322,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
signatureVisitor.writeSupersEnd();
return new JvmClassSignature(jvmName(), superClassAsmType.getInternalName(), superInterfaces, signatureVisitor.makeJavaString(),
return new JvmClassSignature(jvmName(), superClassAsmType.getInternalName(), superInterfaces, signatureVisitor.makeJavaGenericSignature(),
signatureVisitor.makeKotlinClassSignature());
}
compiler/backend/src/org/jetbrains/jet/codegen/signature/BothSignatureWriter.java
+15 -3
View File
@@ -346,7 +346,18 @@ public class BothSignatureWriter {
public void writeParameterType(JvmMethodParameterKind parameterKind) {
transitionState(State.PARAMETERS, State.PARAMETER);
push(signatureVisitor().visitParameterType());
// This magic mimics the behavior of javac that enum constructor have these synthetic parameters in erased signature, but doesn't
// have them in generic signature. IDEA relies on this behavior.
if (parameterKind == JvmMethodParameterKind.ENUM_NAME || parameterKind == JvmMethodParameterKind.ENUM_ORDINAL) {
generic = true;
// pushing dummy visitor, because we don't want these parameters to appear in generic JVM signature
push(new SignatureWriter());
}
else {
push(signatureVisitor().visitParameterType());
}
jetSignatureWriter = new JetSignatureWriter();
if (jvmCurrentType != null || jvmCurrentTypeArrayLevel != 0) {
throw new IllegalStateException();
@@ -476,7 +487,7 @@ public class BothSignatureWriter {
}
@Nullable
public String makeJavaString() {
public String makeJavaGenericSignature() {
if (state != State.METHOD_END && state != State.CLASS_END) {
throw new IllegalStateException();
}
@@ -519,7 +530,7 @@ public class BothSignatureWriter {
if (needGenerics) {
return new JvmMethodSignature(
makeAsmMethod(name),
makeJavaString(),
makeJavaGenericSignature(),
makeKotlinMethodTypeParameters(),
makeKotlinParameterTypes(),
makeKotlinReturnTypeSignature()
@@ -530,3 +541,4 @@ public class BothSignatureWriter {
}
}
}
compiler/testData/loadKotlin/class/EnumWithGenericConstructorParameter.kt
+4
View File
@@ -0,0 +1,4 @@
package test
enum class EnumWithGenericConstructorParameter(list: List<String>?) {
}
compiler/testData/loadKotlin/class/EnumWithGenericConstructorParameter.txt
+12
View File
@@ -0,0 +1,12 @@
namespace test
internal final enum class test.EnumWithGenericConstructorParameter : jet.Enum<test.EnumWithGenericConstructorParameter> {
private final /*primary constructor*/ fun <init>(/*0*/ list: jet.List<jet.String>?): test.EnumWithGenericConstructorParameter
public final override /*1*/ /*fake_override*/ fun name(): jet.String
public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
internal final class object test.EnumWithGenericConstructorParameter.<class-object-for-EnumWithGenericConstructorParameter> {
private final /*constructor*/ fun <init>(): test.EnumWithGenericConstructorParameter.<class-object-for-EnumWithGenericConstructorParameter>
public final fun valueOf(/*0*/ value: jet.String): test.EnumWithGenericConstructorParameter
public final fun values(): jet.Array<test.EnumWithGenericConstructorParameter>
}
}
compiler/testData/loadKotlin/class/EnumWithPrimitiveConstructorParameter.kt
+4
View File
@@ -0,0 +1,4 @@
package test
enum class EnumWithPrimitiveConstructorParameter(b: Boolean) {
}
compiler/testData/loadKotlin/class/EnumWithPrimitiveConstructorParameter.txt
+12
View File
@@ -0,0 +1,12 @@
namespace test
internal final enum class test.EnumWithPrimitiveConstructorParameter : jet.Enum<test.EnumWithPrimitiveConstructorParameter> {
private final /*primary constructor*/ fun <init>(/*0*/ b: jet.Boolean): test.EnumWithPrimitiveConstructorParameter
public final override /*1*/ /*fake_override*/ fun name(): jet.String
public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
internal final class object test.EnumWithPrimitiveConstructorParameter.<class-object-for-EnumWithPrimitiveConstructorParameter> {
private final /*constructor*/ fun <init>(): test.EnumWithPrimitiveConstructorParameter.<class-object-for-EnumWithPrimitiveConstructorParameter>
public final fun valueOf(/*0*/ value: jet.String): test.EnumWithPrimitiveConstructorParameter
public final fun values(): jet.Array<test.EnumWithPrimitiveConstructorParameter>
}
}
compiler/testData/loadKotlinCustom/enum/enumVisibilityBinary.txt
+3 -3
View File
@@ -1,7 +1,7 @@
namespace test
internal final enum class test.In : jet.Enum<test.In> {
private final /*constructor*/ fun <init>(/*0*/ p0: jet.String?, /*1*/ p1: jet.Int): test.In
private final /*constructor*/ fun <init>(): test.In
public final override /*1*/ /*fake_override*/ fun name(): jet.String
public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
internal final class object test.In.<class-object-for-In> {
@@ -12,7 +12,7 @@ internal final enum class test.In : jet.Enum<test.In> {
}
}
private final enum class test.Pr : jet.Enum<test.Pr> {
private final /*constructor*/ fun <init>(/*0*/ p0: jet.String?, /*1*/ p1: jet.Int): test.Pr
private final /*constructor*/ fun <init>(): test.Pr
public final override /*1*/ /*fake_override*/ fun name(): jet.String
public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
private final class object test.Pr.<class-object-for-Pr> {
@@ -23,7 +23,7 @@ private final enum class test.Pr : jet.Enum<test.Pr> {
}
}
public final enum class test.Pu : jet.Enum<test.Pu> {
private final /*constructor*/ fun <init>(/*0*/ p0: jet.String?, /*1*/ p1: jet.Int): test.Pu
private final /*constructor*/ fun <init>(): test.Pu
public final override /*1*/ /*fake_override*/ fun name(): jet.String
public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
public final class object test.Pu.<class-object-for-Pu> {
compiler/testData/loadKotlinCustom/enum/innerEnumBinary.txt
+1 -1
View File
@@ -5,7 +5,7 @@ internal final class test.A : jet.Any {
internal final class object test.A.<class-object-for-A> {
private final /*constructor*/ fun <init>(): test.A.<class-object-for-A>
internal final enum class test.A.<class-object-for-A>.E : jet.Enum<test.A.<class-object-for-A>.E> {
private final /*constructor*/ fun <init>(/*0*/ p0: jet.String?, /*1*/ p1: jet.Int): test.A.<class-object-for-A>.E
private final /*constructor*/ fun <init>(): test.A.<class-object-for-A>.E
public final override /*1*/ /*fake_override*/ fun name(): jet.String
public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
internal final class object test.A.<class-object-for-A>.E.<class-object-for-E> {
compiler/testData/loadKotlinCustom/enum/innerEnumExistingClassObjectBinary.txt
+1 -1
View File
@@ -5,7 +5,7 @@ internal final class test.A : jet.Any {
internal final class object test.A.<class-object-for-A> {
private final /*constructor*/ fun <init>(): test.A.<class-object-for-A>
internal final enum class test.A.<class-object-for-A>.E : jet.Enum<test.A.<class-object-for-A>.E> {
private final /*constructor*/ fun <init>(/*0*/ p0: jet.String?, /*1*/ p1: jet.Int): test.A.<class-object-for-A>.E
private final /*constructor*/ fun <init>(): test.A.<class-object-for-A>.E
public final override /*1*/ /*fake_override*/ fun name(): jet.String
public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
internal final class object test.A.<class-object-for-A>.E.<class-object-for-E> {
compiler/testData/loadKotlinCustom/enum/simpleEnumBinary.txt
+1 -1
View File
@@ -1,7 +1,7 @@
namespace test
internal final enum class test.MyEnum : jet.Enum<test.MyEnum> {
private final /*constructor*/ fun <init>(/*0*/ p0: jet.String?, /*1*/ p1: jet.Int): test.MyEnum
private final /*constructor*/ fun <init>(): test.MyEnum
public final override /*1*/ /*fake_override*/ fun name(): jet.String
public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
internal final class object test.MyEnum.<class-object-for-MyEnum> {
compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinTestGenerated.java
+10
View File
@@ -110,6 +110,16 @@ public class LoadCompiledKotlinTestGenerated extends AbstractLoadCompiledKotlinT
doTest("compiler/testData/loadKotlin/class/ClassTwoParams2.kt");
}
@TestMetadata("EnumWithGenericConstructorParameter.kt")
public void testEnumWithGenericConstructorParameter() throws Exception {
doTest("compiler/testData/loadKotlin/class/EnumWithGenericConstructorParameter.kt");
}
@TestMetadata("EnumWithPrimitiveConstructorParameter.kt")
public void testEnumWithPrimitiveConstructorParameter() throws Exception {
doTest("compiler/testData/loadKotlin/class/EnumWithPrimitiveConstructorParameter.kt");
}
@TestMetadata("InheritClassSimple.kt")
public void testInheritClassSimple() throws Exception {
doTest("compiler/testData/loadKotlin/class/InheritClassSimple.kt");
compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java
+10
View File
@@ -112,6 +112,16 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso
doTestCheckingPrimaryConstructors("compiler/testData/loadKotlin/class/ClassTwoParams2.kt");
}
@TestMetadata("EnumWithGenericConstructorParameter.kt")
public void testEnumWithGenericConstructorParameter() throws Exception {
doTestCheckingPrimaryConstructors("compiler/testData/loadKotlin/class/EnumWithGenericConstructorParameter.kt");
}
@TestMetadata("EnumWithPrimitiveConstructorParameter.kt")
public void testEnumWithPrimitiveConstructorParameter() throws Exception {
doTestCheckingPrimaryConstructors("compiler/testData/loadKotlin/class/EnumWithPrimitiveConstructorParameter.kt");
}
@TestMetadata("InheritClassSimple.kt")
public void testInheritClassSimple() throws Exception {
doTestCheckingPrimaryConstructors("compiler/testData/loadKotlin/class/InheritClassSimple.kt");
idea/testData/libraries/decompiled/Color.kt
+1 -1
View File
@@ -3,7 +3,7 @@
package testData.libraries
[[public final enum class Color(rgb : jet.Int, p1 : jet.Int, p2 : jet.Int) : jet.Enum<testData.libraries.Color> {
[[public final enum class Color(rgb : jet.Int) : jet.Enum<testData.libraries.Color> {
class object {
[public final val BLUE : testData.libraries.Color] /* compiled code */