--- gforth/struct.fs	1994/02/11 16:30:47	1.1
+++ gforth/struct.fs	1995/09/06 21:00:30	1.6
@@ -1,4 +1,4 @@
-\ $Id: struct.fs,v 1.1 1994/02/11 16:30:47 anton Exp $
+\ $Id: struct.fs,v 1.6 1995/09/06 21:00:30 pazsan Exp $
 
 \ Usage example:
 \
@@ -12,22 +12,13 @@
 \     1 cells: field enum-method
 \ end-struct ext-wordlist-map \ with the fields search-method,...,enum-method
 
-\ 2, 2constant and nalign should be somewhere else
-: 2, ( w1 w2 -- )
- here 2 cells allot 2! ;
-
-: 2constant ( w1 w2 -- )
-    create 2,
-    does>  ( -- w1 w2 )
-	2@ ;
-
 : nalign ( addr1 n -- addr2 )
 \ addr2 is the aligned version of addr1 wrt the alignment size n
  1- tuck +  swap invert and ;
 
-: create-field ( offset1 align1 size align -- offset2 align2 )
+: field ( offset1 align1 size align -- offset2 align2 )
 \ note: this version uses local variables
-     create
+     Header reveal -7 ( [ :dostruc ] Literal ) cfa,
 	>r rot r@ nalign  dup ,  ( align1 size offset )
 	+ swap r> nalign ;
 
@@ -36,10 +27,10 @@
 
 0 1 chars end-struct struct
 
-: field  ( offset1 align1 size align -- offset2 align2 )
-    create-field
-    does> ( addr1 -- addr2 )
-	@ + ;
+\ : field  ( offset1 align1 size align -- offset2 align2 )
+\    create-field
+\    does> ( addr1 -- addr2 )
+\	@ + ;
 
 \ I don't really like the "type:" syntax. Any other ideas? - anton
 \ Also, this seems to be somewhat general. It probably belongs to some
@@ -56,9 +47,19 @@
 : floats: ( n -- size align )
     floats 1 floats ;
 
-\ dfoats and sfloats is not yet defined
-\ : dfloats: ( n -- size align )
-\     dfloats 1 dfloats ;
-\ 
-\ : sfloats: ( n -- size align )
-\     sfloats 1 sfloats ;
\ No newline at end of file
+: dfloats: ( n -- size align )
+    dfloats 1 dfloats ;
+
+: sfloats: ( n -- size align )
+    sfloats 1 sfloats ;
+
+: struct-align ( size align -- )
+    dp @ swap nalign dp !
+    drop ;
+
+: struct-allot ( size align -- addr )
+    over swap struct-align
+    here swap allot ;
+
+: struct-allocate ( size align -- addr ior )
+    drop allocate ;