r1588: Added array allocation to allocate-foreign-objects

[uffi.git] / src / objects.cl

diff --git a/src/objects.cl b/src/objects.cl
index 01884302c2679606db6e7af3a7592f0ef8459cce..f9651d468c53603e763012d736c524360e5838ad 100644 (file)
--- 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.8 2002/03/18 22:47:57 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,10 @@
 
 (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))))
+  #+cmu  `(alien:deref ,ptr)
+  #+lispworks `(fli:dereference ,ptr)
+  #+allegro `(ff:fslot-value-typed ,type :c ,ptr)
+)
 
 (defmacro pointer-address (obj)
   #+cmu
@@ -76,6 +80,7 @@
   obj
   )
 
+#|
 (defmacro allocate-byte-array (nsize)
   #+cmu
   `(alien:make-alien (alien:unsigned 8) ,nsize)
@@ -90,8 +95,4 @@
   #+lispworks `(fli:dereference ,array :index ,position)
   #+allegro `(ff:fslot-value-typed '(:array :byte) :c ,array ,position)
 )
-
-
-
-
-)
+|#