;; 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.8 2007-06-01 06:46:06 espen Exp $
+;; $Id: virtual-slots.lisp,v 1.11 2007-11-08 13:49:26 espen Exp $
(in-package "GFFI")
#+clisp(writer-function)
#+clisp(boundp-function)
makunbound-function
+ boundp-function
#+clisp(type :initarg :type :reader slot-definition-type)))
(defclass direct-special-slot-definition (standard-direct-slot-definition)
#-sbcl setter
#+sbcl
(etypecase setter
- (symbol #'(lambda (object value) (funcall setter object value)))
- (list #'(lambda (object value)
+ (symbol #'(lambda (value object) (funcall setter value object)))
+ (list #'(lambda (value object)
(funcall setter value object)))
(function setter))))
#-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)
- (slotd effective-virtual-slot-definition))
- (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))
-
+(defmacro vsc-slot-x-using-class (x x-slot-name computer
+ &key allow-string-fun-p setf-p)
+ (let ((generic-name (intern (concatenate 'string
+ "SLOT-" (string x) "-USING-CLASS"))))
+ `(defmethod ,(if setf-p `(setf ,generic-name) generic-name)
+ (,@(when setf-p '(value))
+ (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))))))
+ (setf (slot-value slotd ',x-slot-name) (,computer slotd)))
+ (funcall (slot-value slotd ',x-slot-name)
+ ,@(when setf-p '(value))
+ object))))
+
+(vsc-slot-x-using-class value getter compute-slot-reader-function
+ :allow-string-fun-p t)
+(vsc-slot-x-using-class value setter compute-slot-writer-function
+ :allow-string-fun-p t :setf-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)
;; 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)))