Bug fix

[clg] / glib / ffi.lisp

diff --git a/glib/ffi.lisp b/glib/ffi.lisp
index 1f13392aee99bca59ab4ff16abbd1e4b12f6c220..bd68c1e78edbc6998f22800d833304c5dedc4621 100644 (file)
--- a/glib/ffi.lisp
+++ b/glib/ffi.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: ffi.lisp,v 1.7 2004-12-04 00:28:47 espen Exp $
+;; $Id: ffi.lisp,v 1.12 2005-01-03 16:35:05 espen Exp $
 
 (in-package "GLIB")
 
@@ -47,15 +47,22 @@ (defmacro use-prefix (prefix &optional (package *package*))
 
 
 (defun default-alien-fname (lisp-name)
-  (let* ((lisp-name-string
-         (if (char= (char (the simple-string (string lisp-name)) 0) #\%)
-             (subseq (the simple-string (string lisp-name)) 1)
-           (string lisp-name)))
-        (prefix (package-prefix *package*))
-        (name (substitute #\_ #\- (string-downcase lisp-name-string))))
+  (let* ((name (substitute #\_ #\- (string-downcase lisp-name)))
+        (stripped-name
+         (cond
+          ((and 
+            (char= (char name 0) #\%)
+            (string= "_p" name :start2 (- (length name) 2)))
+           (subseq name 1 (- (length name) 2)))
+          ((char= (char name 0) #\%)
+           (subseq name 1))
+          ((string= "_p" name :start2 (- (length name) 2))
+           (subseq name 0 (- (length name) 2)))
+          (name)))
+        (prefix (package-prefix *package*)))
     (if (or (not prefix) (string= prefix ""))
-       name
-      (format nil "~A_~A" prefix name))))
+       stripped-name
+      (format nil "~A_~A" prefix stripped-name))))
 
 (defun default-alien-type-name (type-name)
   (let ((prefix (package-prefix *package*)))
@@ -96,11 +103,11 @@ (defmacro defbinding (name lambda-list return-type &rest docs/args)
                     (not supplied-lambda-list)
                     (namep expr) (member style '(:in :in-out :return)))
                (push expr lambda-list))
-             (push
-              (list (if (namep expr) 
-                        (make-symbol (string expr))
-                      (gensym))
-                    expr (mklist type) style) args)))))
+             (push (list (cond 
+                          ((and (namep expr) (eq style :out)) expr)
+                          ((namep expr) (make-symbol (string expr)))
+                          ((gensym)))
+                         expr (mklist type) style) args)))))
       
       (%defbinding
        c-name lisp-name (or supplied-lambda-list (nreverse lambda-list))
@@ -243,6 +250,9 @@ (def-type-method writer-function ())
 (def-type-method reader-function ())
 (def-type-method destroy-function ())
 
+(def-type-method unbound-value ()
+  "First return value is true if the type has an unbound value, second return value is the actual unbound value")
+
 
 ;; Sizes of fundamental C types in bytes (8 bits)
 (defconstant +size-of-short+ 2)
@@ -333,6 +343,10 @@ (defmethod size-of ((type (eql 'signed-byte)) &rest args)
       ((* #.+bits-of-int+) +size-of-int+)
       (#.+bits-of-long+ +size-of-long+))))
 
+(defmethod unbound-value ((type t) &rest args)
+  (declare (ignore type args))
+  nil)
+
 (defmethod writer-function ((type (eql 'signed-byte)) &rest args)
   (declare (ignore type))
   (destructuring-bind (&optional (size '*)) args
@@ -364,7 +378,7 @@ (defmethod reader-function ((type (eql 'signed-byte)) &rest args)
 (defmethod alien-type ((type (eql 'unsigned-byte)) &rest args)
   (destructuring-bind (&optional (size '*)) args
     (ecase size
-      (#.+bits-of-byte+ '(unsigned-byte 8))
+      (#.+bits-of-byte+ '(unsigned #|-byte|# 8))
       (#.+bits-of-short+ 'c-call:unsigned-short)
       ((* #.+bits-of-int+) 'c-call:unsigned-int)
       (#.+bits-of-long+ 'c-call:unsigned-long))))
@@ -452,7 +466,7 @@ (defmethod alien-type ((type (eql 'double-float)) &rest args)
 
 (defmethod size-of ((type (eql 'double-float)) &rest args)
   (declare (ignore type args))
-  +size-of-float+)
+  +size-of-double+)
 
 (defmethod writer-function ((type (eql 'double-float)) &rest args)
   (declare (ignore type args))
@@ -569,6 +583,9 @@ (defmethod destroy-function ((type (eql 'string)) &rest args)
        (deallocate-memory (sap-ref-sap location offset))
        (setf (sap-ref-sap location offset) (make-pointer 0)))))
 
+(defmethod unbound-value ((type (eql 'string)) &rest args)
+  (declare (ignore type args))
+  (values t nil))
 
 (defmethod alien-type ((type (eql 'pathname)) &rest args)
   (declare (ignore type args))
@@ -624,6 +641,10 @@ (defmethod destroy-function ((type (eql 'pathname)) &rest args)
   (declare (ignore type args))
   (destroy-function 'string))
 
+(defmethod unbound-value ((type (eql 'pathname)) &rest args)
+  (declare (ignore type args))
+  (unbound-value 'string))
+
 
 (defmethod alien-type ((type (eql 'boolean)) &rest args)
   (apply #'alien-type 'signed-byte args))