--- gforth/blocks.fs	1997/07/06 16:03:24	1.16
+++ gforth/blocks.fs	1998/04/12 21:49:12	1.18
@@ -32,11 +32,11 @@
 require struct.fs
 
 struct
-    1           cells: field buffer-block   \ the block number
-    1           cells: field buffer-fid     \ the block's fid
-    1           cells: field buffer-dirty   \ the block dirty flag
-    chars/block chars: field block-buffer   \ the data
-    0           cells: field next-buffer
+    cell%		field buffer-block   \ the block number
+    cell%		field buffer-fid     \ the block's fid
+    cell%		field buffer-dirty   \ the block dirty flag
+    char% chars/block * field block-buffer   \ the data
+    cell% 0 *		field next-buffer
 end-struct buffer-struct
 
 Variable block-buffers
@@ -46,10 +46,10 @@ $20 Value buffers
 
 User block-fid
 
-: block-cold
+: block-cold ( -- )
     block-fid off  last-block off
-    buffers buffer-struct drop * allocate throw dup block-buffers !
-    buffers buffer-struct drop * erase ;
+    buffer-struct buffers * %alloc dup block-buffers ! ( addr )
+    buffer-struct %size buffers * erase ;
 
 ' block-cold INIT8 chained
 
@@ -59,9 +59,9 @@ Defer flush-blocks
 
 : open-blocks ( addr u -- ) \ gforth
     \g use the file, whose name is given by @var{addr u}, as blocks file 
-    2dup ['] open-fpath-file catch 0<>
+    2dup open-fpath-file 0<>
     if
-	2drop r/w bin create-file throw
+	r/w bin create-file throw
     else
 	rot close-file throw  2dup file-status throw bin open-file throw
 	>r 2drop r>
@@ -114,7 +114,7 @@ Defer flush-blocks
 ' flush IS flush-blocks
 
 : get-buffer ( n -- a-addr )
-    buffers mod buffer-struct drop * block-buffers @ + ;
+    buffers mod buffer-struct %size * block-buffers @ + ;
 
 : block ( u -- a-addr )
     dup 0= -35 and throw
@@ -164,8 +164,8 @@ User scr 0 scr !
 
 : load ( i*x n -- j*x )
   push-file
-  dup loadline ! blk ! >in off ( ['] ) interpret ( catch )
-  pop-file ( throw ) ;
+  dup loadline ! blk ! >in off ['] interpret catch
+  pop-file throw ;
 
 : thru ( i*x n1 n2 -- j*x )
   1+ swap ?DO  I load  LOOP ;