--- gforth/wordinfo.fs	1996/08/21 14:58:45	1.12
+++ gforth/wordinfo.fs	2001/01/28 18:49:10	1.23
@@ -1,6 +1,6 @@
 \ WORDINFO.FS  V1.0                                    17may93jaw
 
-\ Copyright (C) 1995 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1998,2000 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -16,13 +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.
 
 \ May be cross-compiled
 \ If you want check values then exclude comments,
 \ but keep in mind that this can't be cross-compiled
 
-INCLUDE look.fs
+require look.fs
 
 \ Wordinfo is a tool that checks a nfa
 \ and finds out what wordtype we have
@@ -31,10 +31,11 @@ INCLUDE look.fs
 \ the old alias? did not work and it is not used, so I changed
 \ it in many respects - anton
 : alias? ( nfa1 -- nfa2|0 )
-    \ if nfa1 is an alias, nfa2 is the name of the original word
-    dup cell+ c@ alias-mask and 0=
+    \ if nfa1 is an alias, nfa2 is the name of the original word.
+    \ if the original word has no name, return 0.
+    dup cell+ @ alias-mask and 0=
     IF ( nfa1 )
-	((name>)) @ >name ( use look instead? )
+	((name>)) @ >name
     ELSE
 	drop 0
     THEN ;
@@ -49,9 +50,8 @@ INCLUDE look.fs
     ((name>)) >code-address douser: = ;
 
 : does? ( nfa -- flag )
-    \ !! does not work on all installations
     ((name>))
-    >code-address ['] spaces >code-address = ;
+    >does-code 0<> ;
 
 : defered? ( nfa -- flag )
     ((name>)) >code-address dodefer: = ;
@@ -62,9 +62,16 @@ INCLUDE look.fs
 \ the above words could be factored with create-does>, but this would
 \ probably make this file incompatible with cross.
 
+[IFDEF] forthstart
+: xtprim? ( xt -- flag )
+    in-dictionary? 0= ; \ !! does not work for CODE words
+[ELSE]
+: xtprim? ( xt -- flag )
+    dup >body swap >code-address = ; \ !! works only for indirect threaded code
+				     \ !! does not work for primitives
+[THEN]
 : prim? ( nfa -- flag )
-        name>int
-        forthstart u< ;
+        name>int xtprim? ;
 
 \ None nestable IDs: