[Sbcl-commits] CVS: sbcl/src/compiler/generic primtype.lisp,1.9,1.10 vm-type.lisp,1.13,1.14

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

Update of /cvsroot/sbcl/sbcl/src/compiler/generic
In directory sc8-pr-cvs1:/tmp/cvs-serv6910/src/compiler/generic

Modified Files:
	primtype.lisp vm-type.lisp 
Log Message:
0.pre8.1
	Merge pcl_class_defrobulation_branch
	... CL:CLASS is conforming!
	... still maybe some breakage around the edges (e.g. 
		DESCRIBE, DOCUMENTATION)


Index: primtype.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/compiler/generic/primtype.lisp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- primtype.lisp	10 Mar 2003 14:54:29 -0000	1.9
+++ primtype.lisp	24 Mar 2003 18:39:06 -0000	1.10
@@ -366,11 +366,11 @@
 	 (ecase (named-type-name type)
 	   ((t *) (values *backend-t-primitive-type* t))
 	   ((nil) (any))))
-	(sb!xc:built-in-class
-	 (case (sb!xc:class-name type)
+	(built-in-classoid
+	 (case (classoid-name type)
 	   ((complex function instance
 	     system-area-pointer weak-pointer)
-	    (values (primitive-type-or-lose (sb!xc:class-name type)) t))
+	    (values (primitive-type-or-lose (classoid-name type)) t))
 	   (funcallable-instance
 	    (part-of function))
 	   (base-char
@@ -381,7 +381,7 @@
 	    (any))))
 	(fun-type
 	 (exactly function))
-	(sb!xc:class
+	(classoid
 	 (if (csubtypep type (specifier-type 'function))
 	     (part-of function)
 	     (part-of instance)))

Index: vm-type.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/compiler/generic/vm-type.lisp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- vm-type.lisp	10 Mar 2003 14:54:29 -0000	1.13
+++ vm-type.lisp	24 Mar 2003 18:39:06 -0000	1.14
@@ -170,7 +170,7 @@
      (if (type= type (specifier-type 'cons))
 	 'sb!c:check-cons
 	 nil))
-    (built-in-class
+    (built-in-classoid
      (if (type= type (specifier-type 'symbol))
 	 'sb!c:check-symbol
 	 nil))