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

version 1.15, 2000/09/11 20:56:39 version 1.24, 2003/01/20 19:17:59
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
   
Line 28  here ," *a block*" dup c@ swap 1 + swap Line 28  here ," *a block*" dup c@ swap 1 + swap
 here ," *evaluated string*" dup c@ swap 1 + swap  here ," *evaluated string*" dup c@ swap 1 + swap
 here ," *the terminal*" dup c@ swap 1 + swap  here ," *the terminal*" dup c@ swap 1 + swap
 , A, , A, , A, , A, here 8 cells -  , A, , A, , A, , A, here 8 cells -
 create image-included-files 4 , A, ( pointer to and count of included  create image-included-files 4 , A, ( pointer to and count of included files )
 \ files ) included-files points to ALLOCATEd space, while  \ included-files points to ALLOCATEd space, while image-included-files
 \ image-included-files points to ALLOTed objects, so it survives a  \ points to ALLOTed objects, so it survives a save-system
 \ 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
Line 39  create image-included-files 4 , A, ( poi Line 38  create image-included-files 4 , A, ( poi
     \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.  In Gforth, the result is valid during the      \G result is undefined.  In Gforth, the result is valid during the
     \G whole seesion (but not across @code{savesystem} etc.).      \G whole seesion (but not across @code{savesystem} etc.).
     loadfilename# @ loadfilename#>str ;      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
Line 61  create image-included-files 4 , A, ( poi Line 60  create image-included-files 4 , A, ( poi
     \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 4 , A, ( poi Line 75  create image-included-files 4 , A, ( poi
     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 )  
     included-files 2@ nip 1- loadfilename# !  
     ['] include-file2 catch      ['] include-file2 catch
     r> loadfilename# !  
     throw ;      throw ;
       [ELSE]
   : 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}.
       loadfilename 2@ 2>r
       save-mem 2dup loadfilename 2!
       add-included-file ( file-id )
       ['] include-file2 catch
       2r> loadfilename 2!
       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 4 , A, ( poi Line 143  create image-included-files 4 , A, ( poi
 \   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.
Line 155  create image-included-files 4 , A, ( poi Line 152  create image-included-files 4 , A, ( poi
 : .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@ .strings ;
       
 \ contains tools/newrequire.fs  
 \ \I $Id$  
   

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


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