X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/112ac1d33aa8f9b7f3d2f9542d15431f152b1d35..b238749d7115db31b5fd93210853aa0a7180937b:/glib/genums.lisp?ds=sidebyside

diff --git a/glib/genums.lisp b/glib/genums.lisp
index c49baf8..a3c4d90 100644
--- a/glib/genums.lisp
+++ b/glib/genums.lisp
@@ -20,7 +20,7 @@
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-;; $Id: genums.lisp,v 1.13 2005-04-23 16:48:50 espen Exp $
+;; $Id: genums.lisp,v 1.18 2006-02-19 22:25:31 espen Exp $
 
 (in-package "GLIB")
   
@@ -57,6 +57,9 @@
     (t (error 'type-error :datum ,form :expected-type '(enum ,@args)))))
 
 
+(defmethod callback-from-alien-form (form (type (eql 'enum)) &rest args)
+  (apply #'from-alien-form form type args))
+
 (defmethod from-alien-form (form (type (eql 'enum)) &rest args)
   (declare (ignore type))
   `(case ,form
@@ -87,7 +90,8 @@
   (declare (ignore type))
   (let ((reader (reader-function 'signed))
 	(function (apply #'from-alien-function 'enum args)))
-    #'(lambda (location &optional (offset 0))
+    #'(lambda (location &optional (offset 0) weak-p)
+	(declare (ignore weak-p))
 	(funcall function (funcall reader location offset)))))
 
 (defun enum-int (enum type)
@@ -134,7 +138,8 @@
        (defmethod reader-function ((type (eql ',name)) &rest args)
 	 (declare (ignore type args))
 	 (let ((reader (reader-function 'signed)))
-	   #'(lambda (location &optional (offset 0))
+	   #'(lambda (location &optional (offset 0) weak-p)
+	       (declare (ignore weak-p))
 	       (,int-enum (funcall reader location offset))))))))
 
 
@@ -171,12 +176,15 @@
 	       (t (error 'type-error :datum ,flags 
 		   :expected-type '(,type ,@args)))))))
 
-(defmethod from-alien-form (int (type (eql 'flags)) &rest args)
+(defmethod callback-from-alien-form (form (type (eql 'flags)) &rest args)
+  (apply #'from-alien-form form type args))
+
+(defmethod from-alien-form (value (type (eql 'flags)) &rest args)
   (declare (ignore type))
   `(loop
-    for mapping in ',(%map-flags args :int-symbol)
-    unless (zerop (logand ,int (first mapping)))
-    collect (second mapping)))
+    for (int symbol)  in ',(%map-flags args :int-symbol)
+    when (= (logand ,value int) int)
+    collect symbol))
 
 (defmethod to-alien-function ((type (eql 'flags)) &rest args)
   (declare (ignore type))
@@ -192,11 +200,11 @@
 (defmethod from-alien-function ((type (eql 'flags)) &rest args)
   (declare (ignore type))
   (let ((mappings (%map-flags args :int-symbol)))
-    #'(lambda (int)
+    #'(lambda (value)
 	(loop
-	 for mapping in mappings
-	 unless (zerop (logand int (first mapping)))
-	 collect (second mapping)))))
+	 for (int symbol) in mappings
+	 when (= (logand value int) int)
+	 collect symbol))))
 
 (defmethod writer-function ((type (eql 'flags)) &rest args)
   (declare (ignore type))
@@ -209,7 +217,8 @@
   (declare (ignore type))
   (let ((reader (reader-function 'unsigned))
 	(function (apply #'from-alien-function 'flags args)))
-    #'(lambda (location &optional (offset 0))
+    #'(lambda (location &optional (offset 0) weak-p)
+	(declare (ignore weak-p))
 	(funcall function (funcall reader location offset)))))
 
 
@@ -236,9 +245,9 @@
 		         :expected-type ',name))))))
        (defun ,int-flags (value)
 	 (loop
-	  for mapping in ',(%map-flags args :int-symbol)
-	  unless (zerop (logand value (first mapping)))
-	  collect (second mapping)))
+	  for (int symbol) in ',(%map-flags args :int-symbol)
+	  when(= (logand value int) int)
+	  collect symbol))
        (defmethod alien-type ((type (eql ',name)) &rest args)
 	 (declare (ignore type args))
 	 (alien-type 'flags))
@@ -265,7 +274,8 @@
        (defmethod reader-function ((type (eql ',name)) &rest args)
 	 (declare (ignore type args))
 	 (let ((reader (reader-function 'signed)))
-	   #'(lambda (location &optional (offset 0))
+	   #'(lambda (location &optional (offset 0) weak-p)
+	       (declare (ignore weak-p))
 	       (,int-flags (funcall reader location offset))))))))
 
 
@@ -276,8 +286,8 @@
   (multiple-value-bind (sap length)
       (funcall query-function (type-class-ref type))
     (let ((values nil)
-	  (size (proxy-instance-size (find-class class)))
-	  (proxy (make-instance class :location sap)))
+	  (size (foreign-size (find-class class)))
+	  (proxy (ensure-proxy-instance class sap)))
       (dotimes (i length)
 	(with-slots (location nickname value) proxy
 	  (setf location sap)