[Win32forth-cvs] win32forth/src Class.f,1.9,1.10 FLOAT.F,1.22,1.23

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/win32forth/win32forth/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7112/win32forth/src

Modified Files:
	Class.f FLOAT.F 
Log Message:
gah: Fixed a bug in F+!

Index: Class.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/src/Class.f,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Class.f	6 Jan 2006 10:36:14 -0000	1.9
--- Class.f	13 Jan 2006 12:05:01 -0000	1.10
***************
*** 457,466 ****
         0 value Obj-LOADLINE
  
! \ :OBJECT creates an object with a nameless class.
! \ useful for creating unique objects that are not similar to other objects,
! \ and where there will only ever be one object of this nameless class.
! \ Additional objects of classes can be created with an object as their
! \ superclass.
  : :Object       ( -<object-name>- )
                  bl word count "CLIP" obj-buf place
                  current @ to oldcurrent         \ save context for later restoral
--- 457,467 ----
         0 value Obj-LOADLINE
  
! 
  : :Object       ( -<object-name>- )
+ \ *G Create an object with a nameless class,
+ \ ** useful for creating unique objects that are not similar to other objects,
+ \ ** and where there will only ever be one object of this nameless class.
+ \ ** Additional objects or classes can be created with an object as their
+ \ ** superclass.
                  bl word count "CLIP" obj-buf place
                  current @ to oldcurrent         \ save context for later restoral
***************
*** 476,481 ****
                  then    to Obj-LOADLINE ;
  
! \ :CLASS defines a class for creating a group of similar objects
! : :Class        ( -- )
                  current @ to oldcurrent         \ save context for later restoral
                  false to ?:M
--- 477,482 ----
                  then    to Obj-LOADLINE ;
  
! : :Class        ( -<class-name>- )
! \ *G Define a class for creating a group of similar objects.
                  current @ to oldcurrent         \ save context for later restoral
                  false to ?:M
***************
*** 488,502 ****
                          (Build) ;
  
- \ Specify the superclass of the class or object being created. Used as follows;
- \
- \       :Class  <newclassname> <Super <superclassname>
- \       ;Class
- \
- \        - or -
- \
- \       :Object <newclassname> <Super <superclassname>
- \       :Object
  
! : <Super        ( -- )        \ allow inheriting from a class or an object
                  ' dup  ?isClass
                  if      >Class inherit
--- 489,503 ----
                          (Build) ;
  
  
! : <Super        ( -- )        \ W32F     Class
! \ *G allow inheriting from a class or an object
! \ *E Specify the superclass of the class or object being created. Used as follows;
! \ **       :Class  <newclassname> <Super <superclassname>
! \ **       ;Class
! \ **
! \ **        - or -
! \ **
! \ **       :Object <newobjectname> <Super <superclassname>
! \ **       :Object
                  ' dup  ?isClass
                  if      >Class inherit
***************
*** 526,535 ****
  \                 ' Clone ;
  
- \ |CLASS defines a class that creates headerless objects
- \ |Class objects must be linked in the ClassInit: method
- \ Used primarily for defining menus, where the names of objects are not needed,
- \ and where the objects are only accessed through a linked list, built using
- \ the ClassInit: method.
  : |Class        ( -- )
                  current @ to oldcurrent         \ save context for later restoral
                  false to ?:M
--- 527,536 ----
  \                 ' Clone ;
  
  : |Class        ( -- )
+ \ *G Defines a class that creates headerless objects.
+ \ ** |Class objects should be linked in the ClassInit: method
+ \ ** Used primarily for defining menus, where the names of objects are not needed,
+ \ ** and where the objects are only accessed through a linked list, built using
+ \ ** the ClassInit: method.
                  current @ to oldcurrent         \ save context for later restoral
                  false to ?:M
***************
*** 1074,1078 ****
  forth definitions
  
! : Dispose       ( addr -- )     \ dispose of an dynamically allocated object
                  ~: [ dup ] cell- Free Abort" Disposing Object failed!" ;
  
--- 1075,1080 ----
  forth definitions
  
! : Dispose       ( addr -- )
! \ *G Dispose of a dynamically allocated object.
                  ~: [ dup ] cell- Free Abort" Disposing Object failed!" ;
  

Index: FLOAT.F
===================================================================
RCS file: /cvsroot/win32forth/win32forth/src/FLOAT.F,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** FLOAT.F	3 Jan 2006 08:26:17 -0000	1.22
--- FLOAT.F	13 Jan 2006 12:05:01 -0000	1.23
***************
*** 131,135 ****
  
  
! \ FXAM results:
  \ Class                C3 C2 C0
  \ Unsupported          0  0  0
--- 131,135 ----
  
  
! \ FEXAM results:
  \ Class                C3 C2 C0
  \ Unsupported          0  0  0
***************
*** 347,352 ****
                  fld     FSIZE DATASTACK_MEMORY
                  faddp   st(1), st
!                 FPU>
! 
                  pop     tos
                  float;
--- 347,351 ----
                  fld     FSIZE DATASTACK_MEMORY
                  faddp   st(1), st
!                 fstp    fsize datastack_memory
                  pop     tos
                  float;
***************
*** 538,542 ****
  \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
  
! code fpi        ( fs: -- r )
                  fldpi
                  FPU>
--- 537,542 ----
  \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
  
! code fpi        ( fs: -- r )      \ W32F           Float extra
! \ *G Push the value 3.141596... on to the FP stack
                  fldpi
                  FPU>
***************
*** 1339,1356 ****
  : SFALIGNED     ( addr -- addr ) ; immediate
  
! : FLOAT+        ( addr1 -- addr2 )
!                 B/FLOAT + ;
  
  : FLOATS        ( n1 -- n2 )
                  B/FLOAT * ;
  
! : DFLOAT+       ( addr1 -- addr2 )
!                 8 + ;
  
  : DFLOATS       ( n1 -- n2 )
                  8 * ;
  
! : SFLOAT+       ( addr1 -- addr2 )
!                 4 + ;
  
  : SFLOATS       ( n1 -- n2 )
--- 1339,1353 ----
  : SFALIGNED     ( addr -- addr ) ; immediate
  
! b/float offset FLOAT+        ( addr1 -- addr2 )
  
  : FLOATS        ( n1 -- n2 )
                  B/FLOAT * ;
  
! 8 offset DFLOAT+       ( addr1 -- addr2 )
  
  : DFLOATS       ( n1 -- n2 )
                  8 * ;
  
! 4 offset SFLOAT+       ( addr1 -- addr2 )
  
  : SFLOATS       ( n1 -- n2 )