Diff for /gforth/kernel/require.fs between versions 1.6 and 1.10

version 1.6, 1999/03/23 20:24:26 version 1.10, 2000/07/01 07:59:10
Line 21 Line 21
 \ Now: Kernel Module, Reloadable  \ Now: Kernel Module, Reloadable
   
 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 -  \ 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 )  create image-included-files  1 , 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 )  : loadfilename ( -- a-addr ) \ gforth
     \G a-addr 2@ produces the current file name ( c-addr u )      \G @i{a-addr} @code{2@@} produces the current file name ( @i{c-addr u} )
     included-files 2@ loadfilename# @ min 2* cells + ;      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.
     loadfilename 2@ ;      loadfilename 2@ ;
   
 : 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
       \G Clear the list of earlier included files.
     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 68  create image-included-files  1 , A, ( po Line 77  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# !
Line 76  create image-included-files  1 , A, ( po Line 85  create image-included-files  1 , A, ( po
     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 @code{include-file} 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 101  create image-included-files  1 , A, ( po Line 110  create image-included-files  1 , A, ( po
 \ INCLUDE                                               9may93jaw  \ INCLUDE                                               9may93jaw
   
 : include  ( ... "file" -- ... ) \ gforth  : include  ( ... "file" -- ... ) \ gforth
 \G @code{include-file} the file @var{file}.      \G @code{include-file} the file @var{file}.
   name included ;      name included ;
   
 : require  ( ... "file" -- ... ) \ gforth  : require  ( ... "file" -- ... ) \ gforth
 \G @code{include-file} @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]  0 [IF]
 : \I  : \I
Line 115  create image-included-files  1 , A, ( po Line 124  create image-included-files  1 , A, ( po
   string,    string,
   needsrcs^ @ ! ;    needsrcs^ @ ! ;
   
 : .modules  : .included ( -- ) \ gforth
       \G list the names of the files that have been @code{included}
   cr    cr
   needs^ @    needs^ @
   BEGIN         dup     BEGIN         dup 
Line 138  create image-included-files  1 , A, ( po Line 148  create image-included-files  1 , A, ( po
 : 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  : .included ( -- ) \ gforth
       \G list the names of the files that have been @code{included}
     included-files 2@ 2* cells bounds ?DO      included-files 2@ 2* cells bounds ?DO
         cr I 2@ type  2 cells +LOOP ;            cr I 2@ type  2 cells +LOOP ;  
   

Removed from v.1.6  
changed lines
  Added in v.1.10


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