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

version 1.9, 1999/03/29 22:52:29 version 1.12, 1999/11/08 22:01:09
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 Make the compilation word list 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 stack.
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 65  Variable slowvoc   0 slowvoc ! Line 69  Variable slowvoc   0 slowvoc !
   \G onto the top of the search order stack.    \G onto the top of the search order stack.
   Create wordlist drop  DOES> context ! ;    Create wordlist drop  DOES> context ! ;
   
   : check-maxvp ( n -- )
       maxvp > -49 and throw ;
   
   : push-order ( wid -- ) \ gforth
       \g Push @var{wid} on the search order.
       vp @ 1+ dup check-maxvp vp! context ! ;
   
 : also  ( -- ) \ search ext  : also  ( -- ) \ search ext
   \G Perform a @code{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 @ push-order ;
   vp! context ! ;  
   
 : previous ( -- ) \ search ext  : previous ( -- ) \ search ext
   \G Perform a @code{DROP} on the search order stack, thereby removing the wid at the    \G Perform a @code{DROP} on the search order stack, thereby removing
   \G top of the (search order) stack from the search order.    \G the wid at the top of the (search order) stack from the search
   vp @ 1- dup 0= abort" Vocstack empty" vp! ;    \G order.
     vp @ 1- dup 0= -50 and throw vp! ;
   
 \ vocabulary find                                      14may93py  \ vocabulary find                                      14may93py
   
Line 121  slowvoc off Line 132  slowvoc off
 \ Only root                                            14may93py  \ Only root                                            14may93py
   
 Vocabulary Forth ( -- ) \ thisone- search-ext  Vocabulary Forth ( -- ) \ thisone- search-ext
   \G Push the @var{wid} associated with @code{forth-wordlist} onto the    \G Push the @i{wid} associated with @code{forth-wordlist} onto the
   \G search order stack.    \G search order stack.
   
 Vocabulary Root ( -- ) \ gforth  Vocabulary Root ( -- ) \ gforth
Line 150  lookup ! \ our dictionary search order b Line 161  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 @var{n} entries, of which @var{wid1} represents the word    \G order has @i{n} entries, of which @i{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 @var{widn} represents the word order that is searched last.    \G @i{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 -- ) \ thisone- search  : set-order  ( widn .. wid1 n -- ) \ thisone- search
   \G If @var{n}=0, empty the search order.      \G If @var{n}=0, empty the search order.  If @var{n}=-1, set the
   \G If @var{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 @code{Root}). Otherwise, replace the      \G (for Gforth, this is the word list @code{Root}). Otherwise,
   \G existing search order with the @var{n} wid entries such that @var{wid1} represents the      \G replace the existing search order with the @var{n} wid entries
   \G word list that will be searched first and @var{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 204  Root definitions Line 220  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 word list stack.
 ' set-order alias set-order  ' set-order alias set-order

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


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