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

correctly call properties on annotation classes

Browse Source 
#KT-1932 Fixed
This commit is contained in:
Dmitry Jemerov
2012-06-09 14:48:04 +02:00
parent f8926c8a93
commit c9125d3f59
4 changed files with 39 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/CodegenUtil.java
+5 -1
View File
@@ -41,7 +41,11 @@ public class CodegenUtil {
private static final Random RANDOM = new Random(55L);
public static boolean isInterface(DeclarationDescriptor descriptor) {
return descriptor instanceof ClassDescriptor && ((ClassDescriptor)descriptor).getKind() == ClassKind.TRAIT;
if (descriptor instanceof ClassDescriptor) {
final ClassKind kind = ((ClassDescriptor) descriptor).getKind();
return kind == ClassKind.TRAIT || kind == ClassKind.ANNOTATION_CLASS;
}
return false;
}
public static boolean isInterface(JetType type) {
compiler/backend/src/org/jetbrains/jet/codegen/JetTypeMapper.java
+6 -3
View File
@@ -792,7 +792,10 @@ public class JetTypeMapper {
public JvmPropertyAccessorSignature mapGetterSignature(PropertyDescriptor descriptor, OwnerKind kind) {
String name = PropertyCodegen.getterName(descriptor.getName());
final DeclarationDescriptor parentDescriptor = descriptor.getContainingDeclaration();
boolean isAnnotation = parentDescriptor instanceof ClassDescriptor &&
((ClassDescriptor) parentDescriptor).getKind() == ClassKind.ANNOTATION_CLASS;
String name = isAnnotation ? descriptor.getName().getName() : PropertyCodegen.getterName(descriptor.getName());
// TODO: do not generate generics if not needed
BothSignatureWriter signatureWriter = new BothSignatureWriter(BothSignatureWriter.Mode.METHOD, true);
@@ -801,8 +804,8 @@ public class JetTypeMapper {
signatureWriter.writeParametersStart();
if (kind == OwnerKind.TRAIT_IMPL) {
ClassDescriptor containingDeclaration = (ClassDescriptor) descriptor.getContainingDeclaration();
if(kind == OwnerKind.TRAIT_IMPL) {
ClassDescriptor containingDeclaration = (ClassDescriptor) parentDescriptor;
assert containingDeclaration != null;
signatureWriter.writeParameterType(JvmMethodParameterKind.THIS);
mapType(containingDeclaration.getDefaultType(), signatureWriter, MapTypeMode.IMPL);