--- gforth/wordinfo.fs	1994/02/11 16:30:47	1.1
+++ gforth/wordinfo.fs	1995/10/07 17:38:21	1.7
@@ -13,34 +13,34 @@ INCLUDE look.fs
 : alias? ( nfa -- flag )
         dup name> look
         0= ABORT" WINFO: CFA not found"
-        cell+
+\       cell+
         2dup <>
         IF   nip dup 1 cells - here !
              count $1f and here cell+ place true
         ELSE 2drop false THEN ;
 
 : var?  ( nfa -- flag )
-        (name>)
-        @ ['] leavings @ = ;
+    cell+ (name>) >code-address dovar: = ;
 
 : con?  ( nfa -- flag )
-        (name>)
-        @ ['] bl @ = ;
+    cell+ (name>) >code-address docon: = ;
+
+: user?  ( nfa -- flag )
+    cell+ (name>) >code-address douser: = ;
 
 : does? ( nfa -- flag )
-        dup (name>)
-        @ ['] source @ =
-        dup IF swap (name>) cell+ @ here ! ELSE nip THEN ;
+    \ !! does not work on all installations
+    cell+ (name>)
+    >code-address ['] bits >code-address = ;
 
 : defered? ( nfa -- flag )
-        dup does?
-        IF here @ ['] source cell+ @ =
-           dup IF swap (name>) >body @ here ! ELSE nip THEN
-        ELSE drop false THEN ;
+    cell+ (name>) >code-address dodefer: = ;
 
 : colon? ( nfa -- flag )
-        (name>)
-        @ ['] does? @ = ;
+    cell+ (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
 
@@ -66,24 +66,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 )