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

diff --git a/src/objects.cl b/src/objects.cl
index a114b65..b0b34f0 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,37 +7,38 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; Copyright (c) 2002 Kevin M. Rosenberg
+;;;; $Id: objects.cl,v 1.11 2002/03/21 14:49:14 kevin Exp $
 ;;;;
-;;;; $Id: objects.cl,v 1.1 2002/03/09 19:55:33 kevin Exp $
+;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
-;;;; This file is part of the UFFI. 
-;;;;
-;;;; UFFI is free software; you can redistribute it and/or modify
-;;;; it under the terms of the GNU General Public License (version 2) as
-;;;; published by the Free Software Foundation.
-;;;;
-;;;; UFFI is distributed in the hope that it will be useful,
-;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;;; GNU General Public License for more details.
-;;;;
-;;;; You should have received a copy of the GNU General Public License
-;;;; along with UFFI; if not, write to the Free Software
-;;;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+;;;; UFFI users are granted the rights to distribute and use this software
+;;;; as governed by the terms of the Lisp Lesser GNU Public License
+;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
 (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,10 +55,6 @@
   #+cmu   `(alien:null-alien ,obj)
   )
 
-(def-constant +null-c-string-pointer+
-    #+cmu nil
-    #+allegro 0
-    #+lispworks (fli:make-pointer :address 0 :type '(:unsigned :char)))
 
 (defmacro make-null-pointer (type)
   #+(or allegro cmu) (declare (ignore type))
@@ -69,12 +66,31 @@
 
 (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
   `(system:sap-int (alien:alien-sap ,obj))
@@ -83,3 +99,22 @@
   #+allegro
   obj
   )
+
+;; 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)))
+
+	    
+