--- gforth/wordinfo.fs	1995/11/07 18:07:05	1.8
+++ gforth/wordinfo.fs	1999/01/03 21:48:38	1.18
@@ -1,6 +1,6 @@
 \ WORDINFO.FS  V1.0                                    17may93jaw
 
-\ Copyright (C) 1995 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1998 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -22,55 +22,55 @@
 \ 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
 \ it is used in SEE.FS
 
-: alias? ( nfa -- flag )
-        dup name> look
-        0= ABORT" WINFO: CFA not found"
-\       cell+
-        2dup <>
-        IF   nip dup 1 cells - here !
-             count $1f and here cell+ place true
-        ELSE 2drop false THEN ;
+\ 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 )
+	((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 )
+    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>
-        forthstart u< ;
+        name>int xtprim? ;
 
 \ None nestable IDs: