Initial checkin

[clg] / glib / gforeign.lisp

diff --git a/glib/gforeign.lisp b/glib/gforeign.lisp
index 4627933d2acadcb61db7e6fe6d2cce9dedbcaaea..6f27b8adce03fd2e5f40d6bd20b0e47e2f2932db 100644 (file)
--- a/glib/gforeign.lisp
+++ b/glib/gforeign.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: gforeign.lisp,v 1.10 2001-05-31 21:52:15 espen Exp $
+;; $Id: gforeign.lisp,v 1.14 2002-04-02 14:52:25 espen Exp $
 
 (in-package "GLIB")
 
@@ -53,9 +53,9 @@ (defun find-type-method (type fname)
 
 (defun find-applicable-type-method (type-spec fname &optional (error t))
   (flet ((find-superclass-method (class)
-          (when class
-            (unless (class-finalized-p class)             
-              (finalize-inheritance class))
+          (when (and class (class-finalized-p class))
+;           (unless (class-finalized-p class)
+;             (finalize-inheritance class))
             (dolist (super (cdr (pcl::class-precedence-list class)))
               (return-if (find-type-method super fname)))))
         (find-expanded-type-method (type-spec)
@@ -346,6 +346,7 @@ (defun %defbinding (foreign-name lisp-name lambda-list
     (let ((alien-funcall `(alien-funcall ,lisp-name ,@(alien-parameters))))
       `(defun ,lisp-name ,lambda-list
         ,@docs
+        (declare (optimize (ext:inhibit-warnings 3)))
         (with-alien ((,lisp-name
                       (function
                        ,(translate-type-spec return-type-spec)
@@ -363,18 +364,20 @@ (defun %defbinding (foreign-name lisp-name lambda-list
                 (values ,@(alien-values)))))))))
 
 
-(defun mkbinding (name rettype &rest types)
-  (declare (optimize (ext:inhibit-warnings 3)))
-  (let* ((ftype
-         `(function ,@(mapcar #'translate-type-spec (cons rettype types))))
+(defun mkbinding (name return-type &rest arg-types)
+   (declare (optimize (ext:inhibit-warnings 3)))
+   (let* ((ftype
+          `(function
+            ,@(mapcar #'translate-type-spec (cons return-type arg-types))))
         (alien
          (alien::%heap-alien
           (alien::make-heap-alien-info
            :type (alien::parse-alien-type ftype)
            :sap-form (system:foreign-symbol-address name))))
-        (translate-arguments (mapcar #'intern-return-value-translator types))
-        (translate-return-value (intern-return-value-translator rettype))
-        (cleanup-arguments (mapcar #'intern-cleanup-function types)))
+        (translate-arguments
+         (mapcar #'intern-argument-translator arg-types))
+        (translate-return-value (intern-return-value-translator return-type))
+        (cleanup-arguments (mapcar #'intern-cleanup-function arg-types)))
         
     #'(lambda (&rest args)
        (map-into args #'funcall translate-arguments args)
@@ -384,6 +387,29 @@ (defun mkbinding (name rettype &rest types)
          (mapc #'funcall cleanup-arguments args)))))
 
 
+(defun type-translateable-p (type-spec)
+  (find-applicable-type-method type-spec 'translate-type-spec nil))
+
+(defun every-type-translateable-p (type-specs)
+  (every #'type-translateable-p type-specs))
+
+(defun mkbinding-late (name return-type &rest arg-types)
+  (if (every-type-translateable-p (cons return-type arg-types))
+      (apply #'mkbinding name return-type arg-types)
+    (let ((binding nil))
+      #'(lambda (&rest args)
+         (cond
+          (binding (apply binding args))
+          ((every-type-translateable-p (cons return-type arg-types))
+           (setq binding (apply #'mkbinding name return-type arg-types))
+           (apply binding args))
+          (t
+           (dolist (type-spec (cons return-type arg-types))
+             (unless (type-translateable-p type-spec)
+               (error "Can't translate type ~A" type-spec)))))))))
+
+  
+
 ;;;; Definitons and translations of fundamental types
 
 (deftype long (&optional (min '*) (max '*)) `(integer ,min ,max))