Diff for /gforth/blocks.fs between versions 1.11 and 1.19

version 1.11, 1996/10/02 09:48:56 version 1.19, 1998/12/08 22:02:36
Line 1 Line 1
 \ A less simple implementation of the blocks wordset.   \ A less simple implementation of the blocks wordset. 
   
 \ Copyright (C) 1995 Free Software Foundation, Inc.  \ Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc.
   
 \ This file is part of Gforth.  \ This file is part of Gforth.
   
Line 32 Line 32
 require struct.fs  require struct.fs
   
 struct  struct
     1           cells: field buffer-block   \ the block number      cell%               field buffer-block   \ the block number
     1           cells: field buffer-fid     \ the block's fid      cell%               field buffer-fid     \ the block's fid
     1           cells: field buffer-dirty   \ the block dirty flag      cell%               field buffer-dirty   \ the block dirty flag
     chars/block chars: field block-buffer   \ the data      char% chars/block * field block-buffer   \ the data
     0           cells: field next-buffer      cell% 0 *           field next-buffer
 end-struct buffer-struct  end-struct buffer-struct
   
 Variable block-buffers  Variable block-buffers
Line 46  $20 Value buffers Line 46  $20 Value buffers
   
 User block-fid  User block-fid
   
 : block-cold  : block-cold ( -- )
     defers 'cold  block-fid off  last-block off      block-fid off  last-block off
     buffers buffer-struct drop * allocate throw dup block-buffers !      buffer-struct buffers * %alloc dup block-buffers ! ( addr )
     buffers buffer-struct drop * erase ;      buffer-struct %size buffers * erase ;
   
 ' block-cold IS 'cold  ' block-cold INIT8 chained
   
 block-cold  block-cold
   
 Defer flush-file  Defer flush-blocks
   
 : open-blocks ( addr u -- ) \ gforth  : open-blocks ( addr u -- ) \ gforth
     \g use the file, whose name is given by @var{addr u}, as blocks file       \g use the file, whose name is given by @var{addr u}, as blocks file 
     2dup ['] open-path-file catch 0<>      2dup open-fpath-file 0<>
     if      if
         2drop r/w bin create-file throw          r/w bin create-file throw
     else      else
         rot close-file throw  2dup file-status throw bin open-file throw          rot close-file throw  2dup file-status throw bin open-file throw
         >r 2drop r>          >r 2drop r>
     then      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 ! ;      block-fid ! ;
   
 : use ( "file" -- ) \ gforth  : use ( "file" -- ) \ gforth
Line 111  Defer flush-file Line 111  Defer flush-file
     save-buffers      save-buffers
     empty-buffers ;      empty-buffers ;
   
 ' flush IS flush-file  ' flush IS flush-blocks
   
 : get-buffer ( n -- a-addr )  : get-buffer ( n -- a-addr )
     buffers mod buffer-struct drop * block-buffers @ + ;      buffers mod buffer-struct %size * block-buffers @ + ;
   
 : block ( u -- a-addr )  : block ( u -- a-addr )
     dup 0= -35 and throw      dup 0= -35 and throw
Line 164  User scr 0 scr ! Line 164  User scr 0 scr !
   
 : load ( i*x n -- j*x )  : load ( i*x n -- j*x )
   push-file    push-file
   dup loadline ! blk ! >in off ( ['] ) interpret ( catch )    dup loadline ! blk ! >in off ['] interpret catch
   pop-file ( throw ) ;    pop-file throw ;
   
 : thru ( i*x n1 n2 -- j*x )  : 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 ;  : +load ( i*x n -- j*x )  blk @ + load ;
   
 : +thru ( i*x n1 n2 -- j*x )  : +thru ( i*x n1 n2 -- j*x )
   1+ swap 0 ?DO  I +load  LOOP ;    1+ swap ?DO  I +load  LOOP ;
   
 : --> ( -- )  refill drop ; immediate  : --> ( -- )  refill drop ; immediate
   
Line 182  User scr 0 scr ! Line 182  User scr 0 scr !
     1 load block-fid @ close-file throw flush      1 load block-fid @ close-file throw flush
     r> block-fid ! ;      r> block-fid ! ;
   
 : include ( "name" -- )  \ thrown out because it may provide unpleasant surprises - anton
     name 2dup dup 3 - /string s" .fb" compare  \ : include ( "name" -- )
     0= IF  block-included  ELSE  included  THEN ;  \     name 2dup dup 3 - /string s" .fb" compare
   \     0= IF  block-included  ELSE  included  THEN ;
   
 get-current environment-wordlist set-current  get-current environment-wordlist set-current
 true constant block  true constant block
 true constant block-ext  true constant block-ext
 set-current  set-current
   
 : bye  ['] flush catch drop bye ;  
   
   : bye  ['] flush catch drop bye ;

Removed from v.1.11  
changed lines
  Added in v.1.19


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>