--- gforth/ans-report.fs	2002/03/22 18:40:00	1.7
+++ gforth/ans-report.fs	2003/03/22 10:04:06	1.11
@@ -1,6 +1,6 @@
 \ report words used from the various wordsets
 
-\ Copyright (C) 1996,1998,1999 Free Software Foundation, Inc.
+\ Copyright (C) 1996,1998,1999,2003 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -42,11 +42,11 @@
 vocabulary ans-report-words ans-report-words definitions
 
 : wordset ( "name" -- )
-    lastxt >body
+    latestxt >body
     create
     0 , \ link to next wordset
     0 0 2, \ array of nfas
-    ( lastlinkp ) last @ swap ! \ set link ptr of last wordset
+    ( lastlinkp ) latest swap ! \ set link ptr of last wordset
 ;
 
 wordlist constant wordsets wordsets set-current
@@ -137,8 +137,8 @@ ans-report-words definitions
     \    dodefer: over code-address!
     \    >body ! ;
     dup @ docol: <> -12 and throw \ for colon defs only
-    >body ['] branch compile-prim over !
-    cell+ >r >body r@ - r> ! ;
+    >body ['] branch xt>threaded over !
+    cell+ >r >body r> ! ;
 
 forth definitions
 ans-report-words