--- gforth/ans-report.fs	1996/11/11 16:59:15	1.1
+++ 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 Free Software Foundation, Inc.
+\ Copyright (C) 1996,1998,1999,2003 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -16,7 +16,7 @@
 
 \ 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.
+\ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
 
 
 \ Use this program like this:
@@ -37,14 +37,16 @@
 \ This program uses Gforth internals and won't be easy to port
 \ to other systems.
 
+\ !! ignore struct-voc stuff (dummy, [then] etc.).
+
 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
@@ -86,7 +88,7 @@ ans-report-words definitions
 
 table constant answords answords set-current
 warnings @ warnings off
-include answords.fs
+include ./answords.fs
 warnings !
 ans-report-words definitions
 
@@ -131,8 +133,12 @@ ans-report-words definitions
 : replace-word ( xt cfa -- )
     \ replace word at cfa with xt. !! This is quite general-purpose
     \ and should migrate elsewhere.
-    dodefer: over code-address!
-    >body ! ;
+    \  the following no longer works with primitive-centric hybrid threading:
+    \    dodefer: over code-address!
+    \    >body ! ;
+    dup @ docol: <> -12 and throw \ for colon defs only
+    >body ['] branch xt>threaded over !
+    cell+ >r >body r> ! ;
 
 forth definitions
 ans-report-words