From: Christophe Rhodes <csr21@cam.ac.uk>
Date: Fri, 21 Mar 2003 18:15:14 +0000 (+0000)
Subject: 0.7.13.pcl-class.6:
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=80cc96cee0097619d3aab31244c0c3b8b32d3d0f;p=sbcl.git

0.7.13.pcl-class.6:
	Phew, found it.  Fix embarrassing thinko in ENSURE-CLASS-VALUES
	... continue to pass initargs around
	... now we can initialize strucutures again
	CONDITIONS can have SB-KERNEL:INSTANCE in their CPL
	... so don't remove it
	Fix typo in seemingly-dead code in defs.lisp
	... s/STRUCTURE/STANDARD/
	... probably don't need it any more because a CLASSOID isn't a
		type specifier any more, just a type

_Now_ there are no known regressions; tested both against our test suite
and GCL's ansi-tests.
---

diff --git a/src/pcl/braid.lisp b/src/pcl/braid.lisp
index 0fd84b3..b256c00 100644
--- a/src/pcl/braid.lisp
+++ b/src/pcl/braid.lisp
@@ -547,10 +547,9 @@
 					 :metaclass metaclass :name name
 					 :direct-superclasses supers
 					 :direct-slots slots)
-	       (let ((supers (nsubstitute t 'instance supers)))
-		 (ensure-class-using-class name nil
-					   :metaclass metaclass :name name
-					   :direct-superclasses supers))))))
+	       (ensure-class-using-class name nil
+					 :metaclass metaclass :name name
+					 :direct-superclasses supers)))))
     (cond ((structure-type-p name)
 	   (ensure 'structure-class
 		   (mapcar #'slot-initargs-from-structure-slotd
diff --git a/src/pcl/defs.lisp b/src/pcl/defs.lisp
index 19a1313..9b4bb43 100644
--- a/src/pcl/defs.lisp
+++ b/src/pcl/defs.lisp
@@ -151,7 +151,7 @@
 	;; FIXME: do we still need this?
 	((and (null args) (typep type 'classoid))
 	 (or (classoid-pcl-class type)
-	     (ensure-non-structure-class (classoid-name type))))
+	     (ensure-non-standard-class (classoid-name type))))
 	((specializerp type) type)))
 
 ;;; interface
diff --git a/src/pcl/std-class.lisp b/src/pcl/std-class.lisp
index 49aaa87..74dc13f 100644
--- a/src/pcl/std-class.lisp
+++ b/src/pcl/std-class.lisp
@@ -449,7 +449,8 @@
       (when (neq supplied-supers unsupplied)
 	(list :direct-superclasses (mapcar #'fix-super supplied-supers)))
       (when (neq supplied-slots unsupplied)
-	(list :direct-slots supplied-slots))))))
+	(list :direct-slots supplied-slots))
+      initargs))))
 
 (defmethod shared-initialize :after
 	   ((class std-class)
diff --git a/version.lisp-expr b/version.lisp-expr
index a9fde45..9968f58 100644
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -18,4 +18,4 @@
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
 
-"0.7.13.pcl-class.5"
+"0.7.13.pcl-class.6"