--- gforth/float.fs	2006/12/31 13:39:13	1.50
+++ gforth/float.fs	2012/05/26 10:35:35	1.66
@@ -1,12 +1,12 @@
 \ High level floating point                            14jan94py
 
-\ Copyright (C) 1995,1997,2003,2004,2005,2006 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1997,2003,2004,2005,2006,2007,2009,2010,2011 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., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+\ along with this program. If not, see http://www.gnu.org/licenses/.
 
 \ 1 cells 4 = [IF]
 \ ' cells   Alias sfloats
@@ -51,12 +50,14 @@
     \G enough space to align it.
     here dup dfaligned swap ?DO  bl c,  LOOP ;
 
-1 sfloats (Field) sfloat+ , ( sf-addr1 -- sf-addr2 ) \ float-ext s-float-plus
+(Field) sfloat+ ( sf-addr1 -- sf-addr2 ) \ float-ext s-float-plus
 \G @code{1 sfloats +}.
+    1 sfloats ,
 
-1 dfloats (Field) dfloat+ , ( df-addr1 -- df-addr2 ) \ float-ext d-float-plus
+(Field) dfloat+ ( df-addr1 -- df-addr2 ) \ float-ext d-float-plus
 \G @code{1 dfloats +}.
-
+    1 dfloats ,
+    
 : f, ( f -- ) \ gforth
     \G Reserve data space for one floating-point number and store
     \G @i{f} in the space.
@@ -87,7 +88,7 @@ DOES> ( -- r )
     \G @code{F.} @code{FE.} and @code{FS.} to @i{u}.
     to precision ;
 
-: scratch ( r -- addr len )
+: scratch ( -- addr len )
   pad precision - precision ;
 
 : zeros ( n -- )   0 max 0 ?DO  '0 emit  LOOP ;
@@ -127,19 +128,50 @@ DOES> ( -- r )
   scratch over c@ emit '. emit 1 /string type
   'E emit . ;
 
+[IFDEF] fp-char
 : sfnumber ( c-addr u -- r true | false )
-    2dup [CHAR] e scan ( c-addr u c-addr2 u2 )
-    dup 0=
-    IF
-	2drop 2dup [CHAR] E scan ( c-addr u c-addr3 u3 )
-    THEN
-    nip
-    IF
-	>float
-    ELSE
-	2drop false
-    THEN ;
+    fp-char @ >float1 ;
 
+Create si-prefixes ," PTGMk.munpf"
+si-prefixes count '.' scan drop Constant zero-exp
+
+: prefix-number ( c-addr u -- r true | false )
+    si-prefixes count bounds DO
+	2dup I c@ scan nip 0<> IF
+	    I c@ >float1
+	    dup IF  1000 s>f zero-exp I - s>f f** f*  THEN
+	    UNLOOP  EXIT  THEN
+    LOOP
+    sfnumber ;
+[ELSE]
+: sfnumber ( c-addr u -- r true | false )
+    >float ;
+: prefix-number  sfnumber ;
+[THEN]
+
+[ifdef] recognizer:
+    [IFDEF] 2lit,
+	: flit, postpone Fliteral ;
+	:noname ['] noop ;
+	:noname ['] flit, ;
+    [ELSE]
+	' noop
+	:noname postpone Fliteral ;
+    [THEN]
+    dup
+    recognizer: r:fnumber
+
+    : fnum-recognizer ( addr u -- float int-table | addr u r:fail )
+	2dup prefix-number
+	IF
+	    2drop r:fnumber  EXIT
+	THEN
+	r:fail ;
+
+' fnum-recognizer
+forth-recognizer get-recognizers
+1+ forth-recognizer set-recognizers
+[else]
 [ifundef] compiler-notfound1
 defer compiler-notfound1
 ' no.extensions IS compiler-notfound1
@@ -169,6 +201,7 @@ IS compiler-notfound1
 	defers interpreter-notfound1
     ENDIF ;
 IS interpreter-notfound1
+[then]
 
 : fvariable ( "name" -- ) \ float f-variable
     Create 0.0E0 f, ;
@@ -232,14 +265,23 @@ set-current
 	fnegate f~rel
     THEN ;
 
+-0e 8 0 [do] fp@ [i] + c@ $80 = [if] [i] constant fsign-offset [then] [loop]
+
+: fcopysign ( r1 r2 -- r3 ) \ gforth
+\G r3 takes its absolute value from r1 and its sign from r2
+    \ !! implementation relies on IEEE DP format
+    fp@ fsign-offset + dup c@ $80 and >r ( r1 r2 addr-r1sign )
+    float+ dup c@ $7f and r> or swap c!
+    fdrop ;
+
 \ proposals from Krishna Myeni in <cjsp2d$47l$1@ngspool-d02.news.aol.com>
 \ not sure if they are a good idea
 
-: FTRUNC ( r1 -- r2 )
+: ftrunc ( r1 -- r2 ) \ X:ftrunc
     \ round towards 0
-    \ !! should be implemented properly
-    F>D D>F ;
+    fdup fabs floor fswap fcopysign ;
 
 : FMOD ( r1 r2 -- r )
     \ remainder of r1/r2
     FOVER FOVER F/ ftrunc F* F- ;
+