Diff for /gforth/search.fs between versions 1.6 and 1.16

version 1.6, 1998/12/08 22:02:51 version 1.16, 2000/08/23 21:03:52
Line 23  Variable vp Line 23  Variable vp
   0 A, 0 A,  0 A, 0 A,   0 A, 0 A,   0 A, 0 A,     0 A, 0 A,  0 A, 0 A,   0 A, 0 A,   0 A, 0 A, 
   0 A, 0 A,  0 A, 0 A,   0 A, 0 A,   0 A, 0 A,     0 A, 0 A,  0 A, 0 A,   0 A, 0 A,   0 A, 0 A, 
   
 : get-current  ( -- wid )  current @ ;  : get-current  ( -- wid ) \ search
 : set-current  ( wid -- )  current ! ;    \G @i{wid} is the identifier of the current compilation word list.
     current @ ;
 \ : context ( -- addr )  vp dup @ cells + ;  
 : vp! dup vp ! cells vp + to context ;  : set-current  ( wid -- )  \ search
 : definitions  ( -- )  context @ current ! ;    \G Set the compilation word list to the word list identified by @i{wid}.
     current ! ;
   
   :noname ( -- addr )
       vp dup @ cells + ;
   is context
   
   : vp! ( u -- )
       vp ! ;
   : definitions  ( -- ) \ search
     \G Set the compilation word list to be the same as the word list
     \G that is currently at the top of the search order.
     context @ current ! ;
   
 \ wordlist Vocabulary also previous                    14may93py  \ wordlist Vocabulary also previous                    14may93py
   
Line 37  Variable slowvoc   0 slowvoc ! Line 49  Variable slowvoc   0 slowvoc !
 \ Forth-wordlist AConstant Forth-wordlist  \ Forth-wordlist AConstant Forth-wordlist
   
 : mappedwordlist ( map-struct -- wid )  \ gforth  : mappedwordlist ( map-struct -- wid )  \ gforth
 \G creates a wordlist with a special map-structure  \G Create a wordlist with a special map-structure.
   here swap A, 0 A, voclink @ A, 0 A,    here swap A, 0 A, voclink @ A, 0 A,
   dup wordlist-link voclink !    dup wordlist-link voclink !
   dup initvoc ;    dup initvoc ;
   
 : wordlist  ( -- wid )  : wordlist  ( -- wid ) \ search
     \G Create a new, empty word list represented by @i{wid}.
   slowvoc @    slowvoc @
   IF    \ this is now f83search because hashing may be loaded already    IF    \ this is now f83search because hashing may be loaded already
         \ jaw          \ jaw
Line 50  Variable slowvoc   0 slowvoc ! Line 63  Variable slowvoc   0 slowvoc !
   ELSE  Forth-wordlist wordlist-map @   THEN    ELSE  Forth-wordlist wordlist-map @   THEN
   mappedwordlist ;    mappedwordlist ;
   
 : Vocabulary ( -- ) Create wordlist drop  DOES> context ! ;  : Vocabulary ( "name" -- ) \ gforth
     \G Create a definition "name" and associate a new word list with it.
 : also  ( -- )    \G The run-time effect of "name" is to replace the @i{wid} at the
   context @ vp @ 1+ dup maxvp > abort" Vocstack full"    \G top of the search order with the @i{wid} associated with the new
   vp! context ! ;    \G word list.
     Create wordlist drop  DOES> context ! ;
 : previous ( -- )  vp @ 1- dup 0= abort" Vocstack empty" vp! ;  
   : check-maxvp ( n -- )
       maxvp > -49 and throw ;
   
   : >order ( wid -- ) \ gforth to-order
       \g Push @var{wid} on the search order.
       vp @ 1+ dup check-maxvp vp! context ! ;
   
   : also  ( -- ) \ search-ext
     \G Like @code{DUP} for the search order. Usually used before a
     \G vocabulary (e.g., @code{also Forth}); the combined effect is to push
     \G the wordlist represented by the vocabulary on the search order.
     context @ >order ;
   
   : previous ( -- ) \ search-ext
     \G Drop the wordlist at the top of the search order.
     vp @ 1- dup 0= -50 and throw vp! ;
   
 \ vocabulary find                                      14may93py  \ vocabulary find                                      14may93py
   
Line 102  slowvoc off Line 131  slowvoc off
   
 \ Only root                                            14may93py  \ Only root                                            14may93py
   
 Vocabulary Forth  Vocabulary Forth ( -- ) \ gforthman- search-ext
 Vocabulary Root    \G Replace the @i{wid} at the top of the search order with the
     \G @i{wid} associated with the word list @code{forth-wordlist}.
   
   
 : Only  1 vp! Root also ;  Vocabulary Root ( -- ) \ gforth
     \G Add the root wordlist to the search order stack.  This vocabulary
     \G makes up the minimum search order and contains only a
     \G search-order words.
   
   : Only ( -- ) \ search-ext
     \G Set the search order to the implementation-defined minimum search
     \G order (for Gforth, this is the word list @code{Root}).
     1 vp! Root also ;
   
 \ set initial search order                             14may93py  \ set initial search order                             14may93py
   
Line 120  lookup ! \ our dictionary search order b Line 159  lookup ! \ our dictionary search order b
   
 \ get-order set-order                                  14may93py  \ get-order set-order                                  14may93py
   
 : get-order  ( -- wid1 .. widn n )  : get-order  ( -- widn .. wid1 n ) \ search
   vp @ 0 ?DO  vp cell+ I cells + @  LOOP  vp @ ;    \G Copy the search order to the data stack. The current search order
     \G has @i{n} entries, of which @i{wid1} represents the wordlist
 : set-order  ( wid1 .. widn n / -1 -- )    \G that is searched first (the word list at the top of the search
   dup -1 = IF  drop Only exit  THEN  dup vp!    \G order) and @i{widn} represents the wordlist that is searched
   ?dup IF  1- FOR  vp cell+ I cells + !  NEXT  THEN ;    \G last.
     vp @ 0 ?DO vp cell+ I cells + @ LOOP vp @ ;
 : seal ( -- )  context @ 1 set-order ;  
   : set-order  ( widn .. wid1 n -- ) \ gforthman- search
       \G If @var{n}=0, empty the search order.  If @var{n}=-1, set the
       \G search order to the implementation-defined minimum search order
       \G (for Gforth, this is the word list @code{Root}). Otherwise,
       \G replace the existing search order with the @var{n} wid entries
       \G such that @var{wid1} represents the word list that will be
       \G searched first and @var{widn} represents the word list that will
       \G be searched last.
       dup -1 = IF
           drop only exit
       THEN
       dup check-maxvp
       dup vp!
       ?dup IF 1- FOR vp cell+ I cells + !  NEXT THEN ;
   
   : seal ( -- ) \ gforth
     \G Remove all word lists from the search order stack other than the word
     \G list that is currently on the top of the search order stack.
     context @ 1 set-order ;
   
 : .voc  : .voc
     body> >head name>string type space ;      body> >head-noprim name>string type space ;
   
 : order ( -- )  \  search-ext  : order ( -- )  \  gforthman- search-ext
     \g prints the search order and the @code{current} wordlist.  The    \G Print the search order and the compilation word list.  The
     \g standard requires that the wordlists are printed in the order    \G word lists are printed in the order in which they are searched
     \g in which they are searched. Therefore, the output is reversed    \G (which is reversed with respect to the conventional way of
     \g with respect to the conventional way of displaying stacks. The    \G displaying stacks). The compilation word list is displayed last.
     \g @code{current} wordlist is displayed last.    \ The standard requires that the word lists are printed in the order
     \ in which they are searched. Therefore, the output is reversed
     \ with respect to the conventional way of displaying stacks.
     get-order 0      get-order 0
     ?DO      ?DO
         .voc          .voc
Line 145  lookup ! \ our dictionary search order b Line 205  lookup ! \ our dictionary search order b
     4 spaces get-current .voc ;      4 spaces get-current .voc ;
   
 : vocs ( -- ) \ gforth  : vocs ( -- ) \ gforth
     \g prints vocabularies and wordlists defined in the system.      \G List vocabularies and wordlists defined in the system.
     voclink      voclink
     BEGIN      BEGIN
         @ dup          @ dup
Line 156  lookup ! \ our dictionary search order b Line 216  lookup ! \ our dictionary search order b
   
 Root definitions  Root definitions
   
 ' words Alias words  ' words Alias words  ( -- ) \ tools
   \G Display a list of all of the definitions in the word list at the top
   \G of the search order.
 ' Forth Alias Forth  ' Forth Alias Forth
 ' forth-wordlist alias forth-wordlist  ' forth-wordlist alias forth-wordlist ( -- wid ) \ search
     \G @code{Constant} -- @i{wid} identifies the word list that includes all of the standard words
     \G provided by Gforth. When Gforth is invoked, this word list is the compilation word
     \G list and is at the top of the search order.
 ' set-order alias set-order  ' set-order alias set-order
 ' order alias order  ' order alias order
   

Removed from v.1.6  
changed lines
  Added in v.1.16


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