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

Do not generate DefaultImpls if empty

Browse Source
This commit is contained in:
Yan Zhulanow
2015-10-26 16:03:58 +03:00
parent 2a28baa154
commit 3475b4796f
14 changed files with 271 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeListingTest.kt
+7 -2
View File
@@ -47,6 +47,7 @@ public abstract class AbstractBytecodeListingTest : CodegenTestCase() {
private val declarationsInsideClass = arrayListOf<Declaration>()
private val classAnnotations = arrayListOf<String>()
private var className = ""
private var classAccess = 0
private fun addAnnotation(desc: String, list: MutableList<String> = declarationsInsideClass.last().annotations) {
val name = Type.getType(desc).className
@@ -66,11 +67,14 @@ public abstract class AbstractBytecodeListingTest : CodegenTestCase() {
if ((access and Opcodes.ACC_DEPRECATED) != 0) addModifier("deprecated", list)
if ((access and Opcodes.ACC_FINAL) != 0) addModifier("final", list)
if ((access and Opcodes.ACC_ABSTRACT) != 0) addModifier("abstract", list)
if ((access and Opcodes.ACC_STATIC) != 0) addModifier("static", list)
}
public val text: String
get() = StringBuilder {
append(classAnnotations.joinToString(""))
get() = StringBuilder().apply {
append(classAnnotations.joinToString("\n", postfix = "\n"))
arrayListOf<String>().apply { handleModifiers(classAccess, this) }.forEach { append(it) }
append("class ")
append(className)
if (declarationsInsideClass.isNotEmpty()) {
append(" {\n")
@@ -147,6 +151,7 @@ public abstract class AbstractBytecodeListingTest : CodegenTestCase() {
interfaces: Array<out String>?
) {
className = name
classAccess = access
}
override fun visitInnerClass(name: String, outerName: String?, innerName: String?, access: Int) {
compiler/tests/org/jetbrains/kotlin/codegen/BytecodeListingTestGenerated.java
+6
View File
@@ -35,6 +35,12 @@ public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeListing"), Pattern.compile("^(.+)\\.kt$"), true);
}
@TestMetadata("defaultImpls.kt")
public void testDefaultImpls() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeListing/defaultImpls.kt");
doTest(fileName);
}
@TestMetadata("compiler/testData/codegen/bytecodeListing/annotations")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)