--- gforth/kernel/require.fs	2000/09/11 20:56:39	1.15
+++ gforth/kernel/require.fs	2003/01/22 17:12:49	1.27
@@ -1,6 +1,6 @@
 \ require.fs
 
-\ 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,22 +16,18 @@
 
 \ 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.
 
 \ Now: Kernel Module, Reloadable
 
 create included-files 0 , 0 , ( pointer to and count of included files )
 \ note: these names must not contain a "/" or "\"; otherwise a part of
 \ that name might be used when expanding "./" (see expandtopic).
-here ," *a file*" dup c@ swap 1 + swap
-here ," *a block*" dup c@ swap 1 + swap
-here ," *evaluated string*" dup c@ swap 1 + swap
-here ," *the terminal*" dup c@ swap 1 + swap
-, A, , A, , A, , A, here 8 cells -
-create image-included-files 4 , A, ( pointer to and count of included
-\ files ) included-files points to ALLOCATEd space, while
-\ image-included-files points to ALLOTed objects, so it survives a
-\ save-system
+here ," *somewhere*" dup c@ swap 1 + swap
+, A, here 2 cells -
+create image-included-files 1 , A, ( pointer to and count of included files )
+\ included-files points to ALLOCATEd space, while image-included-files
+\ points to ALLOTed objects, so it survives a save-system
 
 : sourcefilename ( -- c-addr u ) \ gforth
     \G The name of the source file which is currently the input
@@ -39,7 +35,7 @@ create image-included-files 4 , A, ( poi
     \G loaded.  If the current input source is no (stream) file, the
     \G result is undefined.  In Gforth, the result is valid during the
     \G whole seesion (but not across @code{savesystem} etc.).
-    loadfilename# @ loadfilename#>str ;
+    loadfilename 2@ ;
 
 : sourceline# ( -- u ) \ gforth		sourceline-number
     \G The line number of the line that is currently being interpreted
@@ -61,7 +57,7 @@ create image-included-files 4 , A, ( poi
     \G @file{./foo.fs}
     included-files 2@ 0
     ?do ( c-addr u addr )
-	dup >r 2@ 2over compare 0=
+	dup >r 2@ 2over str=
 	if
 	    2drop rdrop unloop
 	    true EXIT
@@ -76,15 +72,21 @@ create image-included-files 4 , A, ( poi
     2/ cell / included-files 2!
     2! ;
 
+has? new-input [IF]
 : included1 ( i*x file-id c-addr u -- j*x ) \ gforth
     \G Include the file file-id with the name given by @var{c-addr u}.
-    loadfilename# @ >r
-    save-mem add-included-file ( file-id )
-    included-files 2@ nip 1- loadfilename# !
+    save-mem 2dup add-included-file ( file-id )
+    ['] read-loop execute-parsing-named-file ;
+[ELSE]
+: included1 ( i*x file-id c-addr u -- j*x ) \ gforth
+\G Include the file file-id with the name given by @var{c-addr u}.
+    save-mem 2dup loadfilename>r
+    add-included-file ( file-id )
     ['] include-file2 catch
-    r> loadfilename# !
+    r>loadfilename
     throw ;
-    
+[THEN]
+
 : included ( i*x c-addr u -- j*x ) \ file
     \G @code{include-file} the file whose name is given by the string
     \G @var{c-addr u}.
@@ -136,16 +138,6 @@ create image-included-files 4 , A, ( poi
 \   REPEAT
 \   drop ;
 
-\ : loadfilename#>str ( n -- adr len )
-\ \ this converts the filenumber into the string
-\   loadfilenamecount @ swap -
-\   needs^ @
-\   swap 0 ?DO dup 0= IF LEAVE THEN @ LOOP 
-\   dup IF cell+ count ELSE drop s" NOT FOUND" THEN ;
-
-: loadfilename#>str ( n -- adr len )
-    included-files 2@ drop swap 2* cells + 2@ ;
-
 : .strings ( addr u -- ) \ gforth
     \G list the strings from an array of string descriptors at addr
     \G with u entries, one per line.
@@ -154,8 +146,4 @@ create image-included-files 4 , A, ( poi
 
 : .included ( -- ) \ gforth
     \G list the names of the files that have been @code{included}
-    included-files 2@ .strings ;
-    
-\ contains tools/newrequire.fs
-\ \I $Id: require.fs,v 1.15 2000/09/11 20:56:39 anton Exp $
-
+    included-files 2@ 2 cells under+ 1- .strings ;