From fa73c5825ea20bb614e4f16f186273b7e92c1616 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Wed, 25 Jun 2014 19:35:04 +0400 Subject: [PATCH] Minor: Remove unused parameter --- .../jet/lang/cfg/JetControlFlowProcessor.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java index 5abdb9058f1..bdc9a8ed052 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java @@ -295,7 +295,7 @@ public class JetControlFlowProcessor { VariableAsFunctionResolvedCall variableAsFunctionResolvedCall = (VariableAsFunctionResolvedCall) resolvedCall; generateCall(expression, variableAsFunctionResolvedCall.getVariableCall()); } - else if (!generateCall(expression, true) && !(expression.getParent() instanceof JetCallExpression)) { + else if (!generateCall(expression) && !(expression.getParent() instanceof JetCallExpression)) { createNonSyntheticValue(expression, generateAndGetReceiverIfAny(expression)); } } @@ -353,7 +353,7 @@ public class JetControlFlowProcessor { mergeValues(Arrays.asList(left, right), expression); } else { - if (!generateCall(operationReference, true)) { + if (!generateCall(operationReference)) { generateBothArgumentsAndMark(expression); } } @@ -535,7 +535,7 @@ public class JetControlFlowProcessor { private void generateArrayAccess(JetArrayAccessExpression arrayAccessExpression, @Nullable ResolvedCall resolvedCall) { mark(arrayAccessExpression); - if (!checkAndGenerateCall(arrayAccessExpression, resolvedCall, true)) { + if (!checkAndGenerateCall(arrayAccessExpression, resolvedCall)) { generateArrayAccessWithoutCall(arrayAccessExpression); } } @@ -1070,7 +1070,7 @@ public class JetControlFlowProcessor { @Override public void visitCallExpression(@NotNull JetCallExpression expression) { JetExpression calleeExpression = expression.getCalleeExpression(); - if (!generateCall(calleeExpression, true)) { + if (!generateCall(calleeExpression)) { List inputExpressions = new ArrayList(); for (ValueArgument argument : expression.getValueArguments()) { JetExpression argumentExpression = argument.getArgumentExpression(); @@ -1197,7 +1197,7 @@ public class JetControlFlowProcessor { public void visitArrayAccessExpression(@NotNull JetArrayAccessExpression expression) { mark(expression); ResolvedCall getMethodResolvedCall = trace.get(BindingContext.INDEXED_LVALUE_GET, expression); - if (!checkAndGenerateCall(expression, getMethodResolvedCall, true)) { + if (!checkAndGenerateCall(expression, getMethodResolvedCall)) { generateArrayAccess(expression, getMethodResolvedCall); } } @@ -1378,12 +1378,15 @@ public class JetControlFlowProcessor { return trace.get(BindingContext.RESOLVED_CALL, expression); } - private boolean generateCall(@Nullable JetExpression calleeExpression, boolean bindResultValue) { + private boolean generateCall(@Nullable JetExpression calleeExpression) { if (calleeExpression == null) return false; - return checkAndGenerateCall(calleeExpression, getResolvedCall(calleeExpression), bindResultValue); + return checkAndGenerateCall(calleeExpression, getResolvedCall(calleeExpression)); } - private boolean checkAndGenerateCall(JetExpression calleeExpression, @Nullable ResolvedCall resolvedCall, boolean bindResultValue) { + private boolean checkAndGenerateCall( + JetExpression calleeExpression, + @Nullable ResolvedCall resolvedCall + ) { if (resolvedCall == null) { builder.compilationError(calleeExpression, "No resolved call"); return false;