Quarks simplified

[clg] / glib / glib.lisp

diff --git a/glib/glib.lisp b/glib/glib.lisp
index e8ca9cad1a833acd12cbadd4db721785456b1e60..33ead6bebb018b6c0ebfe0b2a5d7ce744719c3eb 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
 
-;; $Id: glib.lisp,v 1.22 2004/12/26 11:40:58 espen Exp $
+;; $Id: glib.lisp,v 1.24 2005/01/30 14:26:41 espen Exp $
 
 
 (in-package "GLIB")
@@ -46,8 +46,6 @@ (defun copy-memory (from length &optional (to (allocate-memory length)))
 
 (internal *user-data* *user-data-count*)
 
-(declaim (fixnum *user-data-count*))
-
 (defvar *user-data* (make-hash-table))
 (defvar *user-data-count* 0)
 
@@ -64,6 +62,19 @@ (defun find-user-data (id)
   (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*)))
@@ -74,49 +85,21 @@ (defun destroy-user-data (id)
 
 ;;;; Quarks
 
-(internal *quark-counter* *quark-from-object* *quark-to-object*)
-
 (deftype quark () 'unsigned)
 
-;(defbinding %quark-get-reserved () quark)
-
 (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)
@@ -450,7 +433,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
-           (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)
@@ -458,7 +441,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")
-      `(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))