X-Git-Url: http://git.kpe.io/?p=uffi.git;a=blobdiff_plain;f=tests%2Fforeign-var.lisp;h=3a19d75e29e155a978e38068076372ffe93483d4;hp=52bceb159221330f1d5e03eaaaf1f8cb7133da4e;hb=b86fdf882156aa45dc6e8e93a158dedf506f4233;hpb=a27a393f26a7a423d758e902dbff07c81ccead91

diff --git a/tests/foreign-var.lisp b/tests/foreign-var.lisp
index 52bceb1..3a19d75 100644
--- a/tests/foreign-var.lisp
+++ b/tests/foreign-var.lisp
@@ -4,10 +4,10 @@
 ;;;;
 ;;;; 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.3 2003/08/15 02:34:34 kevin Exp $
+;;;; This file, part of UFFI, is Copyright (c) 2003-2010 by Kevin M. Rosenberg
 ;;;;
 ;;;; *************************************************************************
 
@@ -22,22 +22,21 @@
 (def-foreign-var "float_neg_4_5" :float "uffi_tests")
 (def-foreign-var "double_3_1" :double "uffi_tests")
 
-(deftest fvar.1 uchar-13 13)
-(deftest fvar.2 schar-neg-120 -120)
-(deftest fvar.3 uword-257 257)
-(deftest fvar.4 sword-neg-321 -321)
-(deftest fvar.5 uint-1234567 1234567)
-(deftest fvar.6 sint-neg-123456 -123456)
-(deftest fvar.7 float-neg-4-5 -4.5f0)
-(deftest fvar.8 double-3-1 3.1d0)
-
+(deftest :fvar.1 uchar-13 13)
+(deftest :fvar.2 schar-neg-120 -120)
+(deftest :fvar.3 uword-257 257)
+(deftest :fvar.4 sword-neg-321 -321)
+(deftest :fvar.5 uint-1234567 1234567)
+(deftest :fvar.6 sint-neg-123456 -123456)
+(deftest :fvar.7 float-neg-4-5 -4.5f0)
+(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
   "uffi_tests")
 
@@ -45,38 +44,43 @@
     ()
   :returning :int
   :module "uffi_tests")
- 
+
   (uffi:def-function ("fvar_struct_double" fvar-struct-double)
       ()
     :returning :double
     :module "uffi_tests")
- 
-(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))
+
+(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))
+(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 
+(deftest fvarst.6
     (let ((orig *fvar-addend*))
       (incf *fvar-addend* 3)
       (prog1
-	  *fvar-addend*
-	(setf *fvar-addend* orig)))
+          *fvar-addend*
+        (setf *fvar-addend* orig)))
   6)
 
-(deftest fvarst.7 
+(deftest fvarst.7
     (let ((orig *fvar-addend*))
       (incf *fvar-addend* 3)
       (prog1
-	  (fvar-struct-int)
-	(setf *fvar-addend* orig)))
+          (fvar-struct-int)
+        (setf *fvar-addend* orig)))
   48)
 
-;;(decf (uffi:get-slot-value *fvar-struct* 'fvar-struct 'i) 10)
-;;(deftest fvarst.8 (fvar-struct-int) 38)
+(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)