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

Failing test, now really need to generate getters instead of calls to a getfield

Browse Source
This commit is contained in:
Maxim Shafirov
2011-04-28 22:01:42 +04:00
parent 1ebee592a4
commit 5e2d8869cf
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/codegen/ClassCodegen.java
+3 -2
View File
@@ -207,8 +207,9 @@ public class ClassCodegen {
JetType superType = bindingContext.resolveTypeReference(specifier.getTypeReference()); JetType superType = bindingContext.resolveTypeReference(specifier.getTypeReference());
ClassDescriptor superClassDescriptor = (ClassDescriptor) superType.getConstructor().getDeclarationDescriptor(); ClassDescriptor superClassDescriptor = (ClassDescriptor) superType.getConstructor().getDeclarationDescriptor();
String delegateField = "$delegate_" + n; String delegateField = "$delegate_" + n;
v.visitField(Opcodes.ACC_PRIVATE, delegateField, JetTypeMapper.jvmNameForInterface(superClassDescriptor), /*TODO*/null, null); String fieldDesc = JetTypeMapper.jetInterfaceType(superClassDescriptor).getDescriptor();
iv.putfield(classname, delegateField, JetTypeMapper.jetInterfaceType(superClassDescriptor).getDescriptor()); v.visitField(Opcodes.ACC_PRIVATE, delegateField, fieldDesc, /*TODO*/null, null);
iv.putfield(classname, delegateField, fieldDesc);
} }
n++; n++;
idea/testData/codegen/inheritance.jet
+4 -4
View File
@@ -5,10 +5,10 @@ class Point(x : Int, y : Int) : X(x), Y(y) {}
class Abstract {} class Abstract {}
class P1(x : Int, y : Y) : Abstract, X(x), Y by y {} class P1(x : Int, yy : Y) : Abstract, X(x), Y by yy {}
class P2(x : Int, y : Y) : X(x), Abstract, Y by y {} class P2(x : Int, yy : Y) : X(x), Abstract, Y by yy {}
class P3(x : Int, y : Y) : X(x), Y by y, Abstract {} class P3(x : Int, yy : Y) : X(x), Y by yy, Abstract {}
class P4(x : Int, y : Y) : Y by y, Abstract, X(x) {} class P4(x : Int, yy : Y) : Y by yy, Abstract, X(x) {}
fun box() : String { fun box() : String {
if (new X(239).x != 239) return "FAIL #1" if (new X(239).x != 239) return "FAIL #1"