--- gforth/wordinfo.fs	1996/01/07 17:22:17	1.9
+++ gforth/wordinfo.fs	1998/05/13 16:47:24	1.15
@@ -22,7 +22,7 @@
 \ If you want check values then exclude comments,
 \ but keep in mind that this can't be cross-compiled
 
-INCLUDE look.fs
+\ INCLUDE look.fs
 
 \ Wordinfo is a tool that checks a nfa
 \ and finds out what wordtype we have
@@ -32,47 +32,45 @@ INCLUDE look.fs
 \ it in many respects - anton
 : alias? ( nfa1 -- nfa2|0 )
     \ if nfa1 is an alias, nfa2 is the name of the original word
-    cell+ dup c@ $80 and 0=
-    IF
-	(name>) @ >name ( use look instead? )
+    dup cell+ c@ alias-mask and 0=
+    IF ( nfa1 )
+	((name>)) @ >name ( use look instead? )
     ELSE
 	drop 0
     THEN ;
 
 : var?  ( nfa -- flag )
-    cell+ (name>) >code-address dovar: = ;
+    ((name>)) >code-address dovar: = ;
 
 : con?  ( nfa -- flag )
-    cell+ (name>) >code-address docon: = ;
+    ((name>)) >code-address docon: = ;
 
 : user?  ( nfa -- flag )
-    cell+ (name>) >code-address douser: = ;
+    ((name>)) >code-address douser: = ;
 
 : does? ( nfa -- flag )
-    \ !! does not work on all installations
-    cell+ (name>)
-    >code-address ['] bits >code-address = ;
+    ((name>))
+    >does-code 0<> ;
 
 : defered? ( nfa -- flag )
-    cell+ (name>) >code-address dodefer: = ;
+    ((name>)) >code-address dodefer: = ;
 
 : colon? ( nfa -- flag )
-    cell+ (name>) >code-address docol: = ;
+    ((name>)) >code-address docol: = ;
 
 \ the above words could be factored with create-does>, but this would
 \ probably make this file incompatible with cross.
 
-\ VALUE VCheck
-
-\ : value? ( nfa -- flag )
-\         dup does?
-\         IF here @ ['] VCheck cell+ @ =
-\            dup IF swap (name>) >body @ here ! ELSE nip THEN
-\         ELSE drop false THEN ;
-
+[IFDEF] forthstart
+: xtprim? ( xt -- flag )
+    forthstart dictionary-end within ; \ !! 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>
-        forthstart u< ;
+        name>int xtprim? ;
 
 \ None nestable IDs: