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

Minor, make ownTypeParameters a property in TypeDeserializer

Browse Source
This commit is contained in:
Alexander Udalov
2014-11-25 18:18:41 +03:00
parent 3a066dfd07
commit c35ddc3616
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/serialization/src/org/jetbrains/jet/descriptors/serialization/MemberDeserializer.kt
+2 -2
View File
@@ -55,7 +55,7 @@ public class MemberDeserializer(private val c: DeserializationContext) {
val local = c.childContext(property, proto.getTypeParameterList()) val local = c.childContext(property, proto.getTypeParameterList())
property.setType( property.setType(
local.typeDeserializer.type(proto.getReturnType()), local.typeDeserializer.type(proto.getReturnType()),
local.typeDeserializer.getOwnTypeParameters(), local.typeDeserializer.ownTypeParameters,
getDispatchReceiverParameter(), getDispatchReceiverParameter(),
if (proto.hasReceiverType()) local.typeDeserializer.type(proto.getReceiverType()) else null if (proto.hasReceiverType()) local.typeDeserializer.type(proto.getReceiverType()) else null
) )
@@ -131,7 +131,7 @@ public class MemberDeserializer(private val c: DeserializationContext) {
function.initialize( function.initialize(
if (proto.hasReceiverType()) local.typeDeserializer.type(proto.getReceiverType()) else null, if (proto.hasReceiverType()) local.typeDeserializer.type(proto.getReceiverType()) else null,
getDispatchReceiverParameter(), getDispatchReceiverParameter(),
local.typeDeserializer.getOwnTypeParameters(), local.typeDeserializer.ownTypeParameters,
local.memberDeserializer.valueParameters(proto, AnnotatedCallableKind.FUNCTION), local.memberDeserializer.valueParameters(proto, AnnotatedCallableKind.FUNCTION),
local.typeDeserializer.type(proto.getReturnType()), local.typeDeserializer.type(proto.getReturnType()),
modality(Flags.MODALITY.get(proto.getFlags())), modality(Flags.MODALITY.get(proto.getFlags())),
core/serialization/src/org/jetbrains/jet/descriptors/serialization/TypeDeserializer.kt
+2 -1
View File
@@ -48,7 +48,8 @@ public class TypeDeserializer(
} }
} }
fun getOwnTypeParameters(): List<TypeParameterDescriptor> = typeParameterDescriptors().values().toReadOnlyList() val ownTypeParameters: List<TypeParameterDescriptor>
get() = typeParameterDescriptors().values().toReadOnlyList()
fun type(proto: ProtoBuf.Type): JetType { fun type(proto: ProtoBuf.Type): JetType {
if (proto.hasFlexibleTypeCapabilitiesId()) { if (proto.hasFlexibleTypeCapabilitiesId()) {
core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.kt
+1 -1
View File
@@ -144,7 +144,7 @@ public class DeserializedClassDescriptor(
private inner class DeserializedClassTypeConstructor : AbstractClassTypeConstructor() { private inner class DeserializedClassTypeConstructor : AbstractClassTypeConstructor() {
private val supertypes = computeSuperTypes() private val supertypes = computeSuperTypes()
override fun getParameters() = c.typeDeserializer.getOwnTypeParameters() override fun getParameters() = c.typeDeserializer.ownTypeParameters
override fun getSupertypes(): Collection<JetType> { override fun getSupertypes(): Collection<JetType> {
// We cannot have error supertypes because subclasses inherit error functions from them // We cannot have error supertypes because subclasses inherit error functions from them