--- gforth/float.fs	2000/08/09 20:04:05	1.31
+++ gforth/float.fs	2005/12/31 15:46:08	1.48
@@ -1,6 +1,6 @@
 \ High level floating point                            14jan94py
 
-\ Copyright (C) 1995,1997 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1997,2003,2004,2005 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -16,7 +16,7 @@
 
 \ 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.
+\ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
 
 \ 1 cells 4 = [IF]
 \ ' cells   Alias sfloats
@@ -72,12 +72,12 @@ DOES> ( -- r )
     \G floating-point stack.
     fp0 @ fp@ - [ 1 floats ] Literal / ;
 
-: FLit ( -- r )  r> dup f@ float+ >r ;
 : 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
+    BEGIN  here cell+ cell+ dup faligned <>  WHILE  postpone noop  REPEAT
+    postpone ahead here >r f, postpone then
+    r> postpone literal postpone f@ ;  immediate
 
 &15 Value precision ( -- u ) \ float-ext
 \G @i{u} is the number of significant digits currently used by
@@ -100,9 +100,9 @@ DOES> ( -- r )
   IF  '- emit  THEN ;
 
 : f.  ( r -- ) \ float-ext f-dot
-\G Display (the floating-point number) @i{r} using fixed-point notation,
+\G Display (the floating-point number) @i{r} without exponent,
 \G followed by a space.
-  f$ dup >r 0<
+  f$ dup >r 0<=
   IF    '0 emit
   ELSE  scratch r@ min type  r@ precision - zeros  THEN
   '. emit r@ negate zeros
@@ -110,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?
 
+\ 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, followed by a space.
+\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 -- ) \ float-ext f-s-dot
-\G Display @i{r} using scientific notation, followed by a space.
+\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 . ;
@@ -137,23 +142,35 @@ require debugs.fs
 	2drop false
     THEN ;
 
-:noname ( c-addr u -- )
+[ifundef] compiler-notfound1
+defer compiler-notfound1
+' no.extensions IS compiler-notfound1
+
+:noname compiler-notfound1 execute ; is compiler-notfound
+
+defer interpreter-notfound1
+' no.extensions IS interpreter-notfound1
+
+:noname interpreter-notfound1 execute ; is interpreter-notfound
+[then]
+
+:noname ( c-addr u -- ... xt )
     2dup sfnumber
     IF
-	2drop POSTPONE FLiteral
+	2drop [comp'] FLiteral
     ELSE
-	defers compiler-notfound
+	defers compiler-notfound1
     ENDIF ;
-IS compiler-notfound
+IS compiler-notfound1
 
-:noname ( c-addr u -- r )
+:noname ( c-addr u -- ... xt )
     2dup sfnumber
     IF
-	2drop
+	2drop ['] noop
     ELSE
-	defers interpreter-notfound
+	defers interpreter-notfound1
     ENDIF ;
-IS interpreter-notfound
+IS interpreter-notfound1
 
 : fvariable ( "name" -- ) \ float f-variable
     Create 0.0E0 f, ;
@@ -175,6 +192,9 @@ IS interpreter-notfound
     \G Divide 1.0e0 by @i{r1}.
     1.0e0 fswap f/ ;
 
+get-current environment-wordlist set-current
+1.7976931348623157e308 FConstant max-float
+set-current
 
 \ We now have primitives for these, so we need not define them
 
@@ -203,7 +223,7 @@ IS interpreter-notfound
     \G @code{f~abs}; r3=0: bitwise comparison; r3<0: @code{fnegate f~rel}.
     fdup f0=
     IF \ bitwise comparison
-	fp@ float+ 1 floats over float+ -text 0=
+	fp@ float+ 1 floats over float+ over str=
 	fdrop fdrop fdrop
 	EXIT
     THEN
@@ -214,8 +234,14 @@ IS interpreter-notfound
 	fnegate f~rel
     THEN ;
 
-: f.s ( -- ) \ gforth f-dot-s
-    \G Display the number of items on the floating-point stack,
-    \G followed by a list of the items; TOS is the right-most item.
-    ." <" fdepth 0 .r ." > " fdepth 0 max maxdepth-.s @ min dup 0 
-    ?DO  dup i - 1- floats fp@ + f@ f.  LOOP  drop ; 
+\ proposals from Krishna Myeni in <cjsp2d$47l$1@ngspool-d02.news.aol.com>
+\ not sure if they are a good idea
+
+: FTRUNC ( r1 -- r2 )
+    \ round towards 0
+    \ !! should be implemented properly
+    F>D D>F ;
+
+: FMOD ( r1 r2 -- r )
+    \ remainder of r1/r2
+    FOVER FOVER F/ ftrunc F* F- ;