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

rename SKIP_FUNCTION_ARGUMENTS -> SHAPE_FUNCTION_ARGUMENTS

Browse Source
This commit is contained in:
Svetlana Isakova
2013-10-16 17:12:13 +04:00
parent 14cff91fed
commit 31e9eb497f
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ArgumentTypeResolver.java
+4 -4
View File
@@ -50,7 +50,7 @@ import java.util.Set;
import static org.jetbrains.jet.lang.resolve.BindingContextUtils.getRecordedTypeInfo; import static org.jetbrains.jet.lang.resolve.BindingContextUtils.getRecordedTypeInfo;
import static org.jetbrains.jet.lang.resolve.calls.CallResolverUtil.ResolveArgumentsMode; import static org.jetbrains.jet.lang.resolve.calls.CallResolverUtil.ResolveArgumentsMode;
import static org.jetbrains.jet.lang.resolve.calls.CallResolverUtil.ResolveArgumentsMode.RESOLVE_FUNCTION_ARGUMENTS; import static org.jetbrains.jet.lang.resolve.calls.CallResolverUtil.ResolveArgumentsMode.RESOLVE_FUNCTION_ARGUMENTS;
import static org.jetbrains.jet.lang.resolve.calls.CallResolverUtil.ResolveArgumentsMode.SKIP_FUNCTION_ARGUMENTS; import static org.jetbrains.jet.lang.resolve.calls.CallResolverUtil.ResolveArgumentsMode.SHAPE_FUNCTION_ARGUMENTS;
import static org.jetbrains.jet.lang.types.TypeUtils.*; import static org.jetbrains.jet.lang.types.TypeUtils.*;
public class ArgumentTypeResolver { public class ArgumentTypeResolver {
@@ -85,7 +85,7 @@ public class ArgumentTypeResolver {
} }
public void checkTypesWithNoCallee(@NotNull CallResolutionContext<?> context) { public void checkTypesWithNoCallee(@NotNull CallResolutionContext<?> context) {
checkTypesWithNoCallee(context, SKIP_FUNCTION_ARGUMENTS); checkTypesWithNoCallee(context, SHAPE_FUNCTION_ARGUMENTS);
} }
public void checkTypesWithNoCallee(@NotNull CallResolutionContext<?> context, @NotNull ResolveArgumentsMode resolveFunctionArgumentBodies) { public void checkTypesWithNoCallee(@NotNull CallResolutionContext<?> context, @NotNull ResolveArgumentsMode resolveFunctionArgumentBodies) {
@@ -224,7 +224,7 @@ public class ArgumentTypeResolver {
@NotNull CallResolutionContext<?> context, @NotNull CallResolutionContext<?> context,
@NotNull ResolveArgumentsMode resolveArgumentsMode @NotNull ResolveArgumentsMode resolveArgumentsMode
) { ) {
if (resolveArgumentsMode == SKIP_FUNCTION_ARGUMENTS) { if (resolveArgumentsMode == SHAPE_FUNCTION_ARGUMENTS) {
JetType type = getShapeTypeOfFunctionLiteral(functionLiteralExpression, context.scope, context.trace, true); JetType type = getShapeTypeOfFunctionLiteral(functionLiteralExpression, context.scope, context.trace, true);
return JetTypeInfo.create(type, context.dataFlowInfo); return JetTypeInfo.create(type, context.dataFlowInfo);
} }
@@ -281,7 +281,7 @@ public class ArgumentTypeResolver {
if (expression == null) continue; if (expression == null) continue;
CallResolutionContext<?> newContext = context.replaceDataFlowInfo(infoForArguments.getInfo(argument)); CallResolutionContext<?> newContext = context.replaceDataFlowInfo(infoForArguments.getInfo(argument));
JetTypeInfo typeInfoForCall = getArgumentTypeInfo(expression, newContext, SKIP_FUNCTION_ARGUMENTS); JetTypeInfo typeInfoForCall = getArgumentTypeInfo(expression, newContext, SHAPE_FUNCTION_ARGUMENTS);
infoForArguments.updateInfo(argument, typeInfoForCall.getDataFlowInfo()); infoForArguments.updateInfo(argument, typeInfoForCall.getDataFlowInfo());
} }
} }
compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolverUtil.java
+1 -1
View File
@@ -47,7 +47,7 @@ import static org.jetbrains.jet.lang.types.TypeUtils.DONT_CARE;
public class CallResolverUtil { public class CallResolverUtil {
public static enum ResolveArgumentsMode { public static enum ResolveArgumentsMode {
RESOLVE_FUNCTION_ARGUMENTS, RESOLVE_FUNCTION_ARGUMENTS,
SKIP_FUNCTION_ARGUMENTS SHAPE_FUNCTION_ARGUMENTS
} }
private CallResolverUtil() {} private CallResolverUtil() {}
compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CandidateResolver.java
+5 -5
View File
@@ -54,7 +54,7 @@ import java.util.*;
import static org.jetbrains.jet.lang.diagnostics.Errors.PROJECTION_ON_NON_CLASS_TYPE_ARGUMENT; import static org.jetbrains.jet.lang.diagnostics.Errors.PROJECTION_ON_NON_CLASS_TYPE_ARGUMENT;
import static org.jetbrains.jet.lang.diagnostics.Errors.SUPER_IS_NOT_AN_EXPRESSION; import static org.jetbrains.jet.lang.diagnostics.Errors.SUPER_IS_NOT_AN_EXPRESSION;
import static org.jetbrains.jet.lang.resolve.calls.CallResolverUtil.ResolveArgumentsMode.RESOLVE_FUNCTION_ARGUMENTS; import static org.jetbrains.jet.lang.resolve.calls.CallResolverUtil.ResolveArgumentsMode.RESOLVE_FUNCTION_ARGUMENTS;
import static org.jetbrains.jet.lang.resolve.calls.CallResolverUtil.ResolveArgumentsMode.SKIP_FUNCTION_ARGUMENTS; import static org.jetbrains.jet.lang.resolve.calls.CallResolverUtil.ResolveArgumentsMode.SHAPE_FUNCTION_ARGUMENTS;
import static org.jetbrains.jet.lang.resolve.calls.CallTransformer.CallForImplicitInvoke; import static org.jetbrains.jet.lang.resolve.calls.CallTransformer.CallForImplicitInvoke;
import static org.jetbrains.jet.lang.resolve.calls.context.ContextDependency.INDEPENDENT; import static org.jetbrains.jet.lang.resolve.calls.context.ContextDependency.INDEPENDENT;
import static org.jetbrains.jet.lang.resolve.calls.results.ResolutionStatus.*; import static org.jetbrains.jet.lang.resolve.calls.results.ResolutionStatus.*;
@@ -128,7 +128,7 @@ public class CandidateResolver {
candidateCall.addStatus(status); candidateCall.addStatus(status);
} }
else { else {
candidateCall.addStatus(checkAllValueArguments(context, SKIP_FUNCTION_ARGUMENTS).status); candidateCall.addStatus(checkAllValueArguments(context, SHAPE_FUNCTION_ARGUMENTS).status);
} }
} }
else { else {
@@ -153,7 +153,7 @@ public class CandidateResolver {
TypeSubstitutor substitutor = TypeSubstitutor.create(substitutionContext); TypeSubstitutor substitutor = TypeSubstitutor.create(substitutionContext);
candidateCall.setResultingSubstitutor(substitutor); candidateCall.setResultingSubstitutor(substitutor);
candidateCall.addStatus(checkAllValueArguments(context, SKIP_FUNCTION_ARGUMENTS).status); candidateCall.addStatus(checkAllValueArguments(context, SHAPE_FUNCTION_ARGUMENTS).status);
} }
else { else {
candidateCall.addStatus(OTHER_ERROR); candidateCall.addStatus(OTHER_ERROR);
@@ -557,7 +557,7 @@ public class CandidateResolver {
// We'll type check the arguments later, with the inferred types expected // We'll type check the arguments later, with the inferred types expected
boolean[] isErrorType = new boolean[1]; boolean[] isErrorType = new boolean[1];
addConstraintForValueArgument(valueArgument, valueParameterDescriptor, substituteDontCare, constraintSystem, addConstraintForValueArgument(valueArgument, valueParameterDescriptor, substituteDontCare, constraintSystem,
context, isErrorType, SKIP_FUNCTION_ARGUMENTS); context, isErrorType, SHAPE_FUNCTION_ARGUMENTS);
if (isErrorType[0]) { if (isErrorType[0]) {
candidateCall.argumentHasNoType(); candidateCall.argumentHasNoType();
} }
@@ -594,7 +594,7 @@ public class CandidateResolver {
if (!hasContradiction) { if (!hasContradiction) {
return INCOMPLETE_TYPE_INFERENCE; return INCOMPLETE_TYPE_INFERENCE;
} }
ValueArgumentsCheckingResult checkingResult = checkAllValueArguments(context, SKIP_FUNCTION_ARGUMENTS); ValueArgumentsCheckingResult checkingResult = checkAllValueArguments(context, SHAPE_FUNCTION_ARGUMENTS);
ResolutionStatus argumentsStatus = checkingResult.status; ResolutionStatus argumentsStatus = checkingResult.status;
return OTHER_ERROR.combine(argumentsStatus); return OTHER_ERROR.combine(argumentsStatus);
} }