Diff for /gforth/kernel/require.fs between versions 1.3 and 1.29

version 1.3, 1997/06/01 20:55:22 version 1.29, 2006/01/31 15:25:44
Line 1 Line 1
 \ require.fs  \ require.fs
   
 \ Copyright (C) 1995-1997 Free Software Foundation, Inc.  \ Copyright (C) 1995,1996,1997,1998,2000,2003 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 ," *somewhere*" dup c@ swap 1 + swap
   , A, here 2 cells -
   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 )  
     \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 72  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
       includefilename 2@ 2>r 2dup includefilename 2!
       ['] read-loop execute-parsing-named-file
       2r> includefilename 2! ;
   [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      save-mem 2dup loadfilename>r
     save-mem add-included-file ( file-id )      includefilename 2@ 2>r 2dup includefilename 2!
     included-files 2@ nip 1- loadfilename# !      add-included-file ( file-id )
     ['] include-file catch      ['] include-file2 catch
     r> loadfilename# !      2r> includefilename 2! r>loadfilename
     throw ;      throw ;
       [THEN]
 : included ( i*x addr u -- j*x ) \ file  
   : included2 ( i*x c-addr u -- j*x ) \ file
     open-fpath-file throw included1 ;      open-fpath-file throw included1 ;
   
 : required ( i*x addr u -- j*x ) \ gforth  : required2 ( i*x addr u -- i*x ) \ gforth
     \G include the file with the name given by addr u, if it is not      \ however, it may be better to fstat the file,
     \G included already. Currently this works by comparing the name of      \ and compare the device and inode. The advantages would be: no
     \G the file (with path) against the names of earlier included      \ problems with several paths to the same file (e.g., due to
     \G files; however, it would probably be better to fstat the file,      \ links) and we would catch files included with include-file and
     \G and compare the device and inode. The advantages would be: no      \ write a require-file.
     \G problems with several paths to the same file (e.g., due to  
     \G links) and we would catch files included with include-file and  
     \G write a require-file.  
     open-fpath-file throw 2dup included?      open-fpath-file throw 2dup included?
     if      if
         2drop close-file throw          2drop close-file throw
Line 99  create image-included-files  1 , A, ( po Line 108  create image-included-files  1 , A, ( po
   
 \ INCLUDE                                               9may93jaw  \ INCLUDE                                               9may93jaw
   
 : include  ( "file" -- ) \ gforth  : include  ( ... "file" -- ... ) \ gforth
 \G includes a file and keeps in mind that this file is loaded      \G @code{include-file} the file @var{file}.
   name included ;      name included2 ;
   
 : require  ( "file" -- ) \ gforth  : require  ( ... "file" -- ... ) \ gforth
 \G load a file only when it is not included already      \G @code{include-file} @var{file} only if it is not included already.
   name required ;      name required2 ;
   
 0 [IF]  \ we go through execute-parsing to get nicer output on errors
 : \I  
   here   : included ( i*x c-addr u -- j*x ) \ file
   0 word count      \G @code{include-file} the file whose name is given by the string
   string,      \G @var{c-addr u}.
   needsrcs^ @ ! ;      ['] include execute-parsing ;
   
 : .modules  : required ( i*x addr u -- i*x ) \ gforth
   cr      \G @code{include-file} the file with the name given by @var{addr
   needs^ @      \G u}, if it is not @code{included} (or @code{required})
   BEGIN         dup       \G already. Currently this works by comparing the name of the file
   WHILE         dup cell+ count type cr      \G (with path) against the names of earlier included files.
                 5 spaces      ['] require execute-parsing ;
                 dup cell+ count + aligned  
                 @ dup IF count type ELSE drop THEN cr  \ : \I
                 @  \   here 
   REPEAT  \   0 word count
   drop ;  \   string,
   \   needsrcs^ @ ! ;
 : loadfilename#>str ( n -- adr len )  
 \ this converts the filenumber into the string  \ : .included ( -- ) \ gforth
   loadfilenamecount @ swap -  \     \G list the names of the files that have been @code{included}
   needs^ @  \   cr
   swap 0 ?DO dup 0= IF LEAVE THEN @ LOOP   \   needs^ @
   dup IF cell+ count ELSE drop s" NOT FOUND" THEN ;  \   BEGIN               dup 
 [THEN]  \   WHILE               dup cell+ count type cr
   \               5 spaces
 : loadfilename#>str ( n -- adr len )  \               dup cell+ count + aligned
     included-files 2@ drop swap 2* cells + 2@ ;  \               @ dup IF count type ELSE drop THEN cr
   \               @
 : .modules  \   REPEAT
     included-files 2@ 2* cells bounds ?DO  \   drop ;
         cr I 2@ type  2 cells +LOOP ;    
   : .strings ( addr u -- ) \ gforth
 \ contains tools/newrequire.fs      \G list the strings from an array of string descriptors at addr
 \ \I $Id$      \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 under+ 1- .strings ;

Removed from v.1.3  
changed lines
  Added in v.1.29


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