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

Remove obsolete FallbackPaths

Browse Source
This commit is contained in:
Alexander Udalov
2015-11-24 23:31:12 +03:00
parent bcdea8ef10
commit 6345d0e6d3
3 changed files with 9 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/builtins-serializer/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializer.kt
+3 -9
View File
@@ -132,24 +132,18 @@ public class BuiltInsSerializer(private val dependOnOldBuiltIns: Boolean) {
val fragments = packageView.fragments val fragments = packageView.fragments
val packageProto = DescriptorSerializer.createTopLevel(extension).packageProto(fragments).build() val packageProto = DescriptorSerializer.createTopLevel(extension).packageProto(fragments).build()
packageProto.writeTo(packageStream) packageProto.writeTo(packageStream)
write(destDir, BuiltInsSerializedResourcePaths.getPackageFilePath(fqName), packageStream, write(destDir, BuiltInsSerializedResourcePaths.getPackageFilePath(fqName), packageStream)
BuiltInsSerializedResourcePaths.fallbackPaths.getPackageFilePath(fqName))
val nameStream = ByteArrayOutputStream() val nameStream = ByteArrayOutputStream()
extension.stringTable.serializeTo(nameStream) extension.stringTable.serializeTo(nameStream)
write(destDir, BuiltInsSerializedResourcePaths.getStringTableFilePath(fqName), nameStream, write(destDir, BuiltInsSerializedResourcePaths.getStringTableFilePath(fqName), nameStream)
BuiltInsSerializedResourcePaths.fallbackPaths.getStringTableFilePath(fqName))
} }
private fun write(destDir: File, fileName: String, stream: ByteArrayOutputStream, legacyFileName: String? = null) { private fun write(destDir: File, fileName: String, stream: ByteArrayOutputStream) {
totalSize += stream.size() totalSize += stream.size()
totalFiles++ totalFiles++
File(destDir, fileName).parentFile.mkdirs() File(destDir, fileName).parentFile.mkdirs()
File(destDir, fileName).writeBytes(stream.toByteArray()) File(destDir, fileName).writeBytes(stream.toByteArray())
legacyFileName?.let { fileName ->
File(destDir, fileName).writeBytes(stream.toByteArray())
}
} }
private fun serializeClass( private fun serializeClass(
core/deserialization/src/org/jetbrains/kotlin/serialization/SerializedResourcePaths.kt
+5 -16
View File
@@ -20,23 +20,12 @@ import com.google.protobuf.ExtensionRegistryLite
import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.FqName
public abstract class SerializedResourcePaths { abstract class SerializedResourcePaths {
public abstract val extensionRegistry: ExtensionRegistryLite abstract val extensionRegistry: ExtensionRegistryLite
public abstract fun getClassMetadataPath(classId: ClassId): String abstract fun getClassMetadataPath(classId: ClassId): String
public abstract fun getPackageFilePath(fqName: FqName): String abstract fun getPackageFilePath(fqName: FqName): String
public abstract fun getStringTableFilePath(fqName: FqName): String abstract fun getStringTableFilePath(fqName: FqName): String
// TODO: remove this after M12
public object FallbackPaths {
public fun getPackageFilePath(fqName: FqName): String =
fqName.asString().replace('.', '/') + "/.kotlin_package"
public fun getStringTableFilePath(fqName: FqName): String =
fqName.asString().replace('.', '/') + "/.kotlin_string_table"
}
public val fallbackPaths: FallbackPaths = FallbackPaths
} }
core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/DeserializedPackageFragment.kt
+1 -4
View File
@@ -37,10 +37,7 @@ public abstract class DeserializedPackageFragment(
private val loadResource: (path: String) -> InputStream? private val loadResource: (path: String) -> InputStream?
) : PackageFragmentDescriptorImpl(module, fqName) { ) : PackageFragmentDescriptorImpl(module, fqName) {
val nameResolver = NameResolverImpl.read( val nameResolver = NameResolverImpl.read(loadResourceSure(serializedResourcePaths.getStringTableFilePath(fqName)))
loadResource(serializedResourcePaths.getStringTableFilePath(fqName))
?: loadResourceSure(serializedResourcePaths.fallbackPaths.getStringTableFilePath(fqName))
)
protected var components: DeserializationComponents by Delegates.notNull() protected var components: DeserializationComponents by Delegates.notNull()