--- gforth/kernel/require.fs 2003/01/20 22:16:04 1.25 +++ gforth/kernel/require.fs 2006/02/04 22:09:12 1.31 @@ -1,6 +1,6 @@ \ require.fs -\ Copyright (C) 1995,1996,1997,1998,2000 Free Software Foundation, Inc. +\ Copyright (C) 1995,1996,1997,1998,2000,2003 Free Software Foundation, Inc. \ This file is part of Gforth. @@ -72,29 +72,19 @@ create image-included-files 1 , 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