From d50b3ebc0697fb778b98118eafd96d474cf791e6 Mon Sep 17 00:00:00 2001 From: Ryan Culpepper Date: Tue, 14 Nov 2006 07:50:21 +0000 Subject: [PATCH] Updates to macro stepper: Handle errors in BindSyntax Fixed lift-deriv hiding typo Removed same-marks from partitions When stepper autodisables hiding, update panel Refactored stepper update function Fixed internal error handling svn: r4851 original commit: 97d27f5e08c358ab8b905d8bf959a124f476f643 --- collects/macro-debugger/model/deriv-parser.ss | 3 ++- collects/macro-debugger/model/reductions.ss | 5 ++++- collects/macro-debugger/syntax-browser/partition.ss | 1 - collects/macro-debugger/view/hiding-panel.ss | 1 + 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/collects/macro-debugger/model/deriv-parser.ss b/collects/macro-debugger/model/deriv-parser.ss index 15efd88..4cf815a 100644 --- a/collects/macro-debugger/model/deriv-parser.ss +++ b/collects/macro-debugger/model/deriv-parser.ss @@ -466,11 +466,12 @@ ;; BindSyntaxes Answer = Derivation (BindSyntaxes - [(phase-up (? EE/LetLifts) Eval) $2]) + [(phase-up (? EE/LetLifts) ! Eval) $2]) ;; NextBindSyntaxess Answer = (list-of Derivation) (NextBindSyntaxess (#:skipped null) + (#:no-wrap) [() null] [(next (? BindSyntaxes 'first) (? NextBindSyntaxess 'rest)) (cons $2 $3)]) diff --git a/collects/macro-debugger/model/reductions.ss b/collects/macro-debugger/model/reductions.ss index 70c19a9..69e51a3 100644 --- a/collects/macro-debugger/model/reductions.ss +++ b/collects/macro-debugger/model/reductions.ss @@ -6,6 +6,7 @@ "context.ss" "deriv.ss" "reductions-engine.ss") + (provide reductions) ;; Setup for reduction-engines @@ -266,7 +267,9 @@ ;; Skipped - [#f null])) + [#f null] + + #;[else (error 'reductions "unmatched case: ~s" d)])) ;; reductions-transformation : Transformation -> ReductionSequence (define (reductions-transformation tx) diff --git a/collects/macro-debugger/syntax-browser/partition.ss b/collects/macro-debugger/syntax-browser/partition.ss index 2704181..8a25624 100644 --- a/collects/macro-debugger/syntax-browser/partition.ss +++ b/collects/macro-debugger/syntax-browser/partition.ss @@ -150,7 +150,6 @@ (make-parameter `(("" . #f) ("bound-identifier=?" . ,bound-identifier=?) - ("same marks" . ,id:same-marks?) ("module-identifier=?" . ,module-identifier=?) ("module-or-top-identifier=?" . ,module-or-top-identifier=?) ("symbolic-identifier=?" . ,symbolic-identifier=?) diff --git a/collects/macro-debugger/view/hiding-panel.ss b/collects/macro-debugger/view/hiding-panel.ss index b8c25c7..1d22e75 100644 --- a/collects/macro-debugger/view/hiding-panel.ss +++ b/collects/macro-debugger/view/hiding-panel.ss @@ -100,6 +100,7 @@ ;; enable-hiding : boolean -> void ;; Called only by stepper, which does it's own refresh (define/public (enable-hiding ok?) + (send enable-ctl set-value ok?) (set! enabled? ok?)) ;; get-enabled?