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

ReadDataFromAnnotationVisitor doesn't depend on ASM anymore

Browse Source
This commit is contained in:
Alexander Udalov
2013-09-26 16:21:12 +04:00
parent 8b63665b20
commit 3087c6f584
5 changed files with 116 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileKotlinClass.java
+14 -8
View File
@@ -87,17 +87,23 @@ public class VirtualFileKotlinClass implements KotlinJvmBinaryClass {
}
@Nullable
private static org.jetbrains.asm4.AnnotationVisitor convertAnnotationVisitor(
@NotNull AnnotationVisitor visitor,
@NotNull String desc
) {
final AnnotationArgumentVisitor v = visitor.visitAnnotation(classNameFromAsmDesc(desc));
if (v == null) return null;
private static org.jetbrains.asm4.AnnotationVisitor convertAnnotationVisitor(@NotNull AnnotationVisitor visitor, @NotNull String desc) {
AnnotationArgumentVisitor v = visitor.visitAnnotation(classNameFromAsmDesc(desc));
return v == null ? null : convertAnnotationVisitor(v);
}
@NotNull
private static org.jetbrains.asm4.AnnotationVisitor convertAnnotationVisitor(@NotNull final AnnotationArgumentVisitor v) {
return new org.jetbrains.asm4.AnnotationVisitor(ASM4) {
@Override
public void visit(String name, Object value) {
v.visit(Name.identifier(name), value);
v.visit(name == null ? null : Name.identifier(name), value);
}
@Override
public org.jetbrains.asm4.AnnotationVisitor visitArray(String name) {
AnnotationArgumentVisitor av = v.visitArray(Name.guess(name));
return av == null ? null : convertAnnotationVisitor(av);
}
@Override
@@ -147,7 +153,7 @@ public class VirtualFileKotlinClass implements KotlinJvmBinaryClass {
@Override
public void visitEnd() {
super.visitEnd();
v.visitEnd();
}
};
}