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

Removed dependency on asm in descriptor.loader.java

Browse Source 
Conflicts:
	compiler/backend/src/org/jetbrains/jet/codegen/JavaSerializerExtension.java
This commit is contained in:
Evgeny Gerashchenko
2014-03-19 02:02:53 +04:00
parent 9f8a16fb1a
commit a44f0c2f2d
4 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/JavaSerializerExtension.java
+11 -5
View File
@@ -148,8 +148,8 @@ public class JavaSerializerExtension extends SerializerExtension {
@NotNull JavaProtoBuf.JavaMethodSignature signature,
@NotNull NameResolver nameResolver
) {
Method method = new SignatureDeserializer(nameResolver).methodSignature(signature);
return methodSignature(method);
String method = new SignatureDeserializer(nameResolver).methodSignatureString(signature);
return methodSignature(getAsmMethod(method));
}
@NotNull
@@ -189,11 +189,11 @@ public class JavaSerializerExtension extends SerializerExtension {
}
Method syntheticMethod = signature.hasSyntheticMethod()
? signatureDeserializer.methodSignature(signature.getSyntheticMethod())
? getAsmMethod(signatureDeserializer.methodSignatureString(signature.getSyntheticMethod()))
: null;
Method getter = signature.hasGetter() ? signatureDeserializer.methodSignature(signature.getGetter()) : null;
Method setter = signature.hasSetter() ? signatureDeserializer.methodSignature(signature.getSetter()) : null;
Method getter = signature.hasGetter() ? getAsmMethod(signatureDeserializer.methodSignatureString(signature.getGetter())) : null;
Method setter = signature.hasSetter() ? getAsmMethod(signatureDeserializer.methodSignatureString(signature.getSetter())) : null;
return propertySignature(fieldType, fieldName, isStaticInOuter, syntheticMethod, getter, setter);
}
@@ -269,4 +269,10 @@ public class JavaSerializerExtension extends SerializerExtension {
return FqName.fromSegments(Arrays.asList(internalName.split("/")));
}
}
@NotNull
private static Method getAsmMethod(@NotNull String nameAndDesc) {
int indexOf = nameAndDesc.indexOf('(');
return new Method(nameAndDesc.substring(0, indexOf), nameAndDesc.substring(indexOf));
}
}