--- gforth/search.fs	1999/12/03 18:24:23	1.13
+++ gforth/search.fs	2003/01/19 23:35:30	1.21
@@ -1,6 +1,6 @@
 \ search order wordset                                 14may93py
 
-\ Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc.
+\ Copyright (C) 1995-2003 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -16,12 +16,11 @@
 
 \ You should have received a copy of the GNU General Public License
 \ 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
-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, 
+$10 Value maxvp		\ current size of search order stack
+$400 Value maxvp-limit	\ upper limit for resizing search order stack
+0 AValue vp		\ will be initialized later (dynamic)
 
 : get-current  ( -- wid ) \ search
   \G @i{wid} is the identifier of the current compilation word list.
@@ -71,20 +70,24 @@ Variable slowvoc   0 slowvoc !
   Create wordlist drop  DOES> context ! ;
 
 : 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.
     vp @ 1+ dup check-maxvp vp! context ! ;
 
 : also  ( -- ) \ search-ext
-  \G Perform a @code{DUP} on the @var{wid} at the top of the search
-  \G order. Usually used prior to @code{Forth} etc.
-  context @ push-order ;
+  \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 Perform a @code{DROP} on the @i{wid} at the top of the search
-  \G order, thereby removing the @i{wid} from the search order.
+  \G Drop the wordlist at the top of the search order.
   vp @ 1- dup 0= -50 and throw vp! ;
 
 \ vocabulary find                                      14may93py
@@ -137,22 +140,30 @@ Vocabulary Forth ( -- ) \ gforthman- sea
 
 
 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}
+  \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 ;
 
+: init-vp  ( -- )
+   $10 TO maxvp
+   maxvp 1+ cells allocate throw TO vp
+   Only Forth also definitions ;
+
+:noname
+   init-vp DEFERS 'cold ;
+IS 'cold
+
+init-vp
+
 \ set initial search order                             14may93py
 
 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 ( -- )
 
 ' Forth >body to Forth-wordlist \ "forth definitions get-current" and "forth-wordlist" should produce the same wid
@@ -162,9 +173,9 @@ lookup ! \ our dictionary search order b
 
 : get-order  ( -- widn .. wid1 n ) \ search
   \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 order) and @i{widn} represents the word order that is searched
+  \G order) and @i{widn} represents the wordlist that is searched
   \G last.
   vp @ 0 ?DO vp cell+ I cells + @ LOOP vp @ ;
 
@@ -189,7 +200,7 @@ lookup ! \ our dictionary search order b
   context @ 1 set-order ;
 
 : .voc
-    body> >head name>string type space ;
+    body> >head-noprim name>string type space ;
 
 : order ( -- )  \  gforthman- search-ext
   \G Print the search order and the compilation word list.  The