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

version 1.1, 1997/05/21 20:39:38 version 1.9, 1999/03/29 22:52:29
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 @var{wid} is the identifier of the current compilation word list.
     current @ ;
 : context ( -- addr )  vp dup @ cells + ;  
 : definitions  ( -- )  context @ current ! ;  : set-current  ( wid -- )  \ search
     \G Set the compilation word list to the word list identified by @var{wid}.
     current ! ;
   
   \ : context ( -- addr )  vp dup @ cells + ;
   : vp! dup vp ! cells vp + to context ;
   : 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
   
 AVariable voclink  Variable slowvoc   0 slowvoc !
   
 Defer 'initvoc  
 ' drop ' 'initvoc >body !  
   
 Variable slowvoc   slowvoc off  \ Forth-wordlist AConstant Forth-wordlist
   
 Forth-wordlist AConstant Forth-wordlist  : mappedwordlist ( map-struct -- wid )  \ gforth
   \G Create a wordlist with a special map-structure.
     here swap A, 0 A, voclink @ A, 0 A,
     dup wordlist-link voclink !
     dup initvoc ;
   
 : wordlist  ( -- wid )  : wordlist  ( -- wid ) \ search
   here  0 A,    \G Create a new, empty word list represented by @var{wid}.
   slowvoc @    slowvoc @
   IF    [ Forth-wordlist wordlist-map @ ] ALiteral    IF    \ this is now f83search because hashing may be loaded already
           \ jaw
           f83search 
   ELSE  Forth-wordlist wordlist-map @   THEN    ELSE  Forth-wordlist wordlist-map @   THEN
   A, voclink @ A, slowvoc @ A,    mappedwordlist ;
   dup wordlist-link dup voclink ! 'initvoc ;  
   
 : Vocabulary ( -- ) Create wordlist drop  DOES> context ! ;  
   
 : also  ( -- )  : Vocabulary ( "name" -- ) \ gforth
     \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 onto the top of the search order stack.
     Create wordlist drop  DOES> context ! ;
   
   : also  ( -- ) \ search ext
     \G Perform a @code{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 @code{DROP} 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 88  Forth-wordlist AConstant Forth-wordlist Line 108  Forth-wordlist AConstant Forth-wordlist
   
 \ this is the wordlist-map of the dictionary  \ this is the wordlist-map of the dictionary
 Create vocsearch ( -- wordlist-map )  Create vocsearch ( -- wordlist-map )
 ' (localsvocfind) A, ' (reveal) A,  ' drop A,  ' (localsvocfind) A, ' (reveal) A,  ' drop A, ' drop A,
   
 \ Only root                                            14may93py  
   
 wordlist \ the wordlist structure  \ create dummy wordlist for kernel
 vocsearch over wordlist-map ! \ patch the map into it  slowvoc on
   vocsearch mappedwordlist \ the wordlist structure ( -- wid )
   
   \ we don't want the dummy wordlist in our linked list
   0 Voclink !
   slowvoc off
   
 Vocabulary Forth  \ Only root                                            14may93py
 Vocabulary Root  
   
 : Only  vp off  also Root also definitions ;  Vocabulary Forth ( -- ) \ thisone- search-ext
     \G Push the @var{wid} associated with @code{forth-wordlist} onto the
     \G search order stack.
   
   Vocabulary Root ( -- ) \ gforth
     \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 @code{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 !
   
 vp off  also Root also definitions  0 vp! also Root also definitions
 Only Forth also definitions  Only Forth also definitions
   lookup ! \ our dictionary search order becomes the law ( -- )
 lookup ! \ our dictionary search order becomes the law  
   
 ' Forth >body to Forth-wordlist \ "forth definitions get-current" and "forth-wordlist" should produce the same wid  ' Forth >body to Forth-wordlist \ "forth definitions get-current" and "forth-wordlist" should produce the same wid
   
   
 \ 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 @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 @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  ( wid1 .. widn n / -1 -- )  : set-order  ( widn .. wid1 n -- ) \ thisone- search
   dup -1 = IF  drop Only exit  THEN  dup vp !    \G If @var{n}=0, empty the search order.
     \G If @var{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 existing search order with the @var{n} wid entries such that @var{wid1} represents the
     \G word list that will be searched first and @var{widn} represents the word list that
     \G will be searched last.
     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
 \ words visible in roots                               14may93py    \G list that is currently on the top of the search order stack.
     context @ 1 set-order ;
 : .name ( name -- ) \ gforth    dot-name  
     name>string type space ;  
   
 require termsize.fs  
   
 : words ( -- ) \ tools  
     cr 0 context @  
     BEGIN  
         @ dup  
     WHILE  
         2dup name>string nip 2 + dup >r +  
         cols >=  
         IF  
             cr nip 0 swap  
         THEN  
         dup .name space r> rot + swap  
     REPEAT  
     2drop ;  
   
 ' words alias vlist ( -- ) \ gforth  
 \g Old (pre-Forth-83) name for @code{WORDS}.  
   
 : body> ( data -- cfa )  0 >body - ;  
   
 : .voc  : .voc
     body> >name .name ;      body> >head name>string type space ;
 : order ( -- )  \  search-ext  
     \g prints the search order and the @code{current} wordlist.  The  : order ( -- )  \  thisone- search-ext
     \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
     LOOP      LOOP
     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
     WHILE      WHILE
         dup 0 wordlist-link - .voc          dup 0 wordlist-link - .voc
     REPEAT      REPEAT
Line 174  require termsize.fs Line 199  require termsize.fs
   
 Root definitions  Root definitions
   
 ' words Alias words  ' words Alias words  ( -- ) \ tools
   \G Display a list of all of the definitions in the word list at the top
   \G of the search order.
 ' Forth Alias Forth  ' Forth Alias Forth
 ' forth-wordlist alias forth-wordlist  ' forth-wordlist alias forth-wordlist ( -- wid ) \ search
     \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 list and is at the top of the word list stack.
 ' set-order alias set-order  ' set-order alias set-order
 ' order alias order  ' order alias order
   
 Forth definitions  Forth definitions
   
 include hash.fs  
   
 \ table (case-sensitive wordlist)  
   
 : table-find ( addr len wordlist -- nfa / false )  
     >r 2dup r> bucket @ (tablefind) ;  
   
 Create tablesearch-map ( -- wordlist-map )  
     ' table-find A, ' hash-reveal A, ' (rehash) A,  
   
 : table ( -- wid )  
     \g create a case-sensitive wordlist  
     wordlist  
     tablesearch-map over wordlist-map ! ;  
   
 \ marker                                               18dec94py  
   
 \ Marker creates a mark that is removed (including everything   
 \ defined afterwards) when executing the mark.  
   
 : marker, ( -- mark )  here dup A,  
   voclink @ A, voclink  
   BEGIN  @ dup @  WHILE  dup 0 wordlist-link - @ A,  REPEAT  drop  
   udp @ , ;  
   
 : marker! ( mark -- )  
     dup @ swap cell+  
     dup @ voclink ! cell+  
     voclink  
     BEGIN  
         @ dup @   
     WHILE  
         over @ over 0 wordlist-link - !  
         swap cell+ swap  
     REPEAT  
     drop  voclink  
     BEGIN  
         @ dup @  
     WHILE  
         dup 0 wordlist-link - rehash  
     REPEAT  
     drop  
     @ udp !  dp ! ;  
   
 : marker ( "mark" -- )  
     marker, Create A,  
 DOES> ( -- )  
     @ marker! ;  

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


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