--- gforth/kernel/require.fs 2000/07/01 07:59:10 1.10 +++ gforth/kernel/require.fs 2002/09/14 08:20:21 1.21 @@ -1,6 +1,6 @@ \ require.fs -\ Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc. +\ Copyright (C) 1995,1996,1997,1998,2000 Free Software Foundation, Inc. \ This file is part of Gforth. @@ -16,29 +16,29 @@ \ 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., 675 Mass Ave, Cambridge, MA 02139, USA. +\ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. \ 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 - -\ ./ is confusing for the search path stuff! There should be never a . -\ in sourcefilename.... -here ," #terminal#" dup c@ swap 1 + swap , A, here 2 cells - -create image-included-files 1 , A, ( 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 ) \ included-files points to ALLOCATEd space, while image-included-files \ points to ALLOTed objects, so it survives a save-system -: loadfilename ( -- a-addr ) \ gforth - \G @i{a-addr} @code{2@@} produces the current file name ( @i{c-addr u} ) - included-files 2@ loadfilename# @ min 2* cells + ; - : 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 @@ -47,8 +47,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! ; @@ -61,7 +60,7 @@ create image-included-files 1 , A, ( po \G @file{./foo.fs} included-files 2@ 0 ?do ( c-addr u addr ) - dup >r 2@ 2over compare 0= + dup >r 2@ 2over str= if 2drop rdrop unloop true EXIT @@ -76,15 +75,23 @@ create image-included-files 1 , A, ( po 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 add-included-file ( file-id ) + included-files @ 1- ['] 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# @ >r save-mem add-included-file ( file-id ) included-files 2@ nip 1- loadfilename# ! - ['] include-file catch + ['] include-file2 catch 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}. @@ -117,42 +124,41 @@ 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@ ; +: .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@ 2* cells bounds ?DO - cr I 2@ type 2 cells +LOOP ; - -\ contains tools/newrequire.fs -\ \I $Id: require.fs,v 1.10 2000/07/01 07:59:10 anton Exp $ - + included-files 2@ .strings ;