X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Fbraid.lisp;h=ca670369853dcbfa2cbad8da82055756df37afdf;hb=138ba28006d97560d270d8da3cf3c99012e9053d;hp=e426863c16b05cff51827c61f258f5b5337fa9c5;hpb=4eb1a6d3ad2b7dcc19ac0ec979a1eb1eb049659a;p=sbcl.git diff --git a/src/pcl/braid.lisp b/src/pcl/braid.lisp index e426863..ca67036 100644 --- a/src/pcl/braid.lisp +++ b/src/pcl/braid.lisp @@ -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)