From: Kevin M. Rosenberg <kevin@rosenberg.net>
Date: Tue, 15 Apr 2003 05:18:22 +0000 (+0000)
Subject: r4477: Auto commit for Debian build
X-Git-Tag: debian-2.11.0-2~153
X-Git-Url: http://git.kpe.io/?p=hyperobject.git;a=commitdiff_plain;h=f57679aba5abb3dc8d7e34c38f94201319a5af29

r4477: Auto commit for Debian build
---

diff --git a/debian/changelog b/debian/changelog
index f55084c..ac4dc74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cl-hyperobject (2.6.2-1) unstable; urgency=low
+
+  * Handle both named/unnamed implementations of
+    compute-effective-slot-definition
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Mon, 14 Apr 2003 23:17:13 -0600
+
 cl-hyperobject (2.6.1-1) unstable; urgency=low
 
   * New upstream
diff --git a/mop.lisp b/mop.lisp
index 1c5f050..085408e 100644
--- a/mop.lisp
+++ b/mop.lisp
@@ -11,7 +11,7 @@
 ;;;; in Text, HTML, and XML formats. This includes hyperlinking
 ;;;; capability and sub-objects.
 ;;;;
-;;;; $Id: mop.lisp,v 1.51 2003/04/14 17:50:34 kevin Exp $
+;;;; $Id: mop.lisp,v 1.52 2003/04/15 05:18:22 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
 ;;;;
@@ -191,8 +191,15 @@
     (t
      t)))
 
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (when (>= (length (generic-function-lambda-list
+		     (ensure-generic-function
+		      'compute-effective-slot-definition)))
+	    3)
+    (push :ho-named-cesd-fun cl:*features*)))
+
 (defmethod compute-effective-slot-definition :around ((cl hyperobject-class)
-						      #-(or scl) name
+						      #+ho-named-cesd-fun name
 						      dsds)
   #+allegro (declare (ignore name))
   (let* ((dsd (car dsds))
@@ -216,7 +223,11 @@
 	 :value-constraint (slot-value dsd 'value-constraint)
 	 :null-allowed (slot-value dsd 'null-allowed)
 	 ia)))))
-  
+
+
+#+ho-named-cesd-fun
+(setq cl:*features* (delete :ho-named-cesd-fun cl:*features*))
+
 (defun value-type-to-lisp-type (value-type)
   (case (if (atom value-type)
 	    value-type
diff --git a/package.lisp b/package.lisp
index 94de26b..9d9a718 100644
--- a/package.lisp
+++ b/package.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: package.lisp,v 1.41 2003/04/12 03:30:52 kevin Exp $
+;;;; $Id: package.lisp,v 1.42 2003/04/15 05:18:22 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
 ;;;; *************************************************************************
@@ -64,7 +64,7 @@
      sb-pcl::compute-effective-slot-definition-initargs
      sb-pcl::slot-value-using-class
      sb-pcl:class-prototype sb-pcl:generic-function-method-class sb-pcl:intern-eql-specializer
-     sb-pcl:make-method-lambda)
+     sb-pcl:make-method-lambda sb-pcl:generic-function-lambda-list)
   #+cmu
   '(pcl:class-of  pcl:class-name pcl:class-slots pcl:find-class pcl::standard-class
     pcl::slot-definition-name pcl:finalize-inheritance
@@ -74,7 +74,7 @@
     pcl::compute-effective-slot-definition-initargs
     pcl::slot-value-using-class
     pcl:class-prototype pcl:generic-function-method-class pcl:intern-eql-specializer
-    pcl:make-method-lambda)
+    pcl:make-method-lambda pcl:generic-function-lambda-list)
   #+scl
   '(clos:class-slots clos::standard-class
     clos::slot-definition-name clos:finalize-inheritance
@@ -85,7 +85,8 @@
     clos::slot-value-using-class
     clos::class-prototype clos:generic-function-method-class
     ;; note: make-method-lambda is not fbound
-    clos:intern-eql-specializer clos:make-method-lambda)
+    clos:intern-eql-specializer clos:make-method-lambda
+    clos:generic-function-lambda-list)
   
    :hyperobject))