--- gforth/wordinfo.fs	1996/01/07 17:22:17	1.9
+++ gforth/wordinfo.fs	2007/12/31 18:40:24	1.27
@@ -1,12 +1,12 @@
 \ WORDINFO.FS  V1.0                                    17may93jaw
 
-\ Copyright (C) 1995 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1998,2000,2003 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
 \ Gforth is free software; you can redistribute it and/or
 \ modify it under the terms of the GNU General Public License
-\ as published by the Free Software Foundation; either version 2
+\ as published by the Free Software Foundation, either version 3
 \ of the License, or (at your option) any later version.
 
 \ This program is distributed in the hope that it will be useful,
@@ -15,14 +15,13 @@
 \ GNU General Public License for more details.
 
 \ 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.
+\ along with this program. If not, see http://www.gnu.org/licenses/.
 
 \ 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,48 +30,47 @@ 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
-    cell+ dup c@ $80 and 0=
-    IF
-	(name>) @ >name ( use look instead? )
+    \ 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
     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: