r5500: *** empty log message ***

[uffi.git] / src / objects.lisp

diff --git a/src/objects.lisp b/src/objects.lisp
index 4d86f1a21c4cb1b60a3187bf74aea4a26428025b..b567c11ff2bd484307a60354a96f24a15a7ed09e 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.18 2003/08/14 21:58:29 kevin Exp $
+;;;; $Id: objects.lisp,v 1.19 2003/08/15 02:34:34 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -232,19 +232,25 @@ an array of TYPE with size SIZE. The TYPE parameter is evaluated."
   #-lispworks (declare (ignore module))
   (let ((foreign-name (if (atom names) names (first names)))
         (lisp-name (if (atom names) (make-lisp-name names) (second names)))
-        (var-type (convert-from-uffi-type type :foreign-var)))
+        #-allegro
+        (var-type (convert-from-uffi-type type :type)))
     #+(or cmu scl)
     `(alien:def-alien-variable (,foreign-name ,lisp-name) ,var-type)
     #+sbcl
     `(sb-alien:define-alien-variable (,foreign-name ,lisp-name) ,var-type)
     #+allegro
-    `(ff:def-foreign-variable (,lisp-name ,foreign-name) :convention :c
-      :type ,var-type)
+    `(define-symbol-macro ,lisp-name
+      (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) :type ,var-type :module ,module)
-        (define-symbol-macro ,lisp-name (,temp-name))))
+        (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))))
     #-(or allegro cmu scl sbcl lispworks)
     `(define-symbol-macro ,lisp-name
       '(error "DEF-FOREIGN-VAR not (yet) defined for ~A"