Diff for /gforth/kernel/require.fs between versions 1.13 and 1.27

version 1.13, 2000/09/06 08:47:15 version 1.27, 2003/01/22 17:12:49
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 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  : 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 add-included-file ( file-id )
     save-mem add-included-file ( file-id )      ['] read-loop execute-parsing-named-file ;
     included-files 2@ nip 1- loadfilename# !  [ELSE]
     ['] include-file catch  : included1 ( i*x file-id c-addr u -- j*x ) \ gforth
     r> loadfilename# !  \G Include the file file-id with the name given by @var{c-addr u}.
       save-mem 2dup loadfilename>r
       add-included-file ( file-id )
       ['] include-file2 catch
       r>loadfilename
     throw ;      throw ;
       [THEN]
   
 : included ( i*x c-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{c-addr u}.      \G @var{c-addr u}.
Line 136  create image-included-files  1 , A, ( po Line 138  create image-included-files  1 , A, ( po
 \   REPEAT  \   REPEAT
 \   drop ;  \   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 )  
     included-files 2@ drop swap 2* cells + 2@ ;  
   
 : .strings ( addr u -- ) \ gforth  : .strings ( addr u -- ) \ gforth
     \G list the strings from an array of string descriptors at addr      \G list the strings from an array of string descriptors at addr
     \G with u entries, one per line.      \G with u entries, one per line.
     included-files 2@ 2* cells bounds ?DO      2* cells bounds ?DO
         cr I 2@ type 2 cells +LOOP ;          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@ .strings ;      included-files 2@ 2 cells under+ 1- .strings ;
       
 \ contains tools/newrequire.fs  
 \ \I $Id$  
   

Removed from v.1.13  
changed lines
  Added in v.1.27


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