Diff for /gforth/search.fs between versions 1.14 and 1.25

version 1.14, 2000/05/27 09:41:28 version 1.25, 2003/03/09 15:16:52
Line 1 Line 1
 \ search order wordset                                 14may93py  \ search order wordset                                 14may93py
   
 \ Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc.  \ Copyright (C) 1995,1996,1997,1998,2000,2003 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  require struct.fs
 Variable vp  
   0 A, 0 A,  0 A, 0 A,   0 A, 0 A,   0 A, 0 A,   $10 Value maxvp         \ current size of search order stack
   0 A, 0 A,  0 A, 0 A,   0 A, 0 A,   0 A, 0 A,   $400 Value maxvp-limit  \ upper limit for resizing search order stack
   0 AValue vp             \ will be initialized later (dynamic)
   
 : 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 71  Variable slowvoc   0 slowvoc ! Line 72  Variable slowvoc   0 slowvoc !
   Create wordlist drop  DOES> context ! ;    Create wordlist drop  DOES> context ! ;
   
 : check-maxvp ( n -- )  : check-maxvp ( n -- )
     maxvp > -49 and throw ;     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 ;
   
 : push-order ( wid -- ) \ gforth  : >order ( wid -- ) \ gforth to-order
     \g Push @var{wid} on the search order.      \g Push @var{wid} on the search order.
     vp @ 1+ dup check-maxvp vp! context ! ;      vp @ 1+ dup check-maxvp vp! context ! ;
   
 : also  ( -- ) \ search-ext  : also  ( -- ) \ search-ext
   \G Perform a @code{DUP} on the @var{wid} at the top of the search    \G Like @code{DUP} for the search order. Usually used before a
   \G order. Usually used prior to @code{Forth} etc.    \G vocabulary (e.g., @code{also Forth}); the combined effect is to push
   context @ push-order ;    \G the wordlist represented by the vocabulary on the search order.
     context @ >order ;
   
 : previous ( -- ) \ search-ext  : previous ( -- ) \ search-ext
   \G Perform a @code{DROP} on the @i{wid} at the top of the search    \G Drop the wordlist at the top of the search order.
   \G order, thereby removing the @i{wid} from the search order.  
   vp @ 1- dup 0= -50 and throw vp! ;    vp @ 1- dup 0= -50 and throw vp! ;
   
 \ vocabulary find                                      14may93py  \ vocabulary find                                      14may93py
Line 137  Vocabulary Forth ( -- ) \ gforthman- sea Line 142  Vocabulary Forth ( -- ) \ gforthman- sea
   
   
 Vocabulary Root ( -- ) \ gforth  Vocabulary Root ( -- ) \ gforth
   \G Add the vocabulary @code{Root} to the search order stack.    \G Add the root wordlist to the search order stack.  This vocabulary
   \G This vocabulary makes up the minimum search order and    \G makes up the minimum search order and contains only a
   \G contains these words: @code{order} @code{set-order}    \G search-order words.
   \G @code{forth-wordlist} @code{Forth} @code{words}  
   
 : Only ( -- ) \ search-ext  : Only ( -- ) \ search-ext
   \G Set the search order to the implementation-defined minimum search    \G Set the search order to the implementation-defined minimum search
   \G order (for Gforth, this is the word list @code{Root}).    \G order (for Gforth, this is the word list @code{Root}).
   1 vp! Root also ;    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
   
   here 0 , to vp
   
   init-vp Only Forth also definitions
   
 \ set initial search order                             14may93py  \ set initial search order                             14may93py
   
 Forth-wordlist wordlist-id @ ' Forth >body wordlist-id !  Forth-wordlist wordlist-id @ ' Forth >body wordlist-id !
   
 0 vp! 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
Line 162  lookup ! \ our dictionary search order b Line 184  lookup ! \ our dictionary search order b
   
 : get-order  ( -- widn .. wid1 n ) \ search  : get-order  ( -- widn .. wid1 n ) \ search
   \G Copy the search order to the data stack. The current search order    \G Copy the search order to the data stack. The current search order
   \G has @i{n} entries, of which @i{wid1} represents the word list    \G has @i{n} entries, of which @i{wid1} represents the wordlist
   \G that is searched first (the word list at the top of the search    \G that is searched first (the word list at the top of the search
   \G order) and @i{widn} represents the word order that is searched    \G order) and @i{widn} represents the wordlist that is searched
   \G last.    \G last.
   vp @ 0 ?DO vp cell+ I cells + @ LOOP vp @ ;    vp @ 0 ?DO vp cell+ I cells + @ LOOP vp @ ;
   
Line 188  lookup ! \ our dictionary search order b Line 210  lookup ! \ our dictionary search order b
   \G list that is currently on the top of the search order stack.    \G list that is currently on the top of the search order stack.
   context @ 1 set-order ;    context @ 1 set-order ;
   
 : .voc  [IFUNDEF] .name
     body> >head-noprim name>string type space ;  : id. ( nt -- ) \ gforth
       \G Print the name of the word represented by @var{nt}.
       \ this name comes from fig-Forth
       name>string type space ;
   
   ' id. alias .id ( nt -- )
   \G F83 name for @code{id.}.
   
   ' id. alias .name ( nt -- )
   \G Gforth <=0.5.0 name for @code{id.}.
   
   [THEN]
   
   : .voc ( wid -- ) \ gforth
   \G print the name of the wordlist represented by @var{wid}.  Can
   \G only print names defined with @code{vocabulary} or
   \G @code{wordlist constant}, otherwise prints @samp{???}.
       dup >r wordlist-struct %size + dup head? if ( wid nt )
           dup name>int dup >code-address docon: = swap >body @ r@ = and if
               id. rdrop exit
           endif
       endif
       drop r> body> >head-noprim id. ;
   
 : order ( -- )  \  gforthman- search-ext  : order ( -- )  \  gforthman- search-ext
   \G Print the search order and the compilation word list.  The    \G Print the search order and the compilation word list.  The

Removed from v.1.14  
changed lines
  Added in v.1.25


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