From 93dfc00880377c4a76e15e15c6a1fd89da86eeb3 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Fri, 28 Mar 2014 21:25:58 +0400 Subject: [PATCH] Minor. Renamed enum constants for clarification. --- .../src/org/jetbrains/jet/codegen/FunctionCodegen.java | 2 +- .../org/jetbrains/jet/codegen/ImplementationBodyCodegen.java | 2 +- .../jet/codegen/signature/JvmMethodParameterKind.java | 4 ++-- .../src/org/jetbrains/jet/codegen/state/JetTypeMapper.java | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java index 8ce8b0b2631..7de498b0f05 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java @@ -367,7 +367,7 @@ public class FunctionCodegen extends ParentCodegenAwareImpl { } private static boolean needIndexForVar(JvmMethodParameterKind kind) { - return kind == JvmMethodParameterKind.SHARED_VAR || kind == JvmMethodParameterKind.SUPER_CALL_PARAM; + return kind == JvmMethodParameterKind.CAPTURED_LOCAL_VARIABLE || kind == JvmMethodParameterKind.SUPER_OF_ANONYMOUS_CALL_PARAM; } public static void endVisit(MethodVisitor mv, @Nullable String description, @Nullable PsiElement method) { diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java index 917f144a635..9b231d6a404 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java @@ -1577,7 +1577,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { private static int findFirstSuperArgument(@NotNull CallableMethod method) { int i = 0; for (JvmMethodParameterSignature type : method.getValueParameters()) { - if (type.getKind() == JvmMethodParameterKind.SUPER_CALL_PARAM) { + if (type.getKind() == JvmMethodParameterKind.SUPER_OF_ANONYMOUS_CALL_PARAM) { return i + 1; // because of this } i += type.getAsmType().getSize(); diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/signature/JvmMethodParameterKind.java b/compiler/backend/src/org/jetbrains/jet/codegen/signature/JvmMethodParameterKind.java index 3de0211e488..76a7fccb220 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/signature/JvmMethodParameterKind.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/signature/JvmMethodParameterKind.java @@ -23,10 +23,10 @@ public enum JvmMethodParameterKind { THIS, OUTER, RECEIVER, - SHARED_VAR, + CAPTURED_LOCAL_VARIABLE, ENUM_NAME, ENUM_ORDINAL, - SUPER_CALL_PARAM; + SUPER_OF_ANONYMOUS_CALL_PARAM; private static final EnumSet SKIPPED_IN_GENERIC_SIGNATURE = EnumSet.of(OUTER, ENUM_NAME, ENUM_ORDINAL); diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java b/compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java index 077bd2fbce4..1f1a003b34c 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java @@ -769,7 +769,7 @@ public class JetTypeMapper extends BindingTraceAware { } if (type != null) { - signatureWriter.writeParameterType(JvmMethodParameterKind.SHARED_VAR); + signatureWriter.writeParameterType(JvmMethodParameterKind.CAPTURED_LOCAL_VARIABLE); signatureWriter.writeAsmType(type); signatureWriter.writeParameterTypeEnd(); } @@ -782,7 +782,7 @@ public class JetTypeMapper extends BindingTraceAware { if (superDescriptor instanceof ConstructorDescriptor && isAnonymousObject(descriptor.getContainingDeclaration())) { for (JvmMethodParameterSignature parameter : mapSignature((ConstructorDescriptor) superDescriptor).getValueParameters()) { - signatureWriter.writeParameterType(JvmMethodParameterKind.SUPER_CALL_PARAM); + signatureWriter.writeParameterType(JvmMethodParameterKind.SUPER_OF_ANONYMOUS_CALL_PARAM); signatureWriter.writeAsmType(parameter.getAsmType()); signatureWriter.writeParameterTypeEnd(); }