From f430c9a3d55e01a40e8fbf0ccca8a0078b71f4b6 Mon Sep 17 00:00:00 2001
From: Joe Groff <arcata@gmail.com>
Date: Tue, 25 Aug 2009 11:40:05 -0500
Subject: [PATCH] fix classes.struct structs when used in FFI, add a test

---
 extra/classes/struct/struct-tests.factor | 32 ++++++++++++++++--------
 extra/classes/struct/struct.factor       |  2 +-
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/extra/classes/struct/struct-tests.factor b/extra/classes/struct/struct-tests.factor
index 912d33c7bc..467f9da67b 100644
--- a/extra/classes/struct/struct-tests.factor
+++ b/extra/classes/struct/struct-tests.factor
@@ -1,13 +1,15 @@
 ! (c)Joe Groff bsd license
-USING: accessors alien.c-types alien.structs.fields classes.c-types
-classes.struct combinators io.streams.string kernel libc literals math
-multiline namespaces prettyprint prettyprint.config see tools.test ;
+USING: accessors alien.c-types alien.structs.fields alien.syntax
+classes.c-types classes.struct combinators io.streams.string kernel
+libc literals math multiline namespaces prettyprint prettyprint.config
+see tools.test ;
+FROM: classes.c-types => float ;
 IN: classes.struct.tests
 
 STRUCT: struct-test-foo
     { x char }
     { y int initial: 123 }
-    { z boolean } ;
+    { z bool } ;
 
 STRUCT: struct-test-bar
     { w ushort initial: HEX: ffff }
@@ -32,7 +34,7 @@ STRUCT: struct-test-bar
 [ 7654 ] [ S{ struct-test-foo { y 7654 } } y>> ] unit-test
 
 UNION-STRUCT: struct-test-float-and-bits
-    { f single-float }
+    { f float }
     { bits uint } ;
 
 [ 1.0 ] [ struct-test-float-and-bits <struct> 1.0 float>bits >>bits f>> ] unit-test
@@ -65,7 +67,7 @@ STRUCT: struct-test-foo
 [ <" USING: classes.c-types classes.struct ;
 IN: classes.struct.tests
 UNION-STRUCT: struct-test-float-and-bits
-    { f single-float initial: 0.0 } { bits uint initial: 0 } ;
+    { f float initial: 0.0 } { bits uint initial: 0 } ;
 "> ]
 [ [ struct-test-float-and-bits see ] with-string-writer ] unit-test
 
@@ -73,21 +75,21 @@ UNION-STRUCT: struct-test-float-and-bits
     T{ field-spec
         { name "x" }
         { offset 0 }
-        { type $[ char c-type ] }
+        { type char }
         { reader x>> }
         { writer (>>x) }
     }
     T{ field-spec
         { name "y" }
         { offset 4 }
-        { type $[ int c-type ] }
+        { type int }
         { reader y>> }
         { writer (>>y) }
     }
     T{ field-spec
         { name "z" }
         { offset 8 }
-        { type $[ boolean c-type ] }
+        { type bool }
         { reader z>> }
         { writer (>>z) }
     }
@@ -97,16 +99,24 @@ UNION-STRUCT: struct-test-float-and-bits
     T{ field-spec
         { name "f" }
         { offset 0 }
-        { type $[ single-float c-type ] }
+        { type float }
         { reader f>> }
         { writer (>>f) }
     }
     T{ field-spec
         { name "bits" }
         { offset 0 }
-        { type $[ uint c-type ] }
+        { type uint }
         { reader bits>> }
         { writer (>>bits) }
     }
 } ] [ "struct-test-float-and-bits" c-type fields>> ] unit-test
 
+STRUCT: struct-test-ffi-foo
+    { x int }
+    { y int } ;
+
+LIBRARY: f-cdecl
+FUNCTION: int ffi_test_11 ( int a, struct-test-ffi-foo b, int c ) ;
+
+[ 14 ] [ 1 2 3 struct-test-ffi-foo <struct-boa> 4 ffi_test_11 ] unit-test
diff --git a/extra/classes/struct/struct.factor b/extra/classes/struct/struct.factor
index 3d4ffe138b..02d0a056a8 100644
--- a/extra/classes/struct/struct.factor
+++ b/extra/classes/struct/struct.factor
@@ -96,7 +96,7 @@ M: struct-class writer-quot
     field-spec new swap {
         [ name>> >>name ]
         [ offset>> >>offset ]
-        [ class>> c-type >>type ]
+        [ class>> >>type ]
         [ name>> reader-word >>reader ]
         [ name>> writer-word >>writer ]
     } cleave ;