X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Fbraid.lisp;h=246b911e9604082e0b2e5614888972cd5a8e417d;hb=94ac5b7c3ff37850210b6fc9a7593cf1c5752993;hp=95eced7fc5c2503260a5ce1ac136a85c9fec46ff;hpb=f143939b1dbaf38ebd4f92c851fbc4ecddf37af1;p=sbcl.git

diff --git a/src/pcl/braid.lisp b/src/pcl/braid.lisp
index 95eced7..246b911 100644
--- a/src/pcl/braid.lisp
+++ b/src/pcl/braid.lisp
@@ -33,7 +33,7 @@
 
 (defun allocate-standard-instance (wrapper
 				   &optional (slots-init nil slots-init-p))
-  (let ((instance (%%allocate-instance--class))
+  (let ((instance (%make-standard-instance nil))
 	(no-of-slots (wrapper-no-of-instance-slots wrapper)))
     (setf (std-instance-wrapper instance) wrapper)
     (setf (std-instance-slots instance)
@@ -63,7 +63,7 @@
 
 (defun allocate-funcallable-instance (wrapper &optional
 					      (slots-init nil slots-init-p))
-  (let ((fin (allocate-funcallable-instance-1)))
+  (let ((fin (%make-pcl-funcallable-instance nil nil)))
     (set-funcallable-instance-fun
      fin
      #'(sb-kernel:instance-lambda (&rest args)
@@ -95,21 +95,21 @@
 
 (defmacro !initial-classes-and-wrappers (&rest classes)
   `(progn
-     ,@(mapcar #'(lambda (class)
-		   (let ((wr (intern (format nil "~A-WRAPPER" class)
-				     *pcl-package*)))
-		     `(setf ,wr ,(if (eq class 'standard-generic-function)
-				     '*sgf-wrapper*
-				     `(boot-make-wrapper
-				       (early-class-size ',class)
-				       ',class))
-			    ,class (allocate-standard-instance
-				    ,(if (eq class 'standard-generic-function)
-					 'funcallable-standard-class-wrapper
-					 'standard-class-wrapper))
-			    (wrapper-class ,wr) ,class
-			    (find-class ',class) ,class)))
-	      classes)))
+     ,@(mapcar (lambda (class)
+		 (let ((wr (intern (format nil "~A-WRAPPER" class)
+				   *pcl-package*)))
+		   `(setf ,wr ,(if (eq class 'standard-generic-function)
+				   '*sgf-wrapper*
+				   `(boot-make-wrapper
+				     (early-class-size ',class)
+				     ',class))
+			  ,class (allocate-standard-instance
+				  ,(if (eq class 'standard-generic-function)
+				       'funcallable-standard-class-wrapper
+				       'standard-class-wrapper))
+			  (wrapper-class ,wr) ,class
+			  (find-class ',class) ,class)))
+	       classes)))
 
 (defun !bootstrap-meta-braid ()
   (let* ((*create-classes-from-internal-structure-definitions-p* nil)
@@ -145,10 +145,7 @@
 			(built-in-class built-in-class-wrapper)
 			(structure-class structure-class-wrapper)))
 	     (class (or (find-class name nil)
-			(allocate-standard-instance wrapper))))
-	(when (or (eq meta 'standard-class)
-		  (eq meta 'funcallable-standard-class))
-	  (inform-type-system-about-std-class name))
+			(allocate-standard-instance wrapper))))	
 	(setf (find-class name) class)))
     (dolist (definition *early-class-definitions*)
       (let ((name (ecd-class-name definition))
@@ -511,7 +508,7 @@
 (defvar *find-structure-class* nil)
 
 (defun eval-form (form)
-  #'(lambda () (eval form)))
+  (lambda () (eval form)))
 
 (defun slot-initargs-from-structure-slotd (slotd)
   `(:name ,(structure-slotd-name slotd)
@@ -581,7 +578,7 @@
               (sb-kernel:order-layout-inherits
                (map 'simple-vector #'class-wrapper
                     (reverse (rest (class-precedence-list class))))))
-      (sb-kernel:register-layout layout :invalidate nil)
+      (sb-kernel:register-layout layout)
 
       ;; Subclasses of formerly forward-referenced-class may be
       ;; unknown to CL:FIND-CLASS and also anonymous. This