--- gforth/kernel/require.fs	2000/07/01 07:59:10	1.10
+++ gforth/kernel/require.fs	2000/09/06 08:47:15	1.13
@@ -29,7 +29,7 @@ create image-included-files  1 , A, ( po
 \ included-files points to ALLOCATEd space, while image-included-files
 \ points to ALLOTed objects, so it survives a save-system
 
-: loadfilename ( -- a-addr ) \ gforth
+: 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 + ;
 
@@ -37,7 +37,8 @@ create image-included-files  1 , A, ( po
     \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.
+    \G result is undefined.  In Gforth, the result is valid during the
+    \G whole seesion (but not across @code{savesystem} etc.).
     loadfilename 2@ ;
 
 : sourceline# ( -- u ) \ gforth		sourceline-number
@@ -47,8 +48,7 @@ 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! ;
 
@@ -117,42 +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^ @ ! ;
-
-: .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 ;
-[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@ ;
 
-: .included ( -- ) \ gforth
-    \G list the names of the files that have been @code{included}
+: .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
-	cr I 2@ type  2 cells +LOOP ;  
+	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.10 2000/07/01 07:59:10 anton Exp $
+\ \I $Id: require.fs,v 1.13 2000/09/06 08:47:15 anton Exp $