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

Use ReflectionTypes instead of KotlinBuiltIns in type checker

Browse Source
This commit is contained in:
Alexander Udalov
2014-05-06 18:15:33 +04:00
parent 6004c6cefe
commit c7277250d9
12 changed files with 77 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java
+1 -38
View File
@@ -673,44 +673,7 @@ public class KotlinBuiltIns {
}
@NotNull
public JetType getKFunctionType(
@NotNull Annotations annotations,
@Nullable JetType receiverType,
@NotNull List<JetType> parameterTypes,
@NotNull JetType returnType,
boolean extensionFunction
) {
List<TypeProjection> arguments = getFunctionTypeArgumentProjections(receiverType, parameterTypes, returnType);
ClassDescriptor classDescriptor = getCorrespondingKFunctionClass(receiverType, extensionFunction, parameterTypes.size());
return new JetTypeImpl(
annotations,
classDescriptor.getTypeConstructor(),
false,
arguments,
classDescriptor.getMemberScope(arguments)
);
}
@NotNull
private ClassDescriptor getCorrespondingKFunctionClass(
@Nullable JetType receiverType,
boolean extensionFunction,
int numberOfParameters
) {
if (receiverType == null) {
return getKFunction(numberOfParameters);
}
else if (extensionFunction) {
return getKExtensionFunction(numberOfParameters);
}
else {
return getKMemberFunction(numberOfParameters);
}
}
@NotNull
private static List<TypeProjection> getFunctionTypeArgumentProjections(
public static List<TypeProjection> getFunctionTypeArgumentProjections(
@Nullable JetType receiverType,
@NotNull List<JetType> parameterTypes,
@NotNull JetType returnType