;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-;; $Id: virtual-slots.lisp,v 1.4 2006-09-05 13:16:18 espen Exp $
+;; $Id: virtual-slots.lisp,v 1.11 2007-11-08 13:49:26 espen Exp $
(in-package "GFFI")
(unbound :reader slot-definition-unbound :initarg :unbound)
(boundp :reader slot-definition-boundp :initarg :boundp)
(makunbound :reader slot-definition-makunbound :initarg :makunbound)
- #+clisp(reader-function)
- #+clisp(writer-function)
- #+clisp(boundp-function)
+ reader-function
makunbound-function
+ boundp-function
+ writer-function
#+clisp(type :initarg :type :reader slot-definition-type)))
(defclass direct-special-slot-definition (standard-direct-slot-definition)
;; An explicit boundp function has been supplied
((slot-boundp slotd 'boundp)
- (let ((unbound-value (slot-value slotd 'boundp)))
+ (let ((boundp (slot-value slotd 'boundp)))
#'(lambda (object)
- (let ((value (funcall reader-function object)))
- (if (eq value unbound-value)
- (slot-unbound (class-of object) object (slot-definition-name slotd))
- value)))))
+ (if (not (funcall boundp object))
+ (slot-unbound (class-of object) object (slot-definition-name slotd))
+ (funcall reader-function object)))))
;; A type unbound value exists
((let ((unbound-method (find-applicable-type-method 'unbound-value
(defmethod compute-slot-reader-function ((slotd effective-virtual-slot-definition) &optional signal-unbound-p)
(declare (ignore signal-unbound-p))
- (slot-value slotd 'getter))
+ (let ((getter (slot-value slotd 'getter)))
+ #-sbcl getter
+ #+sbcl
+ (etypecase getter
+ (symbol #'(lambda (object) (funcall getter object)))
+ (function getter))))
(defmethod compute-slot-boundp-function ((slotd effective-virtual-slot-definition))
(cond
#'(lambda (object) (declare (ignore object)) nil))
;; An explicit boundp function has been supplied
- ((slot-boundp slotd 'boundp) (slot-value slotd 'boundp))
-
+ ((slot-boundp slotd 'boundp)
+ (let ((boundp (slot-value slotd 'boundp)))
+ #-sbcl boundp
+ #+sbcl
+ (etypecase boundp
+ (symbol #'(lambda (object) (funcall boundp object)))
+ (function boundp))))
+
;; An unbound value has been supplied
((slot-boundp slotd 'unbound)
(let ((reader-function (compute-slot-reader-function slotd nil))
(call-next-method)))
(defmethod compute-slot-writer-function ((slotd effective-virtual-slot-definition))
- (slot-value slotd 'setter))
+ (let ((setter (slot-value slotd 'setter)))
+ #-sbcl setter
+ #+sbcl
+ (etypecase setter
+ (symbol #'(lambda (value object) (funcall setter value object)))
+ (list #'(lambda (value object)
+ (funcall setter value object)))
+ (function setter))))
(define-condition slot-can-not-be-unbound (cell-error)
((instance :reader slot-can-not-be-unbound-instance :initarg :instance))
((not (slot-writable-p slotd))
#'(lambda (object)
(error 'unwritable-slot :name (slot-definition-name slotd) :instance object)))
- ((slot-boundp slotd 'makunbound) (slot-value slotd 'makunbound))
+ ((slot-boundp slotd 'makunbound)
+ (let ((makunbound (slot-value slotd 'makunbound)))
+ #-sbcl makunbound
+ #+sbcl
+ (etypecase makunbound
+ (symbol #'(lambda (object) (funcall makunbound object)))
+ (function makunbound))))
((slot-boundp slotd 'unbound)
#'(lambda (object)
(funcall (slot-value slotd 'writer-function) (slot-value slotd 'unbound) object)))
#-clisp
(defmethod initialize-internal-slot-functions ((slotd effective-virtual-slot-definition))
- #?-(sbcl>= 0 9 15) ; Delayed to avoid recursive call of finalize-inheritanze
- (setf
- (slot-value slotd 'reader-function) (compute-slot-reader-function slotd)
- (slot-value slotd 'boundp-function) (compute-slot-boundp-function slotd)
- (slot-value slotd 'writer-function) (compute-slot-writer-function slotd)
- (slot-value slotd 'makunbound-function) (compute-slot-makunbound-function slotd))
-
- #?-(sbcl>= 0 9 8)(initialize-internal-slot-gfs (slot-definition-name slotd)))
+ #?-(sbcl>= 0 9 8)
+ (initialize-internal-slot-gfs (slot-definition-name slotd)))
#-clisp
(append '(:special t) (call-next-method)))
(t (call-next-method))))
-#?(or (not (sbcl>= 0 9 14)) (featurep :clisp))
-(defmethod slot-value-using-class
- ((class virtual-slots-class) (object virtual-slots-object)
- (slotd effective-virtual-slot-definition))
- (funcall (slot-value slotd 'reader-function) object))
-
-#?(or (not (sbcl>= 0 9 14)) (featurep :clisp))
-(defmethod slot-boundp-using-class
- ((class virtual-slots-class) (object virtual-slots-object)
- (slotd effective-virtual-slot-definition))
- (funcall (slot-value slotd 'boundp-function) object))
-
-#?(or (not (sbcl>= 0 9 14)) (featurep :clisp))
-(defmethod (setf slot-value-using-class)
- (value (class virtual-slots-class) (object virtual-slots-object)
+(defmacro vsc-slot-x-using-class (x x-slot-name computer &key allow-string-fun-p)
+ (let ((generic-name (intern (concatenate 'string
+ "SLOT-" (string x) "-USING-CLASS"))))
+ `(defmethod ,generic-name
+ ((class virtual-slots-class) (object virtual-slots-object)
+ (slotd effective-virtual-slot-definition))
+ (unless (and (slot-boundp slotd ',x-slot-name)
+ ,@(when allow-string-fun-p
+ `((not (stringp (slot-value slotd ',x-slot-name))))))
+ (let ((computed (,computer slotd)))
+ (setf (slot-value slotd ',x-slot-name) computed)))
+ (funcall (slot-value slotd ',x-slot-name) object))))
+
+(vsc-slot-x-using-class value reader-function
+ compute-slot-reader-function :allow-string-fun-p t)
+(vsc-slot-x-using-class boundp boundp-function compute-slot-boundp-function)
+(vsc-slot-x-using-class makunbound makunbound-function
+ compute-slot-makunbound-function)
+
+(defmethod (setf slot-value-using-class)
+ (value
+ (class virtual-slots-class) (object virtual-slots-object)
(slotd effective-virtual-slot-definition))
+ (unless (slot-boundp slotd 'writer-function)
+ (setf (slot-value slotd 'writer-function)
+ (compute-slot-writer-function slotd)))
(funcall (slot-value slotd 'writer-function) value object))
-(defmethod slot-makunbound-using-class
- ((class virtual-slots-class) (object virtual-slots-object)
- (slotd effective-virtual-slot-definition))
- (funcall (slot-value slotd 'makunbound-function) object))
-
-
;; In CLISP and SBCL (0.9.15 or newler) a class may not have been
;; finalized when update-slots are called. So to avoid the possibility
;; of finalize-instance being called recursivly we have to delay the
;; initialization of slot functions until after an instance has been
;; created.
-#?(or (sbcl>= 0 9 15) (featurep :clisp))
+;; 2007-11-08: done this for all implementations
+;; #?(or (sbcl>= 0 9 15) (featurep :clisp))
(defmethod slot-unbound (class (slotd effective-virtual-slot-definition) (name (eql 'reader-function)))
+ (declare (ignore class))
(setf (slot-value slotd name) (compute-slot-reader-function slotd)))
-#?(or (sbcl>= 0 9 15) (featurep :clisp))
+;; #?(or (sbcl>= 0 9 15) (featurep :clisp))
(defmethod slot-unbound (class (slotd effective-virtual-slot-definition) (name (eql 'boundp-function)))
+ (declare (ignore class))
(setf (slot-value slotd name) (compute-slot-boundp-function slotd)))
-#?(or (sbcl>= 0 9 15) (featurep :clisp))
+;; #?(or (sbcl>= 0 9 15) (featurep :clisp))
(defmethod slot-unbound (class (slotd effective-virtual-slot-definition) (name (eql 'writer-function)))
+ (declare (ignore class))
(setf (slot-value slotd name) (compute-slot-writer-function slotd)))
-#?(or (sbcl>= 0 9 15) (featurep :clisp))
+;; #?(or (sbcl>= 0 9 15) (featurep :clisp))
(defmethod slot-unbound (class (slotd effective-virtual-slot-definition) (name (eql 'makunbound-function)))
+ (declare (ignore class))
(setf (slot-value slotd name) (compute-slot-makunbound-function slotd)))
~mdw / clg / blobdiff