--- gforth/struct.fs	1999/03/23 20:24:20	1.15
+++ gforth/struct.fs	2007/12/31 17:34:58	1.24
@@ -1,6 +1,6 @@
 \ data structures (like C structs)
 
-\ Copyright (C) 1995, 1997 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1997,2000,2003,2007 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -16,7 +16,7 @@
 
 \ You should have received a copy of the GNU General Public License
 \ along with this program; if not, write to the Free Software
-\ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+\ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
 
 : naligned ( addr1 n -- addr2 ) \ gforth
 \g @var{addr2} is the aligned version of @var{addr1} with respect to the
@@ -29,7 +29,7 @@
     \ a field that makes no change
     \ to enable accessing the offset with "['] <field> >body @" this
     \ is not implemented with "['] noop alias"
-    last @
+    latest
     if
 	immediate
     then
@@ -44,7 +44,11 @@ does> ( name execution: -- )
     create field, ;
 
 : field ( align1 offset1 align size "name" --  align2 offset2 ) \ gforth
-    \G @code{name} execution: @var{addr1} -- @var{addr2}.
+    \g Create a field @var{name} with offset @var{offset1}, and the type
+    \g given by @var{align size}. @var{offset2} is the offset of the
+    \g next field, and @var{align2} is the alignment of all fields.@*
+    \g @code{name} execution: @var{addr1} -- @var{addr2}.@*
+    \g @var{addr2}=@var{addr1}+@var{offset1}
     2 pick 
     if \ field offset <> 0
 	[IFDEF]  (Field)
@@ -58,10 +62,10 @@ does> ( name execution: -- )
     field, ;
 
 : end-struct ( align size "name" -- ) \ gforth
-\g @code{name} execution: @var{addr1} -- @var{addr1+offset1}@*
-\g Create a field @var{name} with offset @var{offset1}, and the type
-\g given by @var{size align}. @var{offset2} is the offset of the
-\g next field, and @var{align2} is the alignment of all fields.
+\g Define a structure/type descriptor @var{name} with alignment
+\g @var{align} and size @var{size1} (@var{size} rounded up to be a
+\g multiple of @var{align}).@*
+\g @code{name} execution: -- @var{align size1}@*
     over nalign \ pad size to full alignment
     2constant ;
 
@@ -98,7 +102,7 @@ cell% 2*              2constant double%
     \g similar to @code{allocate}.
     nip allocate ;
 
-: %alloc ( size align -- addr ) \ gforth
+: %alloc ( align size -- addr ) \ gforth
     \g Allocate @var{size} address units with alignment @var{align},
     \g giving a data block at @var{addr}; @code{throw} an ior code
     \g if not successful.