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

Prohibit secondary constructors in traits

Browse Source
This commit is contained in:
Denis Zharkov
2015-02-13 16:09:10 +03:00
parent 978279bff3
commit 835a0df13a
4 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/LazyTopDownAnalyzer.java
+4 -3
View File
@@ -36,9 +36,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import static org.jetbrains.kotlin.diagnostics.Errors.MANY_DEFAULT_OBJECTS;
import static org.jetbrains.kotlin.diagnostics.Errors.SECONDARY_CONSTRUCTOR_IN_OBJECT;
import static org.jetbrains.kotlin.diagnostics.Errors.UNSUPPORTED;
import static org.jetbrains.kotlin.diagnostics.Errors.*;
public class LazyTopDownAnalyzer {
private BindingTrace trace;
@@ -206,6 +204,9 @@ public class LazyTopDownAnalyzer {
if (DescriptorUtils.isSingletonOrAnonymousObject(classDescriptor)) {
trace.report(SECONDARY_CONSTRUCTOR_IN_OBJECT.on((JetSecondaryConstructor) jetDeclaration));
}
else if (classDescriptor.getKind() == ClassKind.TRAIT) {
trace.report(CONSTRUCTOR_IN_TRAIT.on(jetDeclaration));
}
}
}
}
compiler/testData/diagnostics/tests/secondaryConstructors/constructorInTrait.kt
+3
View File
@@ -0,0 +1,3 @@
trait A {
<!CONSTRUCTOR_IN_TRAIT!>constructor() {}<!>
}
compiler/testData/diagnostics/tests/secondaryConstructors/constructorInTrait.txt
+7
View File
@@ -0,0 +1,7 @@
package
internal trait A {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestGenerated.java
+6
View File
@@ -10421,6 +10421,12 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
doTest(fileName);
}
@TestMetadata("constructorInTrait.kt")
public void testConstructorInTrait() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/constructorInTrait.kt");
doTest(fileName);
}
@TestMetadata("cyclicDelegationCalls.kt")
public void testCyclicDelegationCalls() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/cyclicDelegationCalls.kt");