--- gforth/search.fs	1999/03/29 22:52:29	1.9
+++ gforth/search.fs	1999/11/08 22:01:09	1.12
@@ -24,15 +24,19 @@ Variable vp
   0 A, 0 A,  0 A, 0 A,   0 A, 0 A,   0 A, 0 A, 
 
 : get-current  ( -- wid ) \ search
-  \G @var{wid} is the identifier of the current compilation word list.
+  \G @i{wid} is the identifier of the current compilation word list.
   current @ ;
 
 : set-current  ( wid -- )  \ search
-  \G Set the compilation word list to the word list identified by @var{wid}.
+  \G Set the compilation word list to the word list identified by @i{wid}.
   current ! ;
 
-\ : context ( -- addr )  vp dup @ cells + ;
-: vp! dup vp ! cells vp + to context ;
+:noname ( -- addr )
+    vp dup @ cells + ;
+is context
+
+: vp! ( u -- )
+    vp ! ;
 : definitions  ( -- ) \ search
   \G Make the compilation word list the same as the word list
   \G that is currently at the top of the search order stack.
@@ -51,7 +55,7 @@ Variable slowvoc   0 slowvoc !
   dup initvoc ;
 
 : wordlist  ( -- wid ) \ search
-  \G Create a new, empty word list represented by @var{wid}.
+  \G Create a new, empty word list represented by @i{wid}.
   slowvoc @
   IF    \ this is now f83search because hashing may be loaded already
 	\ jaw
@@ -65,16 +69,23 @@ Variable slowvoc   0 slowvoc !
   \G onto the top of the search order stack.
   Create wordlist drop  DOES> context ! ;
 
+: check-maxvp ( n -- )
+    maxvp > -49 and throw ;
+
+: push-order ( wid -- ) \ gforth
+    \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 search order stack. Usually used prior
   \G to @code{Forth}, @code{definitions} etc.
-  context @ vp @ 1+ dup maxvp > abort" Vocstack full"
-  vp! context ! ;
+  context @ push-order ;
 
 : previous ( -- ) \ search ext
-  \G Perform a @code{DROP} on the search order stack, thereby removing the wid at the
-  \G top of the (search order) stack from the search order.
-  vp @ 1- dup 0= abort" Vocstack empty" vp! ;
+  \G Perform a @code{DROP} on the search order stack, thereby removing
+  \G the wid at the top of the (search order) stack from the search
+  \G order.
+  vp @ 1- dup 0= -50 and throw vp! ;
 
 \ vocabulary find                                      14may93py
 
@@ -121,7 +132,7 @@ slowvoc off
 \ Only root                                            14may93py
 
 Vocabulary Forth ( -- ) \ thisone- search-ext
-  \G Push the @var{wid} associated with @code{forth-wordlist} onto the
+  \G Push the @i{wid} associated with @code{forth-wordlist} onto the
   \G search order stack.
 
 Vocabulary Root ( -- ) \ gforth
@@ -150,20 +161,25 @@ lookup ! \ our dictionary search order b
 
 : get-order  ( -- widn .. wid1 n ) \ search
   \G Copy the search order stack to the data stack. The current search
-  \G order has @var{n} entries, of which @var{wid1} represents the word
+  \G order has @i{n} entries, of which @i{wid1} represents the word
   \G list that is searched first (the word list at the top of the stack) and
-  \G @var{widn} represents the word order that is searched last.
+  \G @i{widn} represents the word order that is searched last.
   vp @ 0 ?DO  vp cell+ I cells + @  LOOP  vp @ ;
 
 : set-order  ( widn .. wid1 n -- ) \ thisone- search
-  \G If @var{n}=0, empty the search order.
-  \G If @var{n}=-1, set the search order to the implementation-defined minimum search
-  \G order (for Gforth, this is the word list @code{Root}). Otherwise, replace the
-  \G existing search order with the @var{n} wid entries such that @var{wid1} represents the
-  \G word list that will be searched first and @var{widn} represents the word list that
-  \G will be searched last.
-  dup -1 = IF  drop Only exit  THEN  dup vp!
-  ?dup IF  1- FOR  vp cell+ I cells + !  NEXT  THEN ;
+    \G If @var{n}=0, empty the search order.  If @var{n}=-1, set the
+    \G search order to the implementation-defined minimum search order
+    \G (for Gforth, this is the word list @code{Root}). Otherwise,
+    \G replace the existing search order with the @var{n} wid entries
+    \G such that @var{wid1} represents the word list that will be
+    \G searched first and @var{widn} represents the word list that will
+    \G be searched last.
+    dup -1 = IF
+	drop only exit
+    THEN
+    dup check-maxvp
+    dup vp!
+    ?dup IF 1- FOR vp cell+ I cells + !  NEXT THEN ;
 
 : seal ( -- ) \ gforth
   \G Remove all word lists from the search order stack other than the word
@@ -204,7 +220,7 @@ Root definitions
 \G of the search order.
 ' Forth Alias Forth
 ' forth-wordlist alias forth-wordlist ( -- wid ) \ search
-  \G CONSTANT: @var{wid} identifies the word list that includes all of the standard words
+  \G @code{Constant} -- @i{wid} identifies the word list that includes all of the standard words
   \G provided by Gforth. When Gforth is invoked, this word list is the compilation word
   \G list and is at the top of the word list stack.
 ' set-order alias set-order