X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/c55abd7665ab649e2a27f64fbf60907dafbf6922..35f5ef6559d87986a2f59433a69007802eb9291a:/glib/proxy.lisp?ds=sidebyside diff --git a/glib/proxy.lisp b/glib/proxy.lisp index 0efe379..83a4a99 100644 --- a/glib/proxy.lisp +++ b/glib/proxy.lisp @@ -15,7 +15,7 @@ ;; License along with this library; if not, write to the Free Software ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -;; $Id: proxy.lisp,v 1.16 2004/12/19 23:33:57 espen Exp $ +;; $Id: proxy.lisp,v 1.19 2005/02/03 23:09:04 espen Exp $ (in-package "GLIB") @@ -35,7 +35,7 @@ ((setter :reader slot-definition-setter :initarg :setter) (getter :reader slot-definition-getter :initarg :getter) (unbound :reader slot-definition-unbound :initarg :unbound) - (boundp :reader slot-definition-boundp :initarg :boundp))) + (boundp :reader slot-definition-boundp :initarg :boundp)))) (defvar *unbound-marker* (gensym "UNBOUND-MARKER-")) @@ -47,7 +47,7 @@ instances))) (if object (slot-value object slot) - default)))) + default)));) @@ -84,23 +84,20 @@ (setf (slot-value slotd 'reader-function) #'(lambda (object) (unless reader - (setq reader - (mkbinding getter - (slot-definition-type slotd) 'pointer))) + (setq reader + (mkbinding getter + (slot-definition-type slotd) 'pointer))) (funcall reader (proxy-location object)))))))))) (setf (slot-value slotd 'boundp-function) (cond - ((and - (not (slot-boundp slotd 'unbound)) - (not (slot-boundp slotd 'boundp))) - #'(lambda (object) (declare (ignore object)) t)) ((slot-boundp slotd 'unbound) (let ((unbound-value (slot-value slotd 'unbound))) - (lambda (object) - (not (eq (funcall getter-function object) unbound-value))))) - ((let ((boundp (slot-value slotd 'boundp))) + #'(lambda (object) + (not (eq (funcall getter-function object) unbound-value))))) + ((slot-boundp slotd 'boundp) + (let ((boundp (slot-value slotd 'boundp))) (etypecase boundp (function boundp) (symbol #'(lambda (object) @@ -111,7 +108,13 @@ (setq reader (mkbinding boundp (slot-definition-type slotd) 'pointer))) - (funcall reader (proxy-location object)))))))))) + (funcall reader (proxy-location object)))))))) + ((multiple-value-bind (unbound-p unbound-value) + (unbound-value (slot-definition-type slotd)) + (when unbound-p + #'(lambda (object) + (not (eq (funcall getter-function object) unbound-value)))))) + (#'(lambda (object) (declare (ignore object)) t)))) (setf (slot-value slotd 'reader-function) @@ -119,17 +122,26 @@ ((slot-boundp slotd 'unbound) (let ((unbound (slot-value slotd 'unbound)) (slot-name (slot-definition-name slotd))) - (lambda (object) - (let ((value (funcall getter-function object))) - (if (eq value unbound) - (slot-unbound (class-of object) object slot-name) - value))))) + #'(lambda (object) + (let ((value (funcall getter-function object))) + (if (eq value unbound) + (slot-unbound (class-of object) object slot-name) + value))))) ((slot-boundp slotd 'boundp) (let ((boundp-function (slot-value slotd 'boundp-function))) - (lambda (object) - (and - (funcall boundp-function object) - (funcall getter-function object))))) + #'(lambda (object) + (and + (funcall boundp-function object) + (funcall getter-function object))))) + ((multiple-value-bind (unbound-p unbound-value) + (unbound-value (slot-definition-type slotd)) + (let ((slot-name (slot-definition-name slotd))) + (when unbound-p + #'(lambda (object) + (let ((value (funcall getter-function object))) + (if (eq value unbound-value) + (slot-unbound (class-of object) object slot-name) + value))))))) (getter-function))))) (setf @@ -211,26 +223,26 @@ (defun cache-instance (instance) (setf - (gethash (system:sap-int (proxy-location instance)) *instance-cache*) - (ext:make-weak-pointer instance))) + (gethash (sap-int (proxy-location instance)) *instance-cache*) + (make-weak-pointer instance))) (defun find-cached-instance (location) - (let ((ref (gethash (system:sap-int location) *instance-cache*))) + (let ((ref (gethash (sap-int location) *instance-cache*))) (when ref - (ext:weak-pointer-value ref)))) + (weak-pointer-value ref)))) (defun instance-cached-p (location) - (gethash (system:sap-int location) *instance-cache*)) + (gethash (sap-int location) *instance-cache*)) (defun remove-cached-instance (location) - (remhash (system:sap-int location) *instance-cache*)) + (remhash (sap-int location) *instance-cache*)) ;; For debuging (defun cached-instances () (let ((instances ())) (maphash #'(lambda (location ref) (declare (ignore location)) - (push (ext:weak-pointer-value ref) instances)) + (push (weak-pointer-value ref) instances)) *instance-cache*) instances)) @@ -271,7 +283,7 @@ (setf (slot-value instance 'location) location) (call-next-method)) (cache-instance instance) - (ext:finalize instance (instance-finalizer instance)) + (finalize instance (instance-finalizer instance)) instance) (defmethod instance-finalizer ((instance proxy)) @@ -286,6 +298,10 @@ ;;;; Metaclass used for subclasses of proxy +(defgeneric most-specific-proxy-superclass (class)) +(defgeneric direct-proxy-superclass (class)) + + (eval-when (:compile-toplevel :load-toplevel :execute) (defclass proxy-class (virtual-slots-class) ((size :reader proxy-instance-size))) @@ -297,13 +313,12 @@ (defclass effective-alien-slot-definition (effective-virtual-slot-definition) ((offset :reader slot-definition-offset :initarg :offset))) - (defmethod most-specific-proxy-superclass ((class proxy-class)) (find-if #'(lambda (class) (subtypep (class-name class) 'proxy)) (cdr (compute-class-precedence-list class)))) - + (defmethod direct-proxy-superclass ((class proxy-class)) (find-if #'(lambda (class) @@ -390,6 +405,9 @@ (defmethod proxy-instance-size (class) (declare (ignore class)) 0) + + (defmethod proxy-instance-size ((class-name symbol)) + (proxy-instance-size (find-class class-name))) ) (defmethod alien-type ((class proxy-class) &rest args) @@ -433,7 +451,7 @@ `(reference-foreign ',(class-name class) (proxy-location ,instance))) (defmethod copy-to-alien-function ((class proxy-class) &rest args) - (declare (ignore class args)) + (declare (ignore args)) #'(lambda (instance) (reference-foreign class (proxy-location instance)))) @@ -457,6 +475,9 @@ #'(lambda (location &optional (offset 0)) (unreference-foreign class (sap-ref-sap location offset)))) +(defmethod unbound-value ((class proxy-class) &rest args) + (declare (ignore args)) + (values t nil)) (defgeneric ensure-proxy-instance (class location) (:documentation "Returns a proxy object representing the foreign object at the give location.")) @@ -486,7 +507,7 @@ (let ((size (proxy-instance-size (class-of struct)))) (if (zerop size) (error "~A has zero size" (class-of struct)) - (setf (slot-value struct 'location) (allocate-memory size))))) + (setf (slot-value struct 'location) (allocate-memory size))))) (call-next-method))