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

Rename innerC to c

Browse Source
This commit is contained in:
Andrey Breslav
2013-11-14 17:28:15 +04:00
parent 5442eaf15f
commit d52a1b56ae
2 changed files with 15 additions and 15 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/LazyJavaClassDescriptor.kt
+11 -11
View File
@@ -36,18 +36,18 @@ import org.jetbrains.jet.lang.resolve.scopes.RedeclarationHandler
import org.jetbrains.jet.lang.resolve.scopes.WritableScope import org.jetbrains.jet.lang.resolve.scopes.WritableScope
class LazyJavaClassDescriptor( class LazyJavaClassDescriptor(
private val c: LazyJavaResolverContextWithTypes, private val outerC: LazyJavaResolverContextWithTypes,
containingDeclaration: DeclarationDescriptor, containingDeclaration: DeclarationDescriptor,
internal val fqName: FqName, internal val fqName: FqName,
private val jClass: JavaClass private val jClass: JavaClass
) : ClassDescriptorBase(containingDeclaration, fqName.shortName()), LazyJavaDescriptor, JavaClassDescriptor { ) : ClassDescriptorBase(containingDeclaration, fqName.shortName()), LazyJavaDescriptor, JavaClassDescriptor {
private val c: LazyJavaResolverContextWithTypes = outerC.child(this, jClass.getTypeParameters().toSet());
{ {
c.javaResolverCache.recordClass(jClass, this) c.javaResolverCache.recordClass(jClass, this)
} }
private val innerC: LazyJavaResolverContextWithTypes = c.child(this, jClass.getTypeParameters().toSet())
private val _kind = JavaClassResolver.determineClassKind(jClass) private val _kind = JavaClassResolver.determineClassKind(jClass)
private val _modality = JavaClassResolver.determineClassModality(jClass) private val _modality = JavaClassResolver.determineClassModality(jClass)
private val _visibility = jClass.getVisibility() private val _visibility = jClass.getVisibility()
@@ -61,7 +61,7 @@ class LazyJavaClassDescriptor(
private val _typeConstructor = c.storageManager.createLazyValue { LazyJavaClassTypeConstructor() } private val _typeConstructor = c.storageManager.createLazyValue { LazyJavaClassTypeConstructor() }
override fun getTypeConstructor(): TypeConstructor = _typeConstructor() override fun getTypeConstructor(): TypeConstructor = _typeConstructor()
private val _scopeForMemberLookup = LazyJavaClassMemberScope(innerC, this, jClass) private val _scopeForMemberLookup = LazyJavaClassMemberScope(c, this, jClass)
override fun getScopeForMemberLookup() = _scopeForMemberLookup override fun getScopeForMemberLookup() = _scopeForMemberLookup
private val _thisAsReceiverParameter = c.storageManager.createLazyValue { DescriptorFactory.createLazyReceiverParameterDescriptor(this) } private val _thisAsReceiverParameter = c.storageManager.createLazyValue { DescriptorFactory.createLazyReceiverParameterDescriptor(this) }
@@ -80,7 +80,7 @@ class LazyJavaClassDescriptor(
classObject.setTypeParameterDescriptors(Collections.emptyList<TypeParameterDescriptor>()) classObject.setTypeParameterDescriptors(Collections.emptyList<TypeParameterDescriptor>())
classObject.createTypeConstructor() classObject.createTypeConstructor()
val scope = LazyJavaClassMemberScope(innerC, classObject, jClass, enumClassObject = true) val scope = LazyJavaClassMemberScope(c, classObject, jClass, enumClassObject = true)
val writableScope = WritableScopeImpl(scope, classObject, RedeclarationHandler.THROW_EXCEPTION, "Enum class object scope") val writableScope = WritableScopeImpl(scope, classObject, RedeclarationHandler.THROW_EXCEPTION, "Enum class object scope")
writableScope.changeLockLevel(WritableScope.LockLevel.BOTH) writableScope.changeLockLevel(WritableScope.LockLevel.BOTH)
@@ -128,11 +128,11 @@ class LazyJavaClassDescriptor(
private inner class LazyJavaClassTypeConstructor : TypeConstructor { private inner class LazyJavaClassTypeConstructor : TypeConstructor {
private val _parameters = c.storageManager.createLazyValue { private val _parameters = c.storageManager.createLazyValue {
this@LazyJavaClassDescriptor.jClass.getTypeParameters().map { jClass.getTypeParameters().map({
p -> p ->
innerC.typeParameterResolver.resolveTypeParameter(p) c.typeParameterResolver.resolveTypeParameter(p)
?: throw AssertionError("Parameter $p surely belongs to class $jClass, so it must be resolved") ?: throw AssertionError("Parameter $p surely belongs to class ${jClass}, so it must be resolved")
} })
} }
override fun getParameters(): List<TypeParameterDescriptor> = _parameters() override fun getParameters(): List<TypeParameterDescriptor> = _parameters()
@@ -144,7 +144,7 @@ class LazyJavaClassDescriptor(
listOf(KotlinBuiltIns.getInstance().getAnyType()) listOf(KotlinBuiltIns.getInstance().getAnyType())
} }
else { else {
val jlObject = innerC.javaClassResolver.resolveClassByFqName(JavaSupertypeResolver.OBJECT_FQ_NAME)?.getDefaultType() val jlObject = c.javaClassResolver.resolveClassByFqName(JavaSupertypeResolver.OBJECT_FQ_NAME)?.getDefaultType()
// If java.lang.Object is not found, we simply use Any to recover // If java.lang.Object is not found, we simply use Any to recover
listOf(jlObject ?: KotlinBuiltIns.getInstance().getAnyType()) listOf(jlObject ?: KotlinBuiltIns.getInstance().getAnyType())
} }
@@ -152,7 +152,7 @@ class LazyJavaClassDescriptor(
supertypes.iterator() supertypes.iterator()
.map { .map {
supertype -> supertype ->
innerC.typeResolver.transformJavaType(supertype, TypeUsage.SUPERTYPE.toAttributes()) c.typeResolver.transformJavaType(supertype, TypeUsage.SUPERTYPE.toAttributes())
} }
.filter { supertype -> !supertype.isError() } .filter { supertype -> !supertype.isError() }
.toList() .toList()
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt
+4 -4
View File
@@ -110,10 +110,10 @@ public abstract class LazyJavaMemberScope(
val functionDescriptorImpl = JavaMethodDescriptor(_containingDeclaration, c.resolveAnnotations(method.getAnnotations()), method.getName()) val functionDescriptorImpl = JavaMethodDescriptor(_containingDeclaration, c.resolveAnnotations(method.getAnnotations()), method.getName())
val innerC = c.child(functionDescriptorImpl, method.getTypeParameters().toSet()) val c = c.child(functionDescriptorImpl, method.getTypeParameters().toSet())
val methodTypeParameters = method.getTypeParameters().map { p -> innerC.typeParameterResolver.resolveTypeParameter(p)!! } val methodTypeParameters = method.getTypeParameters().map { p -> c.typeParameterResolver.resolveTypeParameter(p)!! }
val valueParameters = resolveValueParameters(innerC, functionDescriptorImpl, method.getValueParameters()) val valueParameters = resolveValueParameters(c, functionDescriptorImpl, method.getValueParameters())
val returnTypeAttrs = LazyJavaTypeAttributes(c, method, TypeUsage.MEMBER_SIGNATURE_COVARIANT) { val returnTypeAttrs = LazyJavaTypeAttributes(c, method, TypeUsage.MEMBER_SIGNATURE_COVARIANT) {
if (c.hasReadOnlyAnnotation(method) && !c.hasMutableAnnotation(method)) if (c.hasReadOnlyAnnotation(method) && !c.hasMutableAnnotation(method))
@@ -123,7 +123,7 @@ public abstract class LazyJavaMemberScope(
} }
val returnJavaType = method.getReturnType() ?: throw IllegalStateException("Constructor passed as method: $method") val returnJavaType = method.getReturnType() ?: throw IllegalStateException("Constructor passed as method: $method")
val returnType = innerC.typeResolver.transformJavaType(returnJavaType, returnTypeAttrs) val returnType = c.typeResolver.transformJavaType(returnJavaType, returnTypeAttrs)
val signatureErrors: MutableList<String> val signatureErrors: MutableList<String>
val superFunctions: List<FunctionDescriptor> val superFunctions: List<FunctionDescriptor>