From d8517af8986bad4bbd02055472f0caae14724855 Mon Sep 17 00:00:00 2001 From: Stephen Chang Date: Fri, 8 Apr 2011 18:41:13 -0400 Subject: [PATCH] fix stepper rendering of non constructor-style lists in stepper/private/reconstruct.rkt - in recon-value, list case, add quasiquote rendering when constructor-style printing = #f --- collects/stepper/private/model-settings.rkt | 2 +- collects/stepper/private/reconstruct.rkt | 4 +++- collects/tests/stepper/through-tests.rkt | 8 +++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/collects/stepper/private/model-settings.rkt b/collects/stepper/private/model-settings.rkt index b991d10769..32d2bfba62 100644 --- a/collects/stepper/private/model-settings.rkt +++ b/collects/stepper/private/model-settings.rkt @@ -98,7 +98,7 @@ (define fake-lazy-render-settings (make-render-settings (booleans-as-true/false) ; true-false-printed? - (constructor-style-printing) ; constructor-style-printing? + #t ; constructor-style-printing? (abbreviate-cons-as-list) ; abbreviate-cons-as-list? (make-fake-render-to-sexp #t #t #t) ; render-to-sexp #t ; lifting? diff --git a/collects/stepper/private/reconstruct.rkt b/collects/stepper/private/reconstruct.rkt index 19d143c6c2..6e6417f209 100644 --- a/collects/stepper/private/reconstruct.rkt +++ b/collects/stepper/private/reconstruct.rkt @@ -173,7 +173,9 @@ (with-syntax ([(reconed-vals ...) (map (lx (recon-value _ render-settings assigned-name current-so-far)) val)]) - #'(#%plain-app list reconed-vals ...))] + (if (render-settings-constructor-style-printing? render-settings) + #'(#%plain-app list reconed-vals ...) + #'`(reconed-vals ...)))] [(pair? val) (with-syntax ([reconed-car diff --git a/collects/tests/stepper/through-tests.rkt b/collects/tests/stepper/through-tests.rkt index 7c38526de9..c449764c02 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) (list 1 2 3))} -> (... {1} ...) + :: {(for-each (lambda (x) x) `(1 2 3))} -> (... {1} ...) :: ... -> (... {2} ...) :: ... -> (... {3} ...) :: ... -> {(void)}) @@ -486,13 +486,15 @@ (t1 'map m:mz "(map (lambda (x) x) (list 3 4 5))" - `((before-after ((hilite (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)))) ((... (hilite 3) ...))) (before-after (...) ((... (hilite 4) ...))) (before-after (...) ((... (hilite 5) ...))) - (before-after (...) ((hilite (list 3 4 5)))))) + (before-after (...) ((hilite `(3 4 5)))))) (t1 'quoted-list m:beginner-wla "'(3 4 5)"