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

Renamed SignaturesPropagation to SignaturesPropagationData.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-11-26 20:37:23 +04:00
parent caad1c20a2
commit 914db59ea0
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagation.java → compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagationData.java
+2 -2
View File
@@ -39,7 +39,7 @@ import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import java.util.*; import java.util.*;
public class SignaturesPropagation { public class SignaturesPropagationData {
public static JetType modifyReturnTypeAccordingToSuperMethods( public static JetType modifyReturnTypeAccordingToSuperMethods(
@NotNull JetType autoType, // type built by JavaTypeTransformer @NotNull JetType autoType, // type built by JavaTypeTransformer
@NotNull List<FunctionDescriptor> superFunctions, @NotNull List<FunctionDescriptor> superFunctions,
@@ -439,7 +439,7 @@ public class SignaturesPropagation {
return classifier; return classifier;
} }
private SignaturesPropagation() { private SignaturesPropagationData() {
} }
private static class VarargCheckResult { private static class VarargCheckResult {
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java
+5 -4
View File
@@ -29,7 +29,7 @@ import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.resolve.*; import org.jetbrains.jet.lang.resolve.*;
import org.jetbrains.jet.lang.resolve.java.*; import org.jetbrains.jet.lang.resolve.java.*;
import org.jetbrains.jet.lang.resolve.java.kotlinSignature.AlternativeMethodSignatureData; import org.jetbrains.jet.lang.resolve.java.kotlinSignature.AlternativeMethodSignatureData;
import org.jetbrains.jet.lang.resolve.java.kotlinSignature.SignaturesPropagation; import org.jetbrains.jet.lang.resolve.java.kotlinSignature.SignaturesPropagationData;
import org.jetbrains.jet.lang.resolve.java.kt.DescriptorKindUtils; import org.jetbrains.jet.lang.resolve.java.kt.DescriptorKindUtils;
import org.jetbrains.jet.lang.resolve.java.provider.ClassPsiDeclarationProvider; import org.jetbrains.jet.lang.resolve.java.provider.ClassPsiDeclarationProvider;
import org.jetbrains.jet.lang.resolve.java.provider.NamedMembers; import org.jetbrains.jet.lang.resolve.java.provider.NamedMembers;
@@ -142,7 +142,7 @@ public final class JavaFunctionResolver {
final List<String> signatureErrors = Lists.newArrayList(); final List<String> signatureErrors = Lists.newArrayList();
List<FunctionDescriptor> superFunctions = SignaturesPropagation.getSuperFunctionsForMethod(method, trace); List<FunctionDescriptor> superFunctions = SignaturesPropagationData.getSuperFunctionsForMethod(method, trace);
Function1<String, Void> reportError = new Function1<String, Void>() { Function1<String, Void> reportError = new Function1<String, Void>() {
@Override @Override
@@ -151,8 +151,9 @@ public final class JavaFunctionResolver {
return null; return null;
} }
}; };
returnType = SignaturesPropagation.modifyReturnTypeAccordingToSuperMethods(returnType, superFunctions, reportError); returnType = SignaturesPropagationData.modifyReturnTypeAccordingToSuperMethods(returnType, superFunctions, reportError);
valueParameterDescriptors = SignaturesPropagation.modifyValueParametersAccordingToSuperMethods(valueParameterDescriptors, superFunctions, reportError); valueParameterDescriptors = SignaturesPropagationData
.modifyValueParametersAccordingToSuperMethods(valueParameterDescriptors, superFunctions, reportError);
// TODO consider better place for this check // TODO consider better place for this check
AlternativeMethodSignatureData alternativeMethodSignatureData = AlternativeMethodSignatureData alternativeMethodSignatureData =