From e046605473b602e1ac84781cc17e04407677c876 Mon Sep 17 00:00:00 2001
From: Jeremy Hughes <jedahu@gmail.com>
Date: Tue, 7 Jul 2009 19:44:34 +1200
Subject: [PATCH] moved struct wrapper code from alien.structs.structs to
 alien.marshall.structs

---
 basis/alien/marshall/marshall.factor        |  2 +
 basis/alien/marshall/structs/authors.txt    |  1 +
 basis/alien/marshall/structs/structs.factor | 37 ++++++++++++++++++
 basis/alien/structs/structs.factor          | 43 ++-------------------
 basis/alien/syntax/syntax.factor            |  3 +-
 5 files changed, 46 insertions(+), 40 deletions(-)
 create mode 100644 basis/alien/marshall/structs/authors.txt
 create mode 100644 basis/alien/marshall/structs/structs.factor

diff --git a/basis/alien/marshall/marshall.factor b/basis/alien/marshall/marshall.factor
index 4f6d125557..098a0e9127 100644
--- a/basis/alien/marshall/marshall.factor
+++ b/basis/alien/marshall/marshall.factor
@@ -18,10 +18,12 @@ IN: alien.marshall
 [ define-primitive-marshallers ] each >>
 
 TUPLE: alien-wrapper { underlying alien } ;
+TUPLE: struct-wrapper < alien-wrapper disposed ;
 
 GENERIC: dynamic-cast ( alien-wrapper -- alien-wrapper' )
 
 M: alien-wrapper dynamic-cast ;
+M: struct-wrapper dynamic-cast ;
 
 : marshall-pointer ( obj -- alien )
     {
diff --git a/basis/alien/marshall/structs/authors.txt b/basis/alien/marshall/structs/authors.txt
new file mode 100644
index 0000000000..c45c6f3279
--- /dev/null
+++ b/basis/alien/marshall/structs/authors.txt
@@ -0,0 +1 @@
+Jeremy Hughes
\ No newline at end of file
diff --git a/basis/alien/marshall/structs/structs.factor b/basis/alien/marshall/structs/structs.factor
new file mode 100644
index 0000000000..2fbe73563d
--- /dev/null
+++ b/basis/alien/marshall/structs/structs.factor
@@ -0,0 +1,37 @@
+! Copyright (C) 2009 Jeremy Hughes.
+! See http://factorcode.org/license.txt for BSD license.
+USING: accessors alien.c-types alien.marshall arrays assocs
+classes.tuple combinators destructors generalizations generic
+kernel libc locals parser quotations sequences slots words ;
+IN: alien.marshall.structs
+
+M: struct-wrapper dispose* underlying>> free ;
+
+: define-struct-accessor ( class name quot -- )
+    [ "accessors" create create-method dup make-inline ] dip define ;
+
+: define-struct-getter ( class name word type -- )
+    [ ">>" append \ underlying>> ] 2dip 
+    unmarshaller \ call 4array >quotation
+    define-struct-accessor ;
+
+: define-struct-setter ( class name word type -- )
+    [ "(>>" prepend ")" append ] 2dip
+    marshaller [ underlying>> ] \ bi* roll 4array >quotation
+    define-struct-accessor ;
+
+: define-struct-accessors ( class name type reader writer -- )
+    [ dup define-protocol-slot ] 3dip
+    [ drop swap define-struct-getter ]
+    [ nip swap define-struct-setter ] 5 nbi ;
+
+:: define-struct-tuple ( name -- )
+    name create-in :> class
+    class struct-wrapper { } define-tuple-class
+    name c-type fields>> [
+        class swap
+        {
+            [ name>> { { CHAR: space CHAR: - } } substitute ]
+            [ type>> ] [ reader>> ] [ writer>> ]
+        } cleave define-struct-accessors
+    ] each ;
diff --git a/basis/alien/structs/structs.factor b/basis/alien/structs/structs.factor
index 6820c7afeb..b618e7974b 100755
--- a/basis/alien/structs/structs.factor
+++ b/basis/alien/structs/structs.factor
@@ -1,11 +1,9 @@
 ! Copyright (C) 2004, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors alien.c-types alien.marshall
-alien.structs.fields arrays assocs byte-arrays classes.tuple
-combinators cpu.architecture destructors fry generalizations
-generic hashtables kernel kernel.private libc locals math
-math.order namespaces parser quotations sequences slots strings
-words ;
+USING: accessors arrays assocs generic hashtables kernel kernel.private
+math namespaces parser sequences strings words libc fry
+alien.c-types alien.structs.fields cpu.architecture math.order
+quotations byte-arrays ;
 IN: alien.structs
 
 TUPLE: struct-type
@@ -84,36 +82,3 @@ M: struct-type stack-size
 : offset-of ( field struct -- offset )
     c-types get at fields>> 
     [ name>> = ] with find nip offset>> ;
-
-TUPLE: struct-wrapper < alien-wrapper disposed ;
-
-M: struct-wrapper dispose* underlying>> free ;
-
-: define-struct-accessor ( class name quot -- )
-    [ "accessors" create create-method dup make-inline ] dip define ;
-
-: define-struct-getter ( class name word type -- )
-    [ ">>" append \ underlying>> ] 2dip 
-    unmarshaller \ call 4array >quotation
-    define-struct-accessor ;
-
-: define-struct-setter ( class name word type -- )
-    [ "(>>" prepend ")" append ] 2dip
-    marshaller [ underlying>> ] \ bi* roll 4array >quotation
-    define-struct-accessor ;
-
-: define-struct-accessors ( class name type reader writer -- )
-    [ dup define-protocol-slot ] 3dip
-    [ drop swap define-struct-getter ]
-    [ nip swap define-struct-setter ] 5 nbi ;
-
-:: define-struct-tuple ( name -- )
-    name create-in :> class
-    class struct-wrapper { } define-tuple-class
-    name c-type fields>> [
-        class swap
-        {
-            [ name>> { { CHAR: space CHAR: - } } substitute ]
-            [ type>> ] [ reader>> ] [ writer>> ]
-        } cleave define-struct-accessors
-    ] each ;
diff --git a/basis/alien/syntax/syntax.factor b/basis/alien/syntax/syntax.factor
index 113581c949..ba2cbd9e53 100644
--- a/basis/alien/syntax/syntax.factor
+++ b/basis/alien/syntax/syntax.factor
@@ -4,7 +4,8 @@ USING: accessors arrays alien alien.c-types alien.structs
 alien.arrays alien.strings kernel math namespaces parser
 sequences words quotations math.parser splitting grouping
 effects assocs combinators lexer strings.parser alien.parser 
-fry vocabs.parser words.constant alien.libraries ;
+fry vocabs.parser words.constant alien.libraries
+alien.marshall.structs ;
 IN: alien.syntax
 
 SYNTAX: DLL" lexer get skip-blank parse-string dlopen parsed ;