--- gforth/wordinfo.fs	1994/05/18 17:30:03	1.2
+++ gforth/wordinfo.fs	2000/05/27 18:55:55	1.20
@@ -1,58 +1,77 @@
 \ WORDINFO.FS  V1.0                                    17may93jaw
 
+\ Copyright (C) 1995,1996,1998 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
+\ of the License, or (at your option) any later version.
+
+\ This program is distributed in the hope that it will be useful,
+\ but WITHOUT ANY WARRANTY; without even the implied warranty of
+\ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+\ 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.
+
 \ 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
 \ 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.
+    \ if the original word has no name, return 0.
+    dup cell+ c@ alias-mask and 0=
+    IF ( nfa1 )
+	((name>)) @ >name
+    ELSE
+	drop 0
+    THEN ;
 
 : var?  ( nfa -- flag )
-        (name>)
-        >code-address ['] leavings >code-address = ;
+    ((name>)) >code-address dovar: = ;
 
 : con?  ( nfa -- flag )
-        (name>)
-        >code-address ['] bl >code-address = ;
+    ((name>)) >code-address docon: = ;
+
+: user?  ( nfa -- flag )
+    ((name>)) >code-address douser: = ;
 
 : does? ( nfa -- flag )
-        dup (name>)
-        >code-address ['] source >code-address =
-        dup IF swap (name>) cell+ @ here ! ELSE nip THEN ;
+    ((name>))
+    >does-code 0<> ;
 
 : defered? ( nfa -- flag )
-        dup does?
-        IF here @ ['] source cell+ @ =
-           dup IF swap (name>) >body @ here ! ELSE nip THEN
-        ELSE drop false THEN ;
+    ((name>)) >code-address dodefer: = ;
 
 : colon? ( nfa -- flag )
-        (name>)
-        >code-address ['] does? >code-address = ;
-
-\ VALUE VCheck
+    ((name>)) >code-address docol: = ;
 
-\ : value? ( nfa -- flag )
-\         dup does?
-\         IF here @ ['] VCheck cell+ @ =
-\            dup IF swap (name>) >body @ here ! ELSE nip THEN
-\         ELSE drop false THEN ;
+\ 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>
-        forthstart u< ;
+        name>int xtprim? ;
 
 \ None nestable IDs:
 
@@ -66,24 +85,26 @@ INCLUDE look.fs
 5 CONSTANT Doe#         \ Does part
 6 CONSTANT Def#         \ Defer
 7 CONSTANT Col#         \ Colon def
+8 CONSTANT Use#         \ User variable
 
 \ Nobody knows:
 
-8 CONSTANT Ali#         \ Alias
+9 CONSTANT Ali#         \ Alias
 
-9 CONSTANT Str#         \ Structure words
+10 CONSTANT Str#         \ Structure words
 
-10 CONSTANT Com#        \ Compiler directives : ; POSTPONE
+11 CONSTANT Com#        \ Compiler directives : ; POSTPONE
 
 CREATE InfoTable
-        ' Alias? A, Ali# ,
-        ' Con?   A, Con# ,
-        ' Var?   A, Var# ,
-\        ' Value? A, Val# ,
+        ' Prim?    A, Pri# ,
+        ' Alias?   A, Ali# ,
+        ' Con?     A, Con# ,
+        ' Var?     A, Var# ,
+\        ' Value?  A, Val# ,
         ' Defered? A, Def# ,
-        ' Does? A, Doe# ,
-        ' Colon? A, Col# ,
-        ' Prim? A, Pri# ,
+        ' Does?    A, Doe# ,
+        ' Colon?   A, Col# ,
+	' User?    A, Use# ,
         0 ,
 
 : WordInfo ( nfa --- code )