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

Abstract lazy type moved to descriptors

Browse Source
This commit is contained in:
Andrey Breslav
2014-10-31 15:03:02 +03:00
parent 266262df68
commit adafd70730
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaAnnotationDescriptor.kt
+1 -2
View File
@@ -29,7 +29,6 @@ import org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.*
import org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames
import org.jetbrains.jet.lang.resolve.java.resolver.DescriptorResolverUtils
import org.jetbrains.jet.lang.resolve.java.resolver.TypeUsage
import org.jetbrains.jet.lang.resolve.java.lazy.types.LazyJavaType
import org.jetbrains.jet.utils.valuesToMap
import org.jetbrains.jet.utils.keysToMapExceptNulls
import org.jetbrains.jet.lang.resolve.java.lazy.types.toAttributes
@@ -164,7 +163,7 @@ class LazyJavaAnnotationDescriptor(
val arguments = listOf(TypeProjectionImpl(type))
val javaClassObjectType = object : LazyJavaType(c.storageManager) {
val javaClassObjectType = object : AbstractLazyType(c.storageManager) {
override fun computeTypeConstructor() = jlClass.getTypeConstructor()
override fun computeArguments() = arguments
override fun computeMemberScope() = jlClass.getMemberScope(arguments)
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/types/LazyJavaTypeResolver.kt
+1 -1
View File
@@ -104,7 +104,7 @@ class LazyJavaTypeResolver(
private inner class LazyJavaClassifierType(
private val javaType: JavaClassifierType,
private val attr: JavaTypeAttributes
) : LazyJavaType(c.storageManager) {
) : AbstractLazyType(c.storageManager) {
private val classifier = c.storageManager.createNullableLazyValue { javaType.getClassifier() }
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/types/LazyJavaType.kt → core/descriptors/src/org/jetbrains/jet/lang/types/AbstractLazyType.kt
+4 -5
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2013 JetBrains s.r.o.
* 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.
@@ -14,14 +14,13 @@
* limitations under the License.
*/
package org.jetbrains.jet.lang.resolve.java.lazy.types
package org.jetbrains.jet.lang.types
import org.jetbrains.jet.storage.StorageManager
import org.jetbrains.jet.lang.types.*
import org.jetbrains.jet.lang.resolve.scopes.JetScope
import org.jetbrains.jet.lang.descriptors.annotations.Annotations
abstract class LazyJavaType(storageManager: StorageManager) : AbstractJetType(), LazyType {
public abstract class AbstractLazyType(storageManager: StorageManager) : AbstractJetType(), LazyType {
private val _typeConstructor = storageManager.createLazyValue {computeTypeConstructor()}
override fun getConstructor(): TypeConstructor = _typeConstructor()
@@ -53,4 +52,4 @@ abstract class LazyJavaType(storageManager: StorageManager) : AbstractJetType(),
}
return super<AbstractJetType>.toString()
}
}
}