From cc45cf2a4e4e70d0e7ff520810de9f41706bc3a2 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 1 Aug 2013 21:11:04 +0400 Subject: [PATCH] Rename JavaSignatureResolver to TypeParameterResolver Also rename 'parameterResolver' field to 'valueParameterResolver' --- .../di/InjectorForJavaDescriptorResolver.java | 22 +++++++++---------- .../di/InjectorForTopDownAnalyzerForJvm.java | 22 +++++++++---------- .../java/resolver/JavaClassResolver.java | 8 +++---- .../java/resolver/JavaFunctionResolver.java | 16 +++++++------- ...er.java => JavaTypeParameterResolver.java} | 2 +- .../resolver/JavaValueParameterResolver.java | 3 --- 6 files changed, 35 insertions(+), 38 deletions(-) rename compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/{JavaSignatureResolver.java => JavaTypeParameterResolver.java} (98%) diff --git a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java index 78ca3c79385..2c8b8824640 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java @@ -26,9 +26,9 @@ import org.jetbrains.jet.lang.resolve.java.resolver.JavaClassResolver; import org.jetbrains.jet.lang.resolve.java.resolver.JavaAnnotationResolver; import org.jetbrains.jet.lang.resolve.java.resolver.JavaAnnotationArgumentResolver; import org.jetbrains.jet.lang.resolve.java.resolver.JavaFunctionResolver; -import org.jetbrains.jet.lang.resolve.java.resolver.JavaValueParameterResolver; +import org.jetbrains.jet.lang.resolve.java.resolver.JavaTypeParameterResolver; import org.jetbrains.jet.lang.resolve.java.resolver.JavaTypeTransformer; -import org.jetbrains.jet.lang.resolve.java.resolver.JavaSignatureResolver; +import org.jetbrains.jet.lang.resolve.java.resolver.JavaValueParameterResolver; import org.jetbrains.jet.lang.resolve.java.resolver.DeserializedDescriptorResolver; import org.jetbrains.jet.lang.resolve.java.resolver.AnnotationDescriptorDeserializer; import org.jetbrains.jet.lang.resolve.java.resolver.JavaNamespaceResolver; @@ -51,9 +51,9 @@ public class InjectorForJavaDescriptorResolver { private final JavaAnnotationResolver javaAnnotationResolver; private final JavaAnnotationArgumentResolver javaAnnotationArgumentResolver; private final JavaFunctionResolver javaFunctionResolver; - private final JavaValueParameterResolver javaValueParameterResolver; + private final JavaTypeParameterResolver javaTypeParameterResolver; private final JavaTypeTransformer javaTypeTransformer; - private final JavaSignatureResolver javaSignatureResolver; + private final JavaValueParameterResolver javaValueParameterResolver; private final DeserializedDescriptorResolver deserializedDescriptorResolver; private final AnnotationDescriptorDeserializer annotationDescriptorDeserializer; private final JavaNamespaceResolver javaNamespaceResolver; @@ -75,9 +75,9 @@ public class InjectorForJavaDescriptorResolver { this.javaAnnotationResolver = new JavaAnnotationResolver(); this.javaAnnotationArgumentResolver = new JavaAnnotationArgumentResolver(); this.javaFunctionResolver = new JavaFunctionResolver(); - this.javaValueParameterResolver = new JavaValueParameterResolver(); + this.javaTypeParameterResolver = new JavaTypeParameterResolver(); this.javaTypeTransformer = new JavaTypeTransformer(); - this.javaSignatureResolver = new JavaSignatureResolver(); + this.javaValueParameterResolver = new JavaValueParameterResolver(); this.deserializedDescriptorResolver = new DeserializedDescriptorResolver(); this.annotationDescriptorDeserializer = new AnnotationDescriptorDeserializer(); this.javaNamespaceResolver = new JavaNamespaceResolver(); @@ -101,9 +101,9 @@ public class InjectorForJavaDescriptorResolver { javaClassResolver.setJavaDescriptorResolver(javaDescriptorResolver); javaClassResolver.setKotlinDescriptorResolver(deserializedDescriptorResolver); javaClassResolver.setNamespaceResolver(javaNamespaceResolver); - javaClassResolver.setSignatureResolver(javaSignatureResolver); javaClassResolver.setSupertypesResolver(javaSupertypeResolver); javaClassResolver.setTrace(bindingTrace); + javaClassResolver.setTypeParameterResolver(javaTypeParameterResolver); javaClassResolver.setVirtualFileFinder(virtualFileFinder); javaAnnotationResolver.setArgumentResolver(javaAnnotationArgumentResolver); @@ -113,16 +113,16 @@ public class InjectorForJavaDescriptorResolver { javaAnnotationArgumentResolver.setClassResolver(javaClassResolver); javaFunctionResolver.setAnnotationResolver(javaAnnotationResolver); - javaFunctionResolver.setParameterResolver(javaValueParameterResolver); - javaFunctionResolver.setSignatureResolver(javaSignatureResolver); javaFunctionResolver.setTrace(bindingTrace); + javaFunctionResolver.setTypeParameterResolver(javaTypeParameterResolver); javaFunctionResolver.setTypeTransformer(javaTypeTransformer); + javaFunctionResolver.setValueParameterResolver(javaValueParameterResolver); - javaValueParameterResolver.setTypeTransformer(javaTypeTransformer); + javaTypeParameterResolver.setTypeTransformer(javaTypeTransformer); javaTypeTransformer.setClassResolver(javaClassResolver); - javaSignatureResolver.setTypeTransformer(javaTypeTransformer); + javaValueParameterResolver.setTypeTransformer(javaTypeTransformer); deserializedDescriptorResolver.setAnnotationDeserializer(annotationDescriptorDeserializer); deserializedDescriptorResolver.setJavaClassResolver(javaClassResolver); diff --git a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java index 0828dd00ef3..0284c3ac2ca 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java @@ -53,9 +53,9 @@ import org.jetbrains.jet.lang.resolve.java.resolver.JavaClassResolver; import org.jetbrains.jet.lang.resolve.java.resolver.JavaAnnotationResolver; import org.jetbrains.jet.lang.resolve.java.resolver.JavaAnnotationArgumentResolver; import org.jetbrains.jet.lang.resolve.java.resolver.JavaFunctionResolver; -import org.jetbrains.jet.lang.resolve.java.resolver.JavaValueParameterResolver; +import org.jetbrains.jet.lang.resolve.java.resolver.JavaTypeParameterResolver; import org.jetbrains.jet.lang.resolve.java.resolver.JavaTypeTransformer; -import org.jetbrains.jet.lang.resolve.java.resolver.JavaSignatureResolver; +import org.jetbrains.jet.lang.resolve.java.resolver.JavaValueParameterResolver; import org.jetbrains.jet.lang.resolve.java.resolver.DeserializedDescriptorResolver; import org.jetbrains.jet.lang.resolve.java.resolver.AnnotationDescriptorDeserializer; import org.jetbrains.jet.lang.resolve.java.resolver.JavaNamespaceResolver; @@ -105,9 +105,9 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly private final JavaAnnotationResolver javaAnnotationResolver; private final JavaAnnotationArgumentResolver javaAnnotationArgumentResolver; private final JavaFunctionResolver javaFunctionResolver; - private final JavaValueParameterResolver javaValueParameterResolver; + private final JavaTypeParameterResolver javaTypeParameterResolver; private final JavaTypeTransformer javaTypeTransformer; - private final JavaSignatureResolver javaSignatureResolver; + private final JavaValueParameterResolver javaValueParameterResolver; private final DeserializedDescriptorResolver deserializedDescriptorResolver; private final AnnotationDescriptorDeserializer annotationDescriptorDeserializer; private final JavaNamespaceResolver javaNamespaceResolver; @@ -158,9 +158,9 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly this.javaAnnotationResolver = new JavaAnnotationResolver(); this.javaAnnotationArgumentResolver = new JavaAnnotationArgumentResolver(); this.javaFunctionResolver = new JavaFunctionResolver(); - this.javaValueParameterResolver = new JavaValueParameterResolver(); + this.javaTypeParameterResolver = new JavaTypeParameterResolver(); this.javaTypeTransformer = new JavaTypeTransformer(); - this.javaSignatureResolver = new JavaSignatureResolver(); + this.javaValueParameterResolver = new JavaValueParameterResolver(); this.deserializedDescriptorResolver = new DeserializedDescriptorResolver(); this.annotationDescriptorDeserializer = new AnnotationDescriptorDeserializer(); this.javaNamespaceResolver = new JavaNamespaceResolver(); @@ -288,9 +288,9 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly javaClassResolver.setJavaDescriptorResolver(javaDescriptorResolver); javaClassResolver.setKotlinDescriptorResolver(deserializedDescriptorResolver); javaClassResolver.setNamespaceResolver(javaNamespaceResolver); - javaClassResolver.setSignatureResolver(javaSignatureResolver); javaClassResolver.setSupertypesResolver(javaSupertypeResolver); javaClassResolver.setTrace(bindingTrace); + javaClassResolver.setTypeParameterResolver(javaTypeParameterResolver); javaClassResolver.setVirtualFileFinder(virtualFileFinder); javaAnnotationResolver.setArgumentResolver(javaAnnotationArgumentResolver); @@ -300,16 +300,16 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly javaAnnotationArgumentResolver.setClassResolver(javaClassResolver); javaFunctionResolver.setAnnotationResolver(javaAnnotationResolver); - javaFunctionResolver.setParameterResolver(javaValueParameterResolver); - javaFunctionResolver.setSignatureResolver(javaSignatureResolver); javaFunctionResolver.setTrace(bindingTrace); + javaFunctionResolver.setTypeParameterResolver(javaTypeParameterResolver); javaFunctionResolver.setTypeTransformer(javaTypeTransformer); + javaFunctionResolver.setValueParameterResolver(javaValueParameterResolver); - javaValueParameterResolver.setTypeTransformer(javaTypeTransformer); + javaTypeParameterResolver.setTypeTransformer(javaTypeTransformer); javaTypeTransformer.setClassResolver(javaClassResolver); - javaSignatureResolver.setTypeTransformer(javaTypeTransformer); + javaValueParameterResolver.setTypeTransformer(javaTypeTransformer); deserializedDescriptorResolver.setAnnotationDeserializer(annotationDescriptorDeserializer); deserializedDescriptorResolver.setJavaClassResolver(javaClassResolver); diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java index 4c0a6391f48..c0800c75eb3 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java @@ -86,7 +86,7 @@ public final class JavaClassResolver { private final Set unresolvedCache = Sets.newHashSet(); private BindingTrace trace; - private JavaSignatureResolver signatureResolver; + private JavaTypeParameterResolver typeParameterResolver; private JavaDescriptorResolver javaDescriptorResolver; private JavaAnnotationResolver annotationResolver; private JavaClassFinder javaClassFinder; @@ -115,8 +115,8 @@ public final class JavaClassResolver { } @Inject - public void setSignatureResolver(JavaSignatureResolver signatureResolver) { - this.signatureResolver = signatureResolver; + public void setTypeParameterResolver(JavaTypeParameterResolver typeParameterResolver) { + this.typeParameterResolver = typeParameterResolver; } @Inject @@ -300,7 +300,7 @@ public final class JavaClassResolver { classDescriptor.setName(javaClass.getName()); - JavaSignatureResolver.Initializer typeParameterInitializer = signatureResolver.resolveTypeParameters(classDescriptor, javaClass); + JavaTypeParameterResolver.Initializer typeParameterInitializer = typeParameterResolver.resolveTypeParameters(classDescriptor, javaClass); classDescriptor.setTypeParameterDescriptors(typeParameterInitializer.getDescriptors()); List supertypes = Lists.newArrayList(); diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java index 8e14ff8128f..b4aae8fd48a 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java @@ -59,8 +59,8 @@ public final class JavaFunctionResolver { private JavaTypeTransformer typeTransformer; private BindingTrace trace; - private JavaSignatureResolver signatureResolver; - private JavaValueParameterResolver parameterResolver; + private JavaTypeParameterResolver typeParameterResolver; + private JavaValueParameterResolver valueParameterResolver; private JavaAnnotationResolver annotationResolver; public JavaFunctionResolver() { @@ -77,13 +77,13 @@ public final class JavaFunctionResolver { } @Inject - public void setSignatureResolver(JavaSignatureResolver signatureResolver) { - this.signatureResolver = signatureResolver; + public void setTypeParameterResolver(JavaTypeParameterResolver typeParameterResolver) { + this.typeParameterResolver = typeParameterResolver; } @Inject - public void setParameterResolver(JavaValueParameterResolver parameterResolver) { - this.parameterResolver = parameterResolver; + public void setValueParameterResolver(JavaValueParameterResolver valueParameterResolver) { + this.valueParameterResolver = valueParameterResolver; } @Inject @@ -126,13 +126,13 @@ public final class JavaFunctionResolver { CallableMemberDescriptor.Kind.DECLARATION ); - JavaSignatureResolver.Initializer typeParameterInitializer = signatureResolver.resolveTypeParameters(functionDescriptorImpl, method); + JavaTypeParameterResolver.Initializer typeParameterInitializer = typeParameterResolver.resolveTypeParameters(functionDescriptorImpl, method); typeParameterInitializer.initialize(); List methodTypeParameters = typeParameterInitializer.getDescriptors(); TypeVariableResolver typeVariableResolver = new TypeVariableResolver(methodTypeParameters, functionDescriptorImpl); - JavaDescriptorResolver.ValueParameterDescriptors valueParameterDescriptors = parameterResolver + JavaDescriptorResolver.ValueParameterDescriptors valueParameterDescriptors = valueParameterResolver .resolveParameterDescriptors(functionDescriptorImpl, method, typeVariableResolver); JetType returnType = makeReturnType(returnJavaType, method, typeVariableResolver); diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaSignatureResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaTypeParameterResolver.java similarity index 98% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaSignatureResolver.java rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaTypeParameterResolver.java index b5ae09363f5..e303c6eba22 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaSignatureResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaTypeParameterResolver.java @@ -31,7 +31,7 @@ import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import javax.inject.Inject; import java.util.*; -public final class JavaSignatureResolver { +public final class JavaTypeParameterResolver { @NotNull private JavaTypeTransformer typeTransformer; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaValueParameterResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaValueParameterResolver.java index 7694dd6957e..5684c5db109 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaValueParameterResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaValueParameterResolver.java @@ -38,9 +38,6 @@ import java.util.*; public final class JavaValueParameterResolver { private JavaTypeTransformer typeTransformer; - public JavaValueParameterResolver() { - } - @NotNull private ValueParameterDescriptor resolveParameterDescriptor( @NotNull DeclarationDescriptor containingDeclaration,