Diff for /gforth/blocks.fs between versions 1.13 and 1.22

version 1.13, 1997/03/27 13:31:01 version 1.22, 1999/03/23 20:24:16
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
   
Line 59  Defer flush-blocks Line 59  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>
Line 75  Defer flush-blocks Line 75  Defer flush-blocks
   
 \ the file is opened as binary file, since it either will contain text  \ the file is opened as binary file, since it either will contain text
 \ without newlines or binary data  \ without newlines or binary data
 : get-block-fid ( -- fid )  : get-block-fid ( -- fid ) \ gforth
     block-fid @ 0=      block-fid @ 0=
     if      if
         s" blocks.fb" open-blocks          s" blocks.fb" open-blocks
     then      then
     block-fid @ ;      block-fid @ ;
   
 : block-position ( u -- )  : block-position ( u -- ) \ block
     \ positions the block file to the start of block u      \G Position the block file to the start of block @var{u}.
     1- chars/block chars um* get-block-fid reposition-file throw ;      1- chars/block chars um* get-block-fid reposition-file throw ;
   
 : update ( -- )  : update ( -- ) \ block
     last-block @ ?dup IF  buffer-dirty on  THEN ;      last-block @ ?dup IF  buffer-dirty on  THEN ;
   
 : save-buffer ( buffer -- ) >r  : save-buffer ( buffer -- ) \ gforth
       >r
     r@ buffer-dirty @ r@ buffer-block @ 0<> and      r@ buffer-dirty @ r@ buffer-block @ 0<> and
     if      if
         r@ buffer-block @ block-position          r@ buffer-block @ block-position
Line 98  Defer flush-blocks Line 99  Defer flush-blocks
     endif      endif
     rdrop ;      rdrop ;
   
 : empty-buffer ( buffer -- )  : empty-buffer ( buffer -- ) \ gforth
     buffer-block off ;      buffer-block off ;
   
 : save-buffers  ( -- )    block-buffers @  : save-buffers  ( -- ) \ block
       block-buffers @
     buffers 0 ?DO  dup save-buffer  next-buffer  LOOP  drop ;      buffers 0 ?DO  dup save-buffer  next-buffer  LOOP  drop ;
   
 : empty-buffers ( -- )    block-buffers @  : empty-buffers ( -- ) \ block
       block-buffers @
     buffers 0 ?DO  dup empty-buffer  next-buffer  LOOP  drop ;      buffers 0 ?DO  dup empty-buffer  next-buffer  LOOP  drop ;
   
 : flush ( -- )  : flush ( -- ) \ block
     save-buffers      save-buffers
     empty-buffers ;      empty-buffers ;
   
 ' flush IS flush-blocks  ' flush IS flush-blocks
   
 : get-buffer ( n -- a-addr )  : get-buffer ( n -- a-addr ) \ gforth
     buffers mod buffer-struct drop * block-buffers @ + ;      buffers mod buffer-struct %size * block-buffers @ + ;
   
 : block ( u -- a-addr )  : block ( u -- a-addr ) \ block- block
     \G @var{u} identifies a block number. Assign a block buffer to @var{u},
     \G make it the current block buffer and return its start
     \G address, @var{a-addr}.
     dup 0= -35 and throw      dup 0= -35 and throw
     dup get-buffer >r      dup get-buffer >r
     dup r@ buffer-block @ <>      dup r@ buffer-block @ <>
Line 134  Defer flush-blocks Line 140  Defer flush-blocks
     then      then
     r> dup last-block ! block-buffer ;      r> dup last-block ! block-buffer ;
   
 : buffer ( u -- a-addr )  : buffer ( u -- a-addr ) \ block
     \ reading in the block is unnecessary, but simpler      \ reading in the block is unnecessary, but simpler
     block ;      block ;
   
 User scr 0 scr !  User scr ( -- a-addr ) \ block-ext
       \G USER VARIABLE @var{a-addr} is the address of a cell containing
       \G the block number of the block most recently processed by
       \G @code{LIST}.
       0 scr !
   
 : updated?  ( n -- f )   scr @ buffer  : updated?  ( n -- f ) \ gforth
       scr @ buffer
     [ 0 buffer-dirty 0 block-buffer - ] Literal + @ ;      [ 0 buffer-dirty 0 block-buffer - ] Literal + @ ;
   
 : list ( u -- )  : list ( u -- ) \ block
     \ calling block again and again looks inefficient but is necessary      \ calling block again and again looks inefficient but is necessary
     \ in a multitasking environment      \ in a multitasking environment
     dup scr !      dup scr !
Line 162  User scr 0 scr ! Line 173  User scr 0 scr !
   
 ' (source) IS source  ' (source) IS source
   
 : load ( i*x n -- j*x )  : load ( i*x n -- j*x ) \ block
   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 ) \ block
   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 ) \ block
       blk @ + load ;
   
 : +thru ( i*x n1 n2 -- j*x )  : +thru ( i*x n1 n2 -- j*x ) \ block
   1+ swap 0 ?DO  I +load  LOOP ;    1+ swap ?DO  I +load  LOOP ;
   
 : --> ( -- )  refill drop ; immediate  : --> ( -- ) \ block- block
       \G If this symbol is encountered whilst loading block @var{n},
       \G discard the remainder of the block and load block @var{n+1}. Used
       \G for chaining multiple blocks together as a single loadable unit.
       refill drop ; immediate
   
 : block-included ( addr u -- )  : block-included ( addr u -- ) \ gforth
     block-fid @ >r block-fid off open-blocks      block-fid @ >r block-fid off open-blocks
     1 load block-fid @ close-file throw flush      1 load block-fid @ close-file throw flush
     r> block-fid ! ;      r> block-fid ! ;
Line 192  true constant block Line 208  true constant block
 true constant block-ext  true constant block-ext
 set-current  set-current
   
 : bye  ['] flush catch drop bye ;  
   
   : bye ( -- ) \ tools-ext
     \G Return control to the host operating system (if any).
     ['] flush catch drop bye ;

Removed from v.1.13  
changed lines
  Added in v.1.22


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