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

version 1.7, 1999/02/03 00:10:21 version 1.9, 1999/03/29 22:52:29
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 @var{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 @var{wid}.
   current ! ;    current ! ;
   
 \ : context ( -- addr )  vp dup @ cells + ;  \ : context ( -- addr )  vp dup @ cells + ;
Line 51  Variable slowvoc   0 slowvoc ! Line 51  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 @var{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 66  Variable slowvoc   0 slowvoc ! Line 66  Variable slowvoc   0 slowvoc !
   Create wordlist drop  DOES> context ! ;    Create wordlist drop  DOES> context ! ;
   
 : also  ( -- ) \ search ext  : also  ( -- ) \ search ext
   \G Perform a DUP on the search order stack. Usually used prior    \G Perform a @code{DUP} on the search order stack. Usually used prior
   \G to @code{Forth}, @code{definitions} etc.    \G to @code{Forth}, @code{definitions} etc.
   context @ vp @ 1+ dup maxvp > abort" Vocstack full"    context @ vp @ 1+ dup maxvp > abort" Vocstack full"
   vp! context ! ;    vp! context ! ;
   
 : previous ( -- ) \ search ext  : previous ( -- ) \ search ext
   \G Perform a POP on the search order stack, thereby removing the wid at the    \G Perform a @code{DROP} on the search order stack, thereby removing the wid at the
   \G top of the (search order) stack from the search order.    \G top of the (search order) stack from the search order.
   vp @ 1- dup 0= abort" Vocstack empty" vp! ;    vp @ 1- dup 0= abort" Vocstack empty" vp! ;
   
Line 120  slowvoc off Line 120  slowvoc off
   
 \ Only root                                            14may93py  \ Only root                                            14may93py
   
 Vocabulary Forth  Vocabulary Forth ( -- ) \ thisone- search-ext
   \G ** this will not get annotated. See other defn below.. **    \G Push the @var{wid} associated with @code{forth-wordlist} onto the
     \G search order stack.
   
 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 148  lookup ! \ our dictionary search order b Line 150  lookup ! \ our dictionary search order b
   
 : 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 stack to the data stack. The current search
   \G order has n entries, of which wid1 represents the word    \G order has @var{n} entries, of which @var{wid1} represents the word
   \G list that is searched first (the word list at the top of the stack) and    \G list that is searched first (the word list at the top of the stack) and
   \G widn represents the word order that is searched last.    \G @var{widn} represents the word order that is searched last.
   vp @ 0 ?DO  vp cell+ I cells + @  LOOP  vp @ ;    vp @ 0 ?DO  vp cell+ I cells + @  LOOP  vp @ ;
   
 : set-order  ( widn .. wid1 n -- ) \ search  : set-order  ( widn .. wid1 n -- ) \ thisone- search
   \G ** this will not get annotated. See other defn below.. **    \G If @var{n}=0, empty the search order.
   \G If n=0, empty the search order.    \G If @var{n}=-1, set the search order to the implementation-defined minimum search
   \G If n=-1, set the search order to the implementation-defined minimum search    \G order (for Gforth, this is the word list @code{Root}). Otherwise, replace the
   \G order (for Gforth, this is the word list Root). Otherwise, replace the    \G existing search order with the @var{n} wid entries such that @var{wid1} represents the
   \G existing search order with the n wid entries such that wid1 represents the    \G word list that will be searched first and @var{widn} represents the word list that
   \G word list that will be searched first and widn represents the word list that  
   \G will be searched last.    \G will be searched last.
   dup -1 = IF  drop Only exit  THEN  dup vp!    dup -1 = IF  drop Only exit  THEN  dup vp!
   ?dup IF  1- FOR  vp cell+ I cells + !  NEXT  THEN ;    ?dup IF  1- FOR  vp cell+ I cells + !  NEXT  THEN ;
Line 172  lookup ! \ our dictionary search order b Line 173  lookup ! \ our dictionary search order b
 : .voc  : .voc
     body> >head name>string type space ;      body> >head name>string type space ;
   
 : order ( -- )  \  search-ext  : order ( -- )  \  thisone- 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 199  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 CONSTANT: @var{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 word list stack.
 ' 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.9


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