--- gforth/kernel/require.fs	1999/04/16 22:19:54	1.7
+++ gforth/kernel/require.fs	2000/09/11 20:56:39	1.15
@@ -21,21 +21,25 @@
 \ 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 -
-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 )
-    \G a-addr 2@ produces the current file name ( c-addr u )
-    included-files 2@ loadfilename# @ min 2* cells + ;
+\ 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
 
 : 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.
-    loadfilename 2@ ;
+    \G result is undefined.  In Gforth, the result is valid during the
+    \G whole seesion (but not across @code{savesystem} etc.).
+    loadfilename# @ loadfilename#>str ;
 
 : sourceline# ( -- u ) \ gforth		sourceline-number
     \G The line number of the line that is currently being interpreted
@@ -44,18 +48,17 @@ create image-included-files  1 , A, ( po
     \G undefined.
     loadline @ ;
 
-: init-included-files ( -- ) \ gforth
-    \G Clear the list of earlier included files.
+: init-included-files ( -- ) \ gforth-internal
     image-included-files 2@ 2* cells save-mem drop ( addr )
     image-included-files 2@ nip included-files 2! ;
 
 : included? ( c-addr u -- f ) \ gforth
     \G True only if the file @var{c-addr u} is in the list of earlier
     \G included files. If the file has been loaded, it may have been
-    \G specified as, say, foo.fs and found somewhere on the Forth
-    \G search path. To return true from @code{included?}, you must
-    \G specify the exact path to the file, even if that is
-    \G @code{./foo.fs}
+    \G specified as, say, @file{foo.fs} and found somewhere on the
+    \G Forth search path. To return @code{true} from @code{included?},
+    \G you must specify the exact path to the file, even if that is
+    \G @file{./foo.fs}
     included-files 2@ 0
     ?do ( c-addr u addr )
 	dup >r 2@ 2over compare 0=
@@ -78,7 +81,7 @@ create image-included-files  1 , A, ( po
     loadfilename# @ >r
     save-mem add-included-file ( file-id )
     included-files 2@ nip 1- loadfilename# !
-    ['] include-file catch
+    ['] include-file2 catch
     r> loadfilename# !
     throw ;
     
@@ -114,40 +117,45 @@ create image-included-files  1 , A, ( po
     \G @code{include-file} @var{file} only if it is not included already.
     name required ;
 
-0 [IF]
-: \I
-  here 
-  0 word count
-  string,
-  needsrcs^ @ ! ;
-
-: .modules
-  cr
-  needs^ @
-  BEGIN		dup 
-  WHILE		dup cell+ count type cr
-		5 spaces
-		dup cell+ count + aligned
-		@ dup IF count type ELSE drop THEN cr
-		@
-  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 ;
-[THEN]
+\ : \I
+\   here 
+\   0 word count
+\   string,
+\   needsrcs^ @ ! ;
+
+\ : .included ( -- ) \ gforth
+\     \G list the names of the files that have been @code{included}
+\   cr
+\   needs^ @
+\   BEGIN		dup 
+\   WHILE		dup cell+ count type cr
+\ 		5 spaces
+\ 		dup cell+ count + aligned
+\ 		@ dup IF count type ELSE drop THEN cr
+\ 		@
+\   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@ ;
 
-: .modules
-    included-files 2@ 2* cells bounds ?DO
-	cr I 2@ type  2 cells +LOOP ;  
-
+: .strings ( addr u -- ) \ gforth
+    \G list the strings from an array of string descriptors at addr
+    \G with u entries, one per line.
+    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.7 1999/04/16 22:19:54 crook Exp $
+\ \I $Id: require.fs,v 1.15 2000/09/11 20:56:39 anton Exp $