Diff for /gforth/kernel/require.fs between versions 1.4 and 1.17

version 1.4, 1998/06/17 16:55:18 version 1.17, 2000/09/23 15:06:10
Line 1 Line 1
 \ require.fs  \ require.fs
   
 \ Copyright (C) 1995-1997 Free Software Foundation, Inc.  \ Copyright (C) 1995,1996,1997,1998,2000 Free Software Foundation, Inc.
   
 \ This file is part of Gforth.  \ This file is part of Gforth.
   
Line 20 Line 20
   
 \ Now: Kernel Module, Reloadable  \ Now: Kernel Module, Reloadable
   
 \ $Id$  
   
 create included-files 0 , 0 , ( pointer to and count of included files )  create included-files 0 , 0 , ( pointer to and count of included files )
 here ," ./the terminal" dup c@ swap 1 + swap , A, here 2 cells -  \ note: these names must not contain a "/" or "\"; otherwise a part of
 create image-included-files  1 , A, ( pointer to and count of included files )  \ 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  \ included-files points to ALLOCATEd space, while image-included-files
 \ points to ALLOTed objects, so it survives a save-system  \ 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 + ;  
   
 : sourcefilename ( -- c-addr u ) \ gforth  : sourcefilename ( -- c-addr u ) \ gforth
     \G the name of the source file which is currently the input      \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 source.  The result is valid only while the file is being
     \G loaded.  If the current input source is no (stream) file, the      \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
     loadfilename 2@ ;      \G whole seesion (but not across @code{savesystem} etc.).
       loadfilename# @ loadfilename#>str ;
   
 : sourceline# ( -- u ) \ gforth         sourceline-number  : sourceline# ( -- u ) \ gforth         sourceline-number
     \G the line number of the line that is currently being interpreted      \G The line number of the line that is currently being interpreted
     \G from a (stream) file. The first line has the number 1. If the      \G from a (stream) file. The first line has the number 1. If the
     \G current input source is no (stream) file, the result is      \G current input source is not a (stream) file, the result is
     \G undefined.      \G undefined.
     loadline @ ;      loadline @ ;
   
 : init-included-files ( -- )  : init-included-files ( -- ) \ gforth-internal
     image-included-files 2@ 2* cells save-mem drop ( addr )      image-included-files 2@ 2* cells save-mem drop ( addr )
     image-included-files 2@ nip included-files 2! ;      image-included-files 2@ nip included-files 2! ;
   
 : included? ( c-addr u -- f ) \ gforth  : included? ( c-addr u -- f ) \ gforth
     \G true, iff filename c-addr u is in included-files      \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, @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      included-files 2@ 0
     ?do ( c-addr u addr )      ?do ( c-addr u addr )
         dup >r 2@ 2over compare 0=          dup >r 2@ 2over compare 0=
Line 70  create image-included-files  1 , A, ( po Line 76  create image-included-files  1 , A, ( po
     2! ;      2! ;
   
 : included1 ( i*x file-id c-addr u -- j*x ) \ gforth  : included1 ( i*x file-id c-addr u -- j*x ) \ gforth
     \G include the file file-id with the name given by c-addr u      \G Include the file file-id with the name given by @var{c-addr u}.
     loadfilename# @ >r      loadfilename# @ >r
     save-mem add-included-file ( file-id )      save-mem add-included-file ( file-id )
     included-files 2@ nip 1- loadfilename# !      included-files 2@ nip 1- loadfilename# !
     ['] include-file catch      ['] include-file2 catch
     r> loadfilename# !      r> loadfilename# !
     throw ;      throw ;
           
 : included ( i*x addr u -- j*x ) \ file  : included ( i*x c-addr u -- j*x ) \ file
     \G @code{include-file} the file whose name is given by the string      \G @code{include-file} the file whose name is given by the string
     \G @var{addr u}.      \G @var{c-addr u}.
     open-fpath-file throw included1 ;      open-fpath-file throw included1 ;
   
 : required ( i*x addr u -- j*x ) \ gforth  : required ( i*x addr u -- j*x ) \ gforth
     \G include the file with the name given by @var{addr u}, if it is not      \G @code{include-file} the file with the name given by @var{addr
     \G @code{included} (or @code{required}) already. Currently this      \G u}, if it is not @code{included} (or @code{required})
     \G works by comparing the name of the file (with path) against the      \G already. Currently this works by comparing the name of the file
     \G names of earlier included files.      \G (with path) against the names of earlier included files.
     \ however, it may be better to fstat the file,      \ however, it may be better to fstat the file,
     \ and compare the device and inode. The advantages would be: no      \ and compare the device and inode. The advantages would be: no
     \ problems with several paths to the same file (e.g., due to      \ problems with several paths to the same file (e.g., due to
Line 103  create image-included-files  1 , A, ( po Line 109  create image-included-files  1 , A, ( po
 \ INCLUDE                                               9may93jaw  \ INCLUDE                                               9may93jaw
   
 : include  ( ... "file" -- ... ) \ gforth  : include  ( ... "file" -- ... ) \ gforth
 \G includes @var{file}      \G @code{include-file} the file @var{file}.
   name included ;      name included ;
   
 : require  ( ... "file" -- ... ) \ gforth  : require  ( ... "file" -- ... ) \ gforth
 \G includes @var{file} only if it is not included already      \G @code{include-file} @var{file} only if it is not included already.
   name required ;      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 )  \ : \I
 \ this converts the filenumber into the string  \   here 
   loadfilenamecount @ swap -  \   0 word count
   needs^ @  \   string,
   swap 0 ?DO dup 0= IF LEAVE THEN @ LOOP   \   needsrcs^ @ ! ;
   dup IF cell+ count ELSE drop s" NOT FOUND" THEN ;  
 [THEN]  \ : .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 )  : loadfilename#>str ( n -- adr len )
     included-files 2@ drop swap 2* cells + 2@ ;      included-files 2@ drop swap 2* cells + 2@ ;
   
 : .modules  : .strings ( addr u -- ) \ gforth
     included-files 2@ 2* cells bounds ?DO      \G list the strings from an array of string descriptors at addr
         cr I 2@ type  2 cells +LOOP ;        \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  \ contains tools/newrequire.fs
 \ \I $Id$  \ \I $Id$
   

Removed from v.1.4  
changed lines
  Added in v.1.17


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>