--- gforth/kernel/require.fs	2003/01/20 19:17:59	1.24
+++ gforth/kernel/require.fs	2007/12/31 19:02:25	1.34
@@ -1,12 +1,12 @@
 \ require.fs
 
-\ Copyright (C) 1995,1996,1997,1998,2000 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1997,1998,2000,2003,2006,2007 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
 \ Gforth is free software; you can redistribute it and/or
 \ modify it under the terms of the GNU General Public License
-\ as published by the Free Software Foundation; either version 2
+\ as published by the Free Software Foundation, either version 3
 \ of the License, or (at your option) any later version.
 
 \ This program is distributed in the hope that it will be useful,
@@ -15,20 +15,16 @@
 \ GNU General Public License for more details.
 
 \ 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., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+\ along with this program. If not, see http://www.gnu.org/licenses/.
 
 \ Now: Kernel Module, Reloadable
 
 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
 
@@ -75,29 +71,19 @@ create image-included-files 4 , A, ( poi
     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 ( file-id )
-    ['] 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 2@ 2>r
-    save-mem 2dup loadfilename 2!
-    add-included-file ( file-id )
-    ['] include-file2 catch
-    2r> loadfilename 2!
-    throw ;
-[THEN]
+    save-mem 2dup add-included-file
+    includefilename 2@ 2>r 2dup includefilename 2!
+    ['] read-loop execute-parsing-named-file
+    2r> includefilename 2! ;
 
 : 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}.
     open-fpath-file throw included1 ;
 
-: required ( i*x addr u -- j*x ) \ gforth
+: 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
@@ -151,4 +137,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 ;