fix stepper tests broken by lazy stepper

This commit is contained in:
Stephen Chang 2011-04-07 15:11:29 -04:00
parent 989103c3a1
commit 5238c338b6
3 changed files with 13 additions and 18 deletions

View File

@ -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

View File

@ -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)

View File

@ -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)))))