--- gforth/float.fs	1994/09/12 19:00:29	1.8
+++ gforth/float.fs	1995/02/08 13:38:51	1.14
@@ -26,20 +26,18 @@
 
 : f, ( f -- )  here 1 floats allot f! ;
 
-\ !! have create produce faligned pfas
 : fconstant  ( r -- )
-  falign here f,  Create A,
-  DOES>  @ f@ ;
-
-: fvariable
-  falign here 0. d>f f, AConstant ;
+    Create f,
+    DOES> f@ ;
 
 : fdepth  ( -- n )  f0 @ fp@ - [ 1 floats ] Literal / ;
 
-: FLit ( -- r )  r> faligned dup f@ float+ >r ;
-: FLiteral ( r -- )  postpone FLit  falign f, ;  immediate
+: FLit ( -- r )  r> dup f@ float+ >r ;
+: FLiteral ( r -- )
+  BEGIN  here cell+ dup faligned <>  WHILE  postpone noop  REPEAT
+  postpone FLit  f, ;  immediate
 
-&16 Value precision
+&15 Value precision
 : set-precision  to precision ;
 
 : scratch ( r -- addr len )
@@ -83,19 +81,34 @@
 
 ' sfnumber IS notfound
 
+: fvariable ( -- )
+    Create 0e0 f, ;
+    \ does> ( -- f-addr )
+
 1e0 fasin 2e0 f* fconstant pi
 
 : f2*  2e0 f* ;
-: f2/  2e0 f/ ;
+: f2/  .5e0 f* ;
 : 1/f  1e0 fswap f/ ;
 
-: falog ( f -- 10^f )  [ 10e0 fln ] FLiteral f* fexp ;
 
-: fsinh    fexpm1 fdup fdup 1e0 f+ f/ f+ f2/ ;
-: fcosh    fexp fdup 1/f f+ f2/ ;
-: ftanh    f2* fexpm1 fdup 2e0 f+ f/ ;
-
-: fatanh   fdup f0< >r fabs 1e0 fover f- f/  f2* flnp1 f2/
-           r> IF  fnegate  THEN ;
-: facosh   fdup fdup f* 1e0 f- fsqrt f+ fln ;
-: fasinh   fdup fdup f* 1e0 f+ fsqrt f/ fatanh ;
+\ We now have primitives for these, so we need not define them
+
+\ : falog ( f -- 10^f )  [ 10e0 fln ] FLiteral f* fexp ;
+
+\ : fsinh    fexpm1 fdup fdup 1e0 f+ f/ f+ f2/ ;
+\ : fcosh    fexp fdup 1/f f+ f2/ ;
+\ : ftanh    f2* fexpm1 fdup 2e0 f+ f/ ;
+
+\ : fatanh   fdup f0< >r fabs 1e0 fover f- f/  f2* flnp1 f2/
+\            r> IF  fnegate  THEN ;
+\ : facosh   fdup fdup f* 1e0 f- fsqrt f+ fln ;
+\ : fasinh   fdup fdup f* 1e0 f+ fsqrt f/ fatanh ;
+
+: f~ ( f1 f2 f3 -- flag )  fdup f0= IF  fdrop f= EXIT  THEN
+  fdup f0>   IF  frot frot f- fabs fswap
+           ELSE  fnegate frot frot fover fabs fover fabs f+ frot frot
+                 f- fabs frot frot f*  THEN  f< ;
+
+: f.s  ." <" fdepth 0 .r ." > " fdepth 0 max maxdepth-.s @ min dup 0 
+  ?DO  dup i - 1- floats fp@ + f@ f.  LOOP  drop ;