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

Fixed loading integral constants from compiled classes.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2014-06-20 17:47:48 +04:00
parent 111feb2574
commit bf442a9700
9 changed files with 125 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DescriptorDeserializersStorage.java
+30 -1
View File
@@ -87,9 +87,38 @@ public class DescriptorDeserializersStorage {
@Override
public KotlinJvmBinaryClass.AnnotationVisitor visitField(@NotNull Name name, @NotNull String desc, @Nullable Object initializer) {
MemberSignature signature = MemberSignature.fromFieldNameAndDesc(name, desc);
if (initializer != null) {
Object normalizedValue;
if ("ZBCS".contains(desc)) {
int intValue = ((Integer) initializer).intValue();
if ("Z".equals(desc)) {
normalizedValue = intValue != 0;
}
else if ("B".equals(desc)) {
normalizedValue = ((byte) intValue);
}
else if ("C".equals(desc)) {
normalizedValue = ((char) intValue);
}
else if ("S".equals(desc)) {
normalizedValue = ((short) intValue);
}
else {
throw new AssertionError(desc);
}
}
else {
normalizedValue = initializer;
}
propertyConstants.put(signature, ConstantsPackage.createCompileTimeConstant(
initializer, /* canBeUsedInAnnotation */ true, /* isPureIntConstant */ true, /* usesVariableAsConstant */ true, /* expectedType */ null));
normalizedValue,
/* canBeUsedInAnnotation */ true,
/* isPureIntConstant */ true,
/* usesVariableAsConstant */ true,
/* expectedType */ null
));
}
return new MemberAnnotationVisitor(signature);
}