Renamed VECTOR-NULL to NULL-TERMINATED-VECTOR

[clg] / glib / glib.lisp

diff --git a/glib/glib.lisp b/glib/glib.lisp
index 993d78129b3b1e569904801abbd5169a6492cb56..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.9 2001/04/29 20:07:17 espen Exp $
+;; $Id: glib.lisp,v 1.27 2005/02/14 00:44:26 espen Exp $

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


@@ -25,18 +25,22 @@ (use-prefix "g")
 
 ;;;; Memory management
 
 
 ;;;; Memory management
 

-(defbinding ("g_malloc0" allocate-memory) () pointer
+(defbinding (allocate-memory "g_malloc0") () pointer

   (size unsigned-long))
 
   (size unsigned-long))
 

-(defbinding ("g_realloc" reallocate-memory) () pointer
+(defbinding (reallocate-memory "g_realloc") () pointer

   (address pointer)
   (size unsigned-long))
 
   (address pointer)
   (size unsigned-long))
 

-(defbinding ("g_free" deallocate-memory) () nil
+(defbinding (deallocate-memory "g_free") () nil

   (address pointer))
   (address pointer))

+;; (defun deallocate-memory (address)
+;;   (declare (ignore address)))

 
 (defun copy-memory (from length &optional (to (allocate-memory length)))
 
 (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)
 
 


@@ -44,9 +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 *destroy-notify* (system:foreign-symbol-address "destroy_notify"))

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


@@ -63,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*)))


@@ -71,288 +85,508 @@ (defun destroy-user-data (id)
   (remhash id *user-data*))
 
 
   (remhash id *user-data*))
 
 

-

 ;;;; 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)
 

-(deftype glist (type) `(or (null (cons ,type list))))
-
-(defbinding ("g_list_append" %glist-append-unsigned) () pointer
-  (glist pointer)
-  (data unsigned))
+(deftype glist (type) 
+  `(or (null (cons ,type list))))

 
 

-(defbinding ("g_list_append" %glist-append-signed) () pointer
+(defbinding (%glist-append "g_list_append") () pointer

   (glist pointer)
   (glist pointer)

-  (data signed))
+  (nil null))

 
 

-(defbinding ("g_list_append" %glist-append-sap) () pointer
-  (glist pointer)
-  (data pointer))
-
-(defmacro glist-append (glist value type-spec)
-  (ecase (first (mklist (translate-type-spec type-spec)))
-    (unsigned `(%glist-append-unsigned ,glist ,value))
-    (signed `(%glist-append-signed ,glist ,value))
-    (system-area-pointer `(%glist-append-sap ,glist ,value))))
-
-(defmacro glist-data (glist type-spec)
-  (ecase (first (mklist (translate-type-spec type-spec)))
-    (unsigned `(sap-ref-unsigned ,glist 0))
-    (signed `(sap-ref-signed ,glist 0))
-    (system-area-pointer `(sap-ref-sap ,glist 0))))
+(defun make-glist (type list)
+  (loop
+   with writer = (writer-function type)
+   for element in list
+   as glist = (%glist-append (or glist (make-pointer 0)))
+   do (funcall writer element glist)
+   finally (return glist)))

 
 (defun glist-next (glist)
   (unless (null-pointer-p glist)
 
 (defun glist-next (glist)
   (unless (null-pointer-p glist)

-    (sap-ref-sap glist +size-of-sap+)))
+    (sap-ref-sap glist +size-of-pointer+)))

   
   

-(defbinding ("g_list_free" glist-free) () nil
+;; Also used for gslists
+(defun map-glist (seqtype function glist element-type)
+  (let ((reader (reader-function element-type)))
+    (case seqtype 
+     ((nil)
+      (loop
+       as tmp = glist then (glist-next tmp)
+       until (null-pointer-p tmp)
+       do (funcall function (funcall reader tmp))))
+     (list
+      (loop
+       as tmp = glist then (glist-next tmp)
+       until (null-pointer-p tmp)
+       collect (funcall function (funcall reader tmp))))
+     (t
+      (coerce 
+       (loop
+       as tmp = glist then (glist-next tmp)
+       until (null-pointer-p tmp)
+       collect (funcall function (funcall reader tmp)))
+       seqtype)))))
+
+(defbinding (glist-free "g_list_free") () nil

   (glist pointer))
 
   (glist pointer))
 

-(deftype-method translate-type-spec glist (type-spec)
-  (declare (ignore type-spec))
-  (translate-type-spec 'pointer))
+(defun destroy-glist (glist element-type)
+  (loop
+   with destroy = (destroy-function element-type)
+   as tmp = glist then (glist-next tmp)
+   until (null-pointer-p tmp)
+   do (funcall destroy tmp 0))
+  (glist-free glist))
+
+(defmethod alien-type ((type (eql 'glist)) &rest args)
+  (declare (ignore type args))
+  (alien-type 'pointer))

 
 

-(deftype-method size-of glist (type-spec)
-  (declare (ignore type-spec))
+(defmethod size-of ((type (eql 'glist)) &rest args)
+  (declare (ignore type args))

   (size-of 'pointer))
 
   (size-of 'pointer))
 

-(deftype-method translate-to-alien glist (type-spec list &optional weak-ref)
-  (declare (ignore weak-ref))
-  (let* ((element-type (second (type-expand-to 'glist type-spec)))
-        (element (translate-to-alien element-type 'element)))
-    `(let ((glist (make-pointer 0))) 
-       (dolist (element ,list glist)
-        (setq glist (glist-append glist ,element ,element-type))))))
-
-(deftype-method translate-from-alien
-    glist (type-spec glist &optional weak-ref)
-  (let ((element-type (second (type-expand-to 'glist type-spec))))
-    `(let ((glist ,glist)
-          (list nil))
-       (do ((tmp glist (glist-next tmp)))
-          ((null-pointer-p tmp))
-        (push
-         ,(translate-from-alien
-           element-type `(glist-data tmp ,element-type) weak-ref)
-         list))
-       ,(unless weak-ref
-         '(glist-free glist))
-       (nreverse list))))
-
-(deftype-method cleanup-alien glist (type-spec glist &optional weak-ref)
-  (when weak-ref
-    (unreference-alien type-spec glist)))
-
-(deftype-method unreference-alien glist (type-spec glist)
-  (let ((element-type (second (type-expand-to 'glist type-spec))))
+(defmethod to-alien-form (list (type (eql 'glist)) &rest args)
+  (declare (ignore type))
+  (destructuring-bind (element-type) args    
+    `(make-glist ',element-type ,list)))
+
+(defmethod to-alien-function ((type (eql 'glist)) &rest args)
+  (declare (ignore type))
+  (destructuring-bind (element-type) args    
+    #'(lambda (list)
+       (make-glist element-type list))))
+
+(defmethod from-alien-form (glist (type (eql 'glist)) &rest args)
+  (declare (ignore type))
+  (destructuring-bind (element-type) args

     `(let ((glist ,glist))
     `(let ((glist ,glist))

-       (unless (null-pointer-p glist)
-        ,(unless (atomic-type-p element-type)
-           `(do ((tmp glist (glist-next tmp)))
-                ((null-pointer-p tmp))
-              ,(unreference-alien
-                element-type `(glist-data tmp ,element-type))))
-        (glist-free glist)))))
+      (unwind-protect
+          (map-glist 'list #'identity glist ',element-type)
+       (destroy-glist glist ',element-type)))))
+
+(defmethod from-alien-function ((type (eql 'glist)) &rest args)
+  (declare (ignore type))
+  (destructuring-bind (element-type) args
+    #'(lambda (glist)
+       (unwind-protect
+            (map-glist 'list #'identity glist element-type)
+         (destroy-glist glist element-type)))))
+
+(defmethod copy-from-alien-form (glist (type (eql 'glist)) &rest args)
+  (declare (ignore type))
+  (destructuring-bind (element-type) args
+    `(map-glist 'list #'identity ,glist ',element-type)))
+
+(defmethod copy-from-alien-function ((type (eql 'glist)) &rest args)
+  (declare (ignore type))
+  (destructuring-bind (element-type) args
+    #'(lambda (glist)
+       (map-glist 'list #'identity glist element-type))))
+
+(defmethod cleanup-form (glist (type (eql 'glist)) &rest args)
+  (declare (ignore type))
+  (destructuring-bind (element-type) args
+    `(destroy-glist ,glist ',element-type)))
+
+(defmethod cleanup-function ((type (eql 'glist)) &rest args)
+  (declare (ignore 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)
 
 (deftype gslist (type) `(or (null (cons ,type list))))
 
 
 
 ;;;; Single linked list (GSList)
 
 (deftype gslist (type) `(or (null (cons ,type list))))
 

-(defbinding ("g_slist_prepend" %gslist-prepend-unsigned) () pointer
+(defbinding (%gslist-prepend "g_slist_prepend") () pointer

   (gslist pointer)
   (gslist pointer)

-  (data unsigned))
+  (nil null))

 
 

-(defbinding ("g_slist_prepend" %gslist-prepend-signed) () pointer
-  (gslist pointer)
-  (data signed))
+(defun make-gslist (type list)
+  (loop
+   with writer = (writer-function type)
+   for element in (reverse list)
+   as gslist = (%gslist-prepend (or gslist (make-pointer 0)))
+   do (funcall writer element gslist)
+   finally (return gslist)))

 
 

-(defbinding ("g_slist_prepend" %gslist-prepend-sap) () pointer
-  (gslist pointer)
-  (data pointer))
-
-(defmacro gslist-prepend (gslist value type-spec)
-  (ecase (first (mklist (translate-type-spec type-spec)))
-    (unsigned `(%gslist-prepend-unsigned ,gslist ,value))
-    (signed `(%gslist-prepend-signed ,gslist ,value))
-    (system-area-pointer `(%gslist-prepend-sap ,gslist ,value))))
-  
-(defbinding ("g_slist_free" gslist-free) () nil
+(defbinding (gslist-free "g_slist_free") () nil

   (gslist pointer))
 
   (gslist pointer))
 

-(deftype-method translate-type-spec gslist (type-spec)
-  (declare (ignore type-spec))
-  (translate-type-spec 'pointer))
+(defun destroy-gslist (gslist element-type)
+  (loop
+   with destroy = (destroy-function element-type)
+   as tmp = gslist then (glist-next tmp)
+   until (null-pointer-p tmp)
+   do (funcall destroy tmp 0))
+  (gslist-free gslist))

 
 

-(deftype-method size-of gslist (type-spec)
-  (declare (ignore type-spec))
-  (size-of 'pointer))
+(defmethod alien-type ((type (eql 'gslist)) &rest args)
+  (declare (ignore type args))
+  (alien-type 'pointer))

 
 

-(deftype-method translate-to-alien gslist (type-spec list &optional weak-ref)
-  (declare (ignore weak-ref))
-  (let* ((element-type (second (type-expand-to 'gslist type-spec)))
-        (element (translate-to-alien element-type 'element)))
-    `(let ((gslist (make-pointer 0))) 
-       (dolist (element (reverse ,list) gslist)
-        (setq gslist (gslist-prepend gslist ,element ,element-type))))))
-
-(deftype-method translate-from-alien
-    gslist (type-spec gslist &optional weak-ref)
-  (let ((element-type (second (type-expand-to 'gslist type-spec))))
-    `(let ((gslist ,gslist)
-          (list nil))
-       (do ((tmp gslist (glist-next tmp)))
-          ((null-pointer-p tmp))
-        (push
-         ,(translate-from-alien
-           element-type `(glist-data tmp ,element-type) weak-ref)
-         list))
-       ,(unless weak-ref
-         '(gslist-free gslist))
-       (nreverse list))))
-
-(deftype-method cleanup-alien gslist (type-spec gslist &optional weak-ref)
-  (when weak-ref
-    (unreference-alien type-spec gslist)))
-
-(deftype-method unreference-alien gslist (type-spec gslist)
-  (let ((element-type (second (type-expand-to 'gslist type-spec))))
-    `(let ((gslist ,gslist))
-       (unless (null-pointer-p gslist)
-        ,(unless (atomic-type-p element-type)
-           `(do ((tmp gslist (glist-next tmp)))
-                ((null-pointer-p tmp))
-              ,(unreference-alien
-                element-type `(glist-data tmp ,element-type))))
-        (gslist-free gslist)))))
+(defmethod size-of ((type (eql 'gslist)) &rest args)
+  (declare (ignore type args))
+  (size-of 'pointer))

 
 

+(defmethod to-alien-form (list (type (eql 'gslist)) &rest args)
+  (declare (ignore type))
+  (destructuring-bind (element-type) args    
+    `(make-sglist ',element-type ,list)))

 
 

+(defmethod to-alien-function ((type (eql 'gslist)) &rest args)
+  (declare (ignore type))
+  (destructuring-bind (element-type) args    
+    #'(lambda (list)
+       (make-gslist element-type list))))

 
 

-;;; Vector
+(defmethod from-alien-form (gslist (type (eql 'gslist)) &rest args)
+  (declare (ignore type))
+  (destructuring-bind (element-type) args
+    `(let ((gslist ,gslist))
+      (unwind-protect
+          (map-glist 'list #'identity gslist ',element-type)
+       (destroy-gslist gslist ',element-type)))))
+
+(defmethod from-alien-function ((type (eql 'gslist)) &rest args)
+  (declare (ignore type))
+  (destructuring-bind (element-type) args
+    #'(lambda (gslist)
+       (unwind-protect
+            (map-glist 'list #'identity gslist element-type)
+         (destroy-gslist gslist element-type)))))
+
+(defmethod copy-from-alien-form (gslist (type (eql 'gslist)) &rest args)
+  (declare (ignore type))
+  (destructuring-bind (element-type) args
+    `(map-glist 'list #'identity ,gslist ',element-type)))
+
+(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
+    `(destroy-gslist ,gslist ',element-type)))
+
+(defmethod cleanup-function ((type (eql 'gslist)) &rest args)
+  (declare (ignore 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))))))

 
 

-(defvar *magic-end-of-array* (allocate-memory 1))

 
 

-(deftype-method translate-type-spec vector (type-spec)
-  (declare (ignore type-spec))
-  (translate-type-spec 'pointer))
+;;; Vector

 
 

-(deftype-method size-of vector (type-spec)
-  (declare (ignore type-spec))
+(defun make-c-vector (type length &optional content location)
+  (let* ((size-of-type (size-of type))
+        (location (or location (allocate-memory (* size-of-type length))))
+        (writer (writer-function type)))
+    (etypecase content
+      (vector
+       (loop
+       for element across content
+       for i from 0 below length
+       as offset = 0 then (+ offset size-of-type)
+       do (funcall writer element location offset)))
+      (list
+       (loop
+       for element in content
+       for i from 0 below length
+       as offset = 0 then (+ offset size-of-type)
+       do (funcall writer element location offset))))
+    location))
+
+
+(defun map-c-vector (seqtype function location element-type length)
+  (let ((reader (reader-function element-type))
+       (size-of-element (size-of element-type)))
+    (case seqtype 
+     ((nil)
+      (loop
+       for i from 0 below length
+       as offset = 0 then (+ offset size-of-element)
+       do (funcall function (funcall reader location offset))))
+     (list
+      (loop
+       for i from 0 below length
+       as offset = 0 then (+ offset size-of-element)
+       collect (funcall function (funcall reader location offset))))
+     (t
+      (loop
+       with sequence = (make-sequence seqtype length)
+       for i from 0 below length
+       as offset = 0 then (+ offset size-of-element)
+       do (setf 
+          (elt sequence i)
+          (funcall function (funcall reader location offset)))
+       finally (return sequence))))))
+
+
+(defun destroy-c-vector (location element-type length)
+  (loop
+   with destroy = (destroy-function element-type)
+   with element-size = (size-of element-type)
+   for i from 0 below length
+   as offset = 0 then (+ offset element-size)
+   do (funcall destroy location offset))
+  (deallocate-memory location))
+
+
+(defmethod alien-type ((type (eql 'vector)) &rest args)
+  (declare (ignore type args))
+  (alien-type 'pointer))
+
+(defmethod size-of ((type (eql 'vector)) &rest args)
+  (declare (ignore type args))

   (size-of 'pointer))
 
   (size-of 'pointer))
 

-(deftype-method translate-to-alien vector (type-spec vector &optional weak-ref)
-  (declare (ignore weak-ref))
-  (destructuring-bind (element-type &optional (length '*))
-      (cdr (type-expand-to 'vector type-spec))
-    (let* ((element-size (size-of element-type))
-          (size (cond
-                 ((not (eq length '*))
-                  (* element-size length))
-                 ((not (atomic-type-p element-type))
-                  `(* ,element-size (1+ (length vector))))
-                 (t
-                  `(* ,element-size (length vector))))))
-         
-      `(let ((vector ,vector))
-        (let ((c-vector (allocate-memory ,size)))
-          (dotimes (i ,(if (eq length '*) '(length vector) length))
-            (setf
-             (,(sap-ref-fname element-type) c-vector (* i ,element-size))
-             ,(translate-to-alien element-type '(aref vector i))))
-          ,(when (and
-                  (eq length '*)
-                  (not (atomic-type-p element-type)))
-             `(setf
-               (sap-ref-sap c-vector (* (length vector) ,element-size))
-               *magic-end-of-array*))
-          c-vector)))))
-
-(deftype-method translate-from-alien
-    vector (type-spec c-array &optional weak-ref)
-  (destructuring-bind (element-type &optional (length '*))
-      (cdr (type-expand-to 'vector type-spec))
-    (when (eq length '*)
-      (error "Can't use vectors of variable length as return type"))
-    (let ((element-size (size-of element-type)))
-      `(let ((c-array ,c-array)
-            (vector (make-array ,length :element-type ',element-type)))
-        (dotimes (i ,length)
-          (setf
-           (aref vector i)
-           ,(translate-to-alien
-             element-type
-             `(,(sap-ref-fname element-type) c-array (* i ,element-size))
-             weak-ref)))
-        ,(unless weak-ref
-           '(deallocate-memory c-vector))
-        vector))))
-        
-
-(deftype-method cleanup-alien vector (type-spec c-vector &optional weak-ref)
-  (when weak-ref
-    (unreference-alien type-spec c-vector)))
-
-(deftype-method unreference-alien vector (type-spec c-vector)
-  (destructuring-bind (element-type &optional (length '*))
-      (cdr (type-expand-to 'vector type-spec))
-    `(let ((c-vector ,c-vector))
-       (unless (null-pointer-p c-vector)
-        ,(unless (atomic-type-p element-type)
-           (let ((element-size (size-of element-type)))
-             (if (not (eq length '*))
-                 `(dotimes (i ,length)
-                    (unreference-alien
-                     element-type (sap-ref-sap c-vector (* i ,element-size))))
-               `(do ((offset 0 (+ offset ,element-size))
-                     ((sap=
-                       (sap-ref-sap c-vector offset)
-                       *magic-end-of-array*)))
-                    ,(unreference-alien
-                      element-type '(sap-ref-sap c-vector offset))))))
-        (deallocate-memory c-vector)))))
+(defmethod to-alien-form (vector (type (eql 'vector)) &rest args)
+  (declare (ignore type))
+  (destructuring-bind (element-type &optional (length '*)) args
+    (if (eq length '*)
+       `(let* ((vector ,vector)
+               (location (sap+
+                          (allocate-memory (+ ,+size-of-int+ 
+                                              (* ,(size-of element-type) 
+                                                 (length vector))))
+                          ,+size-of-int+)))
+         (make-c-vector ',element-type (length vector) vector location)
+         (setf (sap-ref-32 location ,(- +size-of-int+)) (length vector))
+         location)       
+      `(make-c-vector ',element-type ,length ,vector))))
+
+(defmethod from-alien-form (c-vector (type (eql 'vector)) &rest args)
+  (declare (ignore type))
+  (destructuring-bind (element-type &optional (length '*)) args
+    (if (eq length '*)
+       (error "Can't use vector of variable size as return type")
+      `(let ((c-vector ,c-vector))
+       (prog1
+           (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)
+  (declare (ignore 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 ,c-vector ',element-type ',length))))
+
+(defmethod cleanup-form (location (type (eql 'vector)) &rest args)
+  (declare (ignore type))
+  (destructuring-bind (element-type &optional (length '*)) args
+    `(let* ((location ,location)
+           (length ,(if (eq length '*)
+                        `(sap-ref-32 location ,(- +size-of-int+))
+                        length)))
+      (loop
+       with destroy = (destroy-function ',element-type)
+       for i from 0 below length
+       as offset = 0 then (+ offset ,(size-of element-type))
+       do (funcall destroy location offset))
+      (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))