X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Fdefclass.lisp;h=f4d934a0d147cc209efede2ca48981883be74fa6;hb=aa2dc9529460ea0d9c99998dc87283fc1a43e808;hp=c2ee95e39609eb1fbc9b9534d658b18edd429961;hpb=99ad0a384664dc98af26245a33f11619ec0854ad;p=sbcl.git diff --git a/src/pcl/defclass.lisp b/src/pcl/defclass.lisp index c2ee95e..f4d934a 100644 --- a/src/pcl/defclass.lisp +++ b/src/pcl/defclass.lisp @@ -23,38 +23,6 @@ (in-package "SB-PCL") -;;; MAKE-TOP-LEVEL-FORM is used by all PCL macros that appear `at top-level'. -;;; -;;; The original motiviation for this function was to deal with the -;;; bug in the Genera compiler that prevents lambda expressions in -;;; top-level forms other than DEFUN from being compiled. -;;; -;;; Now this function is used to grab other functionality as well. This -;;; includes: -;;; - Preventing the grouping of top-level forms. For example, a -;;; DEFCLASS followed by a DEFMETHOD may not want to be grouped -;;; into the same top-level form. -;;; - Telling the programming environment what the pretty version -;;; of the name of this form is. This is used by WARN. -;;; -;;; FIXME: It's not clear that this adds value any more. Couldn't -;;; we just use EVAL-WHEN? -(defun make-top-level-form (name times form) - (flet ((definition-name () - (if (and (listp name) - (memq (car name) - '(defmethod defclass class - method method-combination))) - (format nil "~A~{ ~S~}" - (capitalize-words (car name) ()) (cdr name)) - (format nil "~S" name)))) - ;; FIXME: It appears that we're just consing up a string and then - ;; throwing it away?! - (definition-name) - (if (or (member 'compile times) - (member ':compile-toplevel times)) - `(eval-when ,times ,form) - form))) (defun make-progn (&rest forms) (let ((progn-form nil)) @@ -84,7 +52,7 @@ ;; FIXME: We should probably just ensure that the relevant ;; DEFVAR/DEFPARAMETERs occur before this definition, rather ;; than locally declaring them SPECIAL. - (declare (special *defclass-times* *boot-state* *the-class-structure-class*)) + (declare (special *boot-state* *the-class-structure-class*)) (setq supers (copy-tree supers) slots (copy-tree slots) options (copy-tree options)) @@ -106,10 +74,9 @@ (return t)))) (let ((*initfunctions* ()) - (*accessors* ()) ;Truly a crock, but we got - (*readers* ()) ;to have it to live nicely. - (*writers* ())) - (declare (special *initfunctions* *accessors* *readers* *writers*)) + (*readers* ()) ;Truly a crock, but we got + (*writers* ())) ;to have it to live nicely. + (declare (special *initfunctions* *readers* *writers*)) (let ((canonical-slots (mapcar #'(lambda (spec) (canonicalize-slot-specification name spec)) @@ -121,31 +88,37 @@ (defstruct-p (and (eq *boot-state* 'complete) (let ((mclass (find-class metaclass nil))) (and mclass - (*subtypep mclass - *the-class-structure-class*)))))) - (do-standard-defsetfs-for-defclass *accessors*) + (*subtypep + mclass + *the-class-structure-class*)))))) (let ((defclass-form - (make-top-level-form `(defclass ,name) - (if defstruct-p '(:load-toplevel :execute) *defclass-times*) - `(progn - ,@(mapcar #'(lambda (x) - `(declaim (ftype (function (t) t) ,x))) - *readers*) - ,@(mapcar #'(lambda (x) - #-setf (when (consp x) - (setq x (get-setf-function-name (cadr x)))) - `(declaim (ftype (function (t t) t) ,x))) - *writers*) - (let ,(mapcar #'cdr *initfunctions*) - (load-defclass ',name - ',metaclass - ',supers - (list ,@canonical-slots) - (list ,@(apply #'append - (when defstruct-p - '(:from-defclass-p t)) - other-initargs)) - ',*accessors*)))))) + `(progn + ,@(mapcar (lambda (x) + `(declaim (ftype (function (t) t) ,x))) + *readers*) + ,@(mapcar (lambda (x) + `(declaim (ftype (function (t t) t) ,x))) + *writers*) + (let ,(mapcar #'cdr *initfunctions*) + (load-defclass ',name + ',metaclass + ',supers + (list ,@canonical-slots) + (list ,@(apply #'append + (when defstruct-p + '(:from-defclass-p t)) + other-initargs))))))) + ;; FIXME: The way that we do things like (EVAL DEFCLASS-FORM) + ;; here is un-ANSI-Common-Lisp-y and leads to problems + ;; (like DEFUN for the type predicate being called more than + ;; once when we do DEFCLASS at the interpreter prompt), + ;; causing bogus style warnings. It would be better to + ;; rewrite this so that the macroexpansion looks like e.g. + ;; (PROGN + ;; (EVAL-WHEN (:COMPILE-TOPLEVEL :LOAD-TOPLEVEL :EXECUTE) + ;; (FROB1 ..)) + ;; (EVAL-WHEN (:LOAD-TOPLEVEL :EXECUTE) + ;; (FROB2 ..))) (if defstruct-p (progn (eval defclass-form) ; Define the class now, so that.. @@ -153,22 +126,21 @@ ,(class-defstruct-form (find-class name)) ,defclass-form)) (progn - (when (and (eq *boot-state* 'complete) - (not (member 'compile *defclass-times*))) + (when (eq *boot-state* 'complete) (inform-type-system-about-std-class name)) defclass-form))))))) (defun make-initfunction (initform) (declare (special *initfunctions*)) - (cond ((or (eq initform 't) + (cond ((or (eq initform t) (equal initform ''t)) - '(function true)) - ((or (eq initform 'nil) + '(function constantly-t)) + ((or (eq initform nil) (equal initform ''nil)) - '(function false)) - ((or (eql initform '0) + '(function constantly-nil)) + ((or (eql initform 0) (equal initform ''0)) - '(function zero)) + '(function constantly-0)) (t (let ((entry (assoc initform *initfunctions* :test #'equal))) (unless entry @@ -179,7 +151,7 @@ (cadr entry))))) (defun canonicalize-slot-specification (class-name spec) - (declare (special *accessors* *readers* *writers*)) + (declare (special *readers* *writers*)) (cond ((and (symbolp spec) (not (keywordp spec)) (not (memq spec '(t nil)))) @@ -201,8 +173,7 @@ (initform (getf spec :initform unsupplied))) (doplist (key val) spec (case key - (:accessor (push val *accessors*) - (push val readers) + (:accessor (push val readers) (push `(setf ,val) writers)) (:reader (push val readers)) (:writer (push val writers)) @@ -321,8 +292,8 @@ (loop (when (null others) (return nil)) (let ((initarg (pop others))) (unless (eq initarg :direct-default-initargs) - (error "The defclass option ~S is not supported by the bootstrap~%~ - object system." + (error "~@" initarg))) (setq default-initargs (nconc default-initargs (reverse (pop others))))))) @@ -348,7 +319,8 @@ ;;; standard slots must be computed the same way in this file as it is ;;; by the full object system later. (defmacro !bootstrap-get-slot (type object slot-name) - `(instance-ref (get-slots ,object) (!bootstrap-slot-index ,type ,slot-name))) + `(clos-slots-ref (get-slots ,object) + (!bootstrap-slot-index ,type ,slot-name))) (defun !bootstrap-set-slot (type object slot-name new-value) (setf (!bootstrap-get-slot type object slot-name) new-value)) @@ -376,18 +348,16 @@ (unless (fboundp 'class-name-of) (setf (symbol-function 'class-name-of) (symbol-function 'early-class-name-of))) -;;; FIXME: Can we then delete EARLY-CLASS-NAME-OF? +(unintern 'early-class-name-of) (defun early-class-direct-subclasses (class) (!bootstrap-get-slot 'class class 'direct-subclasses)) (declaim (notinline load-defclass)) -(defun load-defclass - (name metaclass supers canonical-slots canonical-options accessor-names) +(defun load-defclass (name metaclass supers canonical-slots canonical-options) (setq supers (copy-tree supers) canonical-slots (copy-tree canonical-slots) canonical-options (copy-tree canonical-options)) - (do-standard-defsetfs-for-defclass accessor-names) (when (eq metaclass 'standard-class) (inform-type-system-about-std-class name)) (let ((ecd