X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fobjects.cl;h=1ac0ad8b4080f6c1836a10b69eb447d2be3b9693;hb=7fcec7e8319f5b11c8f501b6a869142cd26a8bdd;hp=316a7eea35449397fa73703afeb71a4134f5b45b;hpb=bf5c7e7c36474375604bcbcedea8794a68dd1784;p=uffi.git

diff --git a/src/objects.cl b/src/objects.cl
index 316a7ee..1ac0ad8 100644
--- a/src/objects.cl
+++ b/src/objects.cl
@@ -1,4 +1,4 @@
-;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
+;;;; -*- Mode: ANSI-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.5 2002/03/14 21:03:12 kevin Exp $
+;;;; $Id: objects.cl,v 1.10 2002/03/21 07:56:45 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,11 +66,30 @@
 
 (defmacro deref-pointer (ptr type)
   "Returns a object pointed"
-  #+(or lispworks cmu) (declare (ignore type))
+  #+(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
@@ -68,3 +99,20 @@
   #+allegro
   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)
+)
+|#