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

version 1.10, 2000/07/01 07:59:10 version 1.15, 2000/09/11 20:56:39
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 -  \ 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 ," *a file*" dup c@ swap 1 + swap
 here ," #terminal#" dup c@ swap 1 + swap , A, here 2 cells -  here ," *a block*" dup c@ swap 1 + swap
 create image-included-files  1 , A, ( pointer to and count of included files )  here ," *evaluated string*" dup c@ swap 1 + swap
 \ included-files points to ALLOCATEd space, while image-included-files  here ," *the terminal*" dup c@ swap 1 + swap
 \ points to ALLOTed objects, so it survives a save-system  , A, , A, , A, , A, here 8 cells -
   create image-included-files 4 , A, ( pointer to and count of included
 : loadfilename ( -- a-addr ) \ gforth  \ files ) included-files points to ALLOCATEd space, while
     \G @i{a-addr} @code{2@@} produces the current file name ( @i{c-addr u} )  \ image-included-files points to ALLOTed objects, so it survives a
     included-files 2@ loadfilename# @ min 2* cells + ;  \ save-system
   
 : 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
     loadfilename 2@ ;      \G whole seesion (but not across @code{savesystem} etc.).
       loadfilename# @ loadfilename#>str ;
   
 : 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
Line 47  create image-included-files  1 , A, ( po Line 48  create image-included-files  1 , A, ( po
     \G undefined.      \G undefined.
     loadline @ ;      loadline @ ;
   
 : init-included-files ( -- ) \ gforth  : init-included-files ( -- ) \ gforth-internal
     \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! ;
   
Line 81  create image-included-files  1 , A, ( po Line 81  create image-included-files  1 , A, ( po
     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# !
     ['] include-file catch      ['] include-file2 catch
     r> loadfilename# !      r> loadfilename# !
     throw ;      throw ;
           
Line 117  create image-included-files  1 , A, ( po Line 117  create image-included-files  1 , A, ( po
     \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]  \ : \I
 : \I  \   here 
   here   \   0 word count
   0 word count  \   string,
   string,  \   needsrcs^ @ ! ;
   needsrcs^ @ ! ;  
   \ : .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}  \   cr
   cr  \   needs^ @
   needs^ @  \   BEGIN               dup 
   BEGIN         dup   \   WHILE               dup cell+ count type cr
   WHILE         dup cell+ count type cr  \               5 spaces
                 5 spaces  \               dup cell+ count + aligned
                 dup cell+ count + aligned  \               @ dup IF count type ELSE drop THEN cr
                 @ dup IF count type ELSE drop THEN cr  \               @
                 @  \   REPEAT
   REPEAT  \   drop ;
   drop ;  
   \ : loadfilename#>str ( n -- adr len )
 : loadfilename#>str ( n -- adr len )  \ \ this converts the filenumber into the string
 \ this converts the filenumber into the string  \   loadfilenamecount @ swap -
   loadfilenamecount @ swap -  \   needs^ @
   needs^ @  \   swap 0 ?DO dup 0= IF LEAVE THEN @ LOOP 
   swap 0 ?DO dup 0= IF LEAVE THEN @ LOOP   \   dup IF cell+ count ELSE drop s" NOT FOUND" THEN ;
   dup IF cell+ count ELSE drop s" NOT FOUND" THEN ;  
 [THEN]  
   
 : 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@ ;
   
   : .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@ .strings ;
         cr I 2@ type  2 cells +LOOP ;        
   
 \ contains tools/newrequire.fs  \ contains tools/newrequire.fs
 \ \I $Id$  \ \I $Id$
   

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


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