From 8a508fe93823e0d2600fbe7ab0da08424db24b09 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Fri, 5 Jul 2013 20:55:35 +0400 Subject: [PATCH] Refactor: use constants instead of string literals --- .../org/jetbrains/jet/codegen/ImplementationBodyCodegen.java | 4 ++-- .../src/org/jetbrains/jet/codegen/NamespaceCodegen.java | 4 ++-- .../org/jetbrains/jet/lang/resolve/java/JvmStdlibNames.java | 5 +++-- .../java/resolver/DeserializedDescriptorResolver.java | 4 ++-- runtime/src/jet/KotlinInfo.java | 2 +- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java index bcca3760be8..94cbf5b479c 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java @@ -227,8 +227,8 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { ClassData data = new ClassData(createNameResolver(serializer.getNameTable()), classProto); AnnotationVisitor av = v.getVisitor().visitAnnotation(JvmStdlibNames.KOTLIN_INFO_CLASS.getDescriptor(), true); - av.visit("version", JvmAbi.VERSION); - AnnotationVisitor array = av.visitArray("data"); + av.visit(JvmStdlibNames.ABI_VERSION_NAME, JvmAbi.VERSION); + AnnotationVisitor array = av.visitArray(JvmStdlibNames.KOTLIN_INFO_DATA_FIELD); for (String string : JavaProtoBufUtil.encodeBytes(data.toBytes())) { array.visit(null, string); } diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/NamespaceCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/NamespaceCodegen.java index 292bb117fd9..52204b85b09 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/NamespaceCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/NamespaceCodegen.java @@ -169,8 +169,8 @@ public class NamespaceCodegen extends MemberCodegen { PackageData data = new PackageData(createNameResolver(serializer.getNameTable()), packageProto.build()); AnnotationVisitor av = v.getClassBuilder().newAnnotation(JvmStdlibNames.KOTLIN_INFO_CLASS.getDescriptor(), true); - av.visit("version", JvmAbi.VERSION); - AnnotationVisitor array = av.visitArray("data"); + av.visit(JvmStdlibNames.ABI_VERSION_NAME, JvmAbi.VERSION); + AnnotationVisitor array = av.visitArray(JvmStdlibNames.KOTLIN_INFO_DATA_FIELD); for (String string : JavaProtoBufUtil.encodeBytes(data.toBytes())) { array.visit(null, string); } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JvmStdlibNames.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JvmStdlibNames.java index 98406a29f9f..b9cc7169c8b 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JvmStdlibNames.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JvmStdlibNames.java @@ -81,15 +81,16 @@ public class JvmStdlibNames { public static final String JET_CLASS_SIGNATURE = "signature"; - public static final JvmClassName JET_OBJECT = JvmClassName.byFqNameWithoutInnerClasses("jet.JetObject"); - public static final JvmClassName ASSERT_INVISIBLE_IN_RESOLVER = JvmClassName.byFqNameWithoutInnerClasses("org.jetbrains.jet.rt.annotation.AssertInvisibleInResolver"); public static final JvmClassName KOTLIN_SIGNATURE = JvmClassName.byFqNameWithoutInnerClasses("jet.runtime.typeinfo.KotlinSignature"); + public static final String KOTLIN_SIGNATURE_VALUE_METHOD = "value"; + public static final String KOTLIN_INFO_DATA_FIELD = "data"; + private JvmStdlibNames() { } } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DeserializedDescriptorResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DeserializedDescriptorResolver.java index fcd9d4ed0ce..d3f299415ea 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DeserializedDescriptorResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DeserializedDescriptorResolver.java @@ -212,7 +212,7 @@ public final class DeserializedDescriptorResolver { return new AnnotationVisitor(Opcodes.ASM4) { @Override public void visit(String name, Object value) { - if (name.equals("version")) { + if (name.equals(JvmStdlibNames.ABI_VERSION_NAME)) { version = (Integer) value; } else if (isAbiVersionCompatible(version)) { @@ -222,7 +222,7 @@ public final class DeserializedDescriptorResolver { @Override public AnnotationVisitor visitArray(String name) { - if (name.equals("data")) { + if (name.equals(JvmStdlibNames.KOTLIN_INFO_DATA_FIELD)) { return stringArrayVisitor(); } else if (isAbiVersionCompatible(version)) { diff --git a/runtime/src/jet/KotlinInfo.java b/runtime/src/jet/KotlinInfo.java index 404beb5743a..b0a77ced52f 100644 --- a/runtime/src/jet/KotlinInfo.java +++ b/runtime/src/jet/KotlinInfo.java @@ -21,7 +21,7 @@ import java.lang.annotation.RetentionPolicy; @Retention(RetentionPolicy.RUNTIME) public @interface KotlinInfo { - int version(); + int abiVersion(); String[] data(); }