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

Drop deprecated code in ModuleMapping, add TODO

Browse Source
This commit is contained in:
Alexander Udalov
2015-11-27 15:53:13 +03:00
parent 6345d0e6d3
commit 57e75a1b28
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/ModuleMapping.kt
+5 -9
View File
@@ -41,16 +41,9 @@ public class ModuleMapping private constructor(val packageFqName2Parts: Map<Stri
val inputStream = DataInputStream(ByteArrayInputStream(proto)) val inputStream = DataInputStream(ByteArrayInputStream(proto))
val size = inputStream.readInt() val size = inputStream.readInt()
val abiVersion = val version = BinaryVersion.create((0..size - 1).map { inputStream.readInt() }.toIntArray())
if (size == 1) {
// TODO: this is a temporary workaround, drop after M13
BinaryVersion.create(0, inputStream.readInt(), 0)
}
else {
BinaryVersion.create((0..size - 1).map { inputStream.readInt() }.toIntArray())
}
if (AbiVersionUtil.isAbiVersionCompatible(abiVersion)) { if (AbiVersionUtil.isAbiVersionCompatible(version)) {
val parseFrom = JvmPackageTable.PackageTable.parseFrom(inputStream) val parseFrom = JvmPackageTable.PackageTable.parseFrom(inputStream)
if (parseFrom != null) { if (parseFrom != null) {
val packageFqNameParts = hashMapOf<String, PackageParts>() val packageFqNameParts = hashMapOf<String, PackageParts>()
@@ -64,6 +57,9 @@ public class ModuleMapping private constructor(val packageFqName2Parts: Map<Stri
return ModuleMapping(packageFqNameParts) return ModuleMapping(packageFqNameParts)
} }
} }
else {
// TODO: consider reporting "incompatible ABI version" error for package parts
}
return EMPTY return EMPTY
} }