diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/inline/LambdaTransformer.java b/compiler/backend/src/org/jetbrains/jet/codegen/inline/AnonymousObjectTransformer.java similarity index 98% rename from compiler/backend/src/org/jetbrains/jet/codegen/inline/LambdaTransformer.java rename to compiler/backend/src/org/jetbrains/jet/codegen/inline/AnonymousObjectTransformer.java index e96e8f298ba..674c1dd914f 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/inline/LambdaTransformer.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/inline/AnonymousObjectTransformer.java @@ -34,7 +34,7 @@ import org.jetbrains.org.objectweb.asm.tree.*; import java.io.IOException; import java.util.*; -public class LambdaTransformer { +public class AnonymousObjectTransformer { protected final GenerationState state; @@ -54,7 +54,12 @@ public class LambdaTransformer { private final Map> fieldNames = new HashMap>(); - public LambdaTransformer(@NotNull String objectInternalName, @NotNull InliningContext inliningContext, boolean isSameModule, @NotNull Type newLambdaType) { + public AnonymousObjectTransformer( + @NotNull String objectInternalName, + @NotNull InliningContext inliningContext, + boolean isSameModule, + @NotNull Type newLambdaType + ) { this.isSameModule = isSameModule; this.state = inliningContext.state; this.typeMapper = state.getTypeMapper(); diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/inline/MethodInliner.java b/compiler/backend/src/org/jetbrains/jet/codegen/inline/MethodInliner.java index a8870b58a21..778959db44b 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/inline/MethodInliner.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/inline/MethodInliner.java @@ -141,7 +141,7 @@ public class MethodInliner { //TODO: need poping of type but what to do with local funs??? Type newLambdaType = Type.getObjectType(inliningContext.nameGenerator.genLambdaClassName()); currentTypeMapping.put(invocation.getOwnerInternalName(), newLambdaType.getInternalName()); - LambdaTransformer transformer = new LambdaTransformer(invocation.getOwnerInternalName(), + AnonymousObjectTransformer transformer = new AnonymousObjectTransformer(invocation.getOwnerInternalName(), inliningContext.subInline(inliningContext.nameGenerator, currentTypeMapping).classRegeneration(), isSameModule, newLambdaType);