From f616cdbf542f01a4fee8837373759fb4da0dcbe3 Mon Sep 17 00:00:00 2001 From: Ryan Culpepper Date: Wed, 27 Jan 2010 17:31:22 +0000 Subject: [PATCH] macro-debugger: fixed breakage of stepper-text, expand-only Please propagate to release branch if possible. svn: r17852 original commit: 0cea5eb3901d49688d5193e6e508e1ea7e6fa832 --- collects/macro-debugger/expand.ss | 2 +- collects/macro-debugger/stepper-text.ss | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/collects/macro-debugger/expand.ss b/collects/macro-debugger/expand.ss index 29f6d77..48d4c22 100644 --- a/collects/macro-debugger/expand.ss +++ b/collects/macro-debugger/expand.ss @@ -25,7 +25,7 @@ (define (expand/show-predicate stx show?) (let-values ([(result deriv) (trace/result stx)]) (when (exn? result) (raise result)) - (let-values ([(_steps _uses stx exn2) + (let-values ([(_steps _defs _uses stx exn2) (parameterize ((macro-policy show?)) (reductions+ deriv))]) (when (exn? exn2) (raise exn2)) diff --git a/collects/macro-debugger/stepper-text.ss b/collects/macro-debugger/stepper-text.ss index 3df8213..327b52a 100644 --- a/collects/macro-debugger/stepper-text.ss +++ b/collects/macro-debugger/stepper-text.ss @@ -93,13 +93,6 @@ ((if display-like? display write) (syntax-dummy-val obj) port)] [else (error 'pretty-print-hook "unexpected special value: ~e" obj)])) - (define (pp-extend-style-table) - (let* ([ids identifier-list] - [syms (map (lambda (x) (hash-ref stx=>flat x)) ids)] - [like-syms (map syntax-e ids)]) - (pretty-print-extend-style-table (pp-better-style-table) - syms - like-syms))) (define (pp-better-style-table) (pretty-print-extend-style-table (pretty-print-current-style-table) (map car extended-style-list) @@ -107,7 +100,7 @@ (parameterize ([pretty-print-size-hook pp-size-hook] [pretty-print-print-hook pp-print-hook] - [pretty-print-current-style-table (pp-extend-style-table)]) + [pretty-print-current-style-table (pp-better-style-table)]) (pretty-print/defaults datum))) (define (->show-function show)