--- gforth/test/ttester.fs	2007/08/28 19:26:11	1.5
+++ gforth/test/ttester.fs	2008/11/08 18:28:22	1.12
@@ -174,13 +174,13 @@ HAS-FLOATING-STACK [IF]
     : F-> ( ... -- ... )
         FDEPTH DUP ACTUAL-FDEPTH !
         START-FDEPTH @ > IF
-            FDEPTH START-FDEPTH @ DO ACTUAL-FRESULTS I FLOATS + F! LOOP
+            FDEPTH START-FDEPTH @ - 0 DO ACTUAL-FRESULTS I FLOATS + F! LOOP
         THEN ;
 
     : F} ( ... -- ... )
         FDEPTH ACTUAL-FDEPTH @ = IF
             FDEPTH START-FDEPTH @ > IF
-                FDEPTH START-FDEPTH @ DO
+                FDEPTH START-FDEPTH @ - 0 DO
                     ACTUAL-FRESULTS I FLOATS + F@ FCONF= INVERT IF
                         S" INCORRECT FP RESULT: " ERROR LEAVE
                     THEN
@@ -191,20 +191,19 @@ HAS-FLOATING-STACK [IF]
         THEN ;
 
     : F...}T ( -- )
-        FDEPTH START-FDEPTH @ = 0= IF
-            S" WRONG NUMBER OF FP RESULTS" ERROR
-        THEN
-        FCURSOR @ ACTUAL-FDEPTH @ <> IF
-            S" WRONG NUMBER OF FP RESULTS" ERROR
-        THEN ;
+        FCURSOR @ START-FDEPTH @ + ACTUAL-FDEPTH @ <> IF
+            S" NUMBER OF FLOAT RESULTS BEFORE '->' DOES NOT MATCH ...}T SPECIFICATION: " ERROR
+        ELSE FDEPTH START-FDEPTH @ = 0= IF
+            S" NUMBER OF FLOAT RESULTS BEFORE AND AFTER '->' DOES NOT MATCH: " ERROR
+        THEN THEN ;
+
     
     : FTESTER ( R -- )
-        FDEPTH 0= ACTUAL-FDEPTH @ FCURSOR @ 1+ < OR IF
-            S" WRONG NUMBER OF FP RESULTS: " ERROR EXIT
-        THEN
-        ACTUAL-FRESULTS FCURSOR @ FLOATS + F@ FCONF= 0= IF
+        FDEPTH 0= ACTUAL-FDEPTH @ FCURSOR @ START-FDEPTH @ + 1+ < OR IF
+            S" NUMBER OF FLOAT RESULTS AFTER '->' BELOW ...}T SPECIFICATION: " ERROR 
+        ELSE ACTUAL-FRESULTS FCURSOR @ FLOATS + F@ FCONF= 0= IF
             S" INCORRECT FP RESULT: " ERROR
-        THEN
+        THEN THEN
         1 FCURSOR +! ;
         
 [ELSE]
@@ -214,22 +213,23 @@ HAS-FLOATING-STACK [IF]
     : F} ;
     : F...}T ;
 
+    HAS-FLOATING [IF]
     DECIMAL
     : COMPUTE-CELLS-PER-FP ( -- U )
         DEPTH 0E DEPTH 1- >R FDROP R> SWAP - ;
     HEX
 
     COMPUTE-CELLS-PER-FP CONSTANT CELLS-PER-FP
-    
+
     : FTESTER ( R -- )
-        DEPTH CELLS-PER-FP < ACTUAL-DEPTH @ XCURSOR @ CELLS-PER-FP + < OR IF
-            S" WRONG NUMBER OF RESULTS: " ERROR EXIT
-        THEN
-        ACTUAL-RESULTS XCURSOR @ CELLS + F@ FCONF= 0= IF
+        DEPTH CELLS-PER-FP < ACTUAL-DEPTH @ XCURSOR @ START-DEPTH @ + CELLS-PER-FP + < OR IF
+            S" NUMBER OF RESULTS AFTER '->' BELOW ...}T SPECIFICATION: " ERROR EXIT
+        ELSE ACTUAL-RESULTS XCURSOR @ CELLS + F@ FCONF= 0= IF
             S" INCORRECT FP RESULT: " ERROR
-        THEN
+        THEN THEN
         CELLS-PER-FP XCURSOR +! ;
- [THEN]    
+    [THEN]
+[THEN]    
 
 : EMPTY-STACK	\ ( ... -- ) EMPTY STACK: HANDLES UNDERFLOWED STACK TOO.
     DEPTH START-DEPTH @ < IF
@@ -254,7 +254,7 @@ HAS-FLOATING-STACK [IF]
 : ->		\ ( ... -- ) RECORD DEPTH AND CONTENT OF STACK.
    DEPTH DUP ACTUAL-DEPTH !		\ RECORD DEPTH
    START-DEPTH @ > IF		\ IF THERE IS SOMETHING ON STACK
-       DEPTH START-DEPTH @ DO ACTUAL-RESULTS I CELLS + ! LOOP \ SAVE THEM
+       DEPTH START-DEPTH @ - 0 DO ACTUAL-RESULTS I CELLS + ! LOOP \ SAVE THEM
    THEN
    F-> ;
 
@@ -262,7 +262,7 @@ HAS-FLOATING-STACK [IF]
 		\ (ACTUAL) CONTENTS.
    DEPTH ACTUAL-DEPTH @ = IF		\ IF DEPTHS MATCH
       DEPTH START-DEPTH @ > IF		\ IF THERE IS SOMETHING ON THE STACK
-         DEPTH START-DEPTH @ DO		\ FOR EACH STACK ITEM
+         DEPTH START-DEPTH @ - 0 DO	\ FOR EACH STACK ITEM
 	    ACTUAL-RESULTS I CELLS + @	\ COMPARE ACTUAL WITH EXPECTED
 	    <> IF S" INCORRECT RESULT: " ERROR LEAVE THEN
 	 LOOP
@@ -273,30 +273,31 @@ HAS-FLOATING-STACK [IF]
    F} ;
 
 : ...}T ( -- )
-    DEPTH START-DEPTH @ = 0= IF
-        S" WRONG NUMBER OF RESULTS" ERROR
-    THEN
-    XCURSOR @ ACTUAL-DEPTH @ <> IF
-        S" WRONG NUMBER OF RESULTS" ERROR
-    THEN
+    XCURSOR @ START-DEPTH @ + ACTUAL-DEPTH @ <> IF
+        S" NUMBER OF CELL RESULTS BEFORE '->' DOES NOT MATCH ...}T SPECIFICATION: " ERROR
+    ELSE DEPTH START-DEPTH @ = 0= IF
+        S" NUMBER OF CELL RESULTS BEFORE AND AFTER '->' DOES NOT MATCH: " ERROR
+    THEN THEN
     F...}T ;
 
 : XTESTER ( X -- )
-    DEPTH 0= ACTUAL-DEPTH @ XCURSOR @ 1+ < OR IF
-        S" WRONG NUMBER OF RESULTS: " ERROR EXIT
-    THEN
-    ACTUAL-RESULTS XCURSOR @ CELLS + @ <> IF
+    DEPTH 0= ACTUAL-DEPTH @ XCURSOR @ START-DEPTH @ + 1+ < OR IF
+        S" NUMBER OF CELL RESULTS AFTER '->' BELOW ...}T SPECIFICATION: " ERROR EXIT
+    ELSE ACTUAL-RESULTS XCURSOR @ CELLS + @ <> IF
         S" INCORRECT CELL RESULT: " ERROR
-    THEN
+    THEN THEN
     1 XCURSOR +! ;
 
 : X}T XTESTER ...}T ;
-: R}T FTESTER ...}T ;
 : XX}T XTESTER XTESTER ...}T ;
+: XXX}T XTESTER XTESTER XTESTER ...}T ;
+: XXXX}T XTESTER XTESTER XTESTER XTESTER ...}T ;
+
+HAS-FLOATING [IF]
+: R}T FTESTER ...}T ;
 : XR}T FTESTER XTESTER ...}T ;
 : RX}T XTESTER FTESTER ...}T ;
 : RR}T FTESTER FTESTER ...}T ;
-: XXX}T XTESTER XTESTER XTESTER ...}T ;
 : XXR}T FTESTER XTESTER XTESTER ...}T ;
 : XRX}T XTESTER FTESTER XTESTER ...}T ;
 : XRR}T FTESTER FTESTER XTESTER ...}T ;
@@ -304,7 +305,6 @@ HAS-FLOATING-STACK [IF]
 : RXR}T FTESTER XTESTER FTESTER ...}T ;
 : RRX}T XTESTER FTESTER FTESTER ...}T ;
 : RRR}T FTESTER FTESTER FTESTER ...}T ;
-: XXXX}T XTESTER XTESTER XTESTER XTESTER ...}T ;
 : XXXR}T FTESTER XTESTER XTESTER XTESTER ...}T ;
 : XXRX}T XTESTER FTESTER XTESTER XTESTER ...}T ;
 : XXRR}T FTESTER FTESTER XTESTER XTESTER ...}T ;
@@ -320,6 +320,7 @@ HAS-FLOATING-STACK [IF]
 : RRXR}T FTESTER XTESTER FTESTER FTESTER ...}T ;
 : RRRX}T XTESTER FTESTER FTESTER FTESTER ...}T ;
 : RRRR}T FTESTER FTESTER FTESTER FTESTER ...}T ;
+[THEN]
 
 : TESTING	\ ( -- ) TALKING COMMENT.
    SOURCE VERBOSE @
@@ -327,4 +328,4 @@ HAS-FLOATING-STACK [IF]
    ELSE >IN ! DROP
    THEN ;
 
-BASE !
\ No newline at end of file
+BASE !