Diff for /gforth/float.fs between versions 1.16 and 1.24

version 1.16, 1995/10/07 17:38:12 version 1.24, 1999/02/03 00:10:20
Line 1 Line 1
 \ High level floating point                            14jan94py  \ High level floating point                            14jan94py
   
 1 cells 4 = [IF]  \ Copyright (C) 1995,1997 Free Software Foundation, Inc.
 ' cells   Alias sfloats  
 ' cell+   Alias sfloat+  \ This file is part of Gforth.
 ' align   Alias sfalign  
 ' aligned Alias sfaligned  \ Gforth is free software; you can redistribute it and/or
 [ELSE]  \ modify it under the terms of the GNU General Public License
 : sfloats  2* 2* ;  \ as published by the Free Software Foundation; either version 2
 : sfloat+  4 + ;  \ of the License, or (at your option) any later version.
 : sfaligned ( addr -- addr' )  3 + -4 and ;  
 : sfalign ( -- )  here dup sfaligned swap ?DO  bl c,  LOOP ;  \ This program is distributed in the hope that it will be useful,
 [THEN]  \ but WITHOUT ANY WARRANTY; without even the implied warranty of
   \ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 1 floats 8 = [IF]  \ GNU General Public License for more details.
 ' floats   Alias dfloats  
 ' float+   Alias dfloat+  \ You should have received a copy of the GNU General Public License
 ' falign   Alias dfalign  \ along with this program; if not, write to the Free Software
 ' faligned Alias dfaligned  \ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 [ELSE]  
 : dfloats  2* 2* 2* ;  \ 1 cells 4 = [IF]
 : dfloat+  8 + ;  \ ' cells   Alias sfloats
 : dfaligned ( addr -- addr' )  7 + -8 and ;  \ ' cell+   Alias sfloat+
 : dfalign ( -- )  here dup dfaligned swap ?DO  bl c,  LOOP ;  \ ' align   Alias sfalign
 [THEN]  \ ' aligned Alias sfaligned
   \ [ELSE]
   \ : sfloats  2* 2* ;
   \ : sfloat+  4 + ;
   \ : sfaligned ( addr -- addr' )  3 + -4 and ;
   \ : sfalign ( -- )  here dup sfaligned swap ?DO  bl c,  LOOP ;
   \ [THEN]
   
   \ 1 floats 8 = [IF]
   \ ' floats   Alias dfloats
   \ ' float+   Alias dfloat+
   \ ' falign   Alias dfalign
   \ ' faligned Alias dfaligned
   \ [ELSE]
   \ : dfloats  2* 2* 2* ;
   \ : dfloat+  8 + ;
   \ : dfaligned ( addr -- addr' )  7 + -8 and ;
   \ : dfalign ( -- )  here dup dfaligned swap ?DO  bl c,  LOOP ;
   \ [THEN]
   
   : sfalign ( -- ) \ float-ext s-f-align
       here dup sfaligned swap ?DO  bl c,  LOOP ;
   : dfalign ( -- ) \ float-ext d-f-align
       here dup dfaligned swap ?DO  bl c,  LOOP ;
   
   1 sfloats constant sfloat+ ( sf-addr1 -- sf-addr2 ) \ float-ext s-float-plus
   dofield: lastxt code-address! \ change the constant into a field
   
   1 dfloats constant dfloat+ ( df-addr1 -- df-addr2 ) \ float-ext d-float-plus
   dofield: lastxt code-address! \ change the constant into a field
   
 : f, ( f -- )  here 1 floats allot f! ;  : f, ( f -- )  here 1 floats allot f! ;
   
 : fconstant  ( r -- ) \ float  : fconstant  ( r "name" -- ) \ float
     Create f,      Create f,
 DOES> ( -- r )  DOES> ( -- r )
     f@ ;      f@ ;
   
 : fdepth  ( -- n )  f0 @ fp@ - [ 1 floats ] Literal / ;  : fdepth ( -- +n ) \ floating f-depth
       \G +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 ;  : FLit ( -- r )  r> dup f@ float+ >r ;
 : FLiteral ( r -- )  : FLiteral ( compilation r -- ; run-time -- r ) \ float
   BEGIN  here cell+ dup faligned <>  WHILE  postpone noop  REPEAT      \G Compile appropriate code such that, at run-time, r is placed
   postpone FLit  f, ;  immediate      \G on the (floating-point) stack. Interpretation semantics are undefined.
       BEGIN  here cell+ dup faligned <>  WHILE  postpone noop  REPEAT
 &15 Value precision      postpone FLit  f, ;  immediate
 : set-precision  to precision ;  
   &15 Value precision ( -- u ) \ floating-ext
   \G u is the number of significant digits currently used by
   \G @code{F.} @code{FE.} and @code{FS.} 
   : set-precision ( u -- ) \ floating-ext
       \G Set the number of significant digits currently used by
       \G @code{F.} @code{FE.} and @code{FS.} to u.
       to precision ;
   
 : scratch ( r -- addr len )  : scratch ( r -- addr len )
   pad precision - precision ;    pad precision - precision ;
Line 53  DOES> ( -- r ) Line 92  DOES> ( -- r )
   IF  2drop  scratch 3 min type  rdrop  EXIT  THEN    IF  2drop  scratch 3 min type  rdrop  EXIT  THEN
   IF  '- emit  THEN ;    IF  '- emit  THEN ;
   
 : f.  ( r -- )  f$ dup >r 0<  : f.  ( r -- ) \ floating-ext f-dot
   \G Display (the floating-point number) r using fixed-point notation,
   \G followed by a space.
     f$ dup >r 0<
   IF    '0 emit    IF    '0 emit
   ELSE  scratch r@ min type  r@ precision - zeros  THEN    ELSE  scratch r@ min type  r@ precision - zeros  THEN
   '. emit r@ negate zeros    '. emit r@ negate zeros
Line 61  DOES> ( -- r ) Line 103  DOES> ( -- r )
 \ I'm afraid this does not really implement ansi semantics wrt precision.  \ I'm afraid this does not really implement ansi semantics wrt precision.
 \ Shouldn't precision indicate the number of places shown after the point?  \ Shouldn't precision indicate the number of places shown after the point?
   
 : fe. ( r -- )  f$ 1- s>d 3 fm/mod 3 * >r 1+ >r  : fe. ( r -- ) \ floating-ext f-e-dot
   \G Display r using engineering notation, 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@ min type '. emit  scratch r> /string type
   'E emit r> . ;    'E emit r> . ;
   
 : fs. ( r -- )  f$ 1-  : fs. ( r -- ) \ floating-ext f-s-dot
   \G Display r using scientific notation, followed by a space.
     f$ 1-
   scratch over c@ emit '. emit 1 /string type    scratch over c@ emit '. emit 1 /string type
   'E emit . ;    'E emit . ;
   
 require debugging.fs  require debugs.fs
   
 : sfnumber ( c-addr u -- r / )  : sfnumber ( c-addr u -- r true | false )
     2dup [CHAR] e scan      2dup [CHAR] e scan ( c-addr u c-addr2 u2 )
     dup 0=      dup 0=
     IF      IF
         2drop 2dup [CHAR] E scan          2drop 2dup [CHAR] E scan ( c-addr u c-addr3 u3 )
     THEN      THEN
     nip      nip
     IF      IF
         2dup >float          >float
         IF      ELSE
             2drop state @          2drop false
             IF      THEN ;
                 POSTPONE FLiteral  
             THEN  
             EXIT  
         THEN  
     THEN  
     defers notfound ;  
   
 ' sfnumber IS notfound  :noname ( c-addr u -- )
       2dup sfnumber
       IF
           2drop POSTPONE FLiteral
       ELSE
           defers compiler-notfound
       ENDIF ;
   IS compiler-notfound
   
   :noname ( c-addr u -- r )
       2dup sfnumber
       IF
           2drop
       ELSE
           defers interpreter-notfound
       ENDIF ;
   IS interpreter-notfound
   
 : fvariable ( -- )  : fvariable ( "name" -- ) \ float
     Create 0.0E0 f, ;      Create 0.0E0 f, ;
     \ does> ( -- f-addr )      \ does> ( -- f-addr )
   
 1.0e0 fasin 2.0e0 f* fconstant pi  1.0e0 fasin 2.0e0 f* fconstant pi ( -- r ) \ gforth
   \G FCONSTANT: r is the value pi; the ratio of a circle's area
 : f2*  2.0e0 f* ;  \G to its diameter.
 : f2/  0.5e0 f* ;  
 : 1/f  1.0e0 fswap f/ ;  : f2* ( r1 -- r2 ) \ gforth
       \G Multiply r1 by 2.0e0
       2.0e0 f* ;
   
   : f2/ ( r1 -- r2 ) \ gforth
       \G Multiply r1 by 0.5e0
       0.5e0 f* ;
   
   : 1/f ( r1 -- r2 ) \ gforth
       \G Divide 1.0e0 by r1
       1.0e0 fswap f/ ;
   
   
 \ We now have primitives for these, so we need not define them  \ We now have primitives for these, so we need not define them
Line 131  require debugging.fs Line 197  require debugging.fs
     THEN      THEN
     f< ;      f< ;
   
 : f.s  ." <" fdepth 0 .r ." > " fdepth 0 max maxdepth-.s @ min dup 0   : f.s ( -- ) \ gforth f-dot-s
   ?DO  dup i - 1- floats fp@ + f@ f.  LOOP  drop ;       \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 ; 

Removed from v.1.16  
changed lines
  Added in v.1.24


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>