X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/2c708568813055419a75f313819c8b3e94f32932..f28952dfbbc69735b835a429131f2384eee7e9d0:/gffi/interface.lisp

diff --git a/gffi/interface.lisp b/gffi/interface.lisp
index bcb0cae..72e3c13 100644
--- a/gffi/interface.lisp
+++ b/gffi/interface.lisp
@@ -20,7 +20,7 @@
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-;; $Id: interface.lisp,v 1.6 2007-09-07 07:28:42 espen Exp $
+;; $Id: interface.lisp,v 1.10 2008-12-10 02:40:18 espen Exp $
 
 (in-package "GFFI")
 
@@ -72,15 +72,19 @@
       #'string-capitalize    
       (cons prefix (split-string (symbol-name type-name) :delimiter #\-))))))
 
-(defun default-type-name (alien-name)
-  (let ((parts
-	 (mapcar
-	  #'string-upcase
-	  (split-string-if alien-name #'upper-case-p))))
-    (intern
-     (concatenate-strings (rest parts) #\-)
-     (find-prefix-package (first parts)))))
+(defun split-alien-name (alien-name)
+  (let ((parts (split-string-if alien-name #'upper-case-p)))
+    (do ((prefix (first parts) (concatenate 'string prefix (first rest)))
+         (rest (rest parts) (cdr rest)))
+        ((null rest)
+         (error "Couldn't split alien name '~A' to find a registered prefix"
+                alien-name))
+      (when (find-prefix-package prefix)
+        (return (values (string-upcase (concatenate-strings rest #\-))
+                        (find-prefix-package prefix)))))))
 
+(defun default-type-name (alien-name)
+  (multiple-value-call #'intern (split-alien-name alien-name)))
 
 (defun in-arg-p (style)
   (find style '(:in :in/out :in/return :in-out :return)))
@@ -128,8 +132,15 @@
 		     (list 
 		      (cond 
 		       ((and (namep expr) (not (in-arg-p style))) expr)
-		       ((namep expr) (make-symbol (string expr)))
-		       ((gensym)))
+		       ((namep expr)			
+			#-clisp(make-symbol (string expr))
+			;; The above used to work in CLISP, but I'm
+			;; not sure exactly at which version it
+			;; broke. The following could potentially
+			;; cause variable capturing
+			#+clisp(intern (format nil "~A-~A" (string expr) (gensym))))
+		       (#-clisp(gensym)
+			#+clisp(intern (string (gensym)))))
 		      (or aux expr) type style out-type))))
 	     args)))
   
@@ -209,7 +220,8 @@
 		     when (out-arg-p style)
 		     collect (return-type out-type)
 		     when (return-arg-p style)
-		     collect (return-type type)))))))
+		     collect (return-type type))))
+		,lisp-name)))
 	  (defun ,lisp-name ,lambda-list
 	  ,doc
 	  (let ,aux-bindings
@@ -306,7 +318,10 @@
   (let ((define-callback 
 	  #+cmu'alien:def-callback 	              
 	  #+(and sbcl alien-callbacks)'sb-alien::define-alien-callback
-	  #+(and sbcl (not alien-callbacks))'sb-alien:define-alien-function))
+	  #+(and sbcl (not alien-callbacks))'sb-alien:define-alien-function)
+	(args (mapcar #'(lambda (arg)
+			  (if (atom arg) (list arg arg) arg))
+		      args)))
     `(progn
        #+cmu(defparameter ,name nil)
        (,define-callback ,name 
@@ -383,8 +398,11 @@
   ;;; translated according to RETTYPE.  Obtain a pointer that can be
   ;;; passed to C code for this callback by calling %CALLBACK.
   (defmacro define-callback (name return-type args &body body)
-    (let ((arg-names (mapcar #'first args))
-	  (arg-types (mapcar #'second args)))
+    (let* ((args (mapcar #'(lambda (arg)
+			     (if (atom arg) (list arg arg) arg))
+			 args))
+	   (arg-names (mapcar #'first args))
+	   (arg-types  (mapcar #'second args)))
       `(progn
 	 (defvar ,name ',name)
 	 (register-callback ',name 
@@ -406,6 +424,12 @@
 
 ;;;; Type expansion
 
+;; A hack to make the TYPE-EXPAND code for SBCL work.
+#?+(pkg-config:sbcl>= 1 0 35 15)
+(sb-ext:without-package-locks
+  (setf (symbol-function 'sb-kernel::type-expand)
+        (lambda (form) (typexpand form))))
+
 (defun type-expand-1 (form)
   #+(or cmu sbcl)
   (let ((def (cond ((symbolp form)
@@ -431,6 +455,8 @@
 		   (error "~A can not be expanded to ~A" form type))))))
     (expand form)))
 
+(defun type-equal-p (type1 type2)
+  (and (subtypep type1 type2) (subtypep type2 type1)))
 
 
 ;;;; Type methods