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

Rename JavaSignatureResolver to TypeParameterResolver

Browse Source 
Also rename 'parameterResolver' field to 'valueParameterResolver'
This commit is contained in:
Alexander Udalov
2013-08-01 21:11:04 +04:00
parent 944d1fc59e
commit cc45cf2a4e
6 changed files with 35 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java
+11 -11
View File
@@ -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);
compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java
+11 -11
View File
@@ -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);
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java
+4 -4
View File
@@ -86,7 +86,7 @@ public final class JavaClassResolver {
private final Set<FqNameBase> 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<JetType> supertypes = Lists.newArrayList();
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java
+8 -8
View File
@@ -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<TypeParameterDescriptor> 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);
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaSignatureResolver.java → compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaTypeParameterResolver.java
+1 -1
View File
@@ -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;
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaValueParameterResolver.java
-3
View File
@@ -38,9 +38,6 @@ import java.util.*;
public final class JavaValueParameterResolver {
private JavaTypeTransformer typeTransformer;
public JavaValueParameterResolver() {
}
@NotNull
private ValueParameterDescriptor resolveParameterDescriptor(
@NotNull DeclarationDescriptor containingDeclaration,