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

version 1.11, 2000/08/17 12:46:59 version 1.29, 2006/01/31 15:25:44
Line 1 Line 1
 \ require.fs  \ require.fs
   
 \ Copyright (C) 1995,1996,1997,1998 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
   
 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
 \ ./ is confusing for the search path stuff! There should be never a .  \ that name might be used when expanding "./" (see expandtopic).
 \ in sourcefilename....  here ," *somewhere*" dup c@ swap 1 + swap
 here ," #terminal#" dup c@ swap 1 + swap , A, here 2 cells -  , 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 ) \ gforth-internal  
     \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  : 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
Line 61  create image-included-files  1 , A, ( po Line 57  create image-included-files  1 , A, ( po
     \G @file{./foo.fs}      \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 76  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 @var{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 c-addr u -- j*x ) \ file  
     \G @code{include-file} the file whose name is given by the string  : included2 ( i*x c-addr u -- j*x ) \ file
     \G @var{c-addr u}.  
     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 @code{include-file} the file with the name given by @var{addr  
     \G u}, if it is not @code{included} (or @code{required})  
     \G already. Currently this works by comparing the name of the file  
     \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 111  create image-included-files  1 , A, ( po Line 110  create image-included-files  1 , A, ( po
   
 : 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 included2 ;
   
 : 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 required2 ;
   
 0 [IF]  \ we go through execute-parsing to get nicer output on errors
 : \I  
   here   
   0 word count  
   string,  
   needsrcs^ @ ! ;  
   
 : .included ( -- ) \ gforth  : included ( i*x c-addr u -- j*x ) \ file
     \G list the names of the files that have been @code{included}      \G @code{include-file} the file whose name is given by the string
   cr      \G @var{c-addr u}.
   needs^ @      ['] include execute-parsing ;
   BEGIN         dup   
   WHILE         dup cell+ count type cr  : required ( i*x addr u -- i*x ) \ gforth
                 5 spaces      \G @code{include-file} the file with the name given by @var{addr
                 dup cell+ count + aligned      \G u}, if it is not @code{included} (or @code{required})
                 @ dup IF count type ELSE drop THEN cr      \G already. Currently this works by comparing the name of the file
                 @      \G (with path) against the names of earlier included files.
   REPEAT      ['] require execute-parsing ;
   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]  
   
 : loadfilename#>str ( n -- adr len )  \ : \I
     included-files 2@ drop swap 2* cells + 2@ ;  \   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 ;
   
   : .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  : .included ( -- ) \ gforth
     \G list the names of the files that have been @code{included}      \G list the names of the files that have been @code{included}
     included-files 2@ 2* cells bounds ?DO      included-files 2@ 2 cells under+ 1- .strings ;
         cr I 2@ type  2 cells +LOOP ;    
   
 \ contains tools/newrequire.fs  
 \ \I $Id$  
   

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


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