--- gforth/kernel/require.fs	2000/09/06 08:47:15	1.13
+++ gforth/kernel/require.fs	2006/01/31 15:25:44	1.29
@@ -1,6 +1,6 @@
 \ require.fs
 
-\ Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1997,1998,2000,2003 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -16,23 +16,19 @@
 
 \ 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 ," *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
 
-: 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
@@ -61,7 +57,7 @@ create image-included-files  1 , A, ( po
     \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,25 +72,28 @@ 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 2dup add-included-file
+    includefilename 2@ 2>r 2dup includefilename 2!
+    ['] read-loop execute-parsing-named-file
+    2r> includefilename 2! ;
+[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
-    r> loadfilename# !
+\G Include the file file-id with the name given by @var{c-addr u}.
+    save-mem 2dup loadfilename>r
+    includefilename 2@ 2>r 2dup includefilename 2!
+    add-included-file ( file-id )
+    ['] include-file2 catch
+    2r> includefilename 2! r>loadfilename
     throw ;
-    
-: 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}.
+[THEN]
+
+: included2 ( i*x c-addr u -- j*x ) \ file
     open-fpath-file throw included1 ;
 
-: required ( i*x addr u -- j*x ) \ gforth
-    \G @code{include-file} the file with the name given by @var{addr
-    \G u}, if it is not @code{included} (or @code{required})
-    \G already. Currently this works by comparing the name of the file
-    \G (with path) against the names of earlier included files.
+: required2 ( i*x addr u -- i*x ) \ gforth
     \ however, it may be better to fstat the file,
     \ and compare the device and inode. The advantages would be: no
     \ problems with several paths to the same file (e.g., due to
@@ -111,11 +110,25 @@ create image-included-files  1 , A, ( po
 
 : include  ( ... "file" -- ... ) \ gforth
     \G @code{include-file} the file @var{file}.
-    name included ;
+    name included2 ;
 
 : require  ( ... "file" -- ... ) \ gforth
     \G @code{include-file} @var{file} only if it is not included already.
-    name required ;
+    name required2 ;
+
+\ we go through execute-parsing to get nicer output on errors
+
+: 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}.
+    ['] include execute-parsing ;
+
+: required ( i*x addr u -- i*x ) \ gforth
+    \G @code{include-file} the file with the name given by @var{addr
+    \G u}, if it is not @code{included} (or @code{required})
+    \G already. Currently this works by comparing the name of the file
+    \G (with path) against the names of earlier included files.
+    ['] require execute-parsing ;
 
 \ : \I
 \   here 
@@ -136,26 +149,12 @@ create image-included-files  1 , A, ( po
 \   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.
-    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 $
-
+    included-files 2@ 2 cells under+ 1- .strings ;