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

Rename NameTable -> StringTable in serialization

Browse Source 
Since almost the beginning, it was also used to store arbitrary strings, not
just names
This commit is contained in:
Alexander Udalov
2014-12-01 11:58:20 +03:00
parent 66774c0fd1
commit 9bd815126b
10 changed files with 57 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltInsSerializationUtil.kt
+6 -3
View File
@@ -22,7 +22,7 @@ import kotlin.platform.platformStatic
public object BuiltInsSerializationUtil {
private val CLASS_METADATA_FILE_EXTENSION = "kotlin_class"
private val PACKAGE_FILE_NAME = ".kotlin_package"
private val NAME_TABLE_FILE_NAME = ".kotlin_name_table"
private val STRING_TABLE_FILE_NAME = ".kotlin_string_table"
private val CLASS_NAMES_FILE_NAME = ".kotlin_class_names"
private val CLASS_OBJECT_NAME = "object"
@@ -45,8 +45,11 @@ public object BuiltInsSerializationUtil {
platformStatic public fun getPackageFilePath(fqName: FqName): String =
packageFqNameToPath(fqName) + "/" + PACKAGE_FILE_NAME
platformStatic public fun getNameTableFilePath(fqName: FqName): String =
packageFqNameToPath(fqName) + "/" + NAME_TABLE_FILE_NAME
platformStatic public fun getStringTableFilePath(fqName: FqName): List<String> =
listOf(
packageFqNameToPath(fqName) + "/" + STRING_TABLE_FILE_NAME,
packageFqNameToPath(fqName) + "/.kotlin_name_table" // TODO: drop
)
platformStatic public fun getClassNamesFilePath(fqName: FqName): String =
packageFqNameToPath(fqName) + "/" + CLASS_NAMES_FILE_NAME
core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltinsPackageFragment.kt
+3 -1
View File
@@ -37,7 +37,9 @@ public class BuiltinsPackageFragment(
private val loadResource: (path: String) -> InputStream?
) : PackageFragmentDescriptorImpl(module, fqName) {
private val nameResolver = NameSerializationUtil.deserializeNameResolver(getStream(BuiltInsSerializationUtil.getNameTableFilePath(fqName)))
private val nameResolver = BuiltInsSerializationUtil.getStringTableFilePath(fqName).let { paths ->
NameSerializationUtil.deserializeNameResolver(loadResource(paths[0]) ?: getStream(paths[1]))
}
public val provider: PackageFragmentProvider = PackageFragmentProviderImpl(listOf(this))