union classes

diff --git a/extra/classes/struct/struct-tests.factor b/extra/classes/struct/struct-tests.factor
index 58069603320b50495b37ec179764e2376463ce87..8086f45ebf60f07c2a406c691cf3bbc2e105bc50 100644 (file)
--- a/extra/classes/struct/struct-tests.factor
+++ b/extra/classes/struct/struct-tests.factor
@@ -1,5 +1,5 @@
 USING: accessors alien.c-types classes.c-types classes.struct
-combinators inverse kernel tools.test ;
+combinators inverse kernel math tools.test ;
 IN: classes.struct.tests
 
 STRUCT: foo
@@ -30,3 +30,10 @@ STRUCT: bar
 [ 7654 ] [ S{ foo { y 7654 } } y>> ] unit-test
 
 [ 98 7654 t ] [ S{ foo f 98 7654 t } [ foo boa ] undo ] unit-test
+
+UNION-STRUCT: float-and-bits
+    { f single-float }
+    { bits uint } ;
+
+[ 1.0 ] [ float-and-bits <struct> 1.0 float>bits >>bits f>> ] unit-test
+

diff --git a/extra/classes/struct/struct.factor b/extra/classes/struct/struct.factor
index e2d2c336674dd3a4784cd2f241f29f4676d6bd26..2a7679bb0d1170fa6709a0b99e1d20a910dd08b7 100644 (file)
--- a/extra/classes/struct/struct.factor
+++ b/extra/classes/struct/struct.factor
@@ -93,6 +93,9 @@ M: struct-class class-slots
         [ (>>offset) ] [ class>> heap-size + ] 2bi
     ] reduce ;
 
+: union-struct-offsets ( slots -- size )
+    [ 0 >>offset class>> heap-size ] [ max ] map-reduce ;
+
 : struct-align ( slots -- align )
     [ class>> c-type-align ] [ max ] map-reduce ;
 
@@ -132,33 +135,40 @@ M: struct-class direct-array-of
         over [ swapd [ call( value struct -- ) ] curry keep ] [ 2drop ] if
     ] each ;
 
-: (define-struct-class) ( class slots size align -- )
+: (struct-word-props) ( class slots size align -- )
     [
         [ "struct-slots" set-word-prop ]
         [ define-accessors ] 2bi
     ]
     [ "struct-size" set-word-prop ]
-    [ "struct-align" set-word-prop ] tri-curry* tri ;
+    [ "struct-align" set-word-prop ] tri-curry*
+    [ tri ] 3curry
+    [ dup struct-prototype "prototype" set-word-prop ]
+    [ (define-object-slots-method) ] tri ;
 
 : check-struct-slots ( slots -- )
     [ class>> c-type drop ] each ;
 
-: define-struct-class ( class slots -- )
-    [ drop struct f define-tuple-class ] [
+: (define-struct-class) ( class slots offsets-quot -- )
+    [ drop struct f define-tuple-class ] swap '[
         make-slots dup
-        [ check-struct-slots ] [ struct-offsets ] [ struct-align [ align ] keep ] tri
-        (define-struct-class)
-    ] [
-        drop
-        [ dup struct-prototype "prototype" set-word-prop ]
-        [ (define-object-slots-method) ] bi
-    ] 2tri ;
+        [ check-struct-slots ] _ [ struct-align [ align ] keep ] tri
+        (struct-word-props)
+    ] 2bi ; inline
+
+: define-struct-class ( class slots -- )
+    [ struct-offsets ] (define-struct-class) ;
+
+: define-union-struct-class ( class slots -- )
+    [ union-struct-offsets ] (define-struct-class) ;
 
 : parse-struct-definition ( -- class slots )
     CREATE-CLASS [ parse-tuple-slots ] { } make ;
 
 SYNTAX: STRUCT:
     parse-struct-definition define-struct-class ;
+SYNTAX: UNION-STRUCT:
+    parse-struct-definition define-union-struct-class ;
 
 USING: vocabs vocabs.loader ;