--- gforth/kernel/files.fs	1997/05/21 20:40:14	1.1
+++ gforth/kernel/files.fs	2003/01/19 23:35:34	1.18
@@ -1,6 +1,6 @@
 \ File specifiers                                       11jun93jaw
 
-\ Copyright (C) 1995-1997 Free Software Foundation, Inc.
+\ Copyright (C) 1995-2003 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.
 
 4 Constant w/o ( -- fam ) \ file	w-o
 2 Constant r/w ( -- fam ) \ file	r-w
@@ -32,41 +32,64 @@
     ?dup IF
 	r> drop EXIT
     THEN
-    #lf r> emit-file ;
+    newline r> write-file ;
 
 \ include-file                                         07apr93py
 
+has? new-input 0= [IF]
 : push-file  ( -- )  r>
-  sourceline# >r  loadfile @ >r
-  blk @ >r  tibstack @ >r  >tib @ >r  #tib @ >r
-  >tib @ tibstack @ = IF  r@ tibstack +!  THEN
-  tibstack @ >tib ! >in @ >r  >r ;
+    #fill-bytes @ >r
+    loadline @    >r
+    loadfile @    >r
+    blk @         >r
+    tibstack @    >r
+    >tib @        >r
+    #tib @        >r
+    >in @         >r  >r
+    >tib @ tibstack @ = IF  #tib @ tibstack +!  THEN
+    tibstack @ >tib ! ;
 
 : pop-file   ( throw-code -- throw-code )
   dup IF
-         source >in @ sourceline# sourcefilename
-	 error-stack dup @ dup 1+
-	 max-errors 1- min error-stack !
-	 6 * cells + cell+
-	 5 cells bounds swap DO
-	                    I !
-	 -1 cells +LOOP
+         source >in @ sourceline# sourcefilename >error
   THEN
   r>
-  r> >in !  r> #tib !  r> >tib !  r> tibstack !  r> blk !
-  r> loadfile ! r> loadline !  >r ;
+  r> >in         !
+  r> #tib        !
+  r> >tib        !
+  r> tibstack    !
+  r> blk         !
+  r> loadfile    !
+  r> loadline    !
+  r> #fill-bytes !  >r ;
 
 : read-loop ( i*x -- j*x )
   BEGIN  refill  WHILE  interpret  REPEAT ;
 
-: include-file ( i*x fid -- j*x ) \ file
-  push-file  loadfile !
-  0 loadline ! blk off  ['] read-loop catch
-  loadfile @ close-file swap 2dup or
-  pop-file  drop throw throw ;
-
+: include-file1 ( i*x wfileid -- j*x ior1 ior2 )
+    \G Interpret (process using the text interpreter) the contents of
+    \G the file @var{wfileid}.
+    push-file  loadfile !
+    0 loadline ! blk off  ['] read-loop catch
+    loadfile @ close-file swap 2dup or
+    pop-file  drop ;
+
+: include-file2 ( i*x wfileid -- j*x )
+    \ like include-file, but does not update loadfile#
+    include-file1 throw throw ;
+
+: include-file ( i*x wfileid -- j*x ) \ file
+    loadfilename# @ >r
+    3 loadfilename# ! \ "*a file*"
+    include-file1
+    r> loadfilename# !
+    throw throw ;
+[THEN]
+    
 \ additional words only needed if there is file support
 
+Redefinitions-start
+
 : ( ( compilation 'ccc<close-paren>' -- ; run-time -- ) \ core,file	paren
     loadfile @ 0= IF  postpone (  EXIT  THEN
     BEGIN
@@ -84,3 +107,4 @@
 	THEN
     REPEAT ; immediate
 
+Redefinitions-end