X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fobjects.lisp;h=4d86f1a21c4cb1b60a3187bf74aea4a26428025b;hb=7612015bdcfa851374a4e8c6f3ff68a8dd8b9a9a;hp=6c7a745476fea1939bb2e1b7d957d44980a57438;hpb=e88c7547a91c7ea966e1606963736f136e36ac7f;p=uffi.git

diff --git a/src/objects.lisp b/src/objects.lisp
index 6c7a745..4d86f1a 100644
--- a/src/objects.lisp
+++ b/src/objects.lisp
@@ -2,12 +2,12 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; Name:          objects.cl
+;;;; Name:          objects.lisp
 ;;;; Purpose:       UFFI source to handle objects and pointers
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: objects.lisp,v 1.6 2002/11/23 18:01:57 kevin Exp $
+;;;; $Id: objects.lisp,v 1.18 2003/08/14 21:58:29 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -16,8 +16,7 @@
 ;;;; (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)
+(in-package #:uffi)
 
 (defun size-of-foreign-type (type)
   #+lispworks (fli:size-of type)
@@ -58,7 +57,7 @@ an array of TYPE with size SIZE. The TYPE parameter is evaluated."
 	#+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)
+	`(ff:allocate-fobject (list :array (quote ,(convert-from-uffi-type type :allocate)) ,size) :c)
 	#+mcl
 	`(new-ptr (* ,size ,(size-of-foreign-type (convert-from-uffi-type type :allocation))))
 	)))
@@ -108,8 +107,8 @@ an array of TYPE with size SIZE. The TYPE parameter is evaluated."
   #+(or cmu scl)  `(alien:deref ,ptr)
   #+sbcl  `(sb-alien:deref ,ptr)
   #+lispworks `(fli:dereference ,ptr)
-  #+allegro `(ff:fslot-value-typed (convert-from-uffi-type ,type :deref) :c ,ptr)
-  #+mcl `(ccl:pref ,ptr (convert-from-uffi-type ,type :deref))
+  #+allegro `(ff:fslot-value-typed (quote ,(convert-from-uffi-type type :deref)) :c ,ptr)
+  #+mcl `(ccl:pref ,ptr ,(convert-from-uffi-type type :deref))
   )
 
 #+mcl
@@ -119,7 +118,11 @@ an array of TYPE with size SIZE. The TYPE parameter is evaluated."
 #+mcl
 (defsetf deref-pointer deref-pointer-set)
 
-#+(or lispworks (and mcl (not openmcl))) ;; with LW, deref is a character
+#+lispworks
+(defmacro ensure-char-character (obj)
+  `(if (characterp ,obj) ,obj (code-char ,obj)))
+
+#+(and mcl (not openmcl)) 
 (defmacro ensure-char-character (obj)
   obj)
 
@@ -198,3 +201,51 @@ an array of TYPE with size SIZE. The TYPE parameter is evaluated."
   `(with-foreign-objects ((,var ,type)) 
      ,@body))
 
+#+lispworks
+(defmacro with-cast-pointer ((binding-name pointer type) &body body)
+  `(fli:with-coerced-pointer (,binding-name
+                          :type ',(convert-from-uffi-type (eval type) :type))
+      ,pointer
+    ,@body))
+
+#+(or cmu scl sbcl)
+(defmacro with-cast-pointer ((binding-name pointer type) &body body)
+  `(let ((,binding-name
+          (#+(or cmu scl) alien:cast
+           #+sbcl sb-alien:cast
+           ,pointer (* ,(convert-from-uffi-type (eval type) :type)))))
+    ,@body))
+
+#+allegro
+(defmacro with-cast-pointer ((binding-name pointer type) &body body)
+  (declare (ignore type))
+  `(let ((,binding-name ,pointer))
+    ,@body))
+
+#-(or lispworks cmu scl sbcl allegro)
+(defmacro with-cast-pointer ((binding-name pointer type) &body body)
+  (declare (ignore binding-name pointer type))
+  '(error "WITH-CAST-POINTER not (yet) implemented for ~A"
+          (lisp-implementation-type)))
+
+(defmacro def-foreign-var (names type module)
+  #-lispworks (declare (ignore module))
+  (let ((foreign-name (if (atom names) names (first names)))
+        (lisp-name (if (atom names) (make-lisp-name names) (second names)))
+        (var-type (convert-from-uffi-type type :foreign-var)))
+    #+(or cmu scl)
+    `(alien:def-alien-variable (,foreign-name ,lisp-name) ,var-type)
+    #+sbcl
+    `(sb-alien:define-alien-variable (,foreign-name ,lisp-name) ,var-type)
+    #+allegro
+    `(ff:def-foreign-variable (,lisp-name ,foreign-name) :convention :c
+      :type ,var-type)
+    #+lispworks
+    (let ((temp-name (gensym)))
+      `(progn
+        (fli:define-foreign-variable (,temp-name ,foreign-name) :type ,var-type :module ,module)
+        (define-symbol-macro ,lisp-name (,temp-name))))
+    #-(or allegro cmu scl sbcl lispworks)
+    `(define-symbol-macro ,lisp-name
+      '(error "DEF-FOREIGN-VAR not (yet) defined for ~A"
+        (lisp-implementation-type)))))