--- gforth/search.fs	2003/01/19 23:35:30	1.21
+++ gforth/search.fs	2007/07/06 12:54:56	1.29
@@ -1,6 +1,6 @@
 \ search order wordset                                 14may93py
 
-\ Copyright (C) 1995-2003 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1997,1998,2000,2003,2005 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -18,6 +18,8 @@
 \ along with this program; if not, write to the Free Software
 \ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
 
+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)
@@ -49,7 +51,7 @@ Variable slowvoc   0 slowvoc !
 
 : mappedwordlist ( map-struct -- wid )	\ gforth
 \G Create a wordlist with a special map-structure.
-  here swap A, 0 A, voclink @ A, 0 A,
+  align here swap A, 0 A, voclink @ A, 0 A,
   dup wordlist-link voclink !
   dup initvoc ;
 
@@ -134,7 +136,7 @@ slowvoc off
 
 \ Only root                                            14may93py
 
-Vocabulary Forth ( -- ) \ gforthman- search-ext
+Vocabulary Forth ( -- ) \ 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}.
 
@@ -149,16 +151,25 @@ 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  ( -- )
-   $10 TO maxvp
-   maxvp 1+ cells allocate throw TO vp
-   Only Forth also definitions ;
+    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
 
-init-vp
+here 0 , to vp
+
+init-vp Only Forth also definitions
 
 \ set initial search order                             14may93py
 
@@ -179,7 +190,7 @@ lookup ! \ our dictionary search order b
   \G last.
   vp @ 0 ?DO vp cell+ I cells + @ LOOP vp @ ;
 
-: set-order  ( widn .. wid1 n -- ) \ gforthman- search
+: set-order  ( widn .. wid1 n -- ) \ 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,
@@ -199,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-noprim 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 ( -- )  \  gforthman- search-ext
+: order ( -- )  \  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
@@ -231,13 +264,13 @@ Root definitions
 ' words Alias words  ( -- ) \ tools
 \G Display a list of all of the definitions in the word list at the top
 \G of the search order.
-' Forth Alias Forth
+' Forth Alias Forth \ alias- search-ext
 ' 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 search order.
-' set-order alias set-order
-' order alias order
+' set-order alias set-order ( wid1 ... widu u -- ) \ alias- search
+' order alias order ( -- ) \ alias- search-ext
 
 Forth definitions