Renamed VECTOR-NULL to NULL-TERMINATED-VECTOR

[clg] / glib / glib.lisp

diff --git a/glib/glib.lisp b/glib/glib.lisp
index 6ee148807528262195a74cd7ab1a63fc4be98ad1..630d3aeda5f9b5a775891ea690ff6078008f9830 100644 (file)
--- a/glib/glib.lisp
+++ b/glib/glib.lisp
@@ -15,7 +15,7 @@
 ;; License along with this library; if not, write to the Free Software
 ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 ;; 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: glib.lisp,v 1.20 2004/11/21 17:37:24 espen Exp $
+;; $Id: glib.lisp,v 1.27 2005/02/14 00:44:26 espen Exp $

 
 
 (in-package "GLIB")
 
 
 (in-package "GLIB")


@@ -38,7 +38,9 @@ (defbinding (deallocate-memory "g_free") () nil
 ;;   (declare (ignore address)))
 
 (defun copy-memory (from length &optional (to (allocate-memory length)))
 ;;   (declare (ignore address)))
 
 (defun copy-memory (from length &optional (to (allocate-memory length)))

-  (kernel:system-area-copy from 0 to 0 (* 8 length))
+  (;#+cmu kernel:system-area-copy 
+   ;#+sbcl sb-impl::system-area-copy 
+   system-area-copy from 0 to 0 (* 8 length))

   to)
 
 
   to)
 
 


@@ -46,8 +48,6 @@ (defun copy-memory (from length &optional (to (allocate-memory length)))
 
 (internal *user-data* *user-data-count*)
 
 
 (internal *user-data* *user-data-count*)
 

-(declaim (fixnum *user-data-count*))
-

 (defvar *user-data* (make-hash-table))
 (defvar *user-data-count* 0)
 
 (defvar *user-data* (make-hash-table))
 (defvar *user-data-count* 0)
 


@@ -64,6 +64,19 @@ (defun find-user-data (id)
   (multiple-value-bind (user-data p) (gethash id *user-data*)
     (values (car user-data) p)))
 
   (multiple-value-bind (user-data p) (gethash id *user-data*)
     (values (car user-data) p)))
 

+(defun user-data-exists-p (id)
+  (nth-value 1 (find-user-data id)))
+
+(defun update-user-data (id object)
+  (check-type id fixnum)
+  (multiple-value-bind (user-data exists-p) (gethash id *user-data*)
+    (cond
+     ((not exists-p) (error "User data id ~A does not exist" id))
+     (t 
+      (when (cdr user-data)
+       (funcall (cdr user-data) (car user-data)))
+      (setf (car user-data) object)))))
+

 (defun destroy-user-data (id)
   (check-type id fixnum)
   (let ((user-data (gethash id *user-data*)))
 (defun destroy-user-data (id)
   (check-type id fixnum)
   (let ((user-data (gethash id *user-data*)))


@@ -74,49 +87,21 @@ (defun destroy-user-data (id)
 
 ;;;; Quarks
 
 
 ;;;; Quarks
 

-(internal *quark-counter* *quark-from-object* *quark-to-object*)
-

 (deftype quark () 'unsigned)
 
 (deftype quark () 'unsigned)
 

-;(defbinding %quark-get-reserved () quark)
-

 (defbinding %quark-from-string () quark
   (string string))
 
 (defbinding %quark-from-string () quark
   (string string))
 

-(defvar *quark-counter* 0)
-
-(defun %quark-get-reserved ()
-  ;; The string is just a dummy
-  (%quark-from-string (format nil "#@£$%&-quark-~D" (incf *quark-counter*))))
-
-(defvar *quark-from-object* (make-hash-table))
-(defvar *quark-to-object* (make-hash-table))
-
-(defun quark-from-object (object &key (test #'eq))
-  (let ((hash-code (sxhash object)))
-    (or
-     (assoc-ref object (gethash hash-code *quark-from-object*) :test test)
-     (let ((quark (%quark-get-reserved)))
-       (setf
-       (gethash hash-code *quark-from-object*)
-       (append
-        (gethash hash-code *quark-from-object*)
-        (list (cons object quark))))
-       (setf (gethash quark *quark-to-object*) object)
-       quark))))
-
-(defun quark-to-object (quark) 
-  (gethash quark *quark-to-object*))
-  
-(defun remove-quark (quark)
-  (let* ((object (gethash quark *quark-to-object*))
-        (hash-code (sxhash object)))
-    (remhash quark *quark-to-object*)
-    (unless (setf
-            (gethash hash-code *quark-from-object*)
-            (assoc-delete object (gethash hash-code *quark-from-object*)))
-      (remhash hash-code *quark-from-object*))))
+(defun quark-intern (object)
+  (etypecase object
+    (quark object)
+    (string (%quark-from-string object))
+    (symbol (%quark-from-string (format nil "clg-~A:~A" 
+                                (package-name (symbol-package object)) 
+                                object)))))

 
 

+(defbinding quark-to-string () (copy-of string)
+  (quark quark))

 
 
 ;;;; Linked list (GList)
 
 
 ;;;; Linked list (GList)


@@ -225,11 +210,35 @@ (defmethod cleanup-form (glist (type (eql 'glist)) &rest args)
     `(destroy-glist ,glist ',element-type)))
 
 (defmethod cleanup-function ((type (eql 'glist)) &rest args)
     `(destroy-glist ,glist ',element-type)))
 
 (defmethod cleanup-function ((type (eql 'glist)) &rest args)

-  (declare (ignore type args))
+  (declare (ignore type))

   (destructuring-bind (element-type) args
     #'(lambda (glist)
        (destroy-glist glist element-type))))
 
   (destructuring-bind (element-type) args
     #'(lambda (glist)
        (destroy-glist glist element-type))))
 

+(defmethod writer-function ((type (eql 'glist)) &rest args)
+  (declare (ignore type))
+  (destructuring-bind (element-type) args
+    #'(lambda (list location &optional (offset 0))
+       (setf 
+        (sap-ref-sap location offset)
+        (make-glist element-type list)))))
+
+(defmethod reader-function ((type (eql 'glist)) &rest args)
+  (declare (ignore type))
+  (destructuring-bind (element-type) args
+    #'(lambda (location &optional (offset 0))
+       (unless (null-pointer-p (sap-ref-sap location offset))
+         (map-glist 'list #'identity (sap-ref-sap location offset) element-type)))))
+
+(defmethod destroy-function ((type (eql 'glist)) &rest args)
+  (declare (ignore type))
+  (destructuring-bind (element-type) args
+    #'(lambda (location &optional (offset 0))
+       (unless (null-pointer-p (sap-ref-sap location offset))
+         (destroy-glist (sap-ref-sap location offset) element-type)
+         (setf (sap-ref-sap location offset) (make-pointer 0))))))
+
+

 
 ;;;; Single linked list (GSList)
 
 
 ;;;; Single linked list (GSList)
 


@@ -298,23 +307,45 @@ (defmethod copy-from-alien-form (gslist (type (eql 'gslist)) &rest args)
   (destructuring-bind (element-type) args
     `(map-glist 'list #'identity ,gslist ',element-type)))
 
   (destructuring-bind (element-type) args
     `(map-glist 'list #'identity ,gslist ',element-type)))
 

-(defmethod from-alien-function ((type (eql 'gslist)) &rest args)
+(defmethod copy-from-alien-function ((type (eql 'gslist)) &rest args)

   (declare (ignore type))
   (destructuring-bind (element-type) args
     #'(lambda (gslist)
        (map-glist 'list #'identity gslist element-type))))
 
 (defmethod cleanup-form (gslist (type (eql 'gslist)) &rest args)
   (declare (ignore type))
   (destructuring-bind (element-type) args
     #'(lambda (gslist)
        (map-glist 'list #'identity gslist element-type))))
 
 (defmethod cleanup-form (gslist (type (eql 'gslist)) &rest args)

-  (declare (ignore type args))
+  (declare (ignore type))

   (destructuring-bind (element-type) args
     `(destroy-gslist ,gslist ',element-type)))
 
 (defmethod cleanup-function ((type (eql 'gslist)) &rest args)
   (destructuring-bind (element-type) args
     `(destroy-gslist ,gslist ',element-type)))
 
 (defmethod cleanup-function ((type (eql 'gslist)) &rest args)

-  (declare (ignore type args))
+  (declare (ignore type))

   (destructuring-bind (element-type) args
     #'(lambda (gslist)
        (destroy-gslist gslist element-type))))
 
   (destructuring-bind (element-type) args
     #'(lambda (gslist)
        (destroy-gslist gslist element-type))))
 

+(defmethod writer-function ((type (eql 'gslist)) &rest args)
+  (declare (ignore type))
+  (destructuring-bind (element-type) args
+    #'(lambda (list location &optional (offset 0))
+       (setf 
+        (sap-ref-sap location offset)
+        (make-gslist element-type list)))))
+
+(defmethod reader-function ((type (eql 'gslist)) &rest args)
+  (declare (ignore type))
+  (destructuring-bind (element-type) args
+    #'(lambda (location &optional (offset 0))
+       (unless (null-pointer-p (sap-ref-sap location offset))
+         (map-glist 'list #'identity (sap-ref-sap location offset) element-type)))))
+
+(defmethod destroy-function ((type (eql 'gslist)) &rest args)
+  (declare (ignore type))
+  (destructuring-bind (element-type) args
+    #'(lambda (location &optional (offset 0))
+       (unless (null-pointer-p (sap-ref-sap location offset))
+         (destroy-gslist (sap-ref-sap location offset) element-type)
+         (setf (sap-ref-sap location offset) (make-pointer 0))))))

 
 
 ;;; Vector
 
 
 ;;; Vector


@@ -404,7 +435,7 @@ (defmethod from-alien-form (c-vector (type (eql 'vector)) &rest args)
        (error "Can't use vector of variable size as return type")
       `(let ((c-vector ,c-vector))
        (prog1
        (error "Can't use vector of variable size as return type")
       `(let ((c-vector ,c-vector))
        (prog1

-           (map-c-vector 'vector #'identity ',element-type ,length c-vector)
+           (map-c-vector 'vector #'identity c-vector ',element-type ,length)

          (destroy-c-vector c-vector ',element-type ,length))))))
 
 (defmethod copy-from-alien-form (c-vector (type (eql 'vector)) &rest args)
          (destroy-c-vector c-vector ',element-type ,length))))))
 
 (defmethod copy-from-alien-form (c-vector (type (eql 'vector)) &rest args)


@@ -412,7 +443,7 @@ (defmethod copy-from-alien-form (c-vector (type (eql 'vector)) &rest args)
   (destructuring-bind (element-type &optional (length '*)) args
     (if (eq length '*)
        (error "Can't use vector of variable size as return type")
   (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 ',element-type ',length ,c-vector))))
+      `(map-c-vector 'vector #'identity ,c-vector ',element-type ',length))))

 
 (defmethod cleanup-form (location (type (eql 'vector)) &rest args)
   (declare (ignore type))
 
 (defmethod cleanup-form (location (type (eql 'vector)) &rest args)
   (declare (ignore type))


@@ -429,3 +460,133 @@ (defmethod cleanup-form (location (type (eql 'vector)) &rest args)
       (deallocate-memory ,(if (eq length '*) 
                              `(sap+ location  ,(- +size-of-int+))
                            'location)))))
       (deallocate-memory ,(if (eq length '*) 
                              `(sap+ location  ,(- +size-of-int+))
                            'location)))))

+
+(defmethod writer-function ((type (eql 'vector)) &rest args)
+  (declare (ignore type))
+  (destructuring-bind (element-type &optional (length '*)) args
+    #'(lambda (vector location &optional (offset 0))
+       (setf 
+        (sap-ref-sap location offset)
+        (make-c-vector element-type length vector)))))
+
+(defmethod reader-function ((type (eql 'vector)) &rest args)
+  (declare (ignore type))
+  (destructuring-bind (element-type &optional (length '*)) args
+    (if (eq length '*)
+       (error "Can't create reader function for vector of variable size")
+      #'(lambda (location &optional (offset 0))
+         (unless (null-pointer-p (sap-ref-sap location offset))
+           (map-c-vector 'vector #'identity (sap-ref-sap location offset) 
+            element-type length))))))
+
+(defmethod destroy-function ((type (eql 'vector)) &rest args)
+  (declare (ignore type))
+  (destructuring-bind (element-type &optional (length '*)) args
+    (if (eq length '*)
+       (error "Can't create destroy function for vector of variable size")
+      #'(lambda (location &optional (offset 0))
+         (unless (null-pointer-p (sap-ref-sap location offset))
+           (destroy-c-vector 
+            (sap-ref-sap location offset) element-type length)
+           (setf (sap-ref-sap location offset) (make-pointer 0)))))))
+
+
+;;;; Null terminated vector
+
+(defun make-0-vector (type content &optional location)
+  (let* ((size-of-type (size-of type))
+        (location (or 
+                   location 
+                   (allocate-memory (* size-of-type (1+ (length content))))))
+        (writer (writer-function type)))
+    (etypecase content
+      (vector
+       (loop
+       for element across content
+       as offset = 0 then (+ offset size-of-type)
+       do (funcall writer element location offset)
+       finally (setf (sap-ref-sap location offset) (make-pointer 0))))
+      (list
+       (loop
+       for element in content
+       as offset = 0 then (+ offset size-of-type)
+       do (funcall writer element location offset)
+       finally (setf (sap-ref-sap location (+ offset size-of-type)) (make-pointer 0)))))
+    location))
+
+
+(defun map-0-vector (seqtype function location element-type)
+  (let ((reader (reader-function element-type))
+       (size-of-element (size-of element-type)))
+    (case seqtype 
+     ((nil)
+      (loop
+       as offset = 0 then (+ offset size-of-element)
+       until (null-pointer-p (sap-ref-sap location offset))
+       do (funcall function (funcall reader location offset))))
+     (list
+      (loop
+       as offset = 0 then (+ offset size-of-element)
+       until (null-pointer-p (sap-ref-sap location offset))
+       collect (funcall function (funcall reader location offset))))
+     (t
+      (coerce 
+       (loop
+       as offset = 0 then (+ offset size-of-element)
+       until (null-pointer-p (sap-ref-sap location offset))
+       collect (funcall function (funcall reader location offset)))
+       seqtype)))))
+
+
+(defun destroy-0-vector (location element-type)
+  (loop
+   with destroy = (destroy-function element-type)
+   with element-size = (size-of element-type)
+   as offset = 0 then (+ offset element-size)
+   until (null-pointer-p (sap-ref-sap location offset))
+   do (funcall destroy location offset))
+  (deallocate-memory location))
+
+
+(defmethod alien-type ((type (eql 'null-terminated-vector)) &rest args)
+  (declare (ignore type args))
+  (alien-type 'pointer))
+
+(defmethod size-of ((type (eql 'null-terminated-vector)) &rest args)
+  (declare (ignore type args))
+  (alien-type 'pointer))
+
+(defmethod writer-function ((type (eql 'null-terminated-vector)) &rest args)
+  (declare (ignore type))
+  (destructuring-bind (element-type) args
+    (unless (eq (alien-type element-type) (alien-type 'pointer))
+      (error "Elements in null-terminated vectors need to be of pointer types"))
+    #'(lambda (vector location &optional (offset 0))
+       (setf 
+        (sap-ref-sap location offset)
+        (make-0-vector element-type vector)))))
+
+(defmethod reader-function ((type (eql 'null-terminated-vector)) &rest args)
+  (declare (ignore type))
+  (destructuring-bind (element-type) args
+    (unless (eq (alien-type element-type) (alien-type 'pointer))
+      (error "Elements in null-terminated vectors need to be of pointer types"))
+    #'(lambda (location &optional (offset 0))
+       (unless (null-pointer-p (sap-ref-sap location offset))
+         (map-0-vector 'vector #'identity (sap-ref-sap location offset) 
+          element-type)))))
+
+(defmethod destroy-function ((type (eql 'null-terminated-vector)) &rest args)
+  (declare (ignore type))
+  (destructuring-bind (element-type) args
+    (unless (eq (alien-type element-type) (alien-type 'pointer))
+      (error "Elements in null-terminated vectors need to be of pointer types"))
+    #'(lambda (location &optional (offset 0))
+         (unless (null-pointer-p (sap-ref-sap location offset))
+           (destroy-0-vector 
+            (sap-ref-sap location offset) element-type)
+           (setf (sap-ref-sap location offset) (make-pointer 0))))))
+
+(defmethod unbound-value ((type (eql 'null-terminated-vector)) &rest args)
+  (declare (ignore type args))
+  (values t nil))