X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/33939600f4eeda6c3e54f575a633f1247cf4cbce..5c9cc66aa5fa72f1edce094b9c3fe476705de040:/glib/genums.lisp diff --git a/glib/genums.lisp b/glib/genums.lisp index 1ed19c2..64dbc0e 100644 --- a/glib/genums.lisp +++ b/glib/genums.lisp @@ -1,21 +1,26 @@ -;; Common Lisp bindings for GTK+ v2.0 -;; Copyright (C) 2000-2001 Espen S. Johnsen +;; Common Lisp bindings for GTK+ v2.x +;; Copyright 2000-2005 Espen S. Johnsen ;; -;; This library is free software; you can redistribute it and/or -;; modify it under the terms of the GNU Lesser General Public -;; License as published by the Free Software Foundation; either -;; version 2 of the License, or (at your option) any later version. +;; Permission is hereby granted, free of charge, to any person obtaining +;; a copy of this software and associated documentation files (the +;; "Software"), to deal in the Software without restriction, including +;; without limitation the rights to use, copy, modify, merge, publish, +;; distribute, sublicense, and/or sell copies of the Software, and to +;; permit persons to whom the Software is furnished to do so, subject to +;; the following conditions: ;; -;; This library is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -;; Lesser General Public License for more details. +;; The above copyright notice and this permission notice shall be +;; included in all copies or substantial portions of the Software. ;; -;; You should have received a copy of the GNU Lesser General Public -;; License along with this library; if not, write to the Free Software -;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +;; EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +;; MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +;; IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +;; CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +;; 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.9 2005-02-11 19:09:38 espen Exp $ +;; $Id: genums.lisp,v 1.14 2005-04-24 13:24:41 espen Exp $ (in-package "GLIB") @@ -23,14 +28,15 @@ (defun %map-enum (mappings op) (loop - as value = 1 then (1+ value) + as value = 0 then (1+ value) for mapping in mappings collect (let ((symbol (if (atom mapping) mapping (first mapping)))) (unless (atom mapping) (setq value (second mapping))) (ecase op - (:symbol-int (list symbol value)) - (:int-symbol (list value symbol)) + (:symbol-int `(,symbol ,value)) + (:int-symbol `(,value ,symbol)) + (:int-quoted-symbol `(,value ',symbol)) (:symbols symbol))))) (deftype enum (&rest args) @@ -53,8 +59,8 @@ (defmethod from-alien-form (form (type (eql 'enum)) &rest args) (declare (ignore type)) - `(ecase ,form - ,@(%map-enum args :int-symbol))) + `(case ,form + ,@(%map-enum args :int-quoted-symbol))) (defmethod to-alien-function ((type (eql 'enum)) &rest args) (declare (ignore type)) @@ -106,8 +112,8 @@ ,@(%map-enum args :symbol-int) (t (error 'type-error :datum enum :expected-type ',name)))) (defun ,int-enum (value) - (ecase value - ,@(%map-enum args :int-symbol))) + (case value + ,@(%map-enum args :int-quoted-symbol))) (defmethod to-alien-form (form (type (eql ',name)) &rest args) (declare (ignore type args)) (list ',enum-int form)) @@ -142,8 +148,8 @@ (unless (atom mapping) (setq value (second mapping))) (ecase op - (:symbol-int (list symbol value)) - (:int-symbol (list value symbol)) + (:symbol-int `(,symbol ,value)) + (:int-symbol `(,value ,symbol)) (:symbols symbol))))) (deftype flags (&rest args) @@ -165,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)) @@ -186,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)) @@ -230,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)) @@ -330,7 +336,7 @@ (remove-if #'(lambda (mapping) (eq (second mapping) nil)) mappings)))) `(progn - (register-type ',type ,(find-type-name type-number)) + (register-type ',type ',(find-type-init-function type-number)) ,(ecase super (enum `(define-enum-type ,type ,@expanded-mappings)) (flags `(define-flags-type ,type ,@expanded-mappings))))))