X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fobjects.cl;h=014fe9d2fae243f97d4d2b63c94a29ea583eba0c;hb=f73eb94e15649aba5fcfbe3a900aa72f31f46a96;hp=0f28115a0cbd24565ad81b915475212994923d77;hpb=fb93b1923db347f01bdebc7226e5e1eaacacc9f9;p=uffi.git

diff --git a/src/objects.cl b/src/objects.cl
index 0f28115..014fe9d 100644
--- 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.6 2002/03/17 17:33:30 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
 ;;;;
@@ -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. The TYPE parameter is evaluated."
+  (if (eq size :unspecified)
+      (progn
+	#+cmu
+	`(alien:make-alien ,(convert-from-uffi-type (eval 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 (eval 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 (eval type) :allocate) ,(eval size)) :c)
+      )
+  ))
 
 (defmacro free-foreign-object (obj)
   #+cmu
@@ -52,20 +64,39 @@
   #+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"
-  (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
@@ -75,3 +106,32 @@
   #+allegro
   obj
   )
+
+;; 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
+  (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
+					      (eval type) :allocate)))
+    ,@body)
+  )
+
+
+(defmacro with-foreign-objects (bindings &rest body)
+  (if bindings
+      `(with-foreign-object ,(car bindings)
+	(with-foreign-objects ,(cdr bindings)
+	  ,@body))
+      `(progn ,@body)))
+
+	    
+