;; 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")
(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))
(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))
: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))
;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-;; $Id: glib.lisp,v 1.30 2005-04-23 16:48:50 espen Exp $
+;; $Id: glib.lisp,v 1.31 2005-04-24 13:27:20 espen Exp $
(in-package "GLIB")
(destructuring-bind (element-type &optional (length '*)) args
(if (eq length '*)
(error "Can't use vector of variable size as return type")
- `(map-c-vector 'vector #'identity ,c-vector ',element-type ',length))))
+ `(map-c-vector 'vector #'identity ,c-vector ',element-type ,length))))
(defmethod copy-from-alien-function ((type (eql 'vector)) &rest args)
(declare (ignore type))