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

Get rid of recordSourceForSynthesized

Browse Source 
Sam descriptors now implement a common interface
SynthesizedCallableMemberDescriptor, introduced in frontend.
BindingContext.SOURCE_DESCRIPTOR_FOR_SYNTHESIZED is no longer needed
This commit is contained in:
Alexander Udalov
2013-08-30 23:14:19 +04:00
parent 56ca247509
commit 202524ab03
16 changed files with 61 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/SamAdapterDescriptor.java
+2 -4
View File
@@ -16,10 +16,8 @@
package org.jetbrains.jet.lang.resolve.java.descriptor;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
import org.jetbrains.jet.lang.descriptors.SynthesizedCallableMemberDescriptor;
public interface SamAdapterDescriptor<D extends FunctionDescriptor> extends FunctionDescriptor {
@NotNull
D getDeclaration();
public interface SamAdapterDescriptor<D extends FunctionDescriptor> extends FunctionDescriptor, SynthesizedCallableMemberDescriptor<D> {
}
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/SamConstructorDescriptor.java
+5 -2
View File
@@ -18,9 +18,11 @@ package org.jetbrains.jet.lang.resolve.java.descriptor;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.descriptors.ClassOrNamespaceDescriptor;
import org.jetbrains.jet.lang.descriptors.SynthesizedCallableMemberDescriptor;
import org.jetbrains.jet.lang.descriptors.impl.SimpleFunctionDescriptorImpl;
public class SamConstructorDescriptor extends SimpleFunctionDescriptorImpl {
public class SamConstructorDescriptor extends SimpleFunctionDescriptorImpl
implements SynthesizedCallableMemberDescriptor<ClassDescriptorFromJvmBytecode> {
private final ClassDescriptorFromJvmBytecode samInterface;
public SamConstructorDescriptor(
@@ -32,7 +34,8 @@ public class SamConstructorDescriptor extends SimpleFunctionDescriptorImpl {
}
@NotNull
public ClassDescriptorFromJvmBytecode getSamInterface() {
@Override
public ClassDescriptorFromJvmBytecode getBaseForSynthesized() {
return samInterface;
}
}
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaConstructorResolver.java
+2 -6
View File
@@ -223,11 +223,7 @@ public final class JavaConstructorResolver {
}
@Nullable
private ConstructorDescriptor resolveSamAdapter(@NotNull ConstructorDescriptor original) {
if (!isSamAdapterNecessary(original)) return null;
SamAdapterDescriptor<ConstructorDescriptor> adapter = createSamAdapterConstructor(original);
cache.recordSourceDescriptorForSynthesized(adapter, original);
return (ConstructorDescriptor) adapter;
private static ConstructorDescriptor resolveSamAdapter(@NotNull ConstructorDescriptor original) {
return isSamAdapterNecessary(original) ? (ConstructorDescriptor) createSamAdapterConstructor(original) : null;
}
}
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java
+4 -20
View File
@@ -26,7 +26,6 @@ import org.jetbrains.jet.lang.resolve.java.DescriptorResolverUtils;
import org.jetbrains.jet.lang.resolve.java.TypeUsage;
import org.jetbrains.jet.lang.resolve.java.descriptor.ClassDescriptorFromJvmBytecode;
import org.jetbrains.jet.lang.resolve.java.descriptor.JavaMethodDescriptor;
import org.jetbrains.jet.lang.resolve.java.descriptor.SamAdapterDescriptor;
import org.jetbrains.jet.lang.resolve.java.descriptor.SamConstructorDescriptor;
import org.jetbrains.jet.lang.resolve.java.scope.NamedMembers;
import org.jetbrains.jet.lang.resolve.java.structure.JavaMethod;
@@ -271,34 +270,19 @@ public final class JavaFunctionResolver {
}
@Nullable
private SamConstructorDescriptor resolveSamConstructor(@NotNull NamespaceDescriptor owner, @NotNull NamedMembers namedMembers) {
public static SamConstructorDescriptor resolveSamConstructor(@NotNull NamespaceDescriptor owner, @NotNull NamedMembers namedMembers) {
if (namedMembers.getSamInterface() != null) {
ClassDescriptorFromJvmBytecode klass = findClassInNamespace(owner, namedMembers.getName());
if (klass != null) {
SamConstructorDescriptor constructor = createSamConstructorFunction(owner, klass);
cache.recordSourceDescriptorForSynthesized(constructor, klass);
return constructor;
return createSamConstructorFunction(owner, klass);
}
}
return null;
}
@Nullable
private SimpleFunctionDescriptor resolveSamAdapter(@NotNull SimpleFunctionDescriptor original) {
if (!isSamAdapterNecessary(original)) return null;
SamAdapterDescriptor<SimpleFunctionDescriptor> adapter = createSamAdapterFunction(original);
cache.recordSourceDescriptorForSynthesized(adapter, original);
return (SimpleFunctionDescriptor) adapter;
}
@NotNull
public Set<FunctionDescriptor> resolveFunctionGroupForPackage(@NotNull NamedMembers members, @NotNull NamespaceDescriptor owner) {
SamConstructorDescriptor samConstructor = resolveSamConstructor(owner, members);
if (samConstructor != null) {
return Collections.<FunctionDescriptor>singleton(samConstructor);
}
return Collections.emptySet();
private static SimpleFunctionDescriptor resolveSamAdapter(@NotNull SimpleFunctionDescriptor original) {
return isSamAdapterNecessary(original) ? (SimpleFunctionDescriptor) createSamAdapterFunction(original) : null;
}
@NotNull
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaMemberResolver.java
-5
View File
@@ -75,11 +75,6 @@ public class JavaMemberResolver {
return functionResolver.resolveFunctionGroupForClass(members, owner);
}
@NotNull
public Set<FunctionDescriptor> resolveFunctionGroupForPackage(@NotNull NamedMembers members, @NotNull NamespaceDescriptor owner) {
return functionResolver.resolveFunctionGroupForPackage(members, owner);
}
@NotNull
public Set<VariableDescriptor> resolveFieldGroup(@NotNull NamedMembers members, @NotNull ClassOrNamespaceDescriptor ownerDescriptor) {
return propertyResolver.resolveFieldGroup(members, ownerDescriptor);
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaResolverCache.java
-2
View File
@@ -26,8 +26,6 @@ import org.jetbrains.jet.lang.resolve.java.structure.JavaMethod;
import org.jetbrains.jet.lang.resolve.name.FqName;
public interface JavaResolverCache {
void recordSourceDescriptorForSynthesized(@NotNull FunctionDescriptor synthesized, @NotNull DeclarationDescriptor source);
@Nullable
ClassDescriptor getClassResolvedFromSource(@NotNull FqName fqName);
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/TraceBasedJavaResolverCache.java
-5
View File
@@ -50,11 +50,6 @@ public class TraceBasedJavaResolverCache implements JavaResolverCache {
this.trace = trace;
}
@Override
public void recordSourceDescriptorForSynthesized(@NotNull FunctionDescriptor synthesized, @NotNull DeclarationDescriptor source) {
trace.record(SOURCE_DESCRIPTOR_FOR_SYNTHESIZED, synthesized, source);
}
@Nullable
@Override
public ClassDescriptor getClassResolvedFromSource(@NotNull FqName fqName) {
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/sam/SamAdapterConstructorDescriptor.java
+1 -1
View File
@@ -32,7 +32,7 @@ import org.jetbrains.jet.lang.resolve.java.descriptor.SamAdapterDescriptor;
@NotNull
@Override
public ConstructorDescriptor getDeclaration() {
public ConstructorDescriptor getBaseForSynthesized() {
return declaration;
}
}
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/sam/SamAdapterFunctionDescriptor.java
+1 -1
View File
@@ -32,7 +32,7 @@ import org.jetbrains.jet.lang.resolve.java.descriptor.SamAdapterDescriptor;
@NotNull
@Override
public SimpleFunctionDescriptor getDeclaration() {
public SimpleFunctionDescriptor getBaseForSynthesized() {
return declaration;
}
}
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/sam/SamAdapterOverridabilityCondition.java
+1 -1
View File
@@ -60,7 +60,7 @@ public class SamAdapterOverridabilityCondition implements ExternalOverridability
return null;
}
SimpleFunctionDescriptor originalDeclarationOfSam = ((SamAdapterFunctionDescriptor) fun).getDeclaration();
SimpleFunctionDescriptor originalDeclarationOfSam = ((SamAdapterFunctionDescriptor) fun).getBaseForSynthesized();
return ((SimpleFunctionDescriptor) originalDeclarationOfSam.substitute(TypeSubstitutor.create(declarationOrSynthesized.ownerType)));
}
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaPackageScope.java
+7 -1
View File
@@ -19,6 +19,8 @@ package org.jetbrains.jet.lang.resolve.java.scope;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.resolve.java.DescriptorResolverUtils;
import org.jetbrains.jet.lang.resolve.java.descriptor.SamConstructorDescriptor;
import org.jetbrains.jet.lang.resolve.java.resolver.JavaFunctionResolver;
import org.jetbrains.jet.lang.resolve.java.resolver.JavaMemberResolver;
import org.jetbrains.jet.lang.resolve.java.resolver.ProgressChecker;
import org.jetbrains.jet.lang.resolve.java.structure.JavaClass;
@@ -126,7 +128,11 @@ public final class JavaPackageScope extends JavaBaseScope {
if (members == null) {
return Collections.emptySet();
}
return memberResolver.resolveFunctionGroupForPackage(members, (NamespaceDescriptor) descriptor);
SamConstructorDescriptor samConstructor = JavaFunctionResolver.resolveSamConstructor((NamespaceDescriptor) descriptor, members);
if (samConstructor == null) {
return Collections.emptySet();
}
return Collections.<FunctionDescriptor>singleton(samConstructor);
}
@NotNull