X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/112ac1d33aa8f9b7f3d2f9542d15431f152b1d35..e7765a408ed091803f0b93ce9e105d9c3ce53a06:/glib/genums.lisp

diff --git a/glib/genums.lisp b/glib/genums.lisp
index c49baf8..64dbc0e 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.14 2005-04-24 13:24:41 espen Exp $
 
 (in-package "GLIB")
   
@@ -171,12 +171,12 @@
 	       (t (error 'type-error :datum ,flags 
 		   :expected-type '(,type ,@args)))))))
 
-(defmethod from-alien-form (int (type (eql 'flags)) &rest 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 +192,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))
@@ -236,9 +236,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))