X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/94f15c3c3cc7b65dd194b6c10bad3b19a3e31f53..1dd3a887249788743258e78dd887c348689083db:/glib/genums.lisp

diff --git a/glib/genums.lisp b/glib/genums.lisp
index d2cbe4a..44278b3 100644
--- a/glib/genums.lisp
+++ b/glib/genums.lisp
@@ -15,176 +15,226 @@
 ;; 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: genums.lisp,v 1.1 2001-04-29 20:19:25 espen Exp $
+;; $Id: genums.lisp,v 1.7 2005-02-03 22:59:35 espen Exp $
 
 (in-package "GLIB")
 
 
-(defun %map-mappings (args op)
+(defun %map-enum (args op)
   (let ((current-value 0))
-    (map
-     'list 
+    (mapcar
      #'(lambda (mapping)
 	 (destructuring-bind (symbol &optional (value current-value))
 	     (mklist mapping)
 	   (setf current-value (1+ value))
 	   (case op
 	     (:enum-int (list symbol value))
-	     (:flags-int (list symbol value #|(ash 1 value)|#))
+	     (:flags-int (list symbol value))
 	     (:int-enum (list value symbol))
-	     (:int-flags (list value #|(ash 1 value)|# symbol))
+	     (:int-flags (list value symbol))
 	     (:symbols symbol))))
-     (if (integerp (first args))
-	 (rest args)
-       args))))
-
-
-;;;; Enum type
+     args)))
+
+(defun %query-enum-or-flags-values (query-function class type)
+  (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)))
+      (dotimes (i length)
+	(with-slots (location nickname value) proxy
+	  (setf location sap)
+	  (setq sap (sap+ sap size))
+	  (push
+	   (list
+	    (intern (substitute #\- #\_ (string-upcase nickname)) "KEYWORD")
+	    value)
+	   values)))
+      values)))
+   
+  
+;;;; Generic enum type
 
 (deftype enum (&rest args)
-  `(member ,@(%map-mappings args :symbols)))
-
-(deftype-method translate-type-spec enum (type-spec)
-  (let ((args (cdr (type-expand-to 'enum type-spec))))
-    (if (integerp (first args))
-	(translate-type-spec `(signed ,(first args)))
-      (translate-type-spec 'signed))))
-
-(deftype-method size-of enum (type-spec)
-  (let ((args (cdr (type-expand-to 'enum type-spec))))
-    (if (integerp (first args))
-	(size-of `(signed ,(first args)))
-      (size-of 'signed))))
-
-(deftype-method translate-to-alien enum (type-spec expr &optional weak-ref)
-  (declare (ignore weak-ref))
-  (let ((args (cdr (type-expand-to 'enum type-spec))))
-    `(ecase ,expr
-       ,@(%map-mappings args :enum-int))))
-
-(deftype-method translate-from-alien enum (type-spec expr &optional weak-ref)
-  (declare (ignore weak-ref))
-  (destructuring-bind (name &rest args) (type-expand-to 'enum type-spec)
-    (declare (ignore name))
-    `(ecase ,expr
-       ,@(%map-mappings args :int-enum))))
-
-(setf (alien-type-name 'enum) "GEnum")
-
-(eval-when (:compile-toplevel :load-toplevel :execute)
-  (defclass %enum-value (alien-structure)
-    ((value :allocation :alien :type int)
-     (name :allocation :alien :type string)
-     (nickname :allocation :alien :type string))
-    (:metaclass proxy-class)))
-
-(defbinding %enum-class-values () (glist %enum-value)
-  (class pointer))
-
-(defun %query-enum-values (type-number)
-  (mapcar
-   #'(lambda (enum-value)
-       (list
-	(intern
-	 (substitute
-	  #\- #\_ (string-upcase (slot-value enum-value 'nickname))) "KEYWORD")
-	(slot-value enum-value 'value)))
-   (%enum-class-values (type-class-peek type-number))))
-
-(defun define-enum-by-query (init-fname &optional name)
-  (let ((type-number (type-init name init-fname)))
-    (unless (= (type-parent type-number) (find-type-number 'enum))
-      (error "~A is not an enum type" (alien-type-name type-number)))
+  `(member ,@(%map-enum args :symbols)))
+
+(defmethod alien-type ((type (eql 'enum)) &rest args)
+  (declare (ignore type args))
+  (alien-type 'signed))
+
+(defmethod size-of ((type (eql 'enum)) &rest args)
+  (declare (ignore type args))
+  (size-of 'signed))
+
+(defmethod to-alien-form (form (type (eql 'enum)) &rest args)
+  (declare (ignore type))
+  `(ecase ,form
+    ,@(%map-enum args :enum-int)))
+
+(defmethod from-alien-form (form (type (eql 'enum)) &rest args)
+  (declare (ignore type))
+  `(ecase ,form
+    ,@(%map-enum args :int-enum)))
+
+(defmethod to-alien-function ((type (eql 'enum)) &rest args)
+  (let ((mappings (%map-enum args :enum-int)))
+    #'(lambda (enum)
+	(or
+	 (second (assoc enum mappings))
+	 (error "~S is not of type ~S" enum (cons type args))))))
+
+(defmethod from-alien-function ((type (eql 'enum)) &rest args)
+  (declare (ignore type))
+  (let ((mappings (%map-enum args :int-enum)))
+    #'(lambda (int)
+	(second (assoc int mappings)))))
+
+(defmethod writer-function ((type (eql 'enum)) &rest args)
+  (declare (ignore type))
+  (let ((writer (writer-function 'signed))
+	(function (apply #'to-alien-function 'enum args)))
+    #'(lambda (enum location &optional (offset 0))
+	(funcall writer (funcall function enum) location offset))))
     
-    (type-class-ref type-number)
-    (setf (find-type-number name) type-number)
-    (let ((expanded (cons 'enum (%query-enum-values type-number)))
-      	  (name (or name (default-type-name (alien-type-name type-number)))))
-      (lisp::%deftype
-       name
-       #'(lambda (whole)
-	   (unless (zerop (length (cdr whole)))
-	     (lisp::do-arg-count-error 'deftype name (cdr whole) nil 0 0))
-	   expanded)))))
+(defmethod reader-function ((type (eql 'enum)) &rest args)
+  (declare (ignore type))
+  (let ((reader (reader-function 'signed))
+	(function (apply #'from-alien-function 'enum args)))
+    #'(lambda (location &optional (offset 0))
+	(funcall function (funcall reader location offset)))))
+
+
+
+(defclass %enum-value (struct)
+  ((value :allocation :alien :type int)
+   (name :allocation :alien :type string)
+   (nickname :allocation :alien :type string))
+  (:metaclass static-struct-class))
+
+(defbinding %enum-class-values () pointer
+  (class pointer)
+  (n-values unsigned-int :out))
 
+(defun query-enum-values (type)
+  (%query-enum-or-flags-values #'%enum-class-values '%enum-value type))
 
-;;;;  Flags type
+(defun enum-int (enum type)
+  (funcall (to-alien-function type) enum))
+
+(defun int-enum (int type)
+  (funcall (from-alien-function type) int))
+
+(defun enum-mapping (type)
+  (rest (type-expand-to 'enum type)))
+
+;;;;  Generic flags type
 
 (deftype flags (&rest args)
-  `(or
-    null
-    (cons
-     (member ,@(%map-mappings args :symbols))
-     list)))
-
-(deftype-method translate-type-spec flags (type-spec)
-  (let ((args (cdr (type-expand-to 'flags type-spec))))
-    (if (integerp (first args))
-	(translate-type-spec `(unsigned ,(first args)))
-      (translate-type-spec 'unsigned))))
-
-(deftype-method size-of flags (type-spec)
-  (let ((args (cdr (type-expand-to 'flags type-spec))))
-    (if (integerp (first args))
-	(size-of `(unsigned ,(first args)))
-      (size-of 'unsigned))))
-
-(deftype-method translate-to-alien flags (type-spec expr &optional weak-ref)
-  (declare (ignore weak-ref))
-  (destructuring-bind (name &rest args) (type-expand-to 'flags type-spec)
-    (declare (ignore name))
-    (let ((mappings (%map-mappings args :flags-int))
-	  (value (make-symbol "VALUE")))
-      `(let ((,value 0))
-	 (dolist (flag ,expr ,value)
-	   (setq ,value (logior ,value (second (assoc flag ',mappings)))))))))
-
-(deftype-method translate-from-alien flags (type-spec expr &optional weak-ref)
-  (declare (ignore weak-ref))
-  (destructuring-bind (name &rest args) (type-expand-to 'flags type-spec)
-    (declare (ignore name))
-    (let ((mappings (%map-mappings args :int-flags))
-	  (result (make-symbol "RESULT")))
-      `(let ((,result nil))
-	 (dolist (mapping ',mappings ,result)
-	   (unless (zerop (logand ,expr (first mapping)))
-	     (push (second mapping) ,result)))))))
-
-(setf (alien-type-name 'flags) "GFlags")
-
-
-(eval-when (:compile-toplevel :load-toplevel :execute)
-  (defclass %flags-value (alien-structure)
-    ((value :allocation :alien :type unsigned-int)
-     (name :allocation :alien :type string)
-     (nickname :allocation :alien :type string))
-    (:metaclass proxy-class)))
-
-(defbinding %flags-class-values () (glist %flags-value)
-  (class pointer))
-
-(defun %query-flags-values (type-number)
-  (mapcar
-   #'(lambda (flags-value)
-       (list
-	(intern
-	 (substitute
-	  #\- #\_ (string-upcase (slot-value flags-value 'nickname))) "KEYWORD")
-	(slot-value flags-value 'value)))
-   (%flags-class-values (type-class-peek type-number))))
-
-(defun define-flags-by-query (init-fname &optional name)
-  (let ((type-number (type-init nil init-fname)))
-    (unless (= (type-parent type-number) (find-type-number 'flags))
-      (error "~A is not a flags type" (alien-type-name type-number)))
+  `(or null (cons (member ,@(%map-enum args :symbols)) list)))
+
+(defmethod alien-type ((type (eql 'flags)) &rest args)
+  (declare (ignore type args))
+  (alien-type 'unsigned))
+
+(defmethod size-of ((type (eql 'flags)) &rest args)
+  (declare (ignore type args))
+  (size-of 'unsigned))
+
+(defmethod to-alien-form (flags (type (eql 'flags)) &rest args)
+  `(loop
+    with value = 0
+    with flags = ,flags
+    for flag in (mklist flags)
+    do (let ((flagval
+	      (or
+	       (second (assoc flag ',(%map-enum args :flags-int)))
+	       (error "~S is not of type ~S" flags '(,type ,@args)))))
+	 (setq value (logior value flagval)))
+    finally (return value)))
+
+(defmethod from-alien-form (int (type (eql 'flags)) &rest args)
+  (declare (ignore type))
+  `(loop
+    for mapping in ',(%map-enum args :int-flags)
+    unless (zerop (logand ,int (first mapping)))
+    collect (second mapping)))
+
+(defmethod to-alien-function ((type (eql 'flags)) &rest args)
+  (let ((mappings (%map-enum args :flags-int)))
+    #'(lambda (flags)	
+	(loop
+	 with value = 0
+	 for flag in (mklist flags)
+	 do (let ((flagval (or
+		    (second (assoc flag mappings))
+		    (error "~S is not of type ~S" flags (cons type args)))))
+	      (setq value (logior value flagval)))
+	 finally (return value)))))
+
+(defmethod from-alien-function ((type (eql 'flags)) &rest args)
+  (declare (ignore type))
+  (let ((mappings (%map-enum args :int-flags)))
+    #'(lambda (int)
+	(loop
+	 for mapping in mappings
+	 unless (zerop (logand int (first mapping)))
+	 collect (second mapping)))))
+
+(defmethod writer-function ((type (eql 'flags)) &rest args)
+  (declare (ignore type))
+  (let ((writer (writer-function 'unsigned))
+	(function (apply #'to-alien-function 'flags args)))
+    #'(lambda (flags location &optional (offset 0))
+	(funcall writer (funcall function flags) location offset))))
     
-    (type-class-ref type-number)
-    (setf (find-type-number name) type-number)
-    (let ((expanded (cons 'flags (%query-flags-values type-number)))
-	  (name (or name (default-type-name (alien-type-name type-number)))))
-      (lisp::%deftype
-       name
-       #'(lambda (whole)
-	   (unless (zerop (length (cdr whole)))
-	     (lisp::do-arg-count-error 'deftype name (cdr whole) nil 0 0))
-	   expanded)))))
+(defmethod reader-function ((type (eql 'flags)) &rest args)
+  (declare (ignore type))
+  (let ((reader (reader-function 'unsigned))
+	(function (apply #'from-alien-function 'flags args)))
+    #'(lambda (location &optional (offset 0))
+	(funcall function (funcall reader location offset)))))
+
+
+
+(defclass %flags-value (struct)
+  ((value :allocation :alien :type unsigned-int)
+   (name :allocation :alien :type string)
+   (nickname :allocation :alien :type string))
+  (:metaclass static-struct-class))
+
+(defbinding %flags-class-values () pointer
+  (class pointer)
+  (n-values unsigned-int :out))
+
+(defun query-flags-values (type)
+  (%query-enum-or-flags-values #'%flags-class-values '%flags-value type))
+
+
+
+;;;;
+
+(defun expand-enum-type (type-number forward-p options)
+  (declare (ignore forward-p))
+  (let* ((super (supertype type-number))
+	 (type (type-from-number type-number))
+	 (mappings (getf options :mappings))
+	 (expanded-mappings
+	  (append
+	   (delete-if
+	    #'(lambda (mapping)
+		(or
+		 (assoc (first mapping) mappings)
+		 (rassoc (cdr mapping) mappings :test #'equal)))
+	    (if (eq super 'enum)
+		(query-enum-values type-number)
+	      (query-flags-values type-number)))
+	   (remove-if
+	    #'(lambda (mapping) (eq (second mapping) nil)) mappings))))
+    `(progn
+       (register-type ',type ,(find-type-name type-number))
+       (deftype ,type () '(,super ,@expanded-mappings)))))
+
+
+(register-derivable-type 'enum "GEnum" 'expand-enum-type)
+(register-derivable-type 'flags "GFlags" 'expand-enum-type)
+