X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fobjects.cl;h=70d5abd238356d9dfa290f74a1a074be5f6f6c5b;hb=ab96e211bb083d1e1ea4edca83d4f6d47b41c84b;hp=6a33f9b1cc04a9b145e6c27924ad13ddbef7d4e0;hpb=de6c38979da779441669d5ed8fc6cb569201f845;p=uffi.git

diff --git a/src/objects.cl b/src/objects.cl
index 6a33f9b..70d5abd 100644
--- a/src/objects.cl
+++ b/src/objects.cl
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: objects.cl,v 1.13 2002/03/21 16:47:46 kevin Exp $
+;;;; $Id: objects.cl,v 1.16 2002/03/29 15:06:07 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -21,22 +21,22 @@
 
 (defmacro allocate-foreign-object (type &optional (size :unspecified))
   "Allocates an instance of TYPE. If size is specified, then allocate
-an array of TYPE with size SIZE."
+an array of TYPE with size SIZE. The TYPE parameter is evaluated."
   (if (eq size :unspecified)
       (progn
 	#+cmu
-	`(alien:make-alien ,(convert-from-uffi-type type :allocation))
+	`(alien:make-alien ,(convert-from-uffi-type (eval type) :allocation))
 	#+lispworks
-	`(fli:allocate-foreign-object :type ',(convert-from-uffi-type type :allocate))
+	`(fli:allocate-foreign-object :type ,(convert-from-uffi-type type :allocate))
 	#+allegro
-	`(ff:allocate-fobject ',(convert-from-uffi-type type :allocate) :c))
+	`(ff:allocate-fobject ,(convert-from-uffi-type type :allocate) :c))
       (progn
 	#+cmu
-	`(alien:make-alien ,(convert-from-uffi-type type :allocation) ,size)
+	`(alien:make-alien ,(convert-from-uffi-type (eval type) :allocation) ,size)
 	#+lispworks
-	`(fli:allocate-foreign-object :type ',(convert-from-uffi-type type :allocate) :nelems ,size)
+	`(fli:allocate-foreign-object :type ,(convert-from-uffi-type type :allocate) :nelems ,size)
 	#+allegro
-	`(ff:allocate-fobject '(:array ,(convert-from-uffi-type type :allocate) ,(eval size)) :c)
+	`(ff:allocate-fobject '(:array ,(convert-from-uffi-type (eval type) :allocate) ,(eval size)) :c)
       )
   ))
 
@@ -76,7 +76,7 @@ an array of TYPE with size SIZE."
   #+(or cmu lispworks) (declare (ignore type))
   #+cmu  `(alien:deref ,ptr)
   #+lispworks `(fli:dereference ,ptr)
-  #+allegro `(ff:fslot-value-typed ,type :c ,ptr)
+  #+allegro `(ff:fslot-value-typed ,(convert-from-uffi-type type :deref) :c ,ptr)
 )
 
 #+lispworks ;; with LW, deref is a character
@@ -107,20 +107,21 @@ an array of TYPE with size SIZE."
   obj
   )
 
-;; Simple first pass. Will later create optimized routines for
-;; various platforms.
+;; TYPE is evaluated.
 (defmacro with-foreign-object ((var type) &rest body)
-  #+allegro
+  #-(or cmu lispworks) ; default version
   `(let ((,var (allocate-foreign-object ,type)))
     (unwind-protect
 	 (progn ,@body)
       (free-foreign-object ,var)))
   #+cmu
-  `(alien:with-alien ((,var ,(convert-from-uffi-type type :allocate)))
-    (setq ,var (alien:addr ,var))
-    ,@body)
+  (let ((obj (gensym)))
+    `(alien:with-alien ((,obj ,(convert-from-uffi-type (eval type) :allocate)))
+       (let ((,var (alien:addr ,obj)))
+	 ,@body)))
   #+lispworks
-  `(fli:with-dynamic-foreign-objects ((,var ,(convert-from-uffi-type type :allocate)))
+  `(fli:with-dynamic-foreign-objects ((,var ,(convert-from-uffi-type
+					      (eval type) :allocate)))
     ,@body)
   )