Diff for /gforth/kernel/require.fs between versions 1.2 and 1.24

version 1.2, 1997/05/29 19:43:39 version 1.24, 2003/01/20 19:17:59
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 16 Line 16
   
 \ You should have received a copy of the GNU General Public License  \ You should have received a copy of the GNU General Public License
 \ along with this program; if not, write to the Free Software  \ 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  \ 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
       \G whole seesion (but not across @code{savesystem} etc.).
     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-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 str=
         if          if
             2drop rdrop unloop              2drop rdrop unloop
             true EXIT              true EXIT
Line 69  create image-included-files  1 , A, ( po Line 75  create image-included-files  1 , A, ( po
     2/ cell / included-files 2!      2/ cell / included-files 2!
     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  : 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 2@ 2>r
     save-mem add-included-file ( file-id )      save-mem 2dup loadfilename 2!
     included-files 2@ nip 1- loadfilename# !      add-included-file ( file-id )
     ['] include-file catch      ['] include-file2 catch
     r> loadfilename# !      2r> loadfilename 2!
     throw ;      throw ;
       [THEN]
 : included ( i*x addr u -- j*x ) \ file  
     open-fpath-file included1 ;  : 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 -- j*x ) \ gforth
     \G include the file with the name given by addr u, if it is not      \G @code{include-file} the file with the name given by @var{addr
     \G included already. Currently this works by comparing the name of      \G u}, if it is not @code{included} (or @code{required})
     \G the file (with path) against the names of earlier included      \G already. Currently this works by comparing the name of the file
     \G files; however, it would probably be better to fstat the file,      \G (with path) against the names of earlier included files.
     \G and compare the device and inode. The advantages would be: no      \ however, it may be better to fstat the file,
     \G problems with several paths to the same file (e.g., due to      \ and compare the device and inode. The advantages would be: no
     \G links) and we would catch files included with include-file and      \ problems with several paths to the same file (e.g., due to
     \G write a require-file.      \ links) and we would catch files included with include-file and
     open-fpath-file 2dup included?      \ write a require-file.
       open-fpath-file throw 2dup included?
     if      if
         2drop close-file throw          2drop close-file throw
     else      else
Line 99  create image-included-files  1 , A, ( po Line 116  create image-included-files  1 , A, ( po
   
 \ INCLUDE                                               9may93jaw  \ INCLUDE                                               9may93jaw
   
 : include  ( "file" -- ) \ gforth  : include  ( ... "file" -- ... ) \ gforth
   name included ;      \G @code{include-file} the file @var{file}.
       name included ;
 : require  ( "file" -- ) \ gforth  
   name required ;  : require  ( ... "file" -- ... ) \ gforth
       \G @code{include-file} @var{file} only if it is not included already.
 0 [IF]      name required ;
 : \I  
   here   \ : \I
   0 word count  \   here 
   string,  \   0 word count
   needsrcs^ @ ! ;  \   string,
   \   needsrcs^ @ ! ;
 : .modules  
   cr  \ : .included ( -- ) \ gforth
   needs^ @  \     \G list the names of the files that have been @code{included}
   BEGIN         dup   \   cr
   WHILE         dup cell+ count type cr  \   needs^ @
                 5 spaces  \   BEGIN               dup 
                 dup cell+ count + aligned  \   WHILE               dup cell+ count type cr
                 @ dup IF count type ELSE drop THEN cr  \               5 spaces
                 @  \               dup cell+ count + aligned
   REPEAT  \               @ dup IF count type ELSE drop THEN cr
   drop ;  \               @
   \   REPEAT
 : loadfilename#>str ( n -- adr len )  \   drop ;
 \ this converts the filenumber into the string  
   loadfilenamecount @ swap -  : .strings ( addr u -- ) \ gforth
   needs^ @      \G list the strings from an array of string descriptors at addr
   swap 0 ?DO dup 0= IF LEAVE THEN @ LOOP       \G with u entries, one per line.
   dup IF cell+ count ELSE drop s" NOT FOUND" THEN ;      2* cells bounds ?DO
 [THEN]          cr I 2@ type 2 cells +LOOP ;
   
 : loadfilename#>str ( n -- adr len )  : .included ( -- ) \ gforth
     included-files 2@ drop swap 2* cells + 2@ ;      \G list the names of the files that have been @code{included}
       included-files 2@ .strings ;
 : .modules  
     included-files 2@ 2* cells bounds ?DO  
         cr I 2@ type  2 cells +LOOP ;    
   
 \ contains tools/newrequire.fs  
 \ \I $Id$  
   

Removed from v.1.2  
changed lines
  Added in v.1.24


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