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

fixing broken test for naming of class objects

Browse Source
This commit is contained in:
Alex Tkachman
2012-01-26 02:43:39 +02:00
parent c5d88251a9
commit 9dd27cfd1b
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/JetTypeMapper.java
+7
View File
@@ -726,6 +726,13 @@ public class JetTypeMapper {
else if(container instanceof JetClass) { else if(container instanceof JetClass) {
ClassDescriptor aClass = bindingContext.get(BindingContext.CLASS, container); ClassDescriptor aClass = bindingContext.get(BindingContext.CLASS, container);
baseName = mapType(aClass.getDefaultType(), OwnerKind.IMPLEMENTATION).getInternalName(); baseName = mapType(aClass.getDefaultType(), OwnerKind.IMPLEMENTATION).getInternalName();
ClassDescriptor myClass = bindingContext.get(BindingContext.CLASS, expression);
if(CodegenUtil.isClassObject(myClass)) {
return mapType(aClass.getDefaultType(), OwnerKind.IMPLEMENTATION).getInternalName() + "$ClassObject$";
}
else
baseName = classNameForAnonymousClass((JetElement) container);
} }
else { else {
baseName = classNameForAnonymousClass((JetElement) container); baseName = classNameForAnonymousClass((JetElement) container);