Diff for /gforth/extend.fs between versions 1.18 and 1.32

version 1.18, 1996/09/10 16:08:36 version 1.32, 1999/02/03 00:10:20
Line 1 Line 1
 \ EXTEND.FS    CORE-EXT Word not fully tested!         12may93jaw  \ EXTEND.FS    CORE-EXT Word not fully tested!         12may93jaw
   
 \ Copyright (C) 1995 Free Software Foundation, Inc.  \ Copyright (C) 1995,1998 Free Software Foundation, Inc.
   
 \ This file is part of Gforth.  \ This file is part of Gforth.
   
Line 25  decimal Line 25  decimal
   
 \ .(                                                    12may93jaw  \ .(                                                    12may93jaw
   
 : .(   ( compilation "...<paren>" -- ) \ core-ext dot-paren  : .(   ( "ccc<paren>" -- ) \ core-ext dot-paren
     [char] ) parse type ; immediate    \G Parse a string ccc delimited by a ) (right parenthesis). Display
     \G the string. This is often used to display progress information
     \G during compilation. See examples below.
     [char] ) parse type ; immediate
   
 \ VALUE 2>R 2R> 2R@                                     17may93jaw  \ VALUE 2>R 2R> 2R@                                     17may93jaw
   
 : value ( w "name" -- ) \ core-ext  
   (constant) , ;  
 \ !! 2value  \ !! 2value
   
 : 2Literal ( compilation w1 w2 -- ; run-time  -- w1 w2 ) \ double two-literal  : 2Literal ( compilation w1 w2 -- ; run-time  -- w1 w2 ) \ double two-literal
       \G Compile appropriate code such that, at run-time, cell pair w1, w2 are
       \G placed on the stack. Interpretation semantics are undefined.
     swap postpone Literal  postpone Literal ; immediate restrict      swap postpone Literal  postpone Literal ; immediate restrict
   
 ' drop alias d>s ( d -- n ) \ double            d_to_s  ' drop alias d>s ( d -- n ) \ double            d_to_s
Line 72  decimal Line 75  decimal
 : CLiteral  : CLiteral
     postpone (c") here over char+ allot  place align ; immediate restrict      postpone (c") here over char+ allot  place align ; immediate restrict
   
 : C" ( compilation "...<quote>" -- ; run-time  -- c-addr ) \ core-ext c-quote  : C" ( compilation "ccc<quote>" -- ; run-time  -- c-addr ) \ core-ext c-quote
       \G Compilation: parse a string ccc delimited by a " (double quote). At
       \G run-time, return c-addr which specifies the counted string ccc.
       \G Interpretation semantics are undefined.
     [char] " parse postpone CLiteral ; immediate restrict      [char] " parse postpone CLiteral ; immediate restrict
   
 \ UNUSED                                                17may93jaw  
   
 : unused ( -- u ) \ core-ext  
     s0 @ 512 -        \ for stack  
     here - ;  
   
 \ [COMPILE]                                             17may93jaw  \ [COMPILE]                                             17may93jaw
   
 : [compile] ( compilation "name" -- ; run-time ? -- ? ) \ core-ext bracket-compile  : [compile] ( compilation "name" -- ; run-time ? -- ? ) \ core-ext bracket-compile
     ' compile, ; immediate      comp' drop compile, ; immediate
   
 \ MARKER                                                17may93jaw  
   
 \ : marker here last @ create , , DOES> dup @ last ! cell+ @ dp ! ;  
 \ doesn't work now. vocabularies?  
   
 \ CONVERT                                               17may93jaw  \ CONVERT                                               17may93jaw
   
 : convert ( ud1 c-addr1 -- ud2 c-addr2 ) \ core-ext  : convert ( ud1 c-addr1 -- ud2 c-addr2 ) \ core-ext
     \ obsolescent; supersedet by @code{>number}.      \G obsolescent; superseded by @code{>number}.
     true >number drop ;      char+ true >number drop ;
   
 \ ERASE                                                 17may93jaw  \ ERASE                                                 17may93jaw
   
 : erase ( addr len -- ) \ core-ext  : erase ( addr len -- ) \ core-ext
       \G If len>0, clear all bits in each location of a memory region
       \G of len address units starting at address addr.
     \ !! dependence on "1 chars 1 ="      \ !! dependence on "1 chars 1 ="
     ( 0 1 chars um/mod nip )  0 fill ;      ( 0 1 chars um/mod nip )  0 fill ;
 : blank ( addr len -- ) \ string  : blank ( addr len -- ) \ string
       \G If len>0, store the character value for a space in each
       \G location of a memory region
       \G of len character units starting at address addr.
     bl fill ;      bl fill ;
   
 \ SEARCH                                                02sep94py  \ SEARCH                                                02sep94py
   
 : search   ( buf buflen text textlen -- restbuf restlen flag ) \ string  : search ( c-addr1 u1 c-addr2 u2 -- c-addr3 u3 flag ) \ string
     2over  2 pick - 1+ 3 pick c@ >r      \G Search the string specified by c-addr1, u1 for the string
     BEGIN      \G speficied by c-addr2, u2. If flag is true: match was found
         r@ scan dup      \G at c-addr3 with u3 characters remaining. If flag is false:
     WHILE      \G no match was found; c-addr3, u3 are equal to c-addr1, u1.
         >r >r  2dup r@ -text      \ not very efficient; but if we want efficiency, we'll do it as primitive
         0=      2>r 2dup
         IF      begin
             >r drop 2drop r> r> r> rot + 1- rdrop true          dup r@ >=
             EXIT      while
         THEN          over 2r@ swap -text 0= if
         r> r>  1 /string              2swap 2drop 2r> 2drop true exit
     REPEAT          endif
     2drop 2drop  rdrop false ;          1 /string
       repeat
       2drop 2r> 2drop false ;
   
 \ SOURCE-ID SAVE-INPUT RESTORE-INPUT                    11jun93jaw  \ SOURCE-ID SAVE-INPUT RESTORE-INPUT                    11jun93jaw
   
 : source-id ( -- 0 | -1 | fileid ) \ core-ext source-i-d  : source-id ( -- 0 | -1 | fileid ) \ core-ext,file source-i-d
   loadfile @ dup 0= IF  drop sourceline# 0 min  THEN ;    loadfile @ dup 0= IF  drop sourceline# 0 min  THEN ;
   
 : save-input ( -- x1 .. xn n ) \ core-ext  : save-input ( -- x1 .. xn n ) \ core-ext
Line 161  decimal Line 163  decimal
     >in !      >in !
     false ;      false ;
   
 \ : save-input ( -- x1 .. xn n ) \ core-ext  
 \   >in @  
 \   loadfile @ ?dup  
 \   IF    dup file-position throw sourceline# >tib @ 6  
 \         #tib @ >tib +!  
 \   ELSE  sourceline# blk @ linestart @ >tib @ 5 THEN  
 \ ;  
   
 \ : restore-input ( x1 .. xn n -- flag ) \ core-ext  
 \   swap >tib !  
 \   6 = IF   loadline ! rot dup loadfile !  
 \            reposition-file IF drop true EXIT THEN  
 \       ELSE linestart ! blk !  
 \            dup sourceline# <> IF 2drop true EXIT THEN  
 \            loadline !  
 \       THEN  
 \   >in ! false ;  
   
   
   
 \ This things we don't need, but for being complete... jaw  \ This things we don't need, but for being complete... jaw
   
 \ EXPECT SPAN                                           17may93jaw  \ EXPECT SPAN                                           17may93jaw
Line 198  variable span ( -- a-addr ) \ core-ext Line 180  variable span ( -- a-addr ) \ core-ext
     2 pick swap /string type      2 pick swap /string type
     nip span ! ;      nip span ! ;
   
   \ marker                                               18dec94py
   
   \ Marker creates a mark that is removed (including everything 
   \ defined afterwards) when executing the mark.
   
   : included-files-mark ( -- u )
       included-files 2@ nip
       blk @ 0=
       if \ not input from blocks
           source-id 1 -1 within
           if \ input from file
               1- \ do not include the last file (hopefully this is the
                  \ currently included file)
           then
       then ;  
   
   \ hmm, most of the saving appears to be pretty unnecessary: we could
   \ derive the wordlists and the words that have to be kept from the
   \ saved value of dp value. - anton
   
   : marker, ( -- mark )
       here
       included-files-mark ,
       dup A, \ here
       voclink @ A, \ vocabulary list start
       \ for all wordlists, remember wordlist-id (the linked list)
       voclink
       BEGIN
           @ dup
       WHILE
           dup 0 wordlist-link - wordlist-id @ A,
       REPEAT
       drop
       \ remember udp
       udp @ , ;
   
   : marker! ( mark -- )
       \ reset included files count; resize will happen on next add-included-file
       included-files 2@ drop over @ included-files 2! cell+
       \ rest of marker!
       dup @ swap cell+ ( here rest-of-marker )
       dup @ voclink ! cell+
       \ restore wordlists to former words
       voclink
       BEGIN
           @ dup 
       WHILE
           over @ over 0 wordlist-link - wordlist-id !
           swap cell+ swap
       REPEAT
       drop
       \ rehash wordlists to remove forgotten words
       \ why don't we do this in a single step? - anton
       voclink
       BEGIN
           @ dup
       WHILE
           dup 0 wordlist-link - rehash
       REPEAT
       drop
       \ restore udp and dp
       @ udp !  dp !
       \ clean up vocabulary stack
       0 vp @ 0
       ?DO
           vp cell+ I cells + @ dup here >
           IF  drop  ELSE  swap 1+  THEN
       LOOP
       dup 0= or set-order \ -1 set-order if order is empty
       get-current here > IF
           forth-wordlist set-current
       THEN ;
   
   : marker ( "<spaces> name" -- ) \ core-ext
       \G Create a definition, @var{name} (called a @var{mark}) whose
       \G execution semantics are to remove itself and everything 
       \G defined after it.
       marker, Create A,
   DOES> ( -- )
       @ marker! ;
   

Removed from v.1.18  
changed lines
  Added in v.1.32


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