r9326: improve case conversion

[uffi.git] / src / objects.lisp

diff --git a/src/objects.lisp b/src/objects.lisp
index b567c11ff2bd484307a60354a96f24a15a7ed09e..f154990cef415047cc7aadb1cf46aed85b0d5961 100644 (file)
--- a/src/objects.lisp
+++ b/src/objects.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: objects.lisp,v 1.19 2003/08/15 02:34:34 kevin Exp $
+;;;; $Id$
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -92,6 +92,16 @@ an array of TYPE with size SIZE. The TYPE parameter is evaluated."
   #+mcl `(ccl:%null-ptr)
   )
 
+(defmacro make-pointer (addr type)
+  #+(or allegro mcl) (declare (ignore type))
+  #+(or cmu scl) `(alien:sap-alien (system:int-sap ,addr) (* ,(convert-from-uffi-type (eval type) :type)))
+  #+sbcl `(sb-alien:sap-alien (sb-sys:int-sap ,addr) (* ,(convert-from-uffi-type (eval type) :type)))
+  #+lispworks `(fli:make-pointer :address ,addr :type (quote ,(convert-from-uffi-type (eval type) :type)))
+  #+allegro addr
+  #+mcl `(ccl:%int-to-ptr ,addr)
+  )
+
+
 (defmacro char-array-to-pointer (obj)
   #+(or cmu scl) `(alien:cast ,obj (* (alien:unsigned 8)))
   #+sbcl `(sb-alien:cast ,obj (* (sb-alien:unsigned 8)))
@@ -216,7 +226,7 @@ an array of TYPE with size SIZE. The TYPE parameter is evaluated."
            ,pointer (* ,(convert-from-uffi-type (eval type) :type)))))
     ,@body))
 
-#+allegro
+#+(or allegro openmcl)
 (defmacro with-cast-pointer ((binding-name pointer type) &body body)
   (declare (ignore type))
   `(let ((,binding-name ,pointer))
@@ -243,14 +253,13 @@ an array of TYPE with size SIZE. The TYPE parameter is evaluated."
       (ff:fslot-value-typed (quote ,(convert-from-uffi-type type :deref))
                             :c (ff:get-entry-point ,foreign-name)))
     #+lispworks
-    (let ((temp-name (gensym)))
-      `(progn
-        (fli:define-foreign-variable (,temp-name ,foreign-name)
-                                     :accessor :address-of
-                                     :type ,var-type
-                                     :module ,module)
-        (define-symbol-macro ,lisp-name (fli:dereference (,temp-name)
-                                                         :copy-foreign-object nil))))
+    `(progn
+      (fli:define-foreign-variable (,lisp-name ,foreign-name)
+                                    :accessor :address-of
+                                    :type ,var-type
+                                    :module ,module)
+      (define-symbol-macro ,lisp-name (fli:dereference (,lisp-name)
+                                                        :copy-foreign-object nil)))
     #-(or allegro cmu scl sbcl lispworks)
     `(define-symbol-macro ,lisp-name
       '(error "DEF-FOREIGN-VAR not (yet) defined for ~A"