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

version 1.9, 1999/03/29 22:52:29 version 1.16, 2000/08/23 21:03:52
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 @var{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 @var{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 @var{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 @code{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"  : >order ( wid -- ) \ gforth to-order
   vp! context ! ;      \g Push @var{wid} on the search order.
       vp @ 1+ dup check-maxvp vp! context ! ;
 : previous ( -- ) \ search ext  
   \G Perform a @code{DROP} 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 Like @code{DUP} for the search order. Usually used before a
   vp @ 1- dup 0= abort" Vocstack empty" vp! ;    \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 120  slowvoc off Line 131  slowvoc off
   
 \ Only root                                            14may93py  \ Only root                                            14may93py
   
 Vocabulary Forth ( -- ) \ thisone- search-ext  Vocabulary Forth ( -- ) \ gforthman- search-ext
   \G Push the @var{wid} associated with @code{forth-wordlist} onto the    \G Replace the @i{wid} at the top of the search order with the
   \G search order stack.    \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 root wordlist to the search order stack.  This vocabulary
   \G This vocabulary makes up the minimum search order and    \G makes up the minimum search order and contains only a
   \G contains these words: @code{order} @code{set-order}    \G search-order 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
Line 149  lookup ! \ our dictionary search order b Line 160  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 @var{n} entries, of which @var{wid1} represents the word    \G has @i{n} entries, of which @i{wid1} represents the wordlist
   \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 @var{widn} represents the word order that is searched last.    \G order) and @i{widn} represents the wordlist 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 -- ) \ thisone- search  
   \G If @var{n}=0, empty the search order.  : set-order  ( widn .. wid1 n -- ) \ gforthman- search
   \G If @var{n}=-1, set the search order to the implementation-defined minimum search      \G If @var{n}=0, empty the search order.  If @var{n}=-1, set the
   \G order (for Gforth, this is the word list @code{Root}). Otherwise, replace the      \G search order to the implementation-defined minimum search order
   \G existing search order with the @var{n} wid entries such that @var{wid1} represents the      \G (for Gforth, this is the word list @code{Root}). Otherwise,
   \G word list that will be searched first and @var{widn} represents the word list that      \G replace the existing search order with the @var{n} wid entries
   \G will be searched last.      \G such that @var{wid1} represents the word list that will be
   dup -1 = IF  drop Only exit  THEN  dup vp!      \G searched first and @var{widn} represents the word list that will
   ?dup IF  1- FOR  vp cell+ I cells + !  NEXT  THEN ;      \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  : 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 171  lookup ! \ our dictionary search order b Line 188  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 ( -- )  \  thisone- search-ext  : order ( -- )  \  gforthman- search-ext
   \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
Line 204  Root definitions Line 221  Root definitions
 \G of the search order.  \G of the search order.
 ' Forth Alias Forth  ' Forth Alias Forth
 ' forth-wordlist alias forth-wordlist ( -- wid ) \ search  ' forth-wordlist alias forth-wordlist ( -- wid ) \ search
   \G CONSTANT: @var{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  ' set-order alias set-order
 ' order alias order  ' order alias order
   

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


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