X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;ds=sidebyside;f=src%2Fobjects.cl;h=b0b34f07ca98fb8191238cdf7f9fd8e5285c24eb;hb=4054fe997dbce15071a1d2b96a082b4a4a5a8363;hp=01884302c2679606db6e7af3a7592f0ef8459cce;hpb=e4010c4542ebfdb0f95c15b391648eafa7d64949;p=uffi.git

diff --git a/src/objects.cl b/src/objects.cl
index 0188430..b0b34f0 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.7 2002/03/18 02:27:28 kevin Exp $
+;;;; $Id: objects.cl,v 1.11 2002/03/21 14:49:14 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -19,14 +19,26 @@
 (declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
 (in-package :uffi)
 
-(defmacro allocate-foreign-object (type)
-  #+cmu
-  `(alien:make-alien ,(convert-from-uffi-type type :allocation))
-  #+lispworks
-  `(fli:allocate-foreign-object :type ',(convert-from-uffi-type type :allocate))
-  #+allegro
-  `(ff:allocate-fobject ',(convert-from-uffi-type type :allocate) :c)
-  )
+(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."
+  (if (eq size :unspecified)
+      (progn
+	#+cmu
+	`(alien:make-alien ,(convert-from-uffi-type type :allocation))
+	#+lispworks
+	`(fli:allocate-foreign-object :type ',(convert-from-uffi-type type :allocate))
+	#+allegro
+	`(ff:allocate-fobject ',(convert-from-uffi-type type :allocate) :c))
+      (progn
+	#+cmu
+	`(alien:make-alien ,(convert-from-uffi-type type :allocation) ,size)
+	#+lispworks
+	`(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)
+      )
+  ))
 
 (defmacro free-foreign-object (obj)
   #+cmu
@@ -54,18 +66,30 @@
 
 (defmacro deref-pointer (ptr type)
   "Returns a object pointed"
-  (let ((result (gensym)))
-    `(let ((,result
-	    #+cmu  (alien:deref ,ptr)
-	    #+lispworks (fli:dereference ,ptr)
-	    #+allegro (ff:fslot-value-typed ,type :c ,ptr)
-	    ))
-      (if (and
-	   (or (eq ,type :char)
-	       (eq ,type :unsigned-char))
-	   (numberp ,result))
-	  (code-char ,result)
-	  ,result))))
+  #+(or cmu lispworks) (declare (ignore type))
+  #+cmu  `(alien:deref ,ptr)
+  #+lispworks `(fli:dereference ,ptr)
+  #+allegro `(ff:fslot-value-typed ,type :c ,ptr)
+)
+
+#+lispworks ;; with LW, deref is a character
+(defmacro ensure-char-character (obj)
+  obj
+  )
+
+#+(or allegro cmu)
+(defmacro ensure-char-character (obj)
+  `(code-char ,obj)
+  )
+  
+#+lispworks
+(defmacro ensure-char-integer (obj)
+ `(char-code ,obj))
+
+#+(or allegro cmu)
+(defmacro ensure-char-integer (obj)
+  obj
+  ) ;; (* :char) dereference is already an integer
 
 (defmacro pointer-address (obj)
   #+cmu
@@ -76,22 +100,21 @@
   obj
   )
 
-(defmacro allocate-byte-array (nsize)
-  #+cmu
-  `(alien:make-alien (alien:unsigned 8) ,nsize)
-  #+lispworks
-  `(fli:allocate-foreign-object :type :byte :nelems ,nsize)
-  #+allegro
-  `(ff:allocate-fobject (array :byte ,nsize))
-)
-
-(defmacro deref-byte-array (array position)
-  #+cmu `(alien:deref ,array ,position)
-  #+lispworks `(fli:dereference ,array :index ,position)
-  #+allegro `(ff:fslot-value-typed '(:array :byte) :c ,array ,position)
-)
-
-
+;; Simple first pass. Will later create optimized routines for
+;; various platforms.
+(defmacro with-foreign-object ((var type &rest etc) &rest body)
+  (let ((result (gensym)))
+    `(let* ((,var (allocate-foreign-object ,type ,@etc))
+	    (,result (progn ,@body)))
+      (free-foreign-object ,var)
+      ,result)))
 
+(defmacro with-foreign-objects (bindings &rest body)
+  (if bindings
+      `(with-foreign-object ,(car bindings)
+	(with-foreign-objects ,(cdr bindings)
+	  ,@body))
+      `(progn ,@body)))
 
-)
+	    
+