[Sbcl-commits] CVS: sbcl/src/pcl braid.lisp,1.29.4.5,1.29.4.6 defs.lisp,1.26.6.3,1.26.6.4 std-class.lisp,1.37.4.3,1.37.4.4

[Christophe R. <cr...@us...>]

Update of /cvsroot/sbcl/sbcl/src/pcl
In directory sc8-pr-cvs1:/tmp/cvs-serv8399/src/pcl

Modified Files:
      Tag: pcl_class_defrobulation_branch
	braid.lisp defs.lisp std-class.lisp 
Log Message:
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.


Index: braid.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/pcl/braid.lisp,v
retrieving revision 1.29.4.5
retrieving revision 1.29.4.6
diff -u -d -r1.29.4.5 -r1.29.4.6
--- braid.lisp	21 Mar 2003 15:31:13 -0000	1.29.4.5
+++ braid.lisp	21 Mar 2003 18:15:17 -0000	1.29.4.6
@@ -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

Index: defs.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/pcl/defs.lisp,v
retrieving revision 1.26.6.3
retrieving revision 1.26.6.4
diff -u -d -r1.26.6.3 -r1.26.6.4
--- defs.lisp	21 Mar 2003 12:09:44 -0000	1.26.6.3
+++ defs.lisp	21 Mar 2003 18:15:18 -0000	1.26.6.4
@@ -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

Index: std-class.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/pcl/std-class.lisp,v
retrieving revision 1.37.4.3
retrieving revision 1.37.4.4
diff -u -d -r1.37.4.3 -r1.37.4.4
--- std-class.lisp	21 Mar 2003 12:09:44 -0000	1.37.4.3
+++ std-class.lisp	21 Mar 2003 18:15:18 -0000	1.37.4.4
@@ -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)