--- gforth/search.fs	1999/11/08 22:01:09	1.12
+++ gforth/search.fs	2005/10/02 11:30:32	1.26
@@ -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,2003 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -16,12 +16,13 @@
 
 \ 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, 
+require struct.fs
+
+$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.
@@ -38,8 +39,8 @@ 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.
+  \G Set the compilation word list to be the same as the word list
+  \G that is currently at the top of the search order.
   context @ current ! ;
 
 \ wordlist Vocabulary also previous                    14may93py
@@ -65,26 +66,30 @@ Variable slowvoc   0 slowvoc !
 
 : Vocabulary ( "name" -- ) \ gforth
   \G Create a definition "name" and associate a new word list with it.
-  \G The run-time effect of "name" is to push the new word list's wid
-  \G onto the top of the search order stack.
+  \G The run-time effect of "name" is to replace the @i{wid} at the
+  \G top of the search order with the @i{wid} associated with the new
+  \G word list.
   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 search order stack. Usually used prior
-  \G to @code{Forth}, @code{definitions} etc.
-  context @ push-order ;
-
-: previous ( -- ) \ search ext
-  \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.
+: also  ( -- ) \ search-ext
+  \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 Drop the wordlist at the top of the search order.
   vp @ 1- dup 0= -50 and throw vp! ;
 
 \ vocabulary find                                      14may93py
@@ -131,27 +136,45 @@ slowvoc off
 
 \ Only root                                            14may93py
 
-Vocabulary Forth ( -- ) \ thisone- search-ext
-  \G Push the @i{wid} associated with @code{forth-wordlist} onto the
-  \G search order stack.
+Vocabulary Forth ( -- ) \ gforthman- search-ext
+  \G Replace the @i{wid} at the top of the search order with the
+  \G @i{wid} associated with the word list @code{forth-wordlist}.
+
 
 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 ;
 
+: 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
@@ -160,13 +183,14 @@ lookup ! \ our dictionary search order b
 \ get-order set-order                                  14may93py
 
 : get-order  ( -- widn .. wid1 n ) \ search
-  \G Copy the search order stack to the data stack. The current search
-  \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 @i{widn} represents the word order that is searched last.
-  vp @ 0 ?DO  vp cell+ I cells + @  LOOP  vp @ ;
+  \G Copy the search order to the data stack. The current search order
+  \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 wordlist that is searched
+  \G last.
+  vp @ 0 ?DO vp cell+ I cells + @ LOOP vp @ ;
 
-: set-order  ( widn .. wid1 n -- ) \ thisone- search
+: set-order  ( widn .. wid1 n -- ) \ gforthman- search
     \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,
@@ -186,10 +210,32 @@ lookup ! \ our dictionary search order b
   \G list that is currently on the top of the search order stack.
   context @ 1 set-order ;
 
-: .voc
-    body> >head name>string type space ;
+[IFUNDEF] .name
+: 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 ( -- )  \  thisone- search-ext
+: order ( -- )  \  gforthman- search-ext
   \G Print the search order and the compilation word list.  The
   \G word lists are printed in the order in which they are searched
   \G (which is reversed with respect to the conventional way of
@@ -222,7 +268,7 @@ Root definitions
 ' forth-wordlist alias forth-wordlist ( -- wid ) \ search
   \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.
+  \G list and is at the top of the search order.
 ' set-order alias set-order
 ' order alias order