X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Fbraid.lisp;h=0fc49bbb2ef1ae478894743e475efab2b52ee79a;hb=097211d0597e5185c678d5933fb1102b649e3a94;hp=e426863c16b05cff51827c61f258f5b5337fa9c5;hpb=4eb1a6d3ad2b7dcc19ac0ec979a1eb1eb049659a;p=sbcl.git diff --git a/src/pcl/braid.lisp b/src/pcl/braid.lisp index e426863..0fc49bb 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 (%make-standard-instance nil)) + (let ((instance (%make-standard-instance nil (get-instance-hash-code))) (no-of-slots (wrapper-no-of-instance-slots wrapper))) (setf (std-instance-wrapper instance) wrapper) (setf (std-instance-slots instance) @@ -63,10 +63,11 @@ (defun allocate-funcallable-instance (wrapper &optional (slots-init nil slots-init-p)) - (let ((fin (%make-pcl-funcallable-instance nil nil))) - (set-funcallable-instance-fun + (let ((fin (%make-pcl-funcallable-instance nil nil + (get-instance-hash-code)))) + (set-funcallable-instance-function fin - #'(sb-kernel:instance-lambda (&rest args) + #'(instance-lambda (&rest args) (declare (ignore args)) (error "The function of the funcallable-instance ~S has not been set." fin))) @@ -95,21 +96,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) @@ -146,9 +147,6 @@ (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)) (setf (find-class name) class))) (dolist (definition *early-class-definitions*) (let ((name (ecd-class-name definition)) @@ -246,7 +244,7 @@ smc name value))) - (set-slot 'source *load-truename*) + (set-slot 'source *load-pathname*) (set-slot 'type 'standard) (set-slot 'documentation "The standard method combination.") (set-slot 'options ())) @@ -257,7 +255,8 @@ (metaclass-name class name class-eq-wrapper source direct-supers direct-subclasses cpl wrapper &optional - proto direct-slots slots direct-default-initargs default-initargs) + (proto nil proto-p) + direct-slots slots direct-default-initargs default-initargs) (flet ((classes (names) (mapcar #'find-class names)) (set-slot (slot-name value) (!bootstrap-set-slot metaclass-name class slot-name value))) @@ -296,6 +295,22 @@ (set-slot 'direct-slots direct-slots) (set-slot 'slots slots) (set-slot 'initialize-info nil)) + + ;; For all direct superclasses SUPER of CLASS, make sure CLASS is + ;; a direct subclass of SUPER. Note that METACLASS-NAME doesn't + ;; matter here for the slot DIRECT-SUBCLASSES, since every class + ;; inherits the slot from class CLASS. + (dolist (super direct-supers) + (let* ((super (find-class super)) + (subclasses (!bootstrap-get-slot metaclass-name super + 'direct-subclasses))) + (cond ((eq +slot-unbound+ subclasses) + (!bootstrap-set-slot metaclass-name super 'direct-subclasses + (list class))) + ((not (memq class subclasses)) + (!bootstrap-set-slot metaclass-name super 'direct-subclasses + (cons class subclasses)))))) + (if (eq metaclass-name 'structure-class) (let ((constructor-sym '|STRUCTURE-OBJECT class constructor|)) (set-slot 'predicate-name (or (cadr (assoc name @@ -309,7 +324,8 @@ (set-slot 'from-defclass-p t) (set-slot 'plist nil) (set-slot 'prototype (funcall constructor-sym))) - (set-slot 'prototype (or proto (allocate-standard-instance wrapper)))) + (set-slot 'prototype + (if proto-p proto (allocate-standard-instance wrapper)))) class)) (defun !bootstrap-make-slot-definitions (name class slots wrapper effective-p) @@ -382,9 +398,9 @@ (!bootstrap-accessor-definitions1 'slot-object slot-name - (list (slot-reader-symbol slot-name)) - (list (slot-writer-symbol slot-name)) - (list (slot-boundp-symbol slot-name))))))))))) + (list (slot-reader-name slot-name)) + (list (slot-writer-name slot-name)) + (list (slot-boundp-name slot-name))))))))))) (defun !bootstrap-accessor-definition (class-name accessor-name slot-name type) (multiple-value-bind (accessor-class make-method-function arglist specls doc) @@ -479,11 +495,11 @@ (dolist (e *built-in-classes*) (destructuring-bind (name supers subs cpl prototype) e (let* ((class (find-class name)) - (lclass (cl:find-class name)) - (wrapper (sb-kernel:class-layout lclass))) + (lclass (find-classoid name)) + (wrapper (classoid-layout lclass))) (set (get-built-in-class-symbol name) class) (set (get-built-in-wrapper-symbol name) wrapper) - (setf (sb-kernel:class-pcl-class lclass) class) + (setf (classoid-pcl-class lclass) class) (!bootstrap-initialize-class 'built-in-class class name class-eq-wrapper nil @@ -498,7 +514,7 @@ (make-class-predicate class (class-predicate-name class)))))) (defmacro wrapper-of-macro (x) - `(sb-kernel:layout-of ,x)) + `(layout-of ,x)) (defun class-of (x) (wrapper-class* (wrapper-of-macro x))) @@ -508,10 +524,8 @@ (defun wrapper-of (x) (wrapper-of-macro x)) -(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) @@ -522,22 +536,28 @@ :initform ,(structure-slotd-init-form slotd) :initfunction ,(eval-form (structure-slotd-init-form slotd)))) -(defun find-structure-class (symbol) - (if (structure-type-p symbol) - (unless (eq *find-structure-class* symbol) - (let ((*find-structure-class* symbol)) - (ensure-class symbol - :metaclass 'structure-class - :name symbol - :direct-superclasses - (mapcar #'cl:class-name - (sb-kernel:class-direct-superclasses - (cl:find-class symbol))) - :direct-slots - (mapcar #'slot-initargs-from-structure-slotd - (structure-type-slot-description-list - symbol))))) - (error "~S is not a legal structure class name." symbol))) +(defun ensure-non-standard-class (name) + (flet + ((ensure (metaclass &optional (slots nil slotsp)) + (let ((supers + (mapcar #'classoid-name (classoid-direct-superclasses + (find-classoid name))))) + (if slotsp + (ensure-class-using-class nil name + :metaclass metaclass :name name + :direct-superclasses supers + :direct-slots slots) + (ensure-class-using-class nil name + :metaclass metaclass :name name + :direct-superclasses supers))))) + (cond ((structure-type-p name) + (ensure 'structure-class + (mapcar #'slot-initargs-from-structure-slotd + (structure-type-slot-description-list name)))) + ((condition-type-p name) + (ensure 'condition-class)) + (t + (error "~@<~S is not the name of a class.~@:>" name))))) (defun make-class-predicate (class name) (let* ((gf (ensure-generic-function name)) @@ -575,27 +595,38 @@ ;;; Set the inherits from CPL, and register the layout. This actually ;;; installs the class in the Lisp type system. (defun update-lisp-class-layout (class layout) - (let ((lclass (sb-kernel:layout-class layout))) - (unless (eq (sb-kernel:class-layout lclass) layout) - (setf (sb-kernel:layout-inherits layout) - (sb-kernel:order-layout-inherits + (let ((lclass (layout-classoid layout))) + (unless (eq (classoid-layout lclass) layout) + (setf (layout-inherits layout) + (order-layout-inherits (map 'simple-vector #'class-wrapper (reverse (rest (class-precedence-list class)))))) - (sb-kernel:register-layout layout :invalidate nil) + (register-layout layout :invalidate t) ;; Subclasses of formerly forward-referenced-class may be ;; unknown to CL:FIND-CLASS and also anonymous. This ;; functionality moved here from (SETF FIND-CLASS). (let ((name (class-name class))) - (setf (cl:find-class name) lclass - ;; FIXME: It's nasty to use double colons. Perhaps the - ;; best way to fix this is not to export CLASS-%NAME - ;; from SB-KERNEL, but instead to move the whole - ;; UPDATE-LISP-CLASS-LAYOUT function to SB-KERNEL, and - ;; export it. (since it's also nasty for us to be - ;; reaching into %KERNEL implementation details my - ;; messing with raw CLASS-%NAME) - (sb-kernel::class-%name lclass) name))))) + (setf (find-classoid name) lclass + (classoid-name lclass) name))))) + +(defun set-class-type-translation (class name) + (let ((classoid (find-classoid name nil))) + (etypecase classoid + (null) + (built-in-classoid + (let ((translation (built-in-classoid-translation classoid))) + (cond + (translation + (aver (ctype-p translation)) + (setf (info :type :translator class) + (lambda (spec) (declare (ignore spec)) translation))) + (t + (setf (info :type :translator class) + (lambda (spec) (declare (ignore spec)) classoid)))))) + (classoid + (setf (info :type :translator class) + (lambda (spec) (declare (ignore spec)) classoid)))))) (clrhash *find-class*) (!bootstrap-meta-braid) @@ -608,19 +639,21 @@ (dohash (name x *find-class*) (let* ((class (find-class-from-cell name x)) (layout (class-wrapper class)) - (lclass (sb-kernel:layout-class layout)) - (lclass-pcl-class (sb-kernel:class-pcl-class lclass)) - (olclass (cl:find-class name nil))) + (lclass (layout-classoid layout)) + (lclass-pcl-class (classoid-pcl-class lclass)) + (olclass (find-classoid name nil))) (if lclass-pcl-class (aver (eq class lclass-pcl-class)) - (setf (sb-kernel:class-pcl-class lclass) class)) + (setf (classoid-pcl-class lclass) class)) (update-lisp-class-layout class layout) (cond (olclass (aver (eq lclass olclass))) (t - (setf (cl:find-class name) lclass))))) + (setf (find-classoid name) lclass))) + + (set-class-type-translation class name))) (setq *boot-state* 'braid) @@ -629,3 +662,21 @@ ~I~_when called with arguments ~2I~_~S.~:>" generic-function args)) + +(defmethod no-next-method ((generic-function standard-generic-function) + (method standard-method) &rest args) + (error "~@" + generic-function + method + args)) + +;;; An extension to the ANSI standard: in the presence of e.g. a +;;; :BEFORE method, it would seem that going through +;;; NO-APPLICABLE-METHOD is prohibited, as in fact there is an +;;; applicable method. -- CSR, 2002-11-15 +(defmethod no-primary-method (generic-function &rest args) + (error "~@" + generic-function + args))