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

version 1.29, 1997/12/01 21:15:02 version 1.33, 1999/03/23 20:24:18
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 @var{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 @var{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 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 @var{ccc} delimited by a @code{"}
       \G (double quote). At run-time, return @var{c-addr} which
       \G specifies the counted string @var{ccc}.  Interpretation
       \G semantics are undefined.
     [char] " parse postpone CLiteral ; immediate restrict      [char] " parse postpone CLiteral ; immediate restrict
   
 \ [COMPILE]                                             17may93jaw  \ [COMPILE]                                             17may93jaw
Line 81  decimal Line 90  decimal
 \ 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 @var{len}>0, clear all bits in each location of a memory region
       \G of @var{len} address units starting at address @var{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 @var{len}>0, store the character value for a space in each
       \G location of a memory region
       \G of @var{len} character units starting at address @var{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 @var{c-addr1, u1} for the string
       \G specified by @var{c-addr2, u2}. If @var{flag} is true: match was found
       \G at @var{c-addr3} with @var{u3} characters remaining. If @var{flag} is false:
       \G no match was found; @var{c-addr3, u3} are equal to @var{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 168  variable span ( -- a-addr ) \ core-ext Line 186  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 254  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, @var{name} (called a @var{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.33


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