macro-debugger: fixed bug re local-expansion and macro hiding

svn: r17642

original commit: 97135f112c7ddf6b74e23544eb9b98c823ed73c3

collects/macro-debugger/model/reductions.ss

@@ -366,7 +366,8 @@
                  [#:new-local-context
                   [LocalAction ?form local]]])
               ([#:pass1]
-               [LocalAction ?form local]
+               ;; Use ?disconnected; do not modify real term
+               [LocalAction ?disconnected local]
                [#:pass2])]
         [LocalActions ?form rest])]))
 

collects/tests/macro-debugger/gentests.ss

@@ -101,7 +101,17 @@
 (define (check-steps expected actual)
   (check-pred list? actual)
   (check-pred reduction-sequence? actual)
-  (compare-step-sequences actual expected))
+  (with-check-info (['actual-sequence-raw actual]
+                    ['actual-sequence
+                     (for/list ([thing actual])
+                       (if (misstep? thing)
+                           'error
+                           (list* (protostep-type thing)
+                                  (syntax->datum (step-term2 thing))
+                                  (map syntax->datum
+                                       (map bigframe-term (state-lctx (protostep-s1 thing)))))))]
+                    ['expected-sequence expected])
+    (compare-step-sequences actual expected)))
 
 (define (reduction-sequence? rs)
   (andmap protostep? rs))