Diff for /gforth/search.fs between versions 1.7 and 1.14

version 1.7, 1999/02/03 00:10:21 version 1.14, 2000/05/27 09:41:28
Line 24  Variable vp Line 24  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, 
   
 : get-current  ( -- wid ) \ search  : get-current  ( -- wid ) \ search
   \G wid is the identifier of the current compilation word list.    \G @i{wid} is the identifier of the current compilation word list.
   current @ ;    current @ ;
   
 : set-current  ( wid -- )  \ search  : set-current  ( wid -- )  \ search
   \G Set the compilation word list to the word list identified by wid.    \G Set the compilation word list to the word list identified by @i{wid}.
   current ! ;    current ! ;
   
 \ : context ( -- addr )  vp dup @ cells + ;  :noname ( -- addr )
 : vp! dup vp ! cells vp + to context ;      vp dup @ cells + ;
   is context
   
   : vp! ( u -- )
       vp ! ;
 : definitions  ( -- ) \ search  : definitions  ( -- ) \ search
   \G Make the compilation word list the same as the word list    \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 stack.    \G that is currently at the top of the search order.
   context @ current ! ;    context @ current ! ;
   
 \ wordlist Vocabulary also previous                    14may93py  \ wordlist Vocabulary also previous                    14may93py
Line 51  Variable slowvoc   0 slowvoc ! Line 55  Variable slowvoc   0 slowvoc !
   dup initvoc ;    dup initvoc ;
   
 : wordlist  ( -- wid ) \ search  : wordlist  ( -- wid ) \ search
   \G Create a new, empty word list represented by wid.    \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 61  Variable slowvoc   0 slowvoc ! Line 65  Variable slowvoc   0 slowvoc !
   
 : Vocabulary ( "name" -- ) \ gforth  : Vocabulary ( "name" -- ) \ gforth
   \G Create a definition "name" and associate a new word list with it.    \G Create a definition "name" and associate a new word list with it.
   \G The run-time effect of "name" is to push the new word list's wid    \G The run-time effect of "name" is to replace the @i{wid} at the
   \G onto the top of the search order stack.    \G top of the search order with the @i{wid} associated with the new
     \G word list.
   Create wordlist drop  DOES> context ! ;    Create wordlist drop  DOES> context ! ;
   
 : also  ( -- ) \ search ext  : check-maxvp ( n -- )
   \G Perform a DUP on the search order stack. Usually used prior      maxvp > -49 and throw ;
   \G to @code{Forth}, @code{definitions} etc.  
   context @ vp @ 1+ dup maxvp > abort" Vocstack full"  : push-order ( wid -- ) \ gforth
   vp! context ! ;      \g Push @var{wid} on the search order.
       vp @ 1+ dup check-maxvp vp! context ! ;
 : previous ( -- ) \ search ext  
   \G Perform a POP on the search order stack, thereby removing the wid at the  : also  ( -- ) \ search-ext
   \G top of the (search order) stack from the search order.    \G Perform a @code{DUP} on the @var{wid} at the top of the search
   vp @ 1- dup 0= abort" Vocstack empty" vp! ;    \G order. Usually used prior to @code{Forth} etc.
     context @ push-order ;
   
   : previous ( -- ) \ search-ext
     \G Perform a @code{DROP} on the @i{wid} at the top of the search
     \G order, thereby removing the @i{wid} from the search order.
     vp @ 1- dup 0= -50 and throw vp! ;
   
 \ vocabulary find                                      14may93py  \ vocabulary find                                      14may93py
   
Line 120  slowvoc off Line 131  slowvoc off
   
 \ Only root                                            14may93py  \ Only root                                            14may93py
   
 Vocabulary Forth  Vocabulary Forth ( -- ) \ gforthman- search-ext
   \G ** this will not get annotated. See other defn below.. **    \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}.
   
   
 Vocabulary Root ( -- ) \ gforth  Vocabulary Root ( -- ) \ gforth
   \G Add the vocabulary @code{Root} to the search order stack.    \G Add the vocabulary @code{Root} to the search order stack.
   \G This vocabulary makes up the minimum search order and    \G This vocabulary makes up the minimum search order and
   \G contains these words: @code{order} @code{set-order}    \G contains these words: @code{order} @code{set-order}
   \G @code{forth-wordlist} @code{Forth} @code{words}    \G @code{forth-wordlist} @code{Forth} @code{words}
   
 : Only ( -- ) \ search ext  : Only ( -- ) \ search-ext
   \G Set the search order to the implementation-defined minimum search    \G Set the search order to the implementation-defined minimum search
   \G order (for Gforth, this is the word list Root).    \G order (for Gforth, this is the word list @code{Root}).
   1 vp! Root also ;    1 vp! Root also ;
   
 \ set initial search order                             14may93py  \ set initial search order                             14may93py
Line 147  lookup ! \ our dictionary search order b Line 161  lookup ! \ our dictionary search order b
 \ get-order set-order                                  14may93py  \ get-order set-order                                  14may93py
   
 : get-order  ( -- widn .. wid1 n ) \ search  : get-order  ( -- widn .. wid1 n ) \ search
   \G Copy the search order stack to the data stack. The current search    \G Copy the search order to the data stack. The current search order
   \G order has n entries, of which wid1 represents the word    \G has @i{n} entries, of which @i{wid1} represents the word list
   \G list that is searched first (the word list at the top of the stack) and    \G that is searched first (the word list at the top of the search
   \G widn represents the word order that is searched last.    \G order) and @i{widn} represents the word order that is searched
   vp @ 0 ?DO  vp cell+ I cells + @  LOOP  vp @ ;    \G last.
     vp @ 0 ?DO vp cell+ I cells + @ LOOP vp @ ;
 : set-order  ( widn .. wid1 n -- ) \ search  
   \G ** this will not get annotated. See other defn below.. **  : set-order  ( widn .. wid1 n -- ) \ gforthman- search
   \G If n=0, empty the search order.      \G If @var{n}=0, empty the search order.  If @var{n}=-1, set the
   \G If n=-1, set the search order to the implementation-defined minimum search      \G search order to the implementation-defined minimum search order
   \G order (for Gforth, this is the word list Root). Otherwise, replace the      \G (for Gforth, this is the word list @code{Root}). Otherwise,
   \G existing search order with the n wid entries such that wid1 represents the      \G replace the existing search order with the @var{n} wid entries
   \G word list that will be searched first and widn represents the word list that      \G such that @var{wid1} represents the word list that will be
   \G will be searched last.      \G searched first and @var{widn} represents the word list that will
   dup -1 = IF  drop Only exit  THEN  dup vp!      \G be searched last.
   ?dup IF  1- FOR  vp cell+ I cells + !  NEXT  THEN ;      dup -1 = IF
           drop only exit
       THEN
       dup check-maxvp
       dup vp!
       ?dup IF 1- FOR vp cell+ I cells + !  NEXT THEN ;
   
 : seal ( -- ) \ gforth  : seal ( -- ) \ gforth
   \G Remove all word lists from the search order stack other than the word    \G Remove all word lists from the search order stack other than the word
Line 170  lookup ! \ our dictionary search order b Line 189  lookup ! \ our dictionary search order b
   context @ 1 set-order ;    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 ** this will not get annotated. See other defn below.. **    \G Print the search order and the compilation word list.  The
     \G Print the search order and the compilation word list.  The    \G word lists are printed in the order in which they are searched
     \G word lists are printed in the order in which they are searched.    \G (which is reversed with respect to the conventional way of
     \G (which is reversed with respect to the conventional way of    \G displaying stacks). The compilation word list is displayed last.
     \G displaying stacks). The compilation word list is displayed last.    \ The standard requires that the word lists are printed in the order
     \ The standard requires that the word lists are printed in the order    \ in which they are searched. Therefore, the output is reversed
     \ in which they are searched. Therefore, the output is reversed    \ with respect to the conventional way of displaying stacks.
     \ with respect to the conventional way of displaying stacks.  
     get-order 0      get-order 0
     ?DO      ?DO
         .voc          .voc
Line 199  lookup ! \ our dictionary search order b Line 217  lookup ! \ our dictionary search order b
   
 Root definitions  Root definitions
   
 ' words Alias words ( -- ) \ tools  ' words Alias words  ( -- ) \ tools
   \G Display a list of all of the definitions in the word list at the top  \G Display a list of all of the definitions in the word list at the top
   \G of the search order.  \G of the search order.
 ' Forth Alias Forth ( -- ) \ search-ext  ' Forth Alias Forth
   \G PUSH the wid associated with @code{forth-wordlist} onto the search order stack.  
 ' forth-wordlist alias forth-wordlist ( -- wid ) \ search  ' forth-wordlist alias forth-wordlist ( -- wid ) \ search
   \G CONSTANT: wid identifies the word list that includes all of the standard words    \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 provided by Gforth. When Gforth is invoked, this word list is the compilation word
   \G list and is at the top of the word list stack.    \G list and is at the top of the search order.
 ' set-order alias set-order ( widn .. wid1 n -- ) \ search  ' set-order alias set-order
   \G If n=0, empty the search order.  ' order alias order
   \G If n=-1, set the search order to the implementation-defined minimum search  
   \G order (for Gforth, this is the word list Root). Otherwise, replace the  
   \G existing search order with the n wid entries such that wid1 represents the  
   \G word list that will be searched first and widn represents the word list that  
   \G will be searched last.  
 ' order alias order ( -- ) \ search-ext  
   \G Print the search order and the compilation word list.  The  
   \G word lists are printed in the order in which they are searched.  
   \G (which is reversed with respect to the conventional way of  
   \G displaying stacks). The compilation word list is displayed last.  
   
 Forth definitions  Forth definitions
   

Removed from v.1.7  
changed lines
  Added in v.1.14


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