--- gforth/wordinfo.fs	1998/05/13 16:47:24	1.15
+++ gforth/wordinfo.fs	2007/12/31 19:02:24	1.28
@@ -1,12 +1,12 @@
 \ WORDINFO.FS  V1.0                                    17may93jaw
 
-\ Copyright (C) 1995 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1998,2000,2003,2007 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,10 +30,11 @@
 \ 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 ;
@@ -63,7 +63,7 @@
 
 [IFDEF] forthstart
 : xtprim? ( xt -- flag )
-    forthstart dictionary-end within ; \ !! does not work for CODE words
+    in-dictionary? 0= ; \ !! does not work for CODE words
 [ELSE]
 : xtprim? ( xt -- flag )
     dup >body swap >code-address = ; \ !! works only for indirect threaded code