--- gforth/kernel/require.fs	2003/01/19 23:35:35	1.22
+++ gforth/kernel/require.fs	2006/01/31 15:25:44	1.29
@@ -1,6 +1,6 @@
 \ require.fs
 
-\ Copyright (C) 1995-2003 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1997,1998,2000,2003 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -23,12 +23,9 @@
 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 )
+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
 
@@ -38,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
@@ -77,31 +74,26 @@ create image-included-files 4 , A, ( poi
 
 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 ;
+\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# !
+\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
-    r> loadfilename# !
+    2r> includefilename 2! 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}.
+: 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
@@ -118,11 +110,25 @@ has? new-input [IF]
 
 : 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 
@@ -143,16 +149,6 @@ has? new-input [IF]
 \   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.
@@ -161,4 +157,4 @@ has? new-input [IF]
 
 : .included ( -- ) \ gforth
     \G list the names of the files that have been @code{included}
-    included-files 2@ .strings ;
+    included-files 2@ 2 cells under+ 1- .strings ;