Diff for /gforth/search.fs between versions 1.19 and 1.26

version 1.19, 2002/01/05 17:42:30 version 1.26, 2005/10/02 11:30:32
Line 1 Line 1
 \ search order wordset                                 14may93py  \ search order wordset                                 14may93py
   
 \ Copyright (C) 1995,1996,1997,1998,2000 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 18 Line 18
 \ along with this program; if not, write to the Free Software  \ along with this program; if not, write to the Free Software
 \ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.  \ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
   
 $10 value maxvp                 \ current size of search order stack  require struct.fs
 $400 constant maxvp-limit       \ upper limit for resizing search order stack  
 Variable static-vp  $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 A, 0 A,  0 A, 0 A,   0 A, 0 A,   0 A, 0 A,  0 AValue vp             \ will be initialized later (dynamic)
 0 Value vp  
 static-vp ' vp >body A!  
   
 : 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 76  Variable slowvoc   0 slowvoc ! Line 74  Variable slowvoc   0 slowvoc !
 : check-maxvp ( n -- )  : check-maxvp ( n -- )
    dup maxvp-limit > -49 and throw     dup maxvp-limit > -49 and throw
    dup maxvp > IF     dup maxvp > IF
       vp static-vp = -49 and throw        BEGIN  dup  maxvp 2* dup TO maxvp  <= UNTIL
       BEGIN  dup  maxvp 2* dup TO maxvp  > 0= UNTIL  
       vp  maxvp 1+ cells resize throw TO vp        vp  maxvp 1+ cells resize throw TO vp
    THEN drop ;     THEN drop ;
   
 : init-vp  ( n -- )  
    $10 TO maxvp  
    maxvp 1+ cells allocate throw TO vp  
    static-vp dup @ 1+ cells  vp swap move ;  
   
 :noname  
    DEFERS 'cold  
    init-vp ;  
 IS 'cold  
   
 : >order ( wid -- ) \ gforth to-order  : >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 ! ;
Line 164  Vocabulary Root ( -- ) \ gforth Line 151  Vocabulary Root ( -- ) \ gforth
   \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 205  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  i-d-dot
       \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 -- ) \ F83  dot-i-d
   \G F83 name for @code{id.}.
   
   ' id. alias .name ( nt -- ) \ gforth-obsolete  dot-name
   \G Gforth <=0.5.0 name for @code{id.}.
   
   [THEN]
   
   : .voc ( wid -- ) \ gforth  dot-voc
   \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.19  
changed lines
  Added in v.1.26


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