X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests%2Fforeign-var.lisp;h=9409eeaf476fc7428c7b8ed8c152e289bcd1714f;hb=7004c2691d5695471c7bce9d62b82a1914cf05a2;hp=08a6e950388dc7d5e6de1539ce3a372f8e01de82;hpb=db166e2970e1aaabd611e243eb899ae4d2f5f5ff;p=uffi.git

diff --git a/tests/foreign-var.lisp b/tests/foreign-var.lisp
index 08a6e95..9409eea 100644
--- a/tests/foreign-var.lisp
+++ b/tests/foreign-var.lisp
@@ -4,17 +4,17 @@
 ;;;;
 ;;;; Name:          foreign-var
 ;;;; Purpose:       Tests of foreign variables
-;;;; Programmer:    Kevin M. Rosenberg
+;;;; Authors:       Kevin M. Rosenberg and Edi Weitz
 ;;;; Date Started:  Aug 2003
 ;;;;
-;;;; $Id: foreign-var.lisp,v 1.1 2003/08/14 21:40:13 kevin Exp $
+;;;; $Id$
 ;;;;
 ;;;; *************************************************************************
 
 (in-package #:uffi-tests)
 
-(def-foreign-var "uchar_13" :char "uffi_tests")
-(def-foreign-var "schar_neg_120" :char "uffi_tests")
+(def-foreign-var "uchar_13" :unsigned-byte "uffi_tests")
+(def-foreign-var "schar_neg_120" :byte "uffi_tests")
 (def-foreign-var "uword_257" :unsigned-short "uffi_tests")
 (def-foreign-var "sword_neg_321" :short "uffi_tests")
 (def-foreign-var "uint_1234567" :int "uffi_tests")
@@ -32,3 +32,56 @@
 (deftest fvar.8 double-3-1 3.1d0)
 
 
+(uffi:def-foreign-var ("fvar_addend" *fvar-addend*) :int "uffi_tests")
+
+(uffi:def-struct fvar-struct
+    (i :int)
+  (d :double))
+ 
+(uffi:def-foreign-var ("fvar_struct" *fvar-struct*) fvar-struct
+  "c-uffi-tests")
+
+(uffi:def-function ("fvar_struct_int" fvar-struct-int)
+    ()
+  :returning :int
+  :module "c-uffi-test")
+ 
+  (uffi:def-function ("fvar_struct_double" fvar-struct-double)
+      ()
+    :returning :double
+    :module "c-uffi-test")
+ 
+(deftest fvarst.1 *fvar-addend* 3)
+(deftest fvarst.2 (uffi:get-slot-value *fvar-struct* 'fvar-struct 'i) 42)
+(deftest fvarst.3 (= (+ *fvar-addend*
+			(uffi:get-slot-value *fvar-struct* 'fvar-struct 'i))
+		     (fvar-struct-int))
+  t)
+(deftest fvarst.4 (uffi:get-slot-value *fvar-struct* 'fvar-struct 'd) 3.2d0)
+(deftest fvarst.5 (= (uffi:get-slot-value *fvar-struct* 'fvar-struct 'd)
+		     (fvar-struct-double))
+  t)
+
+(deftest fvarst.6 
+    (let ((orig *fvar-addend*))
+      (incf *fvar-addend* 3)
+      (prog1
+	  *fvar-addend*
+	(setf *fvar-addend* orig)))
+  6)
+
+(deftest fvarst.7 
+    (let ((orig *fvar-addend*))
+      (incf *fvar-addend* 3)
+      (prog1
+	  (fvar-struct-int)
+	(setf *fvar-addend* orig)))
+  48)
+
+(deftest fvarst.8 
+    (let ((orig (uffi:get-slot-value *fvar-struct* 'fvar-struct 'i)))
+      (decf (uffi:get-slot-value *fvar-struct* 'fvar-struct 'i) 10)
+      (prog1
+	  (fvar-struct-int)
+	(setf (uffi:get-slot-value *fvar-struct* 'fvar-struct 'i) orig)))
+  35)