X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/d4b21b082be225e0c0edaa822bd8b1e267e2f87a..dfa4f31424800fdb6fb63514121b9cc893269276:/glib/genums.lisp

diff --git a/glib/genums.lisp b/glib/genums.lisp
index f688f9f..06985c6 100644
--- a/glib/genums.lisp
+++ b/glib/genums.lisp
@@ -15,35 +15,264 @@
 ;; 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.2 2001-05-11 16:04:33 espen Exp $
+;; $Id: genums.lisp,v 1.12 2005-03-06 17:26:23 espen Exp $
 
 (in-package "GLIB")
+  
+;;;; Generic enum type
+
+(defun %map-enum (mappings op)
+  (loop
+   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 `(,symbol ,value))
+	       (:int-symbol `(,value ,symbol))
+	       (:int-quoted-symbol `(,value ',symbol))
+	       (:symbols symbol)))))
 
+(deftype enum (&rest args)
+  `(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))
+  `(case ,form
+    ,@(%map-enum args :symbol-int)
+    (t (error 'type-error :datum ,form :expected-type '(enum ,@args)))))
+
+
+(defmethod from-alien-form (form (type (eql 'enum)) &rest args)
+  (declare (ignore type))
+  `(case ,form
+    ,@(%map-enum args :int-quoted-symbol)))
+
+(defmethod to-alien-function ((type (eql 'enum)) &rest args)
+  (declare (ignore type))
+  (let ((mappings (%map-enum args :symbol-int)))
+    #'(lambda (enum)
+	(or
+	 (second (assoc enum mappings))
+	 (error 'type-error :datum enum :expected-type (cons 'enum args))))))
+
+(defmethod from-alien-function ((type (eql 'enum)) &rest args)
+  (declare (ignore type))
+  (let ((mappings (%map-enum args :int-symbol)))
+    #'(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))))
+    
+(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)))))
+
+(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)))
+
+
+;;;; Named enum types
+
+(defmacro define-enum-type (name &rest args)
+  (let ((enum-int (intern (format nil "~A-TO-INT" name)))
+	(int-enum (intern (format nil "INT-TO-~A" name))))
+    `(progn
+       (deftype ,name () '(enum ,@args))
+       (defun ,enum-int (enum)
+	 (case enum
+	   ,@(%map-enum args :symbol-int)
+	   (t (error 'type-error :datum enum :expected-type ',name))))
+       (defun ,int-enum (value)
+	 (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))
+       (defmethod from-alien-form (form (type (eql ',name)) &rest args)
+	 (declare (ignore type args))
+	 (list ',int-enum form))
+       (defmethod to-alien-function ((type (eql ',name)) &rest args)
+	 (declare (ignore type args))
+	 #',enum-int)
+       (defmethod from-alien-function ((type (eql ',name)) &rest args)
+	 (declare (ignore type args))
+	 #',int-enum)
+       (defmethod writer-function ((type (eql ',name)) &rest args)
+	 (declare (ignore type args))
+	 (let ((writer (writer-function 'signed)))
+	   #'(lambda (enum location &optional (offset 0))
+	       (funcall writer (,enum-int enum) location offset))))    
+       (defmethod reader-function ((type (eql ',name)) &rest args)
+	 (declare (ignore type args))
+	 (let ((reader (reader-function 'signed)))
+	   #'(lambda (location &optional (offset 0))
+	       (,int-enum (funcall reader location offset))))))))
+
+
+;;;;  Generic flags type
+
+(defun %map-flags (mappings op)
+  (loop
+   as value = 1 then (ash value 1)
+   for mapping in mappings
+   collect (let ((symbol (if (atom mapping) mapping (first mapping))))
+	     (unless (atom mapping)
+	       (setq value (second mapping)))
+	     (ecase op
+	       (:symbol-int `(,symbol ,value))
+	       (:int-symbol `(,value ,symbol))
+	       (:symbols symbol)))))
 
-(defun %map-mappings (args op)
-  (let ((current-value 0))
-    (map
-     'list 
-     #'(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)|#))
-	     (:int-enum (list value symbol))
-	     (:int-flags (list value #|(ash 1 value)|# symbol))
-	     (:symbols symbol))))
-     (if (integerp (first args))
-	 (rest args)
-       args))))
+(deftype flags (&rest args)
+  `(or (member ,@(%map-flags 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)
+  `(reduce #'logior (mklist ,flags)
+    :key #'(lambda (flag)
+	     (case flag
+	       ,@(%map-flags args :symbol-int)
+	       (t (error 'type-error :datum ,flags 
+		   :expected-type '(,type ,@args)))))))
+
+(defmethod from-alien-form (int (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)))
+
+(defmethod to-alien-function ((type (eql 'flags)) &rest args)
+  (declare (ignore type))
+  (let ((mappings (%map-flags args :symbol-int)))
+    #'(lambda (flags)
+	(reduce #'logior (mklist flags)
+	 :key #'(lambda (flag)
+		  (or
+		   (second (assoc flag mappings))
+		   (error 'type-error :datum flags 
+		    :expected-type (cons 'flags args))))))))
+
+(defmethod from-alien-function ((type (eql 'flags)) &rest args)
+  (declare (ignore type))
+  (let ((mappings (%map-flags args :int-symbol)))
+    #'(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))))
+    
+(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)))))
+
+
+;;;; Named flags types
+
+(defmacro define-flags-type (name &rest args)
+  (let ((flags-int (intern (format nil "~A-TO-INT" name)))
+	(int-flags (intern (format nil "INT-TO-~A" name)))
+	(satisfies  (intern (format nil "~A-P" name))))
+    `(progn
+       (deftype ,name () '(satisfies ,satisfies))
+       (defun ,satisfies (object)
+	 (flet ((valid-p (ob)
+		  (find ob ',(%map-flags args :symbols))))
+	   (typecase object
+	     (symbol (valid-p object))
+	     (list (every #'valid-p object)))))
+       (defun ,flags-int (flags)
+	 (reduce #'logior (mklist flags)
+	  :key #'(lambda (flag)
+		   (case flag
+		     ,@(%map-flags args :symbol-int)
+		     (t (error 'type-error :datum flags 
+		         :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)))
+       (defmethod alien-type ((type (eql ',name)) &rest args)
+	 (declare (ignore type args))
+	 (alien-type 'flags))
+       (defmethod size-of ((type (eql ',name)) &rest args)
+	 (declare (ignore type args))
+	 (size-of 'flags))
+       (defmethod to-alien-form (form (type (eql ',name)) &rest args)
+	 (declare (ignore type args))
+	 (list ',flags-int form))
+       (defmethod from-alien-form (form (type (eql ',name)) &rest args)
+	 (declare (ignore type args))
+	 (list ',int-flags form))
+       (defmethod to-alien-function ((type (eql ',name)) &rest args)
+	 (declare (ignore type args))
+	 #',flags-int)
+       (defmethod from-alien-function ((type (eql ',name)) &rest args)
+	 (declare (ignore type args))
+	 #',int-flags)
+       (defmethod writer-function ((type (eql ',name)) &rest args)
+	 (declare (ignore type args))
+	 (let ((writer (writer-function 'signed)))
+	   #'(lambda (flags location &optional (offset 0))
+	       (funcall writer (,flags-int flags) location offset))))    
+       (defmethod reader-function ((type (eql ',name)) &rest args)
+	 (declare (ignore type args))
+	 (let ((reader (reader-function 'signed)))
+	   #'(lambda (location &optional (offset 0))
+	       (,int-flags (funcall reader location offset))))))))
+
+
+
+;;;; Type definition by introspection
 
 (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-class-size (find-class class)))
-	  (proxy (make-proxy-instance class sap 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)
@@ -54,44 +283,13 @@ (defun %query-enum-or-flags-values (query-function class type)
 	    value)
 	   values)))
       values)))
-   
-  
-;;;; 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))))
-
-(eval-when (:compile-toplevel :load-toplevel :execute)
-  (defclass %enum-value (static)
-    ((value :allocation :alien :type int)
-     (name :allocation :alien :type string)
-     (nickname :allocation :alien :type string))
-    (:metaclass proxy-class)))
+
+(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)
@@ -101,57 +299,11 @@ (defun query-enum-values (type)
   (%query-enum-or-flags-values #'%enum-class-values '%enum-value type))
 
 
-
-;;;;  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)))))))
-
-
-
-;(eval-when (:compile-toplevel :load-toplevel :execute)
-  (defclass %flags-value (static)
-    ((value :allocation :alien :type unsigned-int)
-     (name :allocation :alien :type string)
-     (nickname :allocation :alien :type string))
-    (:metaclass proxy-class));)
+(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)
@@ -161,12 +313,11 @@ (defun query-flags-values (type)
   (%query-enum-or-flags-values #'%flags-class-values '%flags-value type))
 
 
-
-;;;;
-
-(defun expand-enum-type (type-number &optional mappings)
+(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
@@ -180,10 +331,12 @@ (defun expand-enum-type (type-number &optional mappings)
 	   (remove-if
 	    #'(lambda (mapping) (eq (second mapping) nil)) mappings))))
     `(progn
-       (register-type ',type ,(find-type-name type-number))
-       (deftype ,type () '(,super ,@expanded-mappings)))))
+       (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))))))
 
 
-(register-derivable-type 'enum "GEnum" :expand 'expand-enum-type)
-(register-derivable-type 'flags "GFlags" :expand 'expand-enum-type)
+(register-derivable-type 'enum "GEnum" 'expand-enum-type)
+(register-derivable-type 'flags "GFlags" 'expand-enum-type)