azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor: use constants instead of string literals

Browse Source
This commit is contained in:
Pavel V. Talanov
2013-07-05 20:55:35 +04:00
committed by Alexander Udalov
parent 8dd27aa298
commit 8a508fe938
5 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java
+2 -2
View File
@@ -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);
}
compiler/backend/src/org/jetbrains/jet/codegen/NamespaceCodegen.java
+2 -2
View File
@@ -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);
}
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JvmStdlibNames.java
+3 -2
View File
@@ -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() {
}
}
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DeserializedDescriptorResolver.java
+2 -2
View File
@@ -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)) {
runtime/src/jet/KotlinInfo.java
+1 -1
View File
@@ -21,7 +21,7 @@ import java.lang.annotation.RetentionPolicy;
@Retention(RetentionPolicy.RUNTIME)
public @interface KotlinInfo {
int version();
int abiVersion();
String[] data();
}