From 16b17b9e94d522f740190d8b47e5a5b79f13cf37 Mon Sep 17 00:00:00 2001 From: Natalia Ukhorskaya Date: Thu, 7 May 2015 13:19:11 +0300 Subject: [PATCH] Minor: rename --- .../kotlin/codegen/ExpressionCodegen.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java index e39774f6ac1..f990c8142f7 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java @@ -1579,7 +1579,7 @@ public class ExpressionCodegen extends JetVisitor implem result.put(Type.VOID_TYPE, v); } - removeDescriptorFromFrameMap(statement, blockEnd, leaveTasks); + addLeaveTaskToRemoveDescriptorFromFrameMap(statement, blockEnd, leaveTasks); } return new StackValueWithLeaveTask(answer, new ExtensionFunction0() { @@ -1642,7 +1642,7 @@ public class ExpressionCodegen extends JetVisitor implem } } - private void removeDescriptorFromFrameMap( + private void addLeaveTaskToRemoveDescriptorFromFrameMap( @NotNull JetElement statement, @NotNull Label blockEnd, @NotNull List> leaveTasks @@ -1650,20 +1650,20 @@ public class ExpressionCodegen extends JetVisitor implem if (statement instanceof JetMultiDeclaration) { JetMultiDeclaration multiDeclaration = (JetMultiDeclaration) statement; for (JetMultiDeclarationEntry entry : multiDeclaration.getEntries()) { - removeLocalVariableFromFrameMap(entry, blockEnd, leaveTasks); + addLeaveTaskToRemoveLocalVariableFromFrameMap(entry, blockEnd, leaveTasks); } } if (statement instanceof JetVariableDeclaration) { - removeLocalVariableFromFrameMap((JetVariableDeclaration) statement, blockEnd, leaveTasks); + addLeaveTaskToRemoveLocalVariableFromFrameMap((JetVariableDeclaration) statement, blockEnd, leaveTasks); } if (statement instanceof JetNamedFunction) { - removeNamedFunctionFromFrameMap((JetNamedFunction) statement, blockEnd, leaveTasks); + addLeaveTaskToRemoveNamedFunctionFromFrameMap((JetNamedFunction) statement, blockEnd, leaveTasks); } } - private void removeLocalVariableFromFrameMap( + private void addLeaveTaskToRemoveLocalVariableFromFrameMap( @NotNull JetVariableDeclaration statement, final Label blockEnd, @NotNull List> leaveTasks @@ -1691,8 +1691,8 @@ public class ExpressionCodegen extends JetVisitor implem }); } - private void removeNamedFunctionFromFrameMap( - final @NotNull JetNamedFunction statement, + private void addLeaveTaskToRemoveNamedFunctionFromFrameMap( + @NotNull final JetNamedFunction statement, final Label blockEnd, @NotNull List> leaveTasks ) {