unused parameters removed

This commit is contained in:
Alex Tkachman
2012-08-29 14:32:06 +03:00
parent 8840a9bdd8
commit 67e7491d4c
2 changed files with 8 additions and 10 deletions
@@ -1288,7 +1288,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
VariableAsFunctionResolvedCall call = (VariableAsFunctionResolvedCall) resolvedCall; VariableAsFunctionResolvedCall call = (VariableAsFunctionResolvedCall) resolvedCall;
resolvedCall = call.getVariableCall(); resolvedCall = call.getVariableCall();
} }
receiver = StackValue.receiver(resolvedCall, receiver, this, null, state); receiver = StackValue.receiver(resolvedCall, receiver, this, null);
descriptor = resolvedCall.getResultingDescriptor(); descriptor = resolvedCall.getResultingDescriptor();
} }
@@ -1631,7 +1631,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
DeclarationDescriptor funDescriptor = resolvedCall.getResultingDescriptor(); DeclarationDescriptor funDescriptor = resolvedCall.getResultingDescriptor();
if (funDescriptor instanceof ConstructorDescriptor) { if (funDescriptor instanceof ConstructorDescriptor) {
receiver = StackValue.receiver(resolvedCall, receiver, this, null, state); receiver = StackValue.receiver(resolvedCall, receiver, this, null);
return generateConstructorCall(expression, (JetSimpleNameExpression) callee, receiver); return generateConstructorCall(expression, (JetSimpleNameExpression) callee, receiver);
} }
else if (funDescriptor instanceof FunctionDescriptor) { else if (funDescriptor instanceof FunctionDescriptor) {
@@ -1711,7 +1711,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
return returnValueAsStackValue(fd, callReturnType); return returnValueAsStackValue(fd, callReturnType);
} }
else { else {
receiver = StackValue.receiver(resolvedCall, receiver, this, null, state); receiver = StackValue.receiver(resolvedCall, receiver, this, null);
IntrinsicMethod intrinsic = (IntrinsicMethod) callable; IntrinsicMethod intrinsic = (IntrinsicMethod) callable;
List<JetExpression> args = new ArrayList<JetExpression>(); List<JetExpression> args = new ArrayList<JetExpression>();
@@ -1807,7 +1807,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
} }
if (!(resolvedCall.getResultingDescriptor() instanceof ConstructorDescriptor)) { // otherwise already if (!(resolvedCall.getResultingDescriptor() instanceof ConstructorDescriptor)) { // otherwise already
receiver = StackValue.receiver(resolvedCall, receiver, this, callableMethod, state); receiver = StackValue.receiver(resolvedCall, receiver, this, callableMethod);
receiver.put(receiver.type, v); receiver.put(receiver.type, v);
if (calleeType != null) { if (calleeType != null) {
StackValue.onStack(receiver.type).put(boxType(receiver.type), v); StackValue.onStack(receiver.type).put(boxType(receiver.type), v);
@@ -1828,7 +1828,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
ResolvedCall<? extends CallableDescriptor> resolvedCall, ResolvedCall<? extends CallableDescriptor> resolvedCall,
CallableMethod callableMethod CallableMethod callableMethod
) { ) {
receiver = StackValue.receiver(resolvedCall, receiver, this, callableMethod, state); receiver = StackValue.receiver(resolvedCall, receiver, this, callableMethod);
receiver.put(receiver.type, v); receiver.put(receiver.type, v);
} }
@@ -2543,7 +2543,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
StackValue receiver = StackValue.onStack(lhsType); StackValue receiver = StackValue.onStack(lhsType);
if (!(resolvedCall.getResultingDescriptor() instanceof ConstructorDescriptor)) { // otherwise already if (!(resolvedCall.getResultingDescriptor() instanceof ConstructorDescriptor)) { // otherwise already
receiver = StackValue.receiver(resolvedCall, receiver, this, callable, state); receiver = StackValue.receiver(resolvedCall, receiver, this, callable);
receiver.put(receiver.type, v); receiver.put(receiver.type, v);
} }
@@ -344,11 +344,10 @@ public abstract class StackValue {
ResolvedCall<? extends CallableDescriptor> resolvedCall, ResolvedCall<? extends CallableDescriptor> resolvedCall,
StackValue receiver, StackValue receiver,
ExpressionCodegen codegen, ExpressionCodegen codegen,
@Nullable CallableMethod callableMethod, @Nullable CallableMethod callableMethod
GenerationState state
) { ) {
if (resolvedCall.getThisObject().exists() || resolvedCall.getReceiverArgument().exists()) { if (resolvedCall.getThisObject().exists() || resolvedCall.getReceiverArgument().exists()) {
return new CallReceiver(resolvedCall, receiver, codegen, state, callableMethod); return new CallReceiver(resolvedCall, receiver, codegen, callableMethod);
} }
return receiver; return receiver;
} }
@@ -1214,7 +1213,6 @@ public abstract class StackValue {
ResolvedCall<? extends CallableDescriptor> resolvedCall, ResolvedCall<? extends CallableDescriptor> resolvedCall,
StackValue receiver, StackValue receiver,
ExpressionCodegen codegen, ExpressionCodegen codegen,
@NotNull GenerationState state,
CallableMethod callableMethod CallableMethod callableMethod
) { ) {
super(calcType(resolvedCall, codegen, callableMethod)); super(calcType(resolvedCall, codegen, callableMethod));