Improve correctness and consistency of 'eval-when' usage.

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

diff --git a/module/oop/goops/compile.scm b/module/oop/goops/compile.scm
index db1a160..8c546e0 100644 (file)
--- a/module/oop/goops/compile.scm
+++ b/module/oop/goops/compile.scm
@@ -19,7 +19,7 @@
 ;; There are circularities here; you can't import (oop goops compile)
 ;; before (oop goops). So when compiling, make sure that things are
 ;; kosher.
-(eval-when (compile) (resolve-module '(oop goops)))
+(eval-when (expand) (resolve-module '(oop goops)))
 
 (define-module (oop goops compile)
   :use-module (oop goops)
@@ -48,7 +48,7 @@
   (let ((make-procedure (slot-ref (car methods) 'make-procedure)))
     (if make-procedure
         (make-procedure
-         (if (null? methods)
+         (if (null? (cdr methods))
              (lambda args
                (no-next-method (method-generic-function (car methods)) args))
              (compute-cmethod (cdr methods) types)))