Diff for /gforth/extend.fs between versions 1.29 and 1.39

version 1.29, 1997/12/01 21:15:02 version 1.39, 2000/08/08 12:37:05
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 @i{ccc} delimited by a @code{)} (right
     \G parenthesis). Display the string. This is often used to display
     \G progress information during compilation; see examples below.
     [char] ) parse type ; immediate
   
 \ VALUE 2>R 2R> 2R@                                     17may93jaw  \ VALUE 2>R 2R> 2R@                                     17may93jaw
   
 \ !! 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 @i{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
   
 : m*/ ( d1 n2 u3 -- dqout ) \ double m-star-slash  : m*/ ( d1 n2 u3 -- dquot ) \ double m-star-slash
     >r s>d >r abs -rot      >r s>d >r abs -rot
     s>d r> xor r> swap >r >r dabs rot tuck um* 2swap um*      s>d r> xor r> swap >r >r dabs rot tuck um* 2swap um*
     swap >r 0 d+ r> -rot r@ um/mod -rot r> um/mod nip swap      swap >r 0 d+ r> -rot r@ um/mod -rot r> um/mod nip swap
Line 70  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 @i{ccc} delimited by a @code{"}
       \G (double quote). At run-time, return @i{c-addr} which
       \G specifies the counted string @i{ccc}.  Interpretation
       \G semantics are undefined.
     [char] " parse postpone CLiteral ; immediate restrict      [char] " parse postpone CLiteral ; immediate restrict
   
 \ [COMPILE]                                             17may93jaw  \ [COMPILE]                                             17may93jaw
   
 : [compile] ( compilation "name" -- ; run-time ? -- ? ) \ core-ext bracket-compile  : [compile] ( compilation "name" -- ; run-time ? -- ? ) \ core-ext bracket-compile
     comp' drop compile, ; immediate      comp' drop
       dup [ comp' exit drop ] literal = if
           execute \ EXIT has default compilation semantics, perform them
       else
           compile,
       then ; immediate
   
 \ CONVERT                                               17may93jaw  \ CONVERT                                               17may93jaw
   
 : convert ( ud1 c-addr1 -- ud2 c-addr2 ) \ core-ext  : convert ( ud1 c-addr1 -- ud2 c-addr2 ) \ core-ext
     \G obsolescent; superseded by @code{>number}.      \G OBSOLESCENT: superseded by @code{>number}.
     char+ true >number drop ;      char+ true >number drop ;
   
 \ ERASE                                                 17may93jaw  \ ERASE                                                 17may93jaw
   
 : erase ( addr len -- ) \ core-ext  : erase ( addr len -- ) \ core-ext
       \G If @i{len}>0, clear all bits in each location of a memory region
       \G of @i{len} address units starting at address @i{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 ( c-addr u -- ) \ string
       \G If @i{u}>0, store the character value for a space in each
       \G location of a memory region
       \G of @i{u} character units starting at address @i{c-addr}.
     bl fill ;      bl fill ;
   
 \ SEARCH                                                02sep94py  \ SEARCH                                                02sep94py
   
 : search ( c-addr1 u1 c-addr2 u2 -- c-addr3 u3 flag ) \ string  : search ( c-addr1 u1 c-addr2 u2 -- c-addr3 u3 flag ) \ string
       \G Search the string specified by @i{c-addr1, u1} for the string
       \G specified by @i{c-addr2, u2}. If @i{flag} is true: match was found
       \G at @i{c-addr3} with @i{u3} characters remaining. If @i{flag} is false:
       \G no match was found; @i{c-addr3, u3} are equal to @i{c-addr1, u1}.
     \ not very efficient; but if we want efficiency, we'll do it as primitive      \ not very efficient; but if we want efficiency, we'll do it as primitive
     2>r 2dup      2>r 2dup
     begin      begin
Line 110  decimal Line 133  decimal
 \ SOURCE-ID SAVE-INPUT RESTORE-INPUT                    11jun93jaw  \ SOURCE-ID SAVE-INPUT RESTORE-INPUT                    11jun93jaw
   
 : source-id ( -- 0 | -1 | fileid ) \ core-ext,file source-i-d  : source-id ( -- 0 | -1 | fileid ) \ core-ext,file source-i-d
   loadfile @ dup 0= IF  drop sourceline# 0 min  THEN ;      \G Return 0 (the input source is the user input device), -1 (the
       \G input source is a string being processed by @code{evaluate}) or
 : save-input ( -- x1 .. xn n ) \ core-ext      \G a @i{fileid} (the input source is the file specified by
       \G @i{fileid}).
       loadfile @ dup 0= IF  drop sourceline# 0 min  THEN ;
   
   : save-input ( -- xn .. x1 n ) \ core-ext
       \G The @i{n} entries @i{xn - x1} describe the current state of the
       \G input source specification, in some platform-dependent way that can
       \G be used by @code{restore-input}.
     >in @      >in @
     loadfile @      loadfile @
     if      if
         loadfile @ file-position throw          loadfile @ file-position throw #TIB @ 1+ 0 d- \ !! bug for CRLF and EOF
     else      else
         blk @          blk @
         linestart @          linestart @
Line 126  decimal Line 156  decimal
     source-id      source-id
     6 ;      6 ;
   
 : restore-input ( x1 .. xn n -- flag ) \ core-ext  : restore-input ( xn .. x1 n -- flag ) \ core-ext
       \G Attempt to restore the input source specification to the state
       \G described by the @i{n} entries @i{xn - x1}. @i{flag} is
       \G true if the restore fails.  In Gforth it fails pretty often
       \G (and sometimes with a @code{throw}).
     6 <> -12 and throw      6 <> -12 and throw
     source-id <> -12 and throw      source-id <> -12 and throw
     >tib !      >tib !
Line 134  decimal Line 168  decimal
     loadfile @ 0<>      loadfile @ 0<>
     if      if
         loadfile @ reposition-file throw          loadfile @ reposition-file throw
           refill 0= -36 and throw \ should never throw
     else      else
         linestart !          linestart !
         blk !          blk !
Line 150  decimal Line 185  decimal
   
 \ EXPECT SPAN                                           17may93jaw  \ EXPECT SPAN                                           17may93jaw
   
 variable span ( -- a-addr ) \ core-ext  variable span ( -- c-addr ) \ core-ext
 \ obsolescent  \G @code{Variable} -- @i{c-addr} is the address of a cell that stores the
   \G length of the last string received by @code{expect}. OBSOLESCENT.
 : expect ( c-addr +len -- ) \ core-ext  
     \ obsolescent; use accept  : expect ( c-addr +n -- ) \ core-ext
       \G Receive a string of at most @i{+n} characters, and store it
       \G in memory starting at @i{c-addr}. The string is
       \G displayed. Input terminates when the <return> key is pressed or
       \G @i{+n} characters have been received. The normal Gforth line
       \G editing capabilites are available. The length of the string is
       \G stored in @code{span}; it does not include the <return>
       \G character. OBSOLESCENT: superceeded by @code{accept}.
     0 rot over      0 rot over
     BEGIN ( maxlen span c-addr pos1 )      BEGIN ( maxlen span c-addr pos1 )
         key decode ( maxlen span c-addr pos2 flag )          key decode ( maxlen span c-addr pos2 flag )
Line 168  variable span ( -- a-addr ) \ core-ext Line 210  variable span ( -- a-addr ) \ core-ext
 \ Marker creates a mark that is removed (including everything   \ Marker creates a mark that is removed (including everything 
 \ defined afterwards) when executing the mark.  \ defined afterwards) when executing the mark.
   
 : marker, ( -- mark )  here dup A,  : included-files-mark ( -- u )
   voclink @ A, voclink      included-files 2@ nip
   BEGIN  @ dup WHILE  dup 0 wordlist-link - @ A,  REPEAT  drop      blk @ 0=
   udp @ , ;      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 -- )  : marker! ( mark -- )
     dup @ swap cell+      \ 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+      dup @ voclink ! cell+
       \ restore wordlists to former words
     voclink      voclink
     BEGIN      BEGIN
         @ dup           @ dup 
     WHILE      WHILE
         over @ over 0 wordlist-link - !          over @ over 0 wordlist-link - wordlist-id !
         swap cell+ swap          swap cell+ swap
     REPEAT      REPEAT
     drop  voclink      drop
       \ rehash wordlists to remove forgotten words
       \ why don't we do this in a single step? - anton
       voclink
     BEGIN      BEGIN
         @ dup          @ dup
     WHILE      WHILE
         dup 0 wordlist-link - rehash          dup 0 wordlist-link - rehash
     REPEAT      REPEAT
     drop      drop
       \ restore udp and dp
     @ udp !  dp !      @ udp !  dp !
     \ clean up vocabulary stack      \ clean up vocabulary stack
     0 vp @ 0      0 vp @ 0
Line 202  variable span ( -- a-addr ) \ core-ext Line 278  variable span ( -- a-addr ) \ core-ext
         forth-wordlist set-current          forth-wordlist set-current
     THEN ;      THEN ;
   
 : marker ( "mark" -- )  : marker ( "<spaces> name" -- ) \ core-ext
       \G Create a definition, @i{name} (called a @i{mark}) whose
       \G execution semantics are to remove itself and everything 
       \G defined after it.
     marker, Create A,      marker, Create A,
 DOES> ( -- )  DOES> ( -- )
     @ marker! ;      @ marker! ;

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


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