Re-registering custom signals and class closures when loading saved images

[clg] / gffi / interface.lisp

diff --git a/gffi/interface.lisp b/gffi/interface.lisp
index f2dd4640d7177f2ae5d63db0179018af1f1931d5..f5b8b77ce8b86c208c6a23c9bff2e5b76c819a89 100644 (file)
--- 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.7 2007/10/17 17:04:15 espen Exp $
+;; $Id: interface.lisp,v 1.10 2008/12/10 02:40:18 espen Exp $
 
 (in-package "GFFI")
 
@@ -128,8 +128,15 @@ (defmacro defbinding (name lambda-list return-type &rest args)
                     (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 +216,8 @@ (defun %defbinding (cname lisp-name lambda-list declare-p arg-types aux-bindings
                     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
@@ -437,6 +445,8 @@ (defun type-expand-to (type form)
                   (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