www

commit e08317f6c820fcbec49f81f169ba5ab25e85f622
parent 5fee1897e591f68cb1cce1231299c819c5f2dd1d
Author: Ryan Culpepper <ryanc@racket-lang.org>
Date:   Wed,  3 Dec 2008 05:27:54 +0000

macro stepper: fixed disappearing term bug

svn: r12684

original commit: 8cad79c2bf87dddba74eb850f7a3d3a228528736

Diffstat:
M
collects/macro-debugger/model/deriv-parser.ss
 | 
4
++--
M
collects/macro-debugger/view/stepper.ss
 | 
6
++----
M
collects/macro-debugger/view/term-record.ss
 | 
7
+++++--

3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/collects/macro-debugger/model/deriv-parser.ss b/collects/macro-debugger/model/deriv-parser.ss
@@ -300,8 +300,8 @@
     (ModuleProvide/Inner
      [() #f]
      [(!!) $1]
-     [(EE/Interrupted) $1]
-     [(EE (? ModuleProvide/Inner)) $2])
+     [((? EE) (? ModuleProvide/Inner))
+      $2])
 
     ;; Definitions
     (PrimDefineSyntaxes
diff --git a/collects/macro-debugger/view/stepper.ss b/collects/macro-debugger/view/stepper.ss
@@ -136,9 +136,6 @@
            (stepper this)
            (config config)))
 
-    #;
-    (send config listen-show-syntax-properties?
-          (lambda (show?) (send sbview show-props show?)))
     (send config listen-show-hiding-panel?
           (lambda (show?) (show-macro-hiding-panel show?)))
     (send sbc listen-selected-syntax
@@ -378,6 +375,7 @@
         (send (focused-term) on-get-focus))
       (update))
 
+#|
     ;; delayed-recache-errors : (list-of (cons exn string))
     (define delayed-recache-errors null)
 
@@ -407,6 +405,7 @@
                        "")))
                  (set! delayed-recache-errors null)))))
           (raise exn)))
+|#
 
     (define/private (foci x) (if (list? x) x (list x)))
 
@@ -422,7 +421,6 @@
     ;; Initialization
 
     (super-new)
-    #;(send sbview show-props (send config get-show-syntax-properties?))
     (show-macro-hiding-panel (send config get-show-hiding-panel?))
     (show-extra-navigation (send config get-extra-navigation?))
     (refresh/move)
diff --git a/collects/macro-debugger/view/term-record.ss b/collects/macro-debugger/view/term-record.ss
@@ -275,13 +275,16 @@
 
     ;; display-final-term : -> void
     (define/public (display-final-term)
-      (recache-synth!)
+      (recache-steps!)
       (cond [(syntax? raw-steps-estx)
              (add-syntax raw-steps-estx binders definites)]
             [(exn? error)
              (add-error error)]
             [raw-steps-oops
-             (add-internal-error "steps" raw-steps-oops #f)]))
+             (add-internal-error "steps" raw-steps-oops #f)]
+            [else
+             (error 'term-record::display-final-term
+                    "internal error")]))
 
     ;; display-step : -> void
     (define/public (display-step)