--- gforth/search.fs	2000/09/23 15:46:58	1.18
+++ gforth/search.fs	2003/02/06 16:49:17	1.23
@@ -18,10 +18,9 @@
 \ along with this program; if not, write to the Free Software
 \ 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,7 +70,11 @@ 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 ;
 
 : >order ( wid -- ) \ gforth to-order
     \g Push @var{wid} on the search order.
@@ -146,12 +149,30 @@ Vocabulary Root ( -- ) \ gforth
   \G order (for Gforth, this is the word list @code{Root}).
   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
 
 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