--- gforth/kernel/require.fs	2000/09/06 08:47:15	1.13
+++ gforth/kernel/require.fs	2002/04/27 14:52:32	1.20
@@ -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,30 +16,29 @@
 
 \ 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 )
-\ here ," ./the terminal" dup c@ swap 1 + swap , A, here 2 cells -
-\ ./ is confusing for the search path stuff! There should be never a .
-\ in sourcefilename....
-here ," #terminal#" dup c@ swap 1 + swap , A, here 2 cells -
-create image-included-files  1 , A, ( 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
 
-: loadfilename ( -- a-addr ) \ gforth-internal
-    \G @i{a-addr} @code{2@@} produces the current file name ( @i{c-addr u} )
-    included-files 2@ loadfilename# @ min 2* cells + ;
-
 : sourcefilename ( -- c-addr u ) \ gforth
     \G The name of the source file which is currently the input
     \G source.  The result is valid only while the file is being
     \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 2@ ;
+    loadfilename# @ loadfilename#>str ;
 
 : sourceline# ( -- u ) \ gforth		sourceline-number
     \G The line number of the line that is currently being interpreted
@@ -76,15 +75,23 @@ create image-included-files  1 , A, ( po
     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}.
+    save-mem add-included-file ( file-id )
+    included-files @ 1- ['] include-file2 catch
+    throw ;
+[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}.
     loadfilename# @ >r
     save-mem add-included-file ( file-id )
     included-files 2@ nip 1- loadfilename# !
-    ['] include-file catch
+    ['] include-file2 catch
     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}.
@@ -149,13 +156,9 @@ create image-included-files  1 , A, ( po
 : .strings ( addr u -- ) \ gforth
     \G list the strings from an array of string descriptors at addr
     \G with u entries, one per line.
-    included-files 2@ 2* cells bounds ?DO
+    2* cells bounds ?DO
 	cr I 2@ type 2 cells +LOOP ;
 
 : .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.13 2000/09/06 08:47:15 anton Exp $
-