X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=examples%2Funion.cl;h=c3349c6d15939c22d1239b3607a4540befcdd526;hb=6aca6ef38f1f406c9e7987e46cbaca3299c487fb;hp=b876699b6f1fd7ae5fc312e47a16c049f9351c25;hpb=1796f8c038481234982c983cb0ee611c3ffac4c6;p=uffi.git

diff --git a/examples/union.cl b/examples/union.cl
index b876699..c3349c6 100644
--- a/examples/union.cl
+++ b/examples/union.cl
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Mar 2002
 ;;;;
-;;;; $Id: union.cl,v 1.2 2002/03/21 08:30:10 kevin Exp $
+;;;; $Id: union.cl,v 1.7 2002/04/03 00:57:48 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -25,22 +25,62 @@
   (sf :float)
   (df :double))
 
-(defun test-union-1 ()
-  (let ((u (uffi:allocate-foreign-object tunion1)))
-    (setf (uffi:get-slot-value u 'tunion1 'uint) 
-      (+ (char-code #\A) 
-	 (* 256 (char-code #\B))
-	 (* 65536 (char-code #\C))
-	 (* 16777216 255)))
-    (format t "~&Should be #\A: ~S" 
+(defun run-union-1 ()
+  (let ((u (uffi:allocate-foreign-object 'tunion1)))
+    (setf (uffi:get-slot-value u 'tunion1 'uint)
+	  #-sparc
+	  (+ (* 1 (char-code #\A))
+	     (* 256 (char-code #\B))
+	     (* 65536 (char-code #\C))
+	     (* 16777216 255))
+	  #+(or sparc sparc-v9)
+	  (+ (* 16777216 (char-code #\A))
+	     (* 65536 (char-code #\B))
+	     (* 256 (char-code #\C))
+	     (* 1 255)))
+    (format *standard-output* "~&Should be #\A: ~S" 
 	    (uffi:ensure-char-character 
 	     (uffi:get-slot-value u 'tunion1 'char)))
-    (format t "~&Should be negative number: ~D" 
+    (format *standard-output* "~&Should be negative number: ~D" 
 	    (uffi:get-slot-value u 'tunion1 'int))
-    (format t "~&Should be positive number: ~D"
+    (format *standard-output* "~&Should be positive number: ~D"
 	    (uffi:get-slot-value u 'tunion1 'uint))
     (uffi:free-foreign-object u))
   (values))
 
-#+uffi-test
+(defun test-union-1 ()
+  (let ((u (uffi:allocate-foreign-object 'tunion1)))
+    (setf (uffi:get-slot-value u 'tunion1 'uint)
+	  #-sparc
+	  (+ (* 1 (char-code #\A))
+	     (* 256 (char-code #\B))
+	     (* 65536 (char-code #\C))
+	     (* 16777216 128))
+	  #+(or sparc sparc-v9)
+	  (+ (* 16777216 (char-code #\A))
+	     (* 65536 (char-code #\B))
+	     (* 256 (char-code #\C))
+	     (* 1 128))) ;set signed bit
+    (util.test:test (uffi:ensure-char-character 
+		(uffi:get-slot-value u 'tunion1 'char))
+	       #\A
+	       :test #'eql
+	       :fail-info "Error with union character")
+    #-(or sparc sparc-v9)
+    (util.test:test (> 0 (uffi:get-slot-value u 'tunion1 'int))
+	       t
+	       :fail-info
+	       "Error with negative int in union")
+    (util.test:test (plusp (uffi:get-slot-value u 'tunion1 'uint))
+	       t
+	       :fail-info
+	       "Error with unsigned int in union")
+    (uffi:free-foreign-object u))
+  (values))
+
+#+examples-uffi
+(run-union-1)
+
+
+#+test-uffi
 (test-union-1)