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

Properly check overloads in enum

Browse Source
This commit is contained in:
Andrey Breslav
2014-06-16 21:49:03 +04:00
parent f1545963f3
commit 98701b7c6e
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverloadResolver.java
-8
View File
@@ -132,14 +132,6 @@ public class OverloadResolver {
) {
MultiMap<Name, CallableMemberDescriptor> functionsByName = MultiMap.create();
if (classDescriptor.getKind() == ClassKind.ENUM_CLASS) {
ClassDescriptorWithResolutionScopes classObjectDescriptor = classDescriptor.getClassObjectDescriptor();
assert classObjectDescriptor != null;
for (CallableMemberDescriptor memberDescriptor : classObjectDescriptor.getDeclaredCallableMembers()) {
functionsByName.putValue(memberDescriptor.getName(), memberDescriptor);
}
}
for (CallableMemberDescriptor function : classDescriptor.getDeclaredCallableMembers()) {
functionsByName.putValue(function.getName(), function);
}
compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/enum.kt
+7
View File
@@ -0,0 +1,7 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
enum class <!CONFLICTING_JVM_DECLARATIONS, CONFLICTING_JVM_DECLARATIONS!>E<!> {
A;
<!CONFLICTING_JVM_DECLARATIONS!>fun values(): Array<E><!> = null!!
<!CONFLICTING_JVM_DECLARATIONS!>fun valueOf(s: String): E<!> = null!!
}
compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
+5
View File
@@ -2855,6 +2855,11 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/delegationBy.kt");
}
@TestMetadata("enum.kt")
public void testEnum() throws Exception {
doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/enum.kt");
}
@TestMetadata("innerClassField.kt")
public void testInnerClassField() throws Exception {
doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/innerClassField.kt");