X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests%2Fforeign-var.lisp;h=fda7c10d86b62c8e76bdbebe9cf9692c78545789;hb=a3db800bfa385ae39d729ef0eb8f08a78ceaccdb;hp=e2904ff0e145d6817ae5c35984edf5b765954b8f;hpb=0824453227a26da41a3929c9117b66714980414b;p=uffi.git diff --git a/tests/foreign-var.lisp b/tests/foreign-var.lisp index e2904ff..fda7c10 100644 --- a/tests/foreign-var.lisp +++ b/tests/foreign-var.lisp @@ -7,7 +7,7 @@ ;;;; Authors: Kevin M. Rosenberg and Edi Weitz ;;;; Date Started: Aug 2003 ;;;; -;;;; $Id$ +;;;; This file, part of UFFI, is Copyright (c) 2003-2010 by Kevin M. Rosenberg ;;;; ;;;; ************************************************************************* @@ -36,7 +36,7 @@ (uffi:def-struct fvar-struct (i :int) (d :double)) - + (uffi:def-foreign-var ("fvar_struct" *fvar-struct*) fvar-struct "uffi_tests") @@ -44,43 +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)) + (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)) + (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) -(deftest fvarst.8 +(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))) + (fvar-struct-int) + (setf (uffi:get-slot-value *fvar-struct* 'fvar-struct 'i) orig))) 35)