--- gforth/look.fs	1998/12/08 22:02:46	1.11
+++ gforth/look.fs	2002/09/14 10:59:31	1.17
@@ -1,6 +1,6 @@
 \ LOOK.FS      xt -> lfa                               22may93jaw
 
-\ Copyright (C) 1995,1996,1997 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1997,2000 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -16,7 +16,7 @@
 
 \ 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.
 
 \ Look checks first if the word is a primitive. If yes then the
 \ vocabulary in the primitive area is beeing searched, meaning
@@ -26,6 +26,9 @@
 \ Problems: A compiled xt via compile, might be created with noname:
 \           a noname: leaves now a empty name field
 
+require stuff.fs
+require environ.fs
+
 decimal
 
 \ look                                                  17may93jaw
@@ -33,13 +36,20 @@ decimal
 \ rename to discover!!!
 
 : (look)  ( xt startlfa -- lfa flag )
-        false swap
-        BEGIN @ dup
-        WHILE dup name>int
-              3 pick = IF nip dup THEN
-        REPEAT
-        drop nip
-        dup 0<> ;
+    false swap
+    BEGIN
+	@ dup
+    WHILE
+	    dup name>int
+	    threading-method 0= if
+		@
+	    then
+	    3 pick = IF
+		nip dup
+	    THEN
+    REPEAT
+    drop nip
+    dup 0<> ;
 
 
 \ !!! nicht optimal!
@@ -52,26 +62,35 @@ has? rom
     dup [ unlock rom-dictionary area lock ] 
     literal literal within
     IF
-	>name dup ?? <>
+	>head-noprim dup ?? <>
     ELSE
 	forth-wordlist @ (look)
     THEN ;
 [ELSE]
 : look ( cfa -- lfa flag )
-    >name dup ??? <> ;
+    >head-noprim dup ??? <> ;
 [THEN]
 
 [ELSE]
 
-: PrimStart ['] true >name ;
+: PrimStart ['] true >head-noprim ;
 
 : look ( cfa -- lfa flag )
-    dup dictionary-end forthstart within
+    dup in-dictionary?
     IF
-	PrimStart (look)
+	>head-noprim dup ??? <>
     ELSE
-	>name dup ??? <>
+	PrimStart (look)
     THEN ;
 
 [THEN]
 [THEN]
+
+: >head ( cfa -- nt|0 ) \ gforth to-head
+    \G tries to find the name token nt of the word represented by cfa;
+    \G returns 0 if it fails.  This word is not absolutely reliable,
+    \G it may give false positives and produce wrong nts.
+    look and ;
+
+' >head ALIAS >name \ gforth to-name
+\G old name of @code{>head}