--- gforth/extend.fs	2003/01/20 17:07:37	1.52
+++ gforth/extend.fs	2007/01/25 09:11:08	1.58
@@ -1,6 +1,6 @@
 \ EXTEND.FS    CORE-EXT Word not fully tested!         12may93jaw
 
-\ Copyright (C) 1995,1998,2000 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1998,2000,2003,2005 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -36,10 +36,12 @@ decimal
 
 \ !! 2value
 
+[ifundef] 2literal
 : 2Literal ( compilation w1 w2 -- ; run-time  -- w1 w2 ) \ double two-literal
     \G Compile appropriate code such that, at run-time, cell pair @i{w1, w2} are
     \G placed on the stack. Interpretation semantics are undefined.
     swap postpone Literal  postpone Literal ; immediate restrict
+[then]
 
 ' drop alias d>s ( d -- n ) \ double		d_to_s
 
@@ -48,8 +50,8 @@ decimal
     \G In ANS Forth u3 can only be a positive signed number.
     >r s>d >r abs -rot
     s>d r> xor r> swap >r >r dabs rot tuck um* 2swap um*
-    swap >r 0 d+ r> -rot r@ um/mod -rot r> um/mod nip swap
-    r> IF dnegate THEN ;
+    swap >r 0 d+ r> -rot r@ um/mod -rot r> um/mod -rot
+    r> IF IF 1. d+ THEN dnegate ELSE drop THEN ;
 
 \ CASE OF ENDOF ENDCASE                                 17may93jaw
 
@@ -118,7 +120,7 @@ decimal
     begin
 	dup r@ >=
     while
-	over 2r@ swap -text 0= if
+	2dup 2r@ string-prefix? if
 	    2swap 2drop 2r> 2drop true exit
 	endif
 	1 /string
@@ -266,7 +268,7 @@ variable span ( -- c-addr ) \ core-ext
     drop
     \ restore udp and dp
 [IFDEF] forget-dyncode
-    dup cell+ @ forget-dyncode 0= abort" gforth bug"
+    dup cell+ @ forget-dyncode drop
 [THEN]
     @ udp !  dp !
     \ clean up vocabulary stack