fix chaining up from interpreted to compiled methods; allow compiled init-thunk

[bpt/guile.git] / oop / goops / compile.scm

diff --git a/oop/goops/compile.scm b/oop/goops/compile.scm
index 2e58365..ecd0232 100644 (file)
--- a/oop/goops/compile.scm
+++ b/oop/goops/compile.scm
@@ -175,8 +175,11 @@
            (set-cdr! vcell (make-final-make-no-next-method gf))
            (no-next-method gf (if (null? args) default-args args)))
          (let* ((cmethod (compute-cmethod methods types))
-                (method (local-eval (cons 'lambda (cmethod-code cmethod))
-                                    (cmethod-environment cmethod))))
+                (method
+                  (if (pair? cmethod)
+                      (local-eval (cons 'lambda (cmethod-code cmethod))
+                                  (cmethod-environment cmethod))
+                      cmethod)))
            (set-cdr! vcell (make-final-make-next-method method))
            (@apply method (if (null? args) default-args args)))))))