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

version 1.1, 1997/05/21 20:39:38 version 1.23, 2003/02/06 16:49:17
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,2000 Free Software Foundation, Inc.
   
 \ This file is part of Gforth.  \ This file is part of Gforth.
   
Line 16 Line 16
   
 \ You should have received a copy of the GNU General Public License  \ You should have received a copy of the GNU General Public License
 \ along with this program; if not, write to the Free Software  \ along with this program; if not, write to the Free Software
 \ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  \ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
   
 $10 constant maxvp  $10 Value maxvp         \ current size of search order stack
 Variable vp  $400 Value maxvp-limit  \ upper limit for resizing search order stack
   0 A, 0 A,  0 A, 0 A,   0 A, 0 A,   0 A, 0 A,   0 AValue vp             \ will be initialized later (dynamic)
   0 A, 0 A,  0 A, 0 A,   0 A, 0 A,   0 A, 0 A,   
   : get-current  ( -- wid ) \ search
 : get-current  ( -- wid )  current @ ;    \G @i{wid} is the identifier of the current compilation word list.
 : set-current  ( wid -- )  current ! ;    current @ ;
   
 : context ( -- addr )  vp dup @ cells + ;  : set-current  ( wid -- )  \ search
 : definitions  ( -- )  context @ current ! ;    \G Set the compilation word list to the word list identified by @i{wid}.
     current ! ;
   
   :noname ( -- addr )
       vp dup @ cells + ;
   is context
   
   : vp! ( u -- )
       vp ! ;
   : definitions  ( -- ) \ search
     \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.
     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 @i{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  ( -- )  
   context @ vp @ 1+ dup maxvp > abort" Vocstack full"  
   vp ! context ! ;  
   
 : previous ( -- )  vp @ 1- dup 0= abort" Vocstack empty" vp ! ;  : 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 replace the @i{wid} at the
     \G top of the search order with the @i{wid} associated with the new
     \G word list.
     Create wordlist drop  DOES> context ! ;
   
   : check-maxvp ( n -- )
      dup maxvp-limit > -49 and throw
      dup maxvp > IF
         BEGIN  dup  maxvp 2* dup TO maxvp  <= UNTIL
         vp  maxvp 1+ cells resize throw TO vp
      THEN drop ;
   
   : >order ( wid -- ) \ gforth to-order
       \g Push @var{wid} on the search order.
       vp @ 1+ dup check-maxvp vp! context ! ;
   
   : also  ( -- ) \ search-ext
     \G Like @code{DUP} for the search order. Usually used before a
     \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 88  Forth-wordlist AConstant Forth-wordlist Line 122  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,
   
   \ create dummy wordlist for kernel
   slowvoc on
   vocsearch mappedwordlist \ the wordlist structure ( -- wid )
   
   \ we don't want the dummy wordlist in our linked list
   0 Voclink !
   slowvoc off
   
 \ Only root                                            14may93py  \ Only root                                            14may93py
   
 wordlist \ the wordlist structure  Vocabulary Forth ( -- ) \ gforthman- search-ext
 vocsearch over wordlist-map ! \ patch the map into it    \G Replace the @i{wid} at the top of the search order with the
     \G @i{wid} associated with the word list @code{forth-wordlist}.
   
   
   Vocabulary Root ( -- ) \ gforth
     \G Add the root wordlist to the search order stack.  This vocabulary
     \G makes up the minimum search order and contains only a
     \G search-order 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 ;
   
   : update-image-order ( -- )
       \ save search order here, let vp point there
       here vp over vp @ 1+ cells
       dup allot move
       to vp ;
   
   : init-vp  ( -- )
       vp @ $10 max to maxvp
       maxvp 1+ cells allocate throw
       vp over vp @ 1+ cells move
       TO vp ;
   
   :noname
      init-vp DEFERS 'cold ;
   IS 'cold
   
 Vocabulary Forth  here 0 , to vp
 Vocabulary Root  
   
 : Only  vp off  also Root also definitions ;  init-vp Only Forth also definitions
   
 \ 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  
 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
   vp @ 0 ?DO  vp cell+ I cells + @  LOOP  vp @ ;    \G Copy the search order to the data stack. The current search order
     \G has @i{n} entries, of which @i{wid1} represents the wordlist
 : set-order  ( wid1 .. widn n / -1 -- )    \G that is searched first (the word list at the top of the search
   dup -1 = IF  drop Only exit  THEN  dup vp !    \G order) and @i{widn} represents the wordlist that is searched
   ?dup IF  1- FOR  vp cell+ I cells + !  NEXT  THEN ;    \G last.
     vp @ 0 ?DO vp cell+ I cells + @ LOOP vp @ ;
 : seal ( -- )  context @ 1 set-order ;  
   : set-order  ( widn .. wid1 n -- ) \ gforthman- search
 \ words visible in roots                               14may93py      \G If @var{n}=0, empty the search order.  If @var{n}=-1, set the
       \G search order to the implementation-defined minimum search order
 : .name ( name -- ) \ gforth    dot-name      \G (for Gforth, this is the word list @code{Root}). Otherwise,
     name>string type space ;      \G replace the existing search order with the @var{n} wid entries
       \G such that @var{wid1} represents the word list that will be
 require termsize.fs      \G searched first and @var{widn} represents the word list that will
       \G be searched last.
 : words ( -- ) \ tools      dup -1 = IF
     cr 0 context @          drop only exit
     BEGIN      THEN
         @ dup      dup check-maxvp
     WHILE      dup vp!
         2dup name>string nip 2 + dup >r +      ?dup IF 1- FOR vp cell+ I cells + !  NEXT THEN ;
         cols >=  
         IF  : seal ( -- ) \ gforth
             cr nip 0 swap    \G Remove all word lists from the search order stack other than the word
         THEN    \G list that is currently on the top of the search order stack.
         dup .name space r> rot + swap    context @ 1 set-order ;
     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-noprim name>string type space ;
 : order ( -- )  \  search-ext  
     \g prints the search order and the @code{current} wordlist.  The  : order ( -- )  \  gforthman- 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 237  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 @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 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
   
 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.23


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