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

rename local var constraintsSystem -> constraintSystem

Browse Source
This commit is contained in:
Svetlana Isakova
2012-12-27 17:45:01 +04:00
parent 00ef0fc0a6
commit 21f6d1630d
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CandidateResolver.java
+7 -7
View File
@@ -232,7 +232,7 @@ public class CandidateResolver {
context.trace.get(ResolutionDebugInfo.RESOLUTION_DEBUG_INFO, context.call.getCallElement()); context.trace.get(ResolutionDebugInfo.RESOLUTION_DEBUG_INFO, context.call.getCallElement());
ConstraintSystemImpl constraintsSystem = new ConstraintSystemImpl(); ConstraintSystemImpl constraintSystem = new ConstraintSystemImpl();
// If the call is recursive, e.g. // If the call is recursive, e.g.
// fun foo<T>(t : T) : T = foo(t) // fun foo<T>(t : T) : T = foo(t)
@@ -244,7 +244,7 @@ public class CandidateResolver {
for (TypeParameterDescriptor typeParameterDescriptor : candidateWithFreshVariables.getTypeParameters()) { for (TypeParameterDescriptor typeParameterDescriptor : candidateWithFreshVariables.getTypeParameters()) {
constraintsSystem.registerTypeVariable(typeParameterDescriptor, Variance.INVARIANT); // TODO: variance of the occurrences constraintSystem.registerTypeVariable(typeParameterDescriptor, Variance.INVARIANT); // TODO: variance of the occurrences
} }
TypeSubstitutor substituteDontCare = ConstraintSystemWithPriorities TypeSubstitutor substituteDontCare = ConstraintSystemWithPriorities
@@ -263,7 +263,7 @@ public class CandidateResolver {
// and throw the results away // and throw the results away
// 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, constraintsSystem, addConstraintForValueArgument(valueArgument, valueParameterDescriptor, substituteDontCare, constraintSystem,
context, isErrorType, SKIP_FUNCTION_ARGUMENTS); context, isErrorType, SKIP_FUNCTION_ARGUMENTS);
if (isErrorType[0]) { if (isErrorType[0]) {
candidateCall.argumentHasNoType(); candidateCall.argumentHasNoType();
@@ -280,11 +280,11 @@ public class CandidateResolver {
context.candidateCall.isSafeCall() context.candidateCall.isSafeCall()
? TypeUtils.makeNotNullable(receiverArgument.getType()) ? TypeUtils.makeNotNullable(receiverArgument.getType())
: receiverArgument.getType(); : receiverArgument.getType();
constraintsSystem.addSubtypeConstraint(receiverParameter.getType(), receiverType, ConstraintPosition.RECEIVER_POSITION); constraintSystem.addSubtypeConstraint(receiverParameter.getType(), receiverType, ConstraintPosition.RECEIVER_POSITION);
} }
ConstraintSystem ConstraintSystem
constraintSystemWithRightTypeParameters = constraintsSystem.replaceTypeVariables(new Function<TypeParameterDescriptor, TypeParameterDescriptor>() { constraintSystemWithRightTypeParameters = constraintSystem.replaceTypeVariables(new Function<TypeParameterDescriptor, TypeParameterDescriptor>() {
@Override @Override
public TypeParameterDescriptor apply(@Nullable TypeParameterDescriptor typeParameterDescriptor) { public TypeParameterDescriptor apply(@Nullable TypeParameterDescriptor typeParameterDescriptor) {
assert typeParameterDescriptor != null; assert typeParameterDescriptor != null;
@@ -295,8 +295,8 @@ public class CandidateResolver {
// Solution // Solution
boolean hasContradiction = constraintsSystem.hasContradiction(); boolean hasContradiction = constraintSystem.hasContradiction();
boolean boundsAreSatisfied = ConstraintsUtil.checkBoundsAreSatisfied(constraintsSystem); boolean boundsAreSatisfied = ConstraintsUtil.checkBoundsAreSatisfied(constraintSystem);
if (!hasContradiction && boundsAreSatisfied) { if (!hasContradiction && boundsAreSatisfied) {
candidateCall.setHasUnknownTypeParameters(true); candidateCall.setHasUnknownTypeParameters(true);
return SUCCESS; return SUCCESS;