--- gforth/blocks.fs 2007/02/18 18:30:51 1.47 +++ gforth/blocks.fs 2007/12/31 18:40:23 1.53 @@ -1,12 +1,12 @@ \ A less simple implementation of the blocks wordset. -\ Copyright (C) 1995,1996,1997,1998,2000,2003,2006 Free Software Foundation, Inc. +\ Copyright (C) 1995,1996,1997,1998,2000,2003,2006,2007 Free Software Foundation, Inc. \ This file is part of Gforth. \ Gforth is free software; you can redistribute it and/or \ modify it under the terms of the GNU General Public License -\ as published by the Free Software Foundation; either version 2 +\ as published by the Free Software Foundation, either version 3 \ of the License, or (at your option) any later version. \ This program is distributed in the hope that it will be useful, @@ -15,8 +15,7 @@ \ GNU General Public License for more details. \ 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., 59 Temple Place, Suite 330, Boston, MA 02111, USA. +\ along with this program. If not, see http://www.gnu.org/licenses/. \ A more efficient implementation would use mmap on OSs that @@ -79,10 +78,10 @@ Defer flush-blocks ( -- ) \ gforth 2dup open-fpath-file throw rot close-file throw 2dup file-status throw bin open-file throw >r 2drop r> - iferror ( c-addr u ior ) + endtry-iferror ( c-addr u ior ) >r 2dup file-status nip 0= r> and throw \ does it really not exist? r/w bin create-file throw - then endtry + then block-fid @ IF flush-blocks block-fid @ close-file throw THEN @@ -151,7 +150,7 @@ Defer flush-blocks ( -- ) \ gforth : get-buffer ( u -- a-addr ) \ gforth 0 buffers um/mod drop buffer-struct %size * block-buffers @ + ; -: block ( u -- a-addr ) \ gforthman- block +: block ( u -- a-addr ) \ 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 @@ -292,7 +291,7 @@ Create block-input A, A, A, A, A, \ 0= IF block-included ELSE included THEN ; get-current environment-wordlist set-current -true constant block +true constant block \ environment- environment true constant block-ext set-current