r2997: *** empty log message ***

[uffi.git] / src / aggregates.lisp

diff --git a/src/aggregates.lisp b/src/aggregates.lisp
index a1d8a67d69c1b74cbad780ae9fb2dd4ebbec1610..bb183cfb0da837d2d0f755008f577855792a188a 100644 (file)
--- a/src/aggregates.lisp
+++ b/src/aggregates.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: aggregates.lisp,v 1.1 2002/09/30 10:02:36 kevin Exp $
+;;;; $Id: aggregates.lisp,v 1.2 2002/10/14 01:51:15 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -45,6 +45,7 @@ of the enum-name name, separator-string, and field-name"
                       #+allegro `((ff:def-foreign-type ,enum-name :int))
                       #+lispworks `((fli:define-c-typedef ,enum-name :int))
                       #+cmu `((alien:def-alien-type ,enum-name alien:signed))
+                      #+sbcl `((sb-alien:def-alien-type ,enum-name sb-alien:signed))
                        #+(and mcl (not openmcl)) `((def-mcl-type ,enum-name :integer))
                        #+openmcl `((ccl::def-foreign-type ,enum-name :int))
                       (nreverse constants)))
@@ -61,6 +62,9 @@ of the enum-name name, separator-string, and field-name"
   #+cmu
   `(alien:def-alien-type ,name-array 
     (* ,(convert-from-uffi-type type :array)))
+  #+sbcl
+  `(sb-alien:def-alien-type ,name-array 
+    (* ,(convert-from-uffi-type type :array)))
   #+(and mcl (not openmcl))
   `(def-mcl-type ,name-array '(:array ,type))
   #+openmcl
@@ -75,8 +79,9 @@ of the enum-name name, separator-string, and field-name"
             (def (append (list field-name)
                          (if (eq type :pointer-self)
                              #+cmu `((* (alien:struct ,name)))
+                             #+sbcl `((* (sb-alien:struct ,name)))
                              #+mcl `((:* (:struct ,name)))
-                             #-(or cmu mcl) `((* ,name))
+                             #-(or cmu sbcl mcl) `((* ,name))
                              `(,(convert-from-uffi-type type :struct))))))
        (if variant
            (push (list def) processed)
@@ -87,6 +92,8 @@ of the enum-name name, separator-string, and field-name"
 (defmacro def-struct (name &rest fields)
   #+cmu
   `(alien:def-alien-type ,name (alien:struct ,name ,@(process-struct-fields name fields)))
+  #+sbcl
+  `(sb-alien:def-alien-type ,name (sb-alien:struct ,name ,@(process-struct-fields name fields)))
   #+allegro
   `(ff:def-foreign-type ,name (:struct ,@(process-struct-fields name fields)))
   #+lispworks
@@ -101,13 +108,15 @@ of the enum-name name, separator-string, and field-name"
 
 
 (defmacro get-slot-value (obj type slot)
-  #+(or lispworks cmu) (declare (ignore type))
+  #+(or lispworks cmu sbcl) (declare (ignore type))
   #+allegro
   `(ff:fslot-value-typed ,type :c ,obj ,slot)
   #+lispworks
   `(fli:foreign-slot-value ,obj ,slot)
   #+cmu
   `(alien:slot ,obj ,slot)
+  #+sbcl
+  `(sb-alien:slot ,obj ,slot)
   #+mcl
   `(ccl:pref ,obj ,(read-from-string (format nil ":~a.~a" (keyword type) (keyword slot))))
   )
@@ -121,13 +130,15 @@ of the enum-name name, separator-string, and field-name"
 
 
 (defmacro get-slot-pointer (obj type slot)
-  #+(or lispworks cmu) (declare (ignore type))
+  #+(or lispworks cmu sbcl) (declare (ignore type))
   #+allegro
   `(ff:fslot-value-typed ,type :c ,obj ,slot)
   #+lispworks
   `(fli:foreign-slot-pointer ,obj ,slot)
   #+cmu
   `(alien:slot ,obj ,slot)
+  #+sbcl
+  `(sb-alien:slot ,obj ,slot)
   #+(and mcl (not openmcl))
   `(ccl:%int-to-ptr (+ (ccl:%ptr-to-int ,obj) (the fixnum (ccl:field-info ,type ,slot))))
   #+openmcl
@@ -148,8 +159,9 @@ of the enum-name name, separator-string, and field-name"
 
 (defmacro deref-array (obj type i)
   "Returns a field from a row"
-  #+(or lispworks cmu) (declare (ignore type))
+  #+(or lispworks cmu sbcl) (declare (ignore type))
   #+cmu  `(alien:deref ,obj ,i)
+  #+sbcl  `(sb-alien:deref ,obj ,i)
   #+lispworks `(fli:dereference ,obj :index ,i)
   #+allegro `(ff:fslot-value-typed (quote ,(convert-from-uffi-type type :type)) :c ,obj ,i)
   #+mcl
@@ -183,6 +195,8 @@ of the enum-name name, separator-string, and field-name"
   `(fli:define-c-union ,name ,@(process-struct-fields name fields))
   #+cmu
   `(alien:def-alien-type ,name (alien:union ,name ,@(process-struct-fields name fields)))
+  #+sbcl
+  `(sb-alien:def-alien-type ,name (sb-alien:union ,name ,@(process-struct-fields name fields)))
   #+(and mcl (not openmcl))
   `(ccl:defrecord ,name (:variant ,@(process-struct-fields name fields t)))
   #+openmcl