--- gforth/extend.fs	2003/01/31 22:45:11	1.54
+++ gforth/extend.fs	2007/12/31 17:34:58	1.61
@@ -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,2007 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,12 @@ 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
+    [ s" floored" environment? 0= throw ] [if]
+        -rot r> IF IF 1. d+ THEN dnegate ELSE drop THEN
+    [else]
+        nip swap r> IF dnegate THEN
+    [then] ;
 
 \ CASE OF ENDOF ENDCASE                                 17may93jaw
 
@@ -92,8 +98,8 @@ decimal
 
 \ CONVERT                                               17may93jaw
 
-: convert ( ud1 c-addr1 -- ud2 c-addr2 ) \ core-ext
-    \G OBSOLESCENT: superseded by @code{>number}.
+: convert ( ud1 c-addr1 -- ud2 c-addr2 ) \ core-ext-obsolescent
+    \G Obsolescent: superseded by @code{>number}.
     char+ true >number drop ;
 
 \ ERASE                                                 17may93jaw
@@ -182,11 +188,11 @@ decimal
 
 \ EXPECT SPAN                                           17may93jaw
 
-variable span ( -- c-addr ) \ core-ext
+variable span ( -- c-addr ) \ core-ext-obsolescent
 \G @code{Variable} -- @i{c-addr} is the address of a cell that stores the
 \G length of the last string received by @code{expect}. OBSOLESCENT.
 
-: expect ( c-addr +n -- ) \ core-ext
+: expect ( c-addr +n -- ) \ core-ext-obsolescent
     \G Receive a string of at most @i{+n} characters, and store it
     \G in memory starting at @i{c-addr}. The string is
     \G displayed. Input terminates when the <return> key is pressed or