Diff for /gforth/search.fs between versions 1.28 and 1.31

version 1.28, 2007/01/14 22:19:35 version 1.31, 2007/12/31 17:34:58
Line 1 Line 1
 \ search order wordset                                 14may93py  \ search order wordset                                 14may93py
   
 \ Copyright (C) 1995,1996,1997,1998,2000,2003,2005 Free Software Foundation, Inc.  \ Copyright (C) 1995,1996,1997,1998,2000,2003,2005,2007 Free Software Foundation, Inc.
   
 \ This file is part of Gforth.  \ This file is part of Gforth.
   
Line 23  require struct.fs Line 23  require struct.fs
 $10 Value maxvp         \ current size of search order stack  $10 Value maxvp         \ current size of search order stack
 $400 Value maxvp-limit  \ upper limit for resizing search order stack  $400 Value maxvp-limit  \ upper limit for resizing search order stack
 0 AValue vp             \ will be initialized later (dynamic)  0 AValue vp             \ will be initialized later (dynamic)
   \ the first cell at vp contains the search order depth, the others
   \ contain the wordlists, starting with the last-searched one.
   
 : get-current  ( -- wid ) \ search  : get-current  ( -- wid ) \ search
   \G @i{wid} is the identifier of the current compilation word list.    \G @i{wid} is the identifier of the current compilation word list.
Line 96  Variable slowvoc   0 slowvoc ! Line 98  Variable slowvoc   0 slowvoc !
   
 : (vocfind)  ( addr count wid -- nfa|false )  : (vocfind)  ( addr count wid -- nfa|false )
     \ !! generalize this to be independent of vp      \ !! generalize this to be independent of vp
     drop vp dup @ 1- cells over +      drop 0 vp @ -DO ( addr count ) \ note that the loop does not reach 0
     DO  2dup I 2@ over <>          2dup vp i cells + @ (search-wordlist) dup if ( addr count nt )
         IF  (search-wordlist) dup              nip nip unloop exit then
             IF  nip nip  UNLOOP EXIT      drop 1 -loop
             THEN  drop  
         ELSE  drop 2drop  THEN  
     [ -1 cells ] Literal +LOOP  
     2drop false ;      2drop false ;
   
 0 value locals-wordlist  0 value locals-wordlist
Line 136  slowvoc off Line 135  slowvoc off
   
 \ Only root                                            14may93py  \ Only root                                            14may93py
   
 Vocabulary Forth ( -- ) \ gforthman- search-ext  Vocabulary Forth ( -- ) \ search-ext
   \G Replace the @i{wid} at the top of the search order with the    \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}.    \G @i{wid} associated with the word list @code{forth-wordlist}.
   
Line 190  lookup ! \ our dictionary search order b Line 189  lookup ! \ our dictionary search order b
   \G last.    \G last.
   vp @ 0 ?DO vp cell+ I cells + @ LOOP vp @ ;    vp @ 0 ?DO vp cell+ I cells + @ LOOP vp @ ;
   
 : set-order  ( widn .. wid1 n -- ) \ gforthman- search  : set-order  ( widn .. wid1 n -- ) \ search
     \G If @var{n}=0, empty the search order.  If @var{n}=-1, set the      \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      \G search order to the implementation-defined minimum search order
     \G (for Gforth, this is the word list @code{Root}). Otherwise,      \G (for Gforth, this is the word list @code{Root}). Otherwise,
Line 203  lookup ! \ our dictionary search order b Line 202  lookup ! \ our dictionary search order b
     THEN      THEN
     dup check-maxvp      dup check-maxvp
     dup vp!      dup vp!
     ?dup IF 1- FOR vp cell+ I cells + !  NEXT THEN ;      0 swap -DO ( wid1 ... widi )
           vp i cells + ! \ note that the loop does not reach 0
       1 -loop ;
   
 : 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 235  lookup ! \ our dictionary search order b Line 236  lookup ! \ our dictionary search order b
     endif      endif
     drop r> body> >head-noprim id. ;      drop r> body> >head-noprim id. ;
   
 : order ( -- )  \  gforthman- search-ext  : order ( -- )  \  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 264  Root definitions Line 265  Root definitions
 ' words Alias words  ( -- ) \ tools  ' words Alias words  ( -- ) \ tools
 \G Display a list of all of the definitions in the word list at the top  \G Display a list of all of the definitions in the word list at the top
 \G of the search order.  \G of the search order.
 ' Forth Alias Forth  ' Forth Alias Forth \ alias- search-ext
 ' forth-wordlist alias forth-wordlist ( -- wid ) \ search  ' forth-wordlist alias forth-wordlist ( -- wid ) \ search
   \G @code{Constant} -- @i{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 search order.    \G list and is at the top of the search order.
 ' set-order alias set-order  ' set-order alias set-order ( wid1 ... widu u -- ) \ alias- search
 ' order alias order  ' order alias order ( -- ) \ alias- search-ext
   
 Forth definitions  Forth definitions
   

Removed from v.1.28  
changed lines
  Added in v.1.31


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