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

do not generate delegates when the class already has such method either declared or delegated (report an ambiguity in this case)

Browse Source 
Merge conflict resolved by committer
This commit is contained in:
Kirill Berezin
2012-08-26 18:28:48 +04:00
committed by Andrey Breslav
parent 10bdc02409
commit 1061e1ef69
5 changed files with 3310 additions and 3234 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/codegen/ClassGenTest.java
+5
View File
@@ -68,6 +68,11 @@ public class ClassGenTest extends CodegenTestCase {
blackBoxFile("classes/delegation2.kt");
}
public void testInheritanceAndDelegation3() throws Exception {
createEnvironmentWithMockJdkAndIdeaAnnotations(ConfigurationKind.JDK_ONLY);
blackBoxFile("classes/delegation3.kt");
}
public void testFunDelegation() throws Exception {
createEnvironmentWithMockJdkAndIdeaAnnotations(ConfigurationKind.JDK_ONLY);
blackBoxFile("classes/funDelegation.jet");