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

Minor, rename PackagePartSource -> BinarySource

Browse Source
This commit is contained in:
Alexander Udalov
2016-04-06 15:45:58 +03:00
parent ac92be12c6
commit 7620d66019
17 changed files with 36 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/reflection.jvm/src/kotlin/reflect/jvm/internal/RuntimeTypeMapper.kt
+1 -1
View File
@@ -125,7 +125,7 @@ internal sealed class JvmPropertySignature {
return "$" + JvmAbi.sanitizeAsJavaIdentifier(moduleName)
}
if (descriptor.visibility == Visibilities.PRIVATE && containingDeclaration is PackageFragmentDescriptor) {
val packagePartSource = (descriptor as DeserializedPropertyDescriptor).packagePartSource
val packagePartSource = (descriptor as DeserializedPropertyDescriptor).containerSource
if (packagePartSource is JvmPackagePartSource && packagePartSource.facadeClassName != null) {
return "$" + packagePartSource.simpleName.asString()
}
core/reflection.jvm/src/kotlin/reflect/jvm/reflectLambda.kt
+1 -1
View File
@@ -46,7 +46,7 @@ fun <R> Function<R>.reflect(): KFunction<R>? {
val moduleData = javaClass.getOrCreateModule()
val context = DeserializationContext(
moduleData.deserialization, nameResolver, moduleData.module,
typeTable = TypeTable(proto.typeTable), packagePartSource = null, parentTypeDeserializer = null, typeParameters = listOf()
typeTable = TypeTable(proto.typeTable), containerSource = null, parentTypeDeserializer = null, typeParameters = listOf()
)
val descriptor = MemberDeserializer(context).loadFunction(proto)
@Suppress("UNCHECKED_CAST")