r1645: *** empty log message ***

[uffi.git] / src / objects.cl

diff --git a/src/objects.cl b/src/objects.cl
index fdecab26d91c9909582a8bfdaffa8f84389be4f9..014fe9d2fae243f97d4d2b63c94a29ea583eba0c 100644 (file)
--- a/src/objects.cl
+++ b/src/objects.cl
@@ -1,4 +1,4 @@
-;;;; -*- Mode: ANSI-Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*-
+;;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*-
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: objects.cl,v 1.9 2002/03/19 16:42:59 kevin Exp $
+;;;; $Id: objects.cl,v 1.15 2002/03/23 16:32:39 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)
       )
   ))
 
@@ -64,6 +64,13 @@ an array of TYPE with size SIZE."
   #+lispworks `(fli:make-pointer :address 0 :type ,type)
   )
 
+(defmacro char-array-to-pointer (obj)
+  #+cmu `(alien:cast ,obj (* (alien:unsigned 8)))
+  #+lispworks `(fli:make-pointer :type '(:unsigned :char)
+                               :address (fli:pointer-address ,obj))
+  #+allegro obj
+  )
+
 (defmacro deref-pointer (ptr type)
   "Returns a object pointed"
   #+(or cmu lispworks) (declare (ignore type))
@@ -74,22 +81,21 @@ an array of TYPE with size SIZE."
 
 #+lispworks ;; with LW, deref is a character
 (defmacro ensure-char-character (obj)
-  "Ensures that the dereference of a :char is a character"
+  obj
   )
 
 #+(or allegro cmu)
 (defmacro ensure-char-character (obj)
-  "Ensures that the dereference of a :char is a character"
   `(code-char ,obj)
   )
   
 #+lispworks
 (defmacro ensure-char-integer (obj)
-  "Ensures that the dereference of a :char is a character"
  `(char-code ,obj))
 
 #+(or allegro cmu)
 (defmacro ensure-char-integer (obj)
+  obj
   ) ;; (* :char) dereference is already an integer
 
 (defmacro pointer-address (obj)
@@ -101,19 +107,31 @@ an array of TYPE with size SIZE."
   obj
   )
 
-#|
-(defmacro allocate-byte-array (nsize)
+;; TYPE is evaluated.
+(defmacro with-foreign-object ((var type) &rest body)
+  #-(or cmu lispworks) ; default version
+  `(let ((,var (allocate-foreign-object ,type)))
+    (unwind-protect
+        (progn ,@body)
+      (free-foreign-object ,var)))
   #+cmu
-  `(alien:make-alien (alien:unsigned 8) ,nsize)
+  (let ((obj (gensym)))
+    `(alien:with-alien ((,obj ,(convert-from-uffi-type (eval type) :allocate)))
+       (let ((,var (alien:addr ,obj)))
+        ,@body)))
   #+lispworks
-  `(fli:allocate-foreign-object :type :byte :nelems ,nsize)
-  #+allegro
-  `(ff:allocate-fobject (array :byte ,nsize))
-)
+  `(fli:with-dynamic-foreign-objects ((,var ,(convert-from-uffi-type
+                                             (eval type) :allocate)))
+    ,@body)
+  )
 
-(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)
-)
-|#
+
+(defmacro with-foreign-objects (bindings &rest body)
+  (if bindings
+      `(with-foreign-object ,(car bindings)
+       (with-foreign-objects ,(cdr bindings)
+         ,@body))
+      `(progn ,@body)))
+
+           
+