From c9bef0908502d22aeec1e20842d99e66ff487b63 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Sat, 22 Nov 2014 19:24:38 +0300 Subject: [PATCH] Extract DeserializedType to top level and convert to Kotlin --- .../serialization/DeserializedType.kt | 73 ++++++++++++++ .../serialization/TypeDeserializer.java | 94 +------------------ 2 files changed, 74 insertions(+), 93 deletions(-) create mode 100644 core/serialization/src/org/jetbrains/jet/descriptors/serialization/DeserializedType.kt diff --git a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/DeserializedType.kt b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/DeserializedType.kt new file mode 100644 index 00000000000..1f59bcb1925 --- /dev/null +++ b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/DeserializedType.kt @@ -0,0 +1,73 @@ +/* + * Copyright 2010-2014 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jetbrains.jet.descriptors.serialization + +import org.jetbrains.jet.descriptors.serialization.context.DeserializationContext +import org.jetbrains.jet.lang.descriptors.ClassDescriptor +import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor +import org.jetbrains.jet.lang.descriptors.annotations.Annotations +import org.jetbrains.jet.lang.resolve.scopes.JetScope +import org.jetbrains.jet.lang.types.* + +class DeserializedType( + context: DeserializationContext, + private val typeProto: ProtoBuf.Type +) : AbstractJetType(), LazyType { + private val typeDeserializer = context.typeDeserializer + + private val constructor = context.components.storageManager.createLazyValue { + typeDeserializer.typeConstructor(typeProto) + } + + private val arguments = typeDeserializer.typeArguments(typeProto.getArgumentList()) + + private val memberScope = context.components.storageManager.createLazyValue { + computeMemberScope() + } + + override fun getConstructor(): TypeConstructor = constructor() + + override fun getArguments(): List = arguments + + override fun isNullable(): Boolean = typeProto.getNullable() + + private fun computeMemberScope(): JetScope = + if (isError()) { + ErrorUtils.createErrorScope(getConstructor().toString()) + } + else { + getTypeMemberScope(getConstructor(), getArguments()) + } + + private fun getTypeMemberScope(constructor: TypeConstructor, typeArguments: List): JetScope { + val descriptor = constructor.getDeclarationDescriptor() + return when (descriptor) { + is TypeParameterDescriptor -> descriptor.getDefaultType().getMemberScope() + is ClassDescriptor -> descriptor.getMemberScope(typeArguments) + else -> throw IllegalStateException("Unsupported classifier: $descriptor") + } + } + + override fun getMemberScope(): JetScope = memberScope() + + override fun isError(): Boolean { + val descriptor = getConstructor().getDeclarationDescriptor() + return descriptor != null && ErrorUtils.isError(descriptor) + } + + override fun getAnnotations(): Annotations = Annotations.EMPTY +} diff --git a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/TypeDeserializer.java b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/TypeDeserializer.java index 8356846cb68..ce3962889ca 100644 --- a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/TypeDeserializer.java +++ b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/TypeDeserializer.java @@ -16,7 +16,6 @@ package org.jetbrains.jet.descriptors.serialization; -import kotlin.Function0; import kotlin.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -24,13 +23,9 @@ import org.jetbrains.jet.descriptors.serialization.context.DeserializationCompon import org.jetbrains.jet.descriptors.serialization.context.DeserializationContext; import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedTypeParameterDescriptor; import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor; import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; -import org.jetbrains.jet.lang.descriptors.annotations.Annotations; -import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.types.*; import org.jetbrains.jet.storage.MemoizedFunctionToNullable; -import org.jetbrains.jet.storage.NotNullLazyValue; import org.jetbrains.jet.utils.UtilsPackage; import java.util.ArrayList; @@ -163,91 +158,4 @@ public class TypeDeserializer { public String toString() { return debugName; } - - private static class DeserializedType extends AbstractJetType implements LazyType { - private final TypeDeserializer typeDeserializer; - private final ProtoBuf.Type typeProto; - private final NotNullLazyValue constructor; - private final List arguments; - private final NotNullLazyValue memberScope; - - public DeserializedType(@NotNull DeserializationContext context, @NotNull ProtoBuf.Type proto) { - this.typeDeserializer = context.getTypeDeserializer(); - this.typeProto = proto; - this.arguments = typeDeserializer.typeArguments(proto.getArgumentList()); - - this.constructor = context.getComponents().getStorageManager().createLazyValue(new Function0() { - @Override - public TypeConstructor invoke() { - return typeDeserializer.typeConstructor(typeProto); - } - }); - this.memberScope = context.getComponents().getStorageManager().createLazyValue(new Function0() { - @Override - public JetScope invoke() { - return computeMemberScope(); - } - }); - } - - @NotNull - @Override - public TypeConstructor getConstructor() { - return constructor.invoke(); - } - - @NotNull - @Override - public List getArguments() { - return arguments; - } - - @Override - public boolean isNullable() { - return typeProto.getNullable(); - } - - @NotNull - private JetScope computeMemberScope() { - if (isError()) { - return ErrorUtils.createErrorScope(getConstructor().toString()); - } - else { - return getTypeMemberScope(getConstructor(), getArguments()); - } - } - - @NotNull - private static JetScope getTypeMemberScope(@NotNull TypeConstructor constructor, @NotNull List typeArguments) { - ClassifierDescriptor descriptor = constructor.getDeclarationDescriptor(); - if (descriptor instanceof TypeParameterDescriptor) { - TypeParameterDescriptor typeParameterDescriptor = (TypeParameterDescriptor) descriptor; - return typeParameterDescriptor.getDefaultType().getMemberScope(); - } - else if (descriptor instanceof ClassDescriptor) { - return ((ClassDescriptor) descriptor).getMemberScope(typeArguments); - } - else { - throw new IllegalStateException("Unsupported classifier: " + descriptor); - } - } - - @NotNull - @Override - public JetScope getMemberScope() { - return memberScope.invoke(); - } - - @Override - public boolean isError() { - ClassifierDescriptor descriptor = getConstructor().getDeclarationDescriptor(); - return descriptor != null && ErrorUtils.isError(descriptor); - } - - @NotNull - @Override - public Annotations getAnnotations() { - return Annotations.EMPTY; - } - } -} \ No newline at end of file +}