--- gforth/intcomp.fs	1996/09/23 08:52:48	1.3
+++ gforth/intcomp.fs	2007/12/31 19:02:24	1.13
@@ -1,12 +1,12 @@
 \ defining words for words with non-default and non-immediate compilation semantics
 
-\ Copyright (C) 1996 Free Software Foundation, Inc.
+\ Copyright (C) 1996,1997,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,8 +15,7 @@
 \ 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/.
 
 \ used like
 \ : <name> create-interpret/compile ...
@@ -26,46 +25,46 @@
 
 noname create
 does> abort" interpreting word without interpretation semantics" ;
-lastxt >does-code
+latestxt >does-code
 does> abort" compiling word without compilation semantics" ;
-lastxt >does-code
+latestxt >does-code
 constant no-compilation-does-code
 constant no-interpretation-does-code
 
 : create-interpret/compile ( "name" -- ) \ gforth
     0 0 interpret/compile:
-    here lastxt interpret/compile-comp !
+    here latestxt interpret/compile-comp !
     no-compilation-does-code here does-code!
     [ 0 >body ] literal allot
-    here lastxt interpret/compile-int !
+    here latestxt interpret/compile-int !
     no-interpretation-does-code here does-code!
     [ 0 >body ] literal allot ; \ restrict?
 
 : fix-does-code ( addr ret-addr -- )
-    lastxt [ interpret/compile-struct drop ] literal + >r
-    lastxt interpret/compile?
-    lastxt interpret/compile-int @ r@ >body = and
-    lastxt interpret/compile-comp @ r> = and
+    latestxt [ interpret/compile-struct %size ] literal + >r
+    latestxt interpret/compile?
+    latestxt interpret/compile-int @ r@ >body = and
+    latestxt interpret/compile-comp @ r> = and
     0= abort" not created with create-interpret/compile"
-    [ /does-handler cell+ cell+ ] literal + \ to does-code
+    cell+ cell+ maxaligned /does-handler + \ to does-code
     swap @ does-code! ;
 
-: (interpretation>) ( -- )
-    lastxt interpret/compile-int r@ fix-does-code ;
+: (interpretation>1) ( addr R:retaddr -- )
+    latestxt interpret/compile-int swap fix-does-code ;
 
 : interpretation> ( compilation. -- orig colon-sys ) \ gforth
-    POSTPONE (interpretation>) POSTPONE ahead
+    here 4 cells +  POSTPONE literal POSTPONE (interpretation>1) POSTPONE ahead
     dodoes, defstart dead-code off 0 set-locals-size-list ; immediate restrict
 
 : <interpretation ( compilation. orig colon-sys -- ) \ gforth
     ?struc POSTPONE exit
     POSTPONE then ; immediate restrict
 
-: (compilation>) ( -- )
-    lastxt interpret/compile-comp r@ fix-does-code ;
+: (compilation>1) ( addr R:retaddr -- )
+    latestxt interpret/compile-comp swap fix-does-code ;
 
 : compilation> ( compilation. -- orig colon-sys ) \ gforth
-    POSTPONE (compilation>) POSTPONE ahead
+    here 4 cells + POSTPONE literal POSTPONE (compilation>1) POSTPONE ahead
     dodoes, defstart dead-code off 0 set-locals-size-list POSTPONE >body ; immediate restrict
 
 comp' <interpretation drop