From 5238c338b6d9a4628ddbf43ea6c387e2b5500ad2 Mon Sep 17 00:00:00 2001
From: Stephen Chang <stchang216@gmail.com>
Date: Thu, 7 Apr 2011 15:11:29 -0400
Subject: [PATCH] fix stepper tests broken by lazy stepper

---
 collects/stepper/private/model.rkt         | 11 ++++-------
 collects/tests/stepper/automatic-tests.rkt |  2 --
 collects/tests/stepper/through-tests.rkt   | 18 +++++++++---------
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/collects/stepper/private/model.rkt b/collects/stepper/private/model.rkt
index a2250c2b77..7771c39787 100644
--- a/collects/stepper/private/model.rkt
+++ b/collects/stepper/private/model.rkt
@@ -316,15 +316,12 @@
                 (when DEBUG 
                   (printf "SKIPPING STEP (LHS = ellipses and RHS = last RHS)\n"))]
                ; SKIPPING step, lhs = ellipses and highlight-stack = null and last-rhs = null
-               ; if last-rhs != null, send step
+               ; if last-rhs != null, send step (lhs = ...)
                [(null? highlight-stack)
                 (if (not (null? last-rhs-exps))
-                  (begin
-                    (set! lhs-exps last-rhs-exps)
-                    (set! lhs-finished-exps rhs-finished-exps)
-                    (send-it))
-                  (when DEBUG
-                    (printf "SKIPPING STEP (LHS = ellipses and highlight-stack = null)\n")))]
+                    (send-it)
+                    (when DEBUG
+                      (printf "SKIPPING STEP (LHS = ellipses and highlight-stack = null)\n")))]
                ; if last-rhs != null, send step
                ; else if skips = 0, send step
                ; else skip
diff --git a/collects/tests/stepper/automatic-tests.rkt b/collects/tests/stepper/automatic-tests.rkt
index b2482925b6..f3b0be7f20 100644
--- a/collects/tests/stepper/automatic-tests.rkt
+++ b/collects/tests/stepper/automatic-tests.rkt
@@ -3,7 +3,6 @@
 (require "through-tests.ss" 
          "test-engine.ss")
 
-(define steve-broke '(mz1 map))
 (define lazy-tests 
   '(lazy1 lazy2 lazy3 lazy-multi lazy-app1 lazy-app2 lazy-app3 
     lazy-cons1 lazy-cons2 lazy-list1 lazy-list2 lazy-list3 lazy-list4 lazy-list5
@@ -32,7 +31,6 @@
     (if (and (run-all-tests-except 
               (append '(bad-and bad-cons check-error begin-let-bug prims qq-splice time 
                                 set! local-set! local-struct/i local-struct/ilam)
-                      steve-broke
                       lazy-tests))
              (run-tests lazy-tests))
 	(exit 0)
diff --git a/collects/tests/stepper/through-tests.rkt b/collects/tests/stepper/through-tests.rkt
index 6b5d114e22..e58c523367 100755
--- a/collects/tests/stepper/through-tests.rkt
+++ b/collects/tests/stepper/through-tests.rkt
@@ -105,7 +105,7 @@
 
  (t 'mz1 m:mz
    (for-each (lambda (x) x) '(1 2 3))
-   :: {(for-each (lambda (x) x) `(1 2 3))} -> (... {1} ...)
+   :: {(for-each (lambda (x) x) (list 1 2 3))} -> (... {1} ...)
    :: ... -> (... {2} ...)
    :: ... -> (... {3} ...)
    :: ... -> {(void)})
@@ -486,15 +486,13 @@
 
 (t1 'map
     m:mz "(map (lambda (x) x) (list 3 4 5))"
-    `((before-after ((map (lambda (x) x) (hilite (list 3 4 5))))
-                    ((map (lambda (x) x) (hilite `( 3 4 5)))))
-      (before-after ((hilite (map (lambda (x) x) `(3 4 5))))
+    `((before-after ((hilite (map (lambda (x) x) (list 3 4 5))))
                     ((... (hilite 3) ...)))
       (before-after (...)
                     ((... (hilite 4) ...)))
       (before-after (...)
                     ((... (hilite 5) ...)))
-      (before-after (...) ((hilite `(3 4 5))))))
+      (before-after (...) ((hilite (list 3 4 5))))))
 
 (t1 'quoted-list
     m:beginner-wla "'(3 4 5)"
@@ -1898,8 +1896,9 @@
         (+ {(second (cons 1 (cons ,(<delay#> 1) ,(<delay#> 2))))} (third nats))
         -> ,add1-def (define nats (cons 1 (cons ,(<delay#> 1) ,(<delay#> 2))))
         (+ {,(<delay#> 1)} (third nats))
-        :: ,add1-def (define nats (cons 1 (cons {(+ 1 1)} ,(<delay#> 2))))
-        (+ {,(<delay#> 1)} (third nats))
+;        :: ,add1-def (define nats (cons 1 (cons {(+ 1 1)} ,(<delay#> 2))))
+;        (+ {,(<delay#> 1)} (third nats))
+        :: ...
         -> ,add1-def (define nats (cons 1 (cons {(+ 1 1)} ,(<delay#> 2))))
         (+ {(+ 1 1)} (third nats))
         -> ,add1-def (define nats (cons 1 (cons {2} ,(<delay#> 2))))
@@ -1912,8 +1911,9 @@
         (+ 2 {(third (cons 1 (cons 2 ,(<delay#> 2))))})
         -> ,add1-def (define nats (cons 1 (cons 2 (cons ,(<delay#> 3) ,(<delay#> 4)))))
         (+ 2 {,(<delay#> 3)})
-        :: ,add1-def (define nats (cons 1 (cons 2 (cons {(+ 2 1)} ,(<delay#> 4)))))
-        (+ 2 {,(<delay#> 3)})
+;        :: ,add1-def (define nats (cons 1 (cons 2 (cons {(+ 2 1)} ,(<delay#> 4)))))
+;        (+ 2 {,(<delay#> 3)})
+        :: ...
         -> ,add1-def (define nats (cons 1 (cons 2 (cons {(+ 2 1)} ,(<delay#> 4)))))
         (+ 2 {(+ 2 1)})
         -> ,add1-def (define nats (cons 1 (cons 2 (cons {3} ,(<delay#> 4)))))