X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Fmacros.lisp;h=437e802990450ceb42b021799491b2175c1e8439;hb=961c6bf2eda5d492d5dbb7e275fe4e0931f7adf8;hp=4025d9b3ca98662dc3881e12ca738c88ba4e0564;hpb=475c832b081651e66ad9446d4852c62086f5e740;p=sbcl.git

diff --git a/src/pcl/macros.lisp b/src/pcl/macros.lisp
index 4025d9b..437e802 100644
--- a/src/pcl/macros.lisp
+++ b/src/pcl/macros.lisp
@@ -23,277 +23,142 @@
 ;;;; This software is made available AS IS, and Xerox Corporation makes no
 ;;;; warranty about the software, its performance or its conformity to any
 ;;;; specification.
-
+
 (in-package "SB-PCL")
+
+(/show "starting pcl/macros.lisp")
 
 (declaim (declaration
-	  ;; These three nonstandard declarations seem to be used
-	  ;; privately within PCL itself to pass information around,
-	  ;; so we can't just delete them.
-	  %class
-	  %method-name
-	  %method-lambda-list
-	  ;; This declaration may also be used within PCL to pass
-	  ;; information around, I'm not sure. -- WHN 2000-12-30
-	  %variable-rebinding))
-
-(defmacro name-get-fdefinition (name)
-  (sb-int:once-only ((name name))
-             `(if (symbolp ,name) ; take care of "setf <fun>"'s
-               (symbol-function ,name)
-               (fdefinition ,name))))
+          ;; These nonstandard declarations seem to be used privately
+          ;; within PCL itself to pass information around, so we can't
+          ;; just delete them.
+          %class
+          ;; This declaration may also be used within PCL to pass
+          ;; information around, I'm not sure. -- WHN 2000-12-30
+          %variable-rebinding))
 
-(defmacro name-set-fdefinition (name new-definition)
-  (sb-int:once-only ((name name))
-             `(if (symbolp ,name) ; take care of "setf <fun>"'s
-               (setf (symbol-function ,name) ,new-definition)
-               (setf (fdefinition ,name) ,new-definition))))
-
-;;; FIXME: CONSTANTLY-FOO should be boosted up to SB-INT too.
-(macrolet ((def-constantly-fun (name constant-expr)
-	     `(name-set-fdefinition ',name
-		    (constantly ,constant-expr))))
-  (def-constantly-fun constantly-t t)
-  (def-constantly-fun constantly-nil nil)
-  (def-constantly-fun constantly-0 0))
-
-;;; FIXME: This looks like SBCL's PARSE-BODY, and should be shared.
-(eval-when (:compile-toplevel :load-toplevel :execute)
-(defun extract-declarations (body &optional environment)
-  ;;(declare (values documentation declarations body))
-  (let (documentation
-	declarations
-	form)
-    (when (and (stringp (car body))
-	       (cdr body))
-      (setq documentation (pop body)))
-    (block outer
-      (loop
-	(when (null body) (return-from outer nil))
-	(setq form (car body))
-	(when (block inner
-		(loop (cond ((not (listp form))
-			     (return-from outer nil))
-			    ((eq (car form) 'declare)
-			     (return-from inner 't))
-			    (t
-			     (multiple-value-bind (newform macrop)
-				  (macroexpand-1 form environment)
-			       (if (or (not (eq newform form)) macrop)
-				   (setq form newform)
-				 (return-from outer nil)))))))
-	  (pop body)
-	  (dolist (declaration (cdr form))
-	    (push declaration declarations)))))
-    (values documentation
-	    (and declarations `((declare ,.(nreverse declarations))))
-	    body)))
-) ; EVAL-WHEN
+(/show "done with DECLAIM DECLARATION")
 
 (defun get-declaration (name declarations &optional default)
   (dolist (d declarations default)
     (dolist (form (cdr d))
       (when (and (consp form) (eq (car form) name))
-	(return-from get-declaration (cdr form))))))
+        (return-from get-declaration (cdr form))))))
 
-(defmacro collecting-once (&key initial-value)
-   `(let* ((head ,initial-value)
-	   (tail ,(and initial-value `(last head))))
-	  (values #'(lambda (value)
-			   (if (null head)
-			       (setq head (setq tail (list value)))
-			       (unless (memq value head)
-				 (setq tail
-				       (cdr (rplacd tail (list value)))))))
-		  #'(lambda nil head))))
+(/show "pcl/macros.lisp 85")
 
-(defmacro doplist ((key val) plist &body body &environment env)
-  (multiple-value-bind (doc decls bod)
-      (extract-declarations body env)
-    (declare (ignore doc))
-    `(let ((.plist-tail. ,plist) ,key ,val)
-       ,@decls
-       (loop (when (null .plist-tail.) (return nil))
-	     (setq ,key (pop .plist-tail.))
-	     (when (null .plist-tail.)
-	       (error "malformed plist, odd number of elements"))
-	     (setq ,val (pop .plist-tail.))
-	     (progn ,@bod)))))
+(/show "pcl/macros.lisp 101")
 
 (defmacro dolist-carefully ((var list improper-list-handler) &body body)
   `(let ((,var nil)
-	 (.dolist-carefully. ,list))
+         (.dolist-carefully. ,list))
      (loop (when (null .dolist-carefully.) (return nil))
-	   (if (consp .dolist-carefully.)
-	       (progn
-		 (setq ,var (pop .dolist-carefully.))
-		 ,@body)
-	       (,improper-list-handler)))))
+           (if (consp .dolist-carefully.)
+               (progn
+                 (setq ,var (pop .dolist-carefully.))
+                 ,@body)
+               (,improper-list-handler)))))
 
 ;;;; FIND-CLASS
 ;;;;
-;;;; This is documented in the CLOS specification. FIXME: Except that
-;;;; SBCL deviates from the spec by having CL:FIND-CLASS distinct from
-;;;; PCL:FIND-CLASS, alas.
-
-(defvar *find-class* (make-hash-table :test 'eq))
+;;;; This is documented in the CLOS specification.
 
-(defmacro find-class-cell-class (cell)
-  `(car ,cell))
+(/show "pcl/macros.lisp 119")
 
-(defmacro find-class-cell-predicate (cell)
-  `(cadr ,cell))
-
-(defmacro find-class-cell-make-instance-function-keys (cell)
-  `(cddr ,cell))
-
-(defmacro make-find-class-cell (class-name)
-  (declare (ignore class-name))
-  '(list* nil #'constantly-nil nil))
-
-(defun find-class-cell (symbol &optional dont-create-p)
-  (or (gethash symbol *find-class*)
-      (unless dont-create-p
-	(unless (legal-class-name-p symbol)
-	  (error "~S is not a legal class name." symbol))
-	(setf (gethash symbol *find-class*) (make-find-class-cell symbol)))))
+(declaim (inline legal-class-name-p))
+(defun legal-class-name-p (x)
+  (symbolp x))
 
 (defvar *create-classes-from-internal-structure-definitions-p* t)
 
 (defun find-class-from-cell (symbol cell &optional (errorp t))
-  (or (find-class-cell-class cell)
-      (and *create-classes-from-internal-structure-definitions-p*
-	   (structure-type-p symbol)
-	   (find-structure-class symbol))
+  (or (when cell
+        (or (classoid-cell-pcl-class cell)
+            (when *create-classes-from-internal-structure-definitions-p*
+              (let ((classoid (classoid-cell-classoid cell)))
+                (when (and classoid
+                           (or (condition-classoid-p classoid)
+                               (defstruct-classoid-p classoid)))
+                  (ensure-non-standard-class symbol classoid))))))
       (cond ((null errorp) nil)
-	    ((legal-class-name-p symbol)
-	     (error "There is no class named ~S." symbol))
-	    (t
-	     (error "~S is not a legal class name." symbol)))))
-
-(defun find-class-predicate-from-cell (symbol cell &optional (errorp t))
-  (unless (find-class-cell-class cell)
-    (find-class-from-cell symbol cell errorp))
-  (find-class-cell-predicate cell))
-
-(defun legal-class-name-p (x)
-  (and (symbolp x)
-       (not (keywordp x))))
+            ((legal-class-name-p symbol)
+             (error "There is no class named ~
+                     ~/sb-impl::print-symbol-with-prefix/." symbol))
+            (t
+             (error "~S is not a legal class name." symbol)))))
 
 (defun find-class (symbol &optional (errorp t) environment)
   (declare (ignore environment))
   (find-class-from-cell symbol
-			(find-class-cell symbol errorp)
-			errorp))
+                        (find-classoid-cell symbol)
+                        errorp))
 
-(defun find-class-predicate (symbol &optional (errorp t) environment)
-  (declare (ignore environment))
-  (find-class-predicate-from-cell symbol
-				  (find-class-cell symbol errorp)
-				  errorp))
 
 ;;; This DEFVAR was originally in defs.lisp, now moved here.
 ;;;
 ;;; Possible values are NIL, EARLY, BRAID, or COMPLETE.
-;;;
-;;; KLUDGE: This should probably become
-;;;   (DECLAIM (TYPE (MEMBER NIL :EARLY :BRAID :COMPLETE) *BOOT-STATE*))
-(defvar *boot-state* nil)
+(declaim (type (member nil early braid complete) **boot-state**))
+(defglobal **boot-state** nil)
+
+(/show "pcl/macros.lisp 187")
 
-;;; Note that in SBCL as in CMU CL,
-;;;   COMMON-LISP:FIND-CLASS /= SB-PCL:FIND-CLASS.
-;;; (Yes, this is a KLUDGE!)
 (define-compiler-macro find-class (&whole form
-				   symbol &optional (errorp t) environment)
+                                   symbol &optional (errorp t) environment)
   (declare (ignore environment))
   (if (and (constantp symbol)
-	   (legal-class-name-p (eval symbol))
-	   (constantp errorp)
-	   (member *boot-state* '(braid complete)))
-      (let ((symbol (eval symbol))
-	    (errorp (not (null (eval errorp))))
-	    (class-cell (make-symbol "CLASS-CELL")))	
-	`(let ((,class-cell (load-time-value (find-class-cell ',symbol))))
-	   (or (find-class-cell-class ,class-cell)
-	       ,(if errorp
-		    `(find-class-from-cell ',symbol ,class-cell t)
-		    `(and (sb-kernel:class-cell-class
-			   ',(sb-kernel:find-class-cell symbol))
-			  (find-class-from-cell ',symbol ,class-cell nil))))))
+           (legal-class-name-p (setf symbol (constant-form-value symbol)))
+           (constantp errorp)
+           (member **boot-state** '(braid complete)))
+      (let ((errorp (not (null (constant-form-value errorp))))
+            (cell (make-symbol "CLASSOID-CELL")))
+        `(let ((,cell (load-time-value (find-classoid-cell ',symbol :create t))))
+           (or (classoid-cell-pcl-class ,cell)
+               ,(if errorp
+                    `(find-class-from-cell ',symbol ,cell t)
+                    `(when (classoid-cell-classoid ,cell)
+                       (find-class-from-cell ',symbol ,cell nil))))))
       form))
 
-(defun (setf find-class) (new-value symbol)
-  (if (legal-class-name-p symbol)
-      (let ((cell (find-class-cell symbol)))
-	(setf (find-class-cell-class cell) new-value)
-	(when (or (eq *boot-state* 'complete)
-		  (eq *boot-state* 'braid))
-	  (when (and new-value (class-wrapper new-value))
-	    (setf (find-class-cell-predicate cell)
-		  (name-get-fdefinition (class-predicate-name new-value))))
-	  (when (and new-value (not (forward-referenced-class-p new-value)))
-
-	    (dolist (keys+aok (find-class-cell-make-instance-function-keys cell))
-	      (update-initialize-info-internal
-	       (initialize-info new-value (car keys+aok) nil (cdr keys+aok))
-	       'make-instance-function))))
-	new-value)
-      (error "~S is not a legal class name." symbol)))
-
-(defun (setf find-class-predicate)
-       (new-value symbol)
-  (if (legal-class-name-p symbol)
-    (setf (find-class-cell-predicate (find-class-cell symbol)) new-value)
-    (error "~S is not a legal class name." symbol)))
-
-(defun find-wrapper (symbol)
-  (class-wrapper (find-class symbol)))
-
-(defmacro gathering1 (gatherer &body body)
-  `(gathering ((.gathering1. ,gatherer))
-     (macrolet ((gather1 (x) `(gather ,x .gathering1.)))
-       ,@body)))
-
-(defmacro vectorizing (&key (size 0))
-  `(let* ((limit ,size)
-	  (result (make-array limit))
-	  (index 0))
-     (values #'(lambda (value)
-		 (if (= index limit)
-		     (error "vectorizing more elements than promised")
-		     (progn
-		       (setf (svref result index) value)
-		       (incf index)
-		       value)))
-	     #'(lambda () result))))
-
-;;; These are augmented definitions of list-elements and list-tails from
-;;; iterate.lisp. These versions provide the extra :by keyword which can
-;;; be used to specify the step function through the list.
-(defmacro *list-elements (list &key (by #'cdr))
-  `(let ((tail ,list))
-     #'(lambda (finish)
-	 (if (endp tail)
-	     (funcall finish)
-	     (prog1 (car tail)
-		    (setq tail (funcall ,by tail)))))))
-
-(defmacro *list-tails (list &key (by #'cdr))
-   `(let ((tail ,list))
-      #'(lambda (finish)
-	  (prog1 (if (endp tail)
-		     (funcall finish)
-		     tail)
-		 (setq tail (funcall ,by tail))))))
+(declaim (inline class-classoid))
+(defun class-classoid (class)
+  (layout-classoid (class-wrapper class)))
+
+(defun (setf find-class) (new-value name &optional errorp environment)
+  (declare (ignore errorp environment))
+  (cond ((legal-class-name-p name)
+         (with-single-package-locked-error
+             (:symbol name "Using ~A as the class-name argument in ~
+                           (SETF FIND-CLASS)"))
+         (with-world-lock ()
+           (let ((cell (find-classoid-cell name :create new-value)))
+             (cond (new-value
+                    (setf (classoid-cell-pcl-class cell) new-value)
+                    (when (eq **boot-state** 'complete)
+                      (let ((classoid (class-classoid new-value)))
+                        (setf (find-classoid name) classoid)
+                        (%set-class-type-translation new-value classoid))))
+                   (cell
+                    (%clear-classoid name cell)))
+             (when (or (eq **boot-state** 'complete)
+                       (eq **boot-state** 'braid))
+               (update-ctors 'setf-find-class :class new-value :name name))
+             new-value)))
+        (t
+         (error "~S is not a legal class name." name))))
+
+(/show "pcl/macros.lisp 241")
 
 (defmacro function-funcall (form &rest args)
   `(funcall (the function ,form) ,@args))
 
 (defmacro function-apply (form &rest args)
   `(apply (the function ,form) ,@args))
-
 
-(defun get-setf-function-name (name)
+(/show "pcl/macros.lisp 249")
+
+(defun get-setf-fun-name (name)
   `(setf ,name))
 
 (defsetf slot-value set-slot-value)
+
+(/show "finished with pcl/macros.lisp")