--- gforth/float.fs	1995/10/07 17:38:12	1.16
+++ gforth/float.fs	1997/07/06 16:00:11	1.22
@@ -1,37 +1,66 @@
 \ High level floating point                            14jan94py
 
-1 cells 4 = [IF]
-' cells   Alias sfloats
-' cell+   Alias sfloat+
-' align   Alias sfalign
-' 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]
+\ Copyright (C) 1995 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
+\ of the License, or (at your option) any later version.
+
+\ This program is distributed in the hope that it will be useful,
+\ but WITHOUT ANY WARRANTY; without even the implied warranty of
+\ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+\ 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+\ 1 cells 4 = [IF]
+\ ' cells   Alias sfloats
+\ ' cell+   Alias sfloat+
+\ ' align   Alias sfalign
+\ ' 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! ;
 
-: fconstant  ( r -- ) \ float
+: fconstant  ( r "name" -- ) \ float
     Create f,
 DOES> ( -- r )
     f@ ;
 
-: fdepth  ( -- n )  f0 @ fp@ - [ 1 floats ] Literal / ;
+: fdepth  ( -- n )  fp0 @ fp@ - [ 1 floats ] Literal / ;
 
 : FLit ( -- r )  r> dup f@ float+ >r ;
 : FLiteral ( r -- )
@@ -69,30 +98,40 @@ DOES> ( -- r )
   scratch over c@ emit '. emit 1 /string type
   'E emit . ;
 
-require debugging.fs
+require debugs.fs
 
-: sfnumber ( c-addr u -- r / )
-    2dup [CHAR] e scan
+: 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
+	2drop 2dup [CHAR] E scan ( c-addr u c-addr3 u3 )
     THEN
     nip
     IF
-	2dup >float
-	IF
-	    2drop state @
-	    IF
-		POSTPONE FLiteral
-	    THEN
-	    EXIT
-	THEN
-    THEN
-    defers notfound ;
+	>float
+    ELSE
+	2drop false
+    THEN ;
+
+:noname ( c-addr u -- )
+    2dup sfnumber
+    IF
+	2drop POSTPONE FLiteral
+    ELSE
+	defers compiler-notfound
+    ENDIF ;
+IS compiler-notfound
 
-' sfnumber IS 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, ;
     \ does> ( -- f-addr )