r4676: Auto commit for Debian build

diff --git a/attrib-class.lisp b/attrib-class.lisp
index ee88042d4ee09342a92c1cd096bff24f9bce0a24..3e79325b7bdb8d021512e84af439c331fa3a934a 100644 (file)
--- a/attrib-class.lisp
+++ b/attrib-class.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: attrib-class.lisp,v 1.8 2003/04/29 01:39:40 kevin Exp $
+;;;; $Id: attrib-class.lisp,v 1.9 2003/04/29 03:50:42 kevin Exp $
 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -41,16 +41,13 @@ on example from AMOP"))
                                        (superclass kmr-mop:standard-class))
   t)
 
-(defmethod kmr-mop:direct-slot-definition-class ((cl attributes-class)
-                                                #+(or sbcl cmu scl lispworks)
-                                                initargs
-                                                #+(or allegro) &rest #+(or allegro) iargs)
-  ;;  (format t "attributes:~s iargs:~s~%" attributes iargs)
+(defmethod kmr-mop:direct-slot-definition-class ((cl attributes-class) #+kmr-normal-dsdc &rest initargs)
+  (declare (ignore initargs))
   (kmr-mop:find-class 'attributes-dsd))
 
 (defmethod kmr-mop:compute-effective-slot-definition :around
-    ((cl attributes-class) #+kmr-named-cesd name dsds)
-  #+kmr-named-cesd (declare (ignore name))
+    ((cl attributes-class) #+kmr-normal-cesd name dsds)
+  #+kmr-normal-cesd (declare (ignore name))
   (apply
    #'make-instance 'attributes-esd 
    :attributes (remove-duplicates (mapappend #'dsd-attributes dsds))

diff --git a/kmrcl.asd b/kmrcl.asd
index af360d8d7eb61cab6501b525fc24e09a11652324..4c2d1c0bb83557f0c2d131408def62c3ea4303c5 100644 (file)
--- a/kmrcl.asd
+++ b/kmrcl.asd
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: kmrcl.asd,v 1.26 2003/04/29 00:23:21 kevin Exp $
+;;;; $Id: kmrcl.asd,v 1.27 2003/04/29 03:54:40 kevin Exp $
 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -19,7 +19,9 @@
 (defpackage #:kmrcl-system (:use #:asdf #:cl))
 (in-package #:kmrcl-system)
 
-#+(or allegro cmucl lispworks sbcl scl) (pushnew :kmr-mop cl:*features*)
+#+(or allegro cmucl lispworks sbcl scl)
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (pushnew :kmr-mop cl:*features*))
 
 (defsystem kmrcl
     :name "kmrcl"
@@ -56,4 +58,5 @@
   (oos 'test-op 'kmrcl-tests))
 
 #+kmr-mop
-(setq cl:*features* (delete :kmr-mop cl:*features*))
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (setq cl:*features* (delete :kmr-mop cl:*features*)))

diff --git a/mop.lisp b/mop.lisp
index 5e4ba96ecf5ca230ae00f4d7589964a822abb20a..995b368db06dd650d9a97b66ab85522cc9916057 100644 (file)
--- a/mop.lisp
+++ b/mop.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2003
 ;;;;
-;;;; $Id: mop.lisp,v 1.1 2003/04/29 00:26:21 kevin Exp $
+;;;; $Id: mop.lisp,v 1.2 2003/04/29 03:50:42 kevin Exp $
 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -116,5 +116,12 @@
                     (ensure-generic-function
                      'compute-effective-slot-definition)))
            3)
-    (pushnew :kmr-named-cesd cl:*features*)))
+    (pushnew :kmr-normal-cesd cl:*features*)))
+
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (when (>= (length (generic-function-lambda-list
+                   (ensure-generic-function
+                    'direct-slot-definition-class)))
+           3)
+    (pushnew :kmr-normal-dsdc cl:*features*)))