function delegation

idea/src/org/jetbrains/jet/codegen/ClassCodegen.java

@@ -327,7 +327,6 @@ public class ClassCodegen {
         final FunctionCodegen functionCodegen = new FunctionCodegen(toClass, v, standardLibrary, bindingContext);
         final PropertyCodegen propertyCodegen = new PropertyCodegen(v, standardLibrary, bindingContext, functionCodegen);
 
-/* TODO
         for (JetDeclaration declaration : toClass.getDeclarations()) {
             if (declaration instanceof JetProperty) {
                 propertyCodegen.gen((JetProperty) declaration, kind);
@@ -336,7 +335,6 @@ public class ClassCodegen {
                 functionCodegen.gen((JetFunction) declaration, kind);
             }
         }
-*/
 
         for (JetParameter p : toClass.getPrimaryConstructorParameters()) {
             if (p.getValOrVarNode() != null) {

idea/src/org/jetbrains/jet/codegen/FunctionCodegen.java

@@ -7,6 +7,7 @@ import org.objectweb.asm.ClassVisitor;
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
+import org.objectweb.asm.commons.InstructionAdapter;
 import org.objectweb.asm.commons.Method;
 
 import java.util.List;
@@ -61,8 +62,22 @@ public class FunctionCodegen {
             }
 
             ExpressionCodegen codegen = new ExpressionCodegen(mv, bindingContext, frameMap, typeMapper, jvmSignature.getReturnType(), ownerClass, kind);
-            bodyExpression.accept(codegen);
+            if (kind instanceof OwnerKind.DelegateKind) {
-            generateReturn(mv, bodyExpression, codegen);
+                OwnerKind.DelegateKind dk = (OwnerKind.DelegateKind) kind;
+                InstructionAdapter iv = new InstructionAdapter(mv);
+                iv.load(0, JetTypeMapper.TYPE_OBJECT);
+                dk.getDelegate().put(JetTypeMapper.TYPE_OBJECT, iv);
+                for (int i = 0; i < argTypes.length; i++) {
+                    Type argType = argTypes[i];
+                    iv.load(i + 1, argType);
+                }
+                iv.invokeinterface(dk.getOwnerClass(), jvmSignature.getName(), jvmSignature.getDescriptor());
+                iv.areturn(jvmSignature.getReturnType());
+            }
+            else {
+                bodyExpression.accept(codegen);
+                generateReturn(mv, bodyExpression, codegen);
+            }
             mv.visitMaxs(0, 0);
             mv.visitEnd();
         }

idea/testData/codegen/funDelegation.jet

@@ -0,0 +1,17 @@
+class Base() {
+    fun n(n : Int) : Int = n + 1
+}
+
+class Abstract {}
+
+class Derived1() : Base(), Abstract {}
+class Derived2() : Abstract, Base() {}
+
+fun test(s : Base) : Boolean = s.n(238) == 239
+
+fun box() : String {
+    if (!test(new Base())) return "Fail #1"
+    if (!test(new Derived1())) return "Fail #2"
+    if (!test(new Derived2())) return "Fail #3"
+    return "OK"
+}

idea/tests/org/jetbrains/jet/codegen/ClassGenTest.java

@@ -25,10 +25,11 @@ public class ClassGenTest extends CodegenTestCase {
     }
 
     public void testInheritanceAndDelegation_DelegatingDefaultConstructorProperties() throws Exception {
-        loadFile("inheritance.jet");
+        blackBoxFile("inheritance.jet");
-        System.out.println(generateToText());
+    }
 
-        assertEquals("OK", blackBox());
+    public void testFunDelegation() throws Exception {
+        blackBoxFile("funDelegation.jet");
     }
 
     private static void checkInterface(Class aClass, Class ifs) {

idea/tests/org/jetbrains/jet/codegen/CodegenTestCase.java

@@ -40,6 +40,11 @@ public abstract class CodegenTestCase extends LightCodeInsightFixtureTestCase {
         myFixture.configureByFile(JetParsingTest.getTestDataDir() + "/codegen/" + name);
     }
 
+    protected void blackBoxFile(String filename) throws Exception {
+        loadFile(filename);
+        assertEquals("OK", blackBox());
+    }
+
     protected String blackBox() throws Exception {
         Codegens codegens = generateClassesInFile();
         CodegensClassLoader loader = new CodegensClassLoader(codegens);