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 5db406c..8c546e0 100644 (file)
--- a/module/oop/goops/compile.scm
+++ b/module/oop/goops/compile.scm
@@ -1,4 +1,4 @@
-;;;;   Copyright (C) 1999, 2001, 2006 Free Software Foundation, Inc.
+;;;;   Copyright (C) 1999, 2001, 2006, 2009 Free Software Foundation, Inc.
 ;;;; 
 ;;;; This library is free software; you can redistribute it and/or
 ;;;; modify it under the terms of the GNU Lesser General Public
@@ -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)
@@ -28,32 +28,6 @@
   :no-backtrace
   )
 
-;;;
-;;; Method entries
-;;;
-
-(define code-table-lookup
-  (letrec ((check-entry (lambda (entry types)
-                          (cond
-                           ((not (pair? entry)) (and (null? types) entry))
-                           ((null? types) #f)
-                           (else
-                            (and (eq? (car entry) (car types))
-                                 (check-entry (cdr entry) (cdr types))))))))
-    (lambda (code-table types)
-      (cond ((null? code-table) #f)
-           ((check-entry (car code-table) types))
-           (else (code-table-lookup (cdr code-table) types))))))
-
-(define (compute-cmethod methods types)
-  (or (code-table-lookup (slot-ref (car methods) 'code-table) types)
-      (let* ((method (car methods))
-             (cmethod (compile-method methods types))
-            (entry (append types cmethod)))
-       (slot-set! method 'code-table
-                  (cons entry (slot-ref method 'code-table)))
-       cmethod)))
-
 ;;;
 ;;; Compiling next methods into method bodies
 ;;;
@@ -70,11 +44,11 @@
 ;;; I think this whole generic application mess would benefit from a
 ;;; strict MOP.
 
-(define (compile-method methods types)
+(define (compute-cmethod methods types)
   (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)))