Refactor BinaryVersion and subclasses, get rid of static factories

This commit is contained in:
Alexander Udalov
2016-01-18 00:13:55 +03:00
parent e37bd4eba6
commit d4c4515944
11 changed files with 31 additions and 78 deletions
@@ -28,7 +28,7 @@ import org.jetbrains.kotlin.utils.KotlinJavascriptMetadataUtils
import java.util.*
object KotlinJavaScriptAbiVersionIndex : KotlinAbiVersionIndexBase<KotlinJavaScriptAbiVersionIndex>(
KotlinJavaScriptAbiVersionIndex::class.java, { JsBinaryVersion.create(it) }
KotlinJavaScriptAbiVersionIndex::class.java, { JsBinaryVersion(*it) }
) {
override fun getIndexer() = INDEXER
@@ -47,7 +47,7 @@ object KotlinJavaScriptAbiVersionIndex : KotlinAbiVersionIndexBase<KotlinJavaScr
KotlinJavascriptMetadataUtils.parseMetadata(text, metadataList)
for (metadata in metadataList) {
val version = if (KotlinJavascriptMetadataUtils.isAbiVersionCompatible(metadata.abiVersion)) {
JsBinaryVersion.create(0, metadata.abiVersion, 0)
JsBinaryVersion(0, metadata.abiVersion, 0)
}
else {
// Version is set to something weird
@@ -30,7 +30,7 @@ import org.jetbrains.org.objectweb.asm.ClassVisitor
import org.jetbrains.org.objectweb.asm.Opcodes
object KotlinMetadataVersionIndex : KotlinAbiVersionIndexBase<KotlinMetadataVersionIndex>(
KotlinMetadataVersionIndex::class.java, { JvmMetadataVersion.create(it) }
KotlinMetadataVersionIndex::class.java, { JvmMetadataVersion(*it) }
) {
override fun getIndexer() = INDEXER
@@ -61,7 +61,7 @@ object KotlinMetadataVersionIndex : KotlinAbiVersionIndexBase<KotlinMetadataVers
return object : AnnotationVisitor(Opcodes.ASM5) {
override fun visit(name: String, value: Any) {
if (name == VERSION_FIELD_NAME && value is IntArray) {
version = JvmMetadataVersion.create(value)
version = JvmMetadataVersion(*value)
}
}
}