From d4c4515944ee6609f3c77b15cfe4b36ba80a9824 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 18 Jan 2016 00:13:55 +0300 Subject: [PATCH] Refactor BinaryVersion and subclasses, get rid of static factories --- .../KotlinSyntheticClassAnnotationTest.java | 2 +- .../utils/KotlinJavascriptMetadataUtils.kt | 14 +++----- .../load/java/JvmBytecodeBinaryVersion.kt | 14 ++------ .../kotlin/load/kotlin/JvmMetadataVersion.kt | 14 ++------ .../kotlin/load/kotlin/ModuleMapping.kt | 2 +- ...eadKotlinClassHeaderAnnotationVisitor.java | 8 ++--- .../kotlin/builtins/BuiltInsBinaryVersion.kt | 12 ++----- .../builtins/BuiltinsPackageFragment.kt | 2 +- .../deserialization/BinaryVersion.kt | 33 ++++--------------- .../KotlinJavaScriptAbiVersionIndex.kt | 4 +-- .../versions/KotlinMetadataVersionIndex.kt | 4 +-- 11 files changed, 31 insertions(+), 78 deletions(-) diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/KotlinSyntheticClassAnnotationTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/KotlinSyntheticClassAnnotationTest.java index 02438600e6e..9d6e8c9a514 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/KotlinSyntheticClassAnnotationTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/KotlinSyntheticClassAnnotationTest.java @@ -146,6 +146,6 @@ public class KotlinSyntheticClassAnnotationTest extends CodegenTestCase { int[] version = (int[]) CodegenTestUtil.getAnnotationAttribute(annotation, VERSION_FIELD_NAME); assertNotNull(version); assertTrue("Annotation " + annotationFqName + " is written with an unsupported format", - JvmMetadataVersion.create(version).isCompatible()); + new JvmMetadataVersion(version).isCompatible()); } } diff --git a/compiler/util/src/org/jetbrains/kotlin/utils/KotlinJavascriptMetadataUtils.kt b/compiler/util/src/org/jetbrains/kotlin/utils/KotlinJavascriptMetadataUtils.kt index 6d974e6fe1c..4327c714fad 100644 --- a/compiler/util/src/org/jetbrains/kotlin/utils/KotlinJavascriptMetadataUtils.kt +++ b/compiler/util/src/org/jetbrains/kotlin/utils/KotlinJavascriptMetadataUtils.kt @@ -26,19 +26,15 @@ class KotlinJavascriptMetadata(val abiVersion: Int, val moduleName: String, val } // TODO: move to JS modules -class JsBinaryVersion protected constructor( - major: Int, minor: Int, patch: Int, rest: List -) : BinaryVersion(major, minor, patch, rest) { +class JsBinaryVersion(vararg numbers: Int) : BinaryVersion(*numbers) { override fun isCompatible() = this.isCompatibleTo(INSTANCE) companion object { - @JvmField val INSTANCE = create(0, 3, 0) + @JvmField + val INSTANCE = JsBinaryVersion(0, 3, 0) - @JvmField val INVALID_VERSION = JsBinaryVersion.create(IntArray(0)) - - @JvmStatic fun create(version: IntArray) = create(version, ::JsBinaryVersion) - - @JvmStatic fun create(major: Int, minor: Int, patch: Int) = create(major, minor, patch, ::JsBinaryVersion) + @JvmField + val INVALID_VERSION = JsBinaryVersion() } } diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmBytecodeBinaryVersion.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmBytecodeBinaryVersion.kt index b3b8c61eaec..fc5b5bcc4fd 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmBytecodeBinaryVersion.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmBytecodeBinaryVersion.kt @@ -22,22 +22,14 @@ import org.jetbrains.kotlin.serialization.deserialization.BinaryVersion * The version of conventions used in bytecode of generated .class files, such as default method naming & signatures, * internal member name mangling specifics, property getter/setter names, etc. */ -class JvmBytecodeBinaryVersion protected constructor( - major: Int, minor: Int, patch: Int, rest: List -) : BinaryVersion(major, minor, patch, rest) { +class JvmBytecodeBinaryVersion(vararg numbers: Int) : BinaryVersion(*numbers) { override fun isCompatible() = this.isCompatibleTo(INSTANCE) companion object { @JvmField - val INSTANCE = create(1, 0, 2) + val INSTANCE = JvmBytecodeBinaryVersion(1, 0, 2) @JvmField - val INVALID_VERSION = JvmBytecodeBinaryVersion.create(IntArray(0)) - - @JvmStatic - fun create(version: IntArray) = create(version, ::JvmBytecodeBinaryVersion) - - @JvmStatic - fun create(major: Int, minor: Int, patch: Int) = create(major, minor, patch, ::JvmBytecodeBinaryVersion) + val INVALID_VERSION = JvmBytecodeBinaryVersion() } } diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/JvmMetadataVersion.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/JvmMetadataVersion.kt index 0f8acc6b315..b59aae68218 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/JvmMetadataVersion.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/JvmMetadataVersion.kt @@ -22,22 +22,14 @@ import org.jetbrains.kotlin.serialization.deserialization.BinaryVersion * The version of the metadata serialized by the compiler and deserialized by the compiler and reflection. * This version includes the version of the core protobuf messages (descriptors.proto) as well as JVM extensions (jvm_descriptors.proto). */ -class JvmMetadataVersion protected constructor( - major: Int, minor: Int, patch: Int, rest: List -) : BinaryVersion(major, minor, patch, rest) { +class JvmMetadataVersion(vararg numbers: Int) : BinaryVersion(*numbers) { override fun isCompatible() = this.isCompatibleTo(INSTANCE) companion object { @JvmField - val INSTANCE = create(1, 0, 2) + val INSTANCE = JvmMetadataVersion(1, 0, 2) @JvmField - val INVALID_VERSION = JvmMetadataVersion.create(IntArray(0)) - - @JvmStatic - fun create(version: IntArray) = create(version, ::JvmMetadataVersion) - - @JvmStatic - fun create(major: Int, minor: Int, patch: Int) = create(major, minor, patch, ::JvmMetadataVersion) + val INVALID_VERSION = JvmMetadataVersion() } } diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/ModuleMapping.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/ModuleMapping.kt index 32b4efa9ed9..1a1cb781980 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/ModuleMapping.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/ModuleMapping.kt @@ -39,7 +39,7 @@ class ModuleMapping private constructor(val packageFqName2Parts: Map -) : BinaryVersion(major, minor, patch, rest) { +class BuiltInsBinaryVersion(vararg numbers: Int) : BinaryVersion(*numbers) { override fun isCompatible() = this.isCompatibleTo(INSTANCE) companion object { @JvmField - val INSTANCE = create(1, 0, 0) - - @JvmStatic - fun create(version: IntArray) = create(version, ::BuiltInsBinaryVersion) - - @JvmStatic - fun create(major: Int, minor: Int, patch: Int) = create(major, minor, patch, ::BuiltInsBinaryVersion) + val INSTANCE = BuiltInsBinaryVersion(1, 0, 0) } } diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltinsPackageFragment.kt b/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltinsPackageFragment.kt index d35bd53d16e..bf555e41cc9 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltinsPackageFragment.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltinsPackageFragment.kt @@ -36,7 +36,7 @@ class BuiltinsPackageFragment( ) : DeserializedPackageFragment(fqName, storageManager, module, BuiltInsSerializedResourcePaths, loadResource) { val builtinsMessage = loadResource(BuiltInsSerializedResourcePaths.getBuiltInsFilePath(fqName))?.let { stream -> val dataInput = DataInputStream(stream) - val version = BuiltInsBinaryVersion.create((1..dataInput.readInt()).map { dataInput.readInt() }.toIntArray()) + val version = BuiltInsBinaryVersion(*(1..dataInput.readInt()).map { dataInput.readInt() }.toIntArray()) if (!version.isCompatible()) { // TODO: report a proper diagnostic diff --git a/core/util.runtime/src/org/jetbrains/kotlin/serialization/deserialization/BinaryVersion.kt b/core/util.runtime/src/org/jetbrains/kotlin/serialization/deserialization/BinaryVersion.kt index 21d2e37c670..70e892c0a72 100644 --- a/core/util.runtime/src/org/jetbrains/kotlin/serialization/deserialization/BinaryVersion.kt +++ b/core/util.runtime/src/org/jetbrains/kotlin/serialization/deserialization/BinaryVersion.kt @@ -25,16 +25,15 @@ package org.jetbrains.kotlin.serialization.deserialization * - Patch version can be increased freely and is only supposed to be used for debugging. Increase the patch version when you * make a change to binaries which is both forward- and backward compatible. */ -abstract class BinaryVersion protected constructor( - val major: Int, - val minor: Int, - val patch: Int, - val rest: List -) { +abstract class BinaryVersion(vararg val numbers: Int) { + val major: Int = numbers.getOrNull(0) ?: UNKNOWN + val minor: Int = numbers.getOrNull(1) ?: UNKNOWN + val patch: Int = numbers.getOrNull(2) ?: UNKNOWN + val rest: List = if (numbers.size > 3) numbers.asList().subList(3, numbers.size).toList() else emptyList() + abstract fun isCompatible(): Boolean - fun toArray(): IntArray = - intArrayOf(major, minor, patch, *rest.toIntArray()) + fun toArray(): IntArray = numbers /** * Returns true if this version of some format loaded from some binaries is compatible @@ -66,23 +65,5 @@ abstract class BinaryVersion protected constructor( companion object { private val UNKNOWN = -1 - - @JvmStatic - fun create( - version: IntArray, - factory: (major: Int, minor: Int, patch: Int, rest: List) -> T - ): T { - return factory( - version.getOrNull(0) ?: UNKNOWN, - version.getOrNull(1) ?: UNKNOWN, - version.getOrNull(2) ?: UNKNOWN, - if (version.size > 3) version.asList().subList(3, version.size).toList() else emptyList() - ) - } - - @JvmStatic - fun create( - major: Int, minor: Int, patch: Int, factory: (major: Int, minor: Int, patch: Int, rest: List) -> T - ): T = factory(major, minor, patch, emptyList()) } } diff --git a/idea/src/org/jetbrains/kotlin/idea/versions/KotlinJavaScriptAbiVersionIndex.kt b/idea/src/org/jetbrains/kotlin/idea/versions/KotlinJavaScriptAbiVersionIndex.kt index bd53d611c96..98ebdb5085d 100644 --- a/idea/src/org/jetbrains/kotlin/idea/versions/KotlinJavaScriptAbiVersionIndex.kt +++ b/idea/src/org/jetbrains/kotlin/idea/versions/KotlinJavaScriptAbiVersionIndex.kt @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.utils.KotlinJavascriptMetadataUtils import java.util.* object KotlinJavaScriptAbiVersionIndex : KotlinAbiVersionIndexBase( - KotlinJavaScriptAbiVersionIndex::class.java, { JsBinaryVersion.create(it) } + KotlinJavaScriptAbiVersionIndex::class.java, { JsBinaryVersion(*it) } ) { override fun getIndexer() = INDEXER @@ -47,7 +47,7 @@ object KotlinJavaScriptAbiVersionIndex : KotlinAbiVersionIndexBase( - KotlinMetadataVersionIndex::class.java, { JvmMetadataVersion.create(it) } + KotlinMetadataVersionIndex::class.java, { JvmMetadataVersion(*it) } ) { override fun getIndexer() = INDEXER @@ -61,7 +61,7 @@ object KotlinMetadataVersionIndex : KotlinAbiVersionIndexBase