--- gforth/blocks.fs	1996/07/16 20:57:06	1.9
+++ 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,37 +46,39 @@ $20 Value buffers
 
 User block-fid
 
-: block-cold
-    defers 'cold  block-fid off  last-block off
-    buffers buffer-struct drop * allocate throw dup block-buffers !
-    buffers buffer-struct drop * erase ;
+: block-cold ( -- )
+    block-fid off  last-block off
+    buffer-struct buffers * %alloc dup block-buffers ! ( addr )
+    buffer-struct %size buffers * erase ;
 
-' block-cold IS 'cold
+' block-cold INIT8 chained
 
 block-cold
 
-Defer flush-file
+Defer flush-blocks
 
-: use-file ( addr u -- )
-    2dup ['] open-path-file catch 0<>
+: open-blocks ( addr u -- ) \ gforth
+    \g use the file, whose name is given by @var{addr u}, as blocks file 
+    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>
     then
-    block-fid @ IF  flush-file block-fid @ close-file throw  THEN
+    block-fid @ IF  flush-blocks block-fid @ close-file throw  THEN
     block-fid ! ;
 
-: use ( "file" -- )
-    name use-file ;
+: use ( "file" -- ) \ gforth
+    \g use @var{file} as blocks file
+    name open-blocks ;
 
 \ the file is opened as binary file, since it either will contain text
 \ without newlines or binary data
 : get-block-fid ( -- fid )
     block-fid @ 0=
     if
-	s" blocks.fb" use-file
+	s" blocks.fb" open-blocks
     then
     block-fid @ ;
 
@@ -109,10 +111,10 @@ Defer flush-file
     save-buffers
     empty-buffers ;
 
-' flush IS flush-file
+' 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
@@ -162,31 +164,32 @@ 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 0 ?DO  I load  LOOP ;
+  1+ swap ?DO  I load  LOOP ;
 
 : +load ( i*x n -- j*x )  blk @ + load ;
 
 : +thru ( i*x n1 n2 -- j*x )
-  1+ swap 0 ?DO  I +load  LOOP ;
+  1+ swap ?DO  I +load  LOOP ;
 
 : --> ( -- )  refill drop ; immediate
 
 : block-included ( addr u -- )
-    block-fid @ >r block-fid off use-file
+    block-fid @ >r block-fid off open-blocks
     1 load block-fid @ close-file throw flush
     r> block-fid ! ;
 
-: include ( "name" -- )
-    name 2dup dup 3 - /string s" .fb" compare
-    0= IF  block-included  ELSE  included  THEN ;
+\ thrown out because it may provide unpleasant surprises - anton
+\ : include ( "name" -- )
+\     name 2dup dup 3 - /string s" .fb" compare
+\     0= IF  block-included  ELSE  included  THEN ;
 
 get-current environment-wordlist set-current
 true constant block
 true constant block-ext
 set-current
 
-: bye  ['] flush catch drop bye ;
\ No newline at end of file
+: bye  ['] flush catch drop bye ;