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

version 1.3, 1997/10/04 18:26:52 version 1.7, 1999/02/03 00:10:21
Line 1 Line 1
 \ search order wordset                                 14may93py  \ search order wordset                                 14may93py
   
 \ Copyright (C) 1995 Free Software Foundation, Inc.  \ Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc.
   
 \ This file is part of Gforth.  \ This file is part of Gforth.
   
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 wid is the identifier of the current compilation word list.
     current @ ;
   
   : set-current  ( wid -- )  \ search
     \G Set the compilation word list to the word list identified by wid.
     current ! ;
   
 \ : context ( -- addr )  vp dup @ cells + ;  \ : context ( -- addr )  vp dup @ cells + ;
 : vp! dup vp ! cells vp + to context ;  : vp! dup vp ! cells vp + to context ;
 : definitions  ( -- )  context @ current ! ;  : definitions  ( -- ) \ search
     \G Make the compilation word list the same as the word list
     \G that is currently at the top of the search order stack.
     context @ current ! ;
   
 \ wordlist Vocabulary also previous                    14may93py  \ wordlist Vocabulary also previous                    14may93py
   
Line 37  Variable slowvoc   0 slowvoc ! Line 45  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 0 A, swap 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 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 59  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 push the new word list's wid
     \G onto the top of the search order stack.
     Create wordlist drop  DOES> context ! ;
   
   : also  ( -- ) \ search ext
     \G Perform a DUP on the search order stack. Usually used prior
     \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 ( -- )  vp @ 1- dup 0= abort" Vocstack empty" vp! ;  : previous ( -- ) \ search ext
     \G Perform a POP on the search order stack, thereby removing the wid at the
     \G top of the (search order) stack from the search order.
     vp @ 1- dup 0= abort" Vocstack empty" vp! ;
   
 \ vocabulary find                                      14may93py  \ vocabulary find                                      14may93py
   
Line 103  slowvoc off Line 121  slowvoc off
 \ Only root                                            14may93py  \ Only root                                            14may93py
   
 Vocabulary Forth  Vocabulary Forth
 Vocabulary Root    \G ** this will not get annotated. See other defn below.. **
   Vocabulary Root ( -- ) \ gforth
 : Only  1 vp! Root also ;    \G Add the vocabulary @code{Root} to the search order stack.
     \G This vocabulary makes up the minimum search order and
     \G contains these words: @code{order} @code{set-order}
     \G @code{forth-wordlist} @code{Forth} @code{words}
   
   : Only ( -- ) \ search ext
     \G Set the search order to the implementation-defined minimum search
     \G order (for Gforth, this is the word list Root).
     1 vp! Root also ;
   
 \ set initial search order                             14may93py  \ set initial search order                             14may93py
   
 Forth-wordlist @ ' Forth >body !  Forth-wordlist wordlist-id @ ' Forth >body wordlist-id !
   
 0 vp! also Root also definitions  0 vp! also Root also definitions
 Only Forth also definitions  Only Forth also definitions
Line 120  lookup ! \ our dictionary search order b Line 146  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
     \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 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.
   vp @ 0 ?DO  vp cell+ I cells + @  LOOP  vp @ ;    vp @ 0 ?DO  vp cell+ I cells + @  LOOP  vp @ ;
   
 : set-order  ( wid1 .. widn n / -1 -- )  : set-order  ( widn .. wid1 n -- ) \ search
     \G ** this will not get annotated. See other defn below.. **
     \G If n=0, empty the search 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.
   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 ;
   
 : seal ( -- )  context @ 1 set-order ;  : 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 head>string type space ;      body> >head name>string type space ;
   
 : order ( -- )  \  search-ext  : order ( -- )  \  search-ext
     \g prints the search order and the @code{current} wordlist.  The      \G ** this will not get annotated. See other defn below.. **
     \g standard requires that the wordlists are printed in the order      \G Print the search order and the compilation word list.  The
     \g in which they are searched. Therefore, the output is reversed      \G word lists are printed in the order in which they are searched.
     \g with respect to the conventional way of displaying stacks. The      \G (which is reversed with respect to the conventional way of
     \g @code{current} wordlist 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
       \ 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 188  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 199  lookup ! \ our dictionary search order b
   
 Root definitions  Root definitions
   
 ' words Alias words  ' words Alias words ( -- ) \ tools
 ' Forth Alias Forth    \G Display a list of all of the definitions in the word list at the top
 ' forth-wordlist alias forth-wordlist    \G of the search order.
 ' set-order alias set-order  ' Forth Alias Forth ( -- ) \ search-ext
 ' order alias order    \G PUSH the wid associated with @code{forth-wordlist} onto the search order stack.
   ' forth-wordlist alias forth-wordlist ( -- wid ) \ search
     \G CONSTANT: 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 word list stack.
   ' set-order alias set-order ( widn .. wid1 n -- ) \ search
     \G If n=0, empty the search 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.3  
changed lines
  Added in v.1.7


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