--- gforth/float.fs	1999/11/08 22:01:09	1.28
+++ gforth/float.fs	2000/09/23 12:27:46	1.33
@@ -51,42 +51,38 @@
     \G enough space to align it.
     here dup dfaligned swap ?DO  bl c,  LOOP ;
 
-1 sfloats constant sfloat+ ( sf-addr1 -- sf-addr2 ) \ float-ext s-float-plus
-\G Increment @i{sf-addr1} by the number of address units corresponding to the size of
-\G a single-precision IEEE floating-point number, to give @i{sf-addr2}.""
-dofield: lastxt code-address! \ change the constant into a field
-
-1 dfloats constant dfloat+ ( df-addr1 -- df-addr2 ) \ float-ext d-float-plus
-\G Increment @i{df-addr1} by the number of address units corresponding to the size of
-\G a double-precision IEEE floating-point number, to give @i{df-addr2}.""
-dofield: lastxt code-address! \ change the constant into a field
+1 sfloats (Field) sfloat+ , ( sf-addr1 -- sf-addr2 ) \ float-ext s-float-plus
+\G @code{1 sfloats +}.
+
+1 dfloats (Field) dfloat+ , ( df-addr1 -- df-addr2 ) \ float-ext d-float-plus
+\G @code{1 dfloats +}.
 
 : f, ( f -- ) \ gforth
     \G Reserve data space for one floating-point number and store
     \G @i{f} in the space.
     here 1 floats allot f! ;
 
-: fconstant  ( r "name" -- ) \ float
+: fconstant  ( r "name" -- ) \ float f-constant
     Create f,
 DOES> ( -- r )
     f@ ;
 
-: fdepth ( -- +n ) \ floating f-depth
+: fdepth ( -- +n ) \ float f-depth
     \G @i{+n} is the current number of (floating-point) values on the
     \G floating-point stack.
     fp0 @ fp@ - [ 1 floats ] Literal / ;
 
 : FLit ( -- r )  r> dup f@ float+ >r ;
-: FLiteral ( compilation r -- ; run-time -- r ) \ float
+: FLiteral ( compilation r -- ; run-time -- r ) \ float f-literal
     \G Compile appropriate code such that, at run-time, @i{r} is placed
     \G on the (floating-point) stack. Interpretation semantics are undefined.
     BEGIN  here cell+ dup faligned <>  WHILE  postpone noop  REPEAT
     postpone FLit  f, ;  immediate
 
-&15 Value precision ( -- u ) \ floating-ext
+&15 Value precision ( -- u ) \ float-ext
 \G @i{u} is the number of significant digits currently used by
 \G @code{F.} @code{FE.} and @code{FS.} 
-: set-precision ( u -- ) \ floating-ext
+: set-precision ( u -- ) \ float-ext
     \G Set the number of significant digits currently used by
     \G @code{F.} @code{FE.} and @code{FS.} to @i{u}.
     to precision ;
@@ -103,8 +99,8 @@ DOES> ( -- r )
   IF  2drop  scratch 3 min type  rdrop  EXIT  THEN
   IF  '- emit  THEN ;
 
-: f.  ( r -- ) \ floating-ext f-dot
-\G Display (the floating-point number) @i{r} using fixed-point notation,
+: f.  ( r -- ) \ float-ext f-dot
+\G Display (the floating-point number) @i{r} without exponent,
 \G followed by a space.
   f$ dup >r 0<
   IF    '0 emit
@@ -114,14 +110,19 @@ DOES> ( -- r )
 \ I'm afraid this does not really implement ansi semantics wrt precision.
 \ Shouldn't precision indicate the number of places shown after the point?
 
-: fe. ( r -- ) \ floating-ext f-e-dot
-\G Display @i{r} using engineering notation, followed by a space.
+\ Why do you think so? ANS Forth appears ambiguous on this point. -anton.
+
+: fe. ( r -- ) \ float-ext f-e-dot
+\G Display @i{r} using engineering notation (with exponent dividable
+\G by 3), followed by a space.
   f$ 1- s>d 3 fm/mod 3 * >r 1+ >r
-  scratch r@ min type '. emit  scratch r> /string type
+  scratch r@ tuck min tuck - >r type r> zeros
+  '. emit scratch r> /string type
   'E emit r> . ;
 
-: fs. ( r -- ) \ floating-ext f-s-dot
-\G Display @i{r} using scientific notation, followed by a space.
+: fs. ( r -- ) \ float-ext f-s-dot
+\G Display @i{r} using scientific notation (with exponent), followed
+\G by a space.
   f$ 1-
   scratch over c@ emit '. emit 1 /string type
   'E emit . ;
@@ -159,7 +160,7 @@ IS compiler-notfound
     ENDIF ;
 IS interpreter-notfound
 
-: fvariable ( "name" -- ) \ float
+: fvariable ( "name" -- ) \ float f-variable
     Create 0.0E0 f, ;
     \ does> ( -- f-addr )
 
@@ -202,13 +203,13 @@ IS interpreter-notfound
 	frot frot fover fabs fover fabs f+ frot frot
 	f- fabs frot frot f* f< ;
 
-: f~ ( r1 r2 r3 -- flag ) \ float-ext
-    \G ANS Forth medley: r3>0: @code{f~abs}; r3=0: r1=r2; r3<0: @code{fnegate f~abs}.
+: f~ ( r1 r2 r3 -- flag ) \ float-ext f-proximate
+    \G ANS Forth medley for comparing r1 and r2 for equality: r3>0:
+    \G @code{f~abs}; r3=0: bitwise comparison; r3<0: @code{fnegate f~rel}.
     fdup f0=
-    IF
-	fdrop f=  \ !! this does not work, because 0=-0 with f= on Linux-Intel
-	          \ the standard says they should compare unequal
-		  \ the comparison should be done with COMPARE
+    IF \ bitwise comparison
+	fp@ float+ 1 floats over float+ -text 0=
+	fdrop fdrop fdrop
 	EXIT
     THEN
     fdup f0>