--- gforth/blocks.fs 1999/04/16 22:19:50 1.24 +++ gforth/blocks.fs 2000/10/29 20:27:02 1.34 @@ -1,6 +1,6 @@ \ A less simple implementation of the blocks wordset. -\ Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc. +\ Copyright (C) 1995,1996,1997,1998,2000 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. \ A more efficient implementation would use mmap on OSs that @@ -45,6 +45,15 @@ Variable last-block $20 Value buffers User block-fid +User block-offset ( -- addr ) \ gforth +\G User variable containing the number of the first block (default +\G since 0.5.0: 0). Block files created with Gforth versions before +\G 0.5.0 have the offset 1. If you use these files you can: @code{1 +\G offset !}; or add 1 to every block number used; or prepend 1024 +\G characters to the file. +0 block-offset ! \ store 1 here fore 0.4.0 compatibility + +' block-offset alias offset \ !! eliminate this? : block-cold ( -- ) block-fid off last-block off @@ -87,10 +96,10 @@ Defer flush-blocks ( -- ) \ gforth : block-position ( u -- ) \ block \G Position the block file to the start of block @i{u}. - 1- chars/block chars um* get-block-fid reposition-file throw ; + offset @ - chars/block chars um* get-block-fid reposition-file throw ; : update ( -- ) \ block - \G Mark the current block buffer as dirty. + \G Mark the state of the current block buffer as assigned-dirty. last-block @ ?dup IF buffer-dirty on THEN ; : save-buffer ( buffer -- ) \ gforth @@ -108,7 +117,7 @@ Defer flush-blocks ( -- ) \ gforth : save-buffers ( -- ) \ block \G Transfer the contents of each @code{update}d block buffer to - \G mass storage, then mark all block buffers as unassigned. + \G mass storage, then mark all block buffers as assigned-clean. block-buffers @ buffers 0 ?DO dup save-buffer next-buffer LOOP drop ; @@ -127,17 +136,17 @@ Defer flush-blocks ( -- ) \ gforth ' flush IS flush-blocks -: get-buffer ( n -- a-addr ) \ gforth - buffers mod buffer-struct %size * block-buffers @ + ; +: get-buffer ( u -- a-addr ) \ gforth + 0 buffers um/mod drop buffer-struct %size * block-buffers @ + ; -: block ( u -- a-addr ) \ block- block +: block ( u -- a-addr ) \ gforthman- block \G If a block buffer is assigned for block @i{u}, return its \G start address, @i{a-addr}. Otherwise, assign a block buffer \G for block @i{u} (if the assigned block buffer has been \G @code{update}d, transfer the contents to mass storage), read \G the block into the block buffer and return its start address, \G @i{a-addr}. - dup 0= -35 and throw + dup offset @ u< -35 and throw dup get-buffer >r dup r@ buffer-block @ <> r@ buffer-fid @ block-fid @ <> or @@ -167,15 +176,16 @@ Defer flush-blocks ( -- ) \ gforth \ reading in the block is unnecessary, but simpler block ; -User scr ( -- a-addr ) \ block-ext - \G USER VARIABLE: @i{a-addr} is the address of a cell containing +User scr ( -- a-addr ) \ block-ext s-c-r + \G @code{User} variable -- @i{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 ! \ nac31Mar1999 moved "scr @" to list to make the stack comment correct : updated? ( n -- f ) \ gforth - \G Return true if block @i{n} has been marked as dirty. + \G Return true if @code{updated} has been used to mark block @i{n} + \G as assigned-dirty. buffer [ 0 buffer-dirty 0 block-buffer - ] Literal + @ ; @@ -192,6 +202,23 @@ User scr ( -- a-addr ) \ block-ext i 2 .r space scr @ block i 64 * chars + 64 type cr loop ; +[IFDEF] current-input +:noname 2 <> -12 and throw >in ! blk ! ; + \ restore-input +:noname blk @ >in @ 2 ; \ save-input +:noname 2 ; \ source-id "*a block*" +:noname 1 blk +! 1 loadline +! true ; \ refill +:noname blk @ block chars/block ; \ source + +Create block-input A, A, A, A, A, + +: load ( i*x n -- j*x ) \ block + \G Save the current input source specification. Store @i{n} in + \G @code{BLK}, set @code{>IN} to 0 and interpret. When the parse + \G area is exhausted, restore the input source specification. + block-input 0 new-tib dup loadline ! blk ! 2 loadfilename# ! + ['] interpret catch pop-file throw ; +[ELSE] : (source) ( -- c-addr u ) blk @ ?dup IF block chars/block @@ -206,9 +233,14 @@ User scr ( -- a-addr ) \ block-ext \G Save the current input source specification. Store @i{n} in \G @code{BLK}, set @code{>IN} to 0 and interpret. When the parse \G area is exhausted, restore the input source specification. + loadfilename# @ >r + 2 loadfilename# ! \ "*a block*" push-file dup loadline ! blk ! >in off ['] interpret catch - pop-file throw ; + pop-file + r> loadfilename# ! + throw ; +[THEN] : thru ( i*x n1 n2 -- j*x ) \ block-ext \G @code{load} the blocks @i{n1} through @i{n2} in sequence. @@ -224,10 +256,13 @@ User scr ( -- a-addr ) \ block-ext \G current block + @i{n1} thru the current block + @i{n2}. 1+ swap ?DO I +load LOOP ; -: --> ( -- ) \ block- block chain +: --> ( -- ) \ gforthman- gforth chain \G If this symbol is encountered whilst loading block @i{n}, \G discard the remainder of the block and load block @i{n+1}. Used - \G for chaining multiple blocks together as a single loadable unit. + \G for chaining multiple blocks together as a single loadable + \G unit. Not recommended, because it destroys the independence of + \G loading. Use @code{thru} (which is standard) or @code{+thru} + \G instead. refill drop ; immediate : block-included ( a-addr u -- ) \ gforth