--- gforth/search.fs	2000/08/16 09:26:52	1.15
+++ gforth/search.fs	2002/01/05 17:42:30	1.19
@@ -1,6 +1,6 @@
 \ search order wordset                                 14may93py
 
-\ Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1997,1998,2000 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -16,12 +16,15 @@
 
 \ 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, 
+$10 value maxvp			\ current size of search order stack
+$400 constant maxvp-limit	\ upper limit for resizing search order stack
+Variable static-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,
+0 Value vp
+static-vp ' vp >body A!
 
 : get-current  ( -- wid ) \ search
   \G @i{wid} is the identifier of the current compilation word list.
@@ -71,9 +74,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
+      vp static-vp = -49 and throw
+      BEGIN  dup  maxvp 2* dup TO maxvp  > 0= UNTIL
+      vp  maxvp 1+ cells resize throw TO vp
+   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
 
-: push-order ( wid -- ) \ gforth
+: >order ( wid -- ) \ gforth to-order
     \g Push @var{wid} on the search order.
     vp @ 1+ dup check-maxvp vp! context ! ;
 
@@ -81,7 +99,7 @@ Variable slowvoc   0 slowvoc !
   \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 @ push-order ;
+  context @ >order ;
 
 : previous ( -- ) \ search-ext
   \G Drop the wordlist at the top of the search order.