From 259cd8ae6406c0c3e1085f3dded5ab20340b0494 Mon Sep 17 00:00:00 2001 From: Ryan Culpepper Date: Sun, 15 Nov 2009 11:23:40 +0000 Subject: [PATCH] unstable: added class-iop, gui/prefs (needs doc), gui/notify (needs doc) macro-debugger: changed imports for above, deleted dead code svn: r16781 original commit: 2051f3ab2a2cfe9768ed9987c7cd9d00abb0aa8e --- collects/macro-debugger/model/context.ss | 25 +------------------ .../syntax-browser/controller.ss | 7 +++--- .../macro-debugger/syntax-browser/display.ss | 4 ++- .../macro-debugger/syntax-browser/frame.ss | 6 ++++- .../syntax-browser/interfaces.ss | 2 +- .../macro-debugger/syntax-browser/keymap.ss | 2 +- .../macro-debugger/syntax-browser/prefs.ss | 4 +-- .../syntax-browser/pretty-helper.ss | 4 +-- .../syntax-browser/properties.ss | 4 +-- .../syntax-browser/syntax-snip.ss | 6 ++--- .../macro-debugger/syntax-browser/text.ss | 2 +- .../macro-debugger/syntax-browser/widget.ss | 4 +-- collects/macro-debugger/view/debug.ss | 4 +-- collects/macro-debugger/view/extensions.ss | 8 +++--- collects/macro-debugger/view/frame.ss | 7 +++--- collects/macro-debugger/view/hiding-panel.ss | 7 +++--- collects/macro-debugger/view/interfaces.ss | 3 +-- collects/macro-debugger/view/prefs.ss | 4 +-- collects/macro-debugger/view/step-display.ss | 8 +++--- collects/macro-debugger/view/stepper.ss | 9 ++++--- collects/macro-debugger/view/term-record.ss | 7 ++++-- collects/macro-debugger/view/view.ss | 4 +-- collects/unstable/scribblings/find.scrbl | 2 +- 23 files changed, 64 insertions(+), 69 deletions(-) diff --git a/collects/macro-debugger/model/context.ss b/collects/macro-debugger/model/context.ss index 7ed83c0..c385aff 100644 --- a/collects/macro-debugger/model/context.ss +++ b/collects/macro-debugger/model/context.ss @@ -6,8 +6,7 @@ path-get pathseg-get path-replace - pathseg-replace - find-subterm-paths) + pathseg-replace) ;; A Path is a (list-of PathSeg) ;; where the PathSegs are listed outermost to innermost @@ -117,25 +116,3 @@ (define (sd x) (syntax->datum (datum->syntax #f x))) - -;;======= - -;; find-subterm-paths : syntax syntax -> (list-of Path) -(define (find-subterm-paths subterm term) - (let outer-loop ([term term]) - (cond [(eq? subterm term) - (list null)] - [(stx-pair? term) - ;; Optimized for lists... - (let loop ([term term] [n 0]) - (if (stx-pair? term) - (let* ([seg0 (make-ref n)]) - (append (map (lambda (p) (cons seg0 p)) (outer-loop (stx-car term))) - (if (eq? subterm (stx-cdr term)) - (list (list (make-tail n))) - (loop (stx-cdr term) (add1 n))))) - (let ([seg0 (make-tail n)]) - (map (lambda (p) (cons seg0 p)) - (outer-loop term)))))] - ;; FIXME: more structured cases here: box, vector, ... - [else null]))) diff --git a/collects/macro-debugger/syntax-browser/controller.ss b/collects/macro-debugger/syntax-browser/controller.ss index 030c938..e1a1da8 100644 --- a/collects/macro-debugger/syntax-browser/controller.ss +++ b/collects/macro-debugger/syntax-browser/controller.ss @@ -1,10 +1,11 @@ - #lang scheme/base (require scheme/class - macro-debugger/util/class-iop + (rename-in unstable/class-iop + [send/i send:] + [init-field/i init-field:]) "interfaces.ss" "partition.ss" - "../util/notify.ss") + unstable/gui/notify) (provide controller%) ;; displays-manager-mixin diff --git a/collects/macro-debugger/syntax-browser/display.ss b/collects/macro-debugger/syntax-browser/display.ss index 9fe40f8..2de3c18 100644 --- a/collects/macro-debugger/syntax-browser/display.ss +++ b/collects/macro-debugger/syntax-browser/display.ss @@ -2,7 +2,9 @@ (require scheme/class scheme/gui scheme/list - macro-debugger/util/class-iop + (rename-in unstable/class-iop + [send/i send:] + [init-field/i init-field:]) (only-in mzlib/etc begin-with-definitions) "pretty-printer.ss" "interfaces.ss" diff --git a/collects/macro-debugger/syntax-browser/frame.ss b/collects/macro-debugger/syntax-browser/frame.ss index 9f41e05..7b4a3ff 100644 --- a/collects/macro-debugger/syntax-browser/frame.ss +++ b/collects/macro-debugger/syntax-browser/frame.ss @@ -1,6 +1,10 @@ #lang scheme/base (require scheme/class - macro-debugger/util/class-iop + (rename-in unstable/class-iop + [define/i define:] + [send/i send:] + [send*/i send*:] + [init-field/i init-field:]) scheme/gui framework/framework scheme/list diff --git a/collects/macro-debugger/syntax-browser/interfaces.ss b/collects/macro-debugger/syntax-browser/interfaces.ss index 4f71cb5..5b72ce7 100644 --- a/collects/macro-debugger/syntax-browser/interfaces.ss +++ b/collects/macro-debugger/syntax-browser/interfaces.ss @@ -1,6 +1,6 @@ #lang scheme/base (require scheme/class - macro-debugger/util/class-iop + unstable/class-iop (for-syntax scheme/base)) (provide (all-defined-out)) diff --git a/collects/macro-debugger/syntax-browser/keymap.ss b/collects/macro-debugger/syntax-browser/keymap.ss index 7bc7c8f..10dad67 100644 --- a/collects/macro-debugger/syntax-browser/keymap.ss +++ b/collects/macro-debugger/syntax-browser/keymap.ss @@ -1,7 +1,7 @@ #lang scheme/base (require scheme/class scheme/gui - "../util/notify.ss" + unstable/gui/notify "interfaces.ss" "partition.ss") (provide smart-keymap% diff --git a/collects/macro-debugger/syntax-browser/prefs.ss b/collects/macro-debugger/syntax-browser/prefs.ss index fe86c83..ca3d772 100644 --- a/collects/macro-debugger/syntax-browser/prefs.ss +++ b/collects/macro-debugger/syntax-browser/prefs.ss @@ -3,8 +3,8 @@ (require scheme/class framework/framework "interfaces.ss" - "../util/notify.ss" - "../util/misc.ss") + unstable/gui/notify + unstable/gui/prefs) (provide prefs-base% syntax-prefs-base% syntax-prefs% diff --git a/collects/macro-debugger/syntax-browser/pretty-helper.ss b/collects/macro-debugger/syntax-browser/pretty-helper.ss index cf5e265..73b2246 100644 --- a/collects/macro-debugger/syntax-browser/pretty-helper.ss +++ b/collects/macro-debugger/syntax-browser/pretty-helper.ss @@ -1,8 +1,8 @@ - #lang scheme/base (require scheme/class scheme/pretty - macro-debugger/util/class-iop + (rename-in unstable/class-iop + [send/i send:]) syntax/stx unstable/struct "interfaces.ss") diff --git a/collects/macro-debugger/syntax-browser/properties.ss b/collects/macro-debugger/syntax-browser/properties.ss index 63176ba..f6a1a9d 100644 --- a/collects/macro-debugger/syntax-browser/properties.ss +++ b/collects/macro-debugger/syntax-browser/properties.ss @@ -1,8 +1,8 @@ - #lang scheme/base (require scheme/class scheme/gui - macro-debugger/util/class-iop + (rename-in unstable/class-iop + [send/i send:]) "interfaces.ss" "util.ss" "../util/mpi.ss") diff --git a/collects/macro-debugger/syntax-browser/syntax-snip.ss b/collects/macro-debugger/syntax-browser/syntax-snip.ss index d002b16..7aeba51 100644 --- a/collects/macro-debugger/syntax-browser/syntax-snip.ss +++ b/collects/macro-debugger/syntax-browser/syntax-snip.ss @@ -1,13 +1,13 @@ - #lang scheme/base (require scheme/class - macro-debugger/util/class-iop + (rename-in unstable/class-iop + [send/i send:]) scheme/match scheme/list mzlib/string mred framework - "../util/notify.ss" + unstable/gui/notify "interfaces.ss" "display.ss" "controller.ss" diff --git a/collects/macro-debugger/syntax-browser/text.ss b/collects/macro-debugger/syntax-browser/text.ss index b6f30f1..72193dc 100644 --- a/collects/macro-debugger/syntax-browser/text.ss +++ b/collects/macro-debugger/syntax-browser/text.ss @@ -5,7 +5,7 @@ scheme/gui drscheme/arrow framework/framework - "../util/notify.ss") + unstable/gui/notify) (provide text:hover<%> text:hover-identifier<%> diff --git a/collects/macro-debugger/syntax-browser/widget.ss b/collects/macro-debugger/syntax-browser/widget.ss index f32e001..7685f8f 100644 --- a/collects/macro-debugger/syntax-browser/widget.ss +++ b/collects/macro-debugger/syntax-browser/widget.ss @@ -1,4 +1,3 @@ - #lang scheme/base (require scheme/class mred @@ -6,7 +5,8 @@ scheme/list scheme/match syntax/id-table - macro-debugger/util/class-iop + (rename-in unstable/class-iop + [send/i send:]) "interfaces.ss" "controller.ss" "display.ss" diff --git a/collects/macro-debugger/view/debug.ss b/collects/macro-debugger/view/debug.ss index 1b12f0f..dff2ec1 100644 --- a/collects/macro-debugger/view/debug.ss +++ b/collects/macro-debugger/view/debug.ss @@ -1,8 +1,8 @@ - #lang scheme/base (require scheme/pretty scheme/class - macro-debugger/util/class-iop + (rename-in unstable/class-iop + [send/i send:]) "interfaces.ss" "debug-format.ss" "prefs.ss" diff --git a/collects/macro-debugger/view/extensions.ss b/collects/macro-debugger/view/extensions.ss index 64a8779..1894f80 100644 --- a/collects/macro-debugger/view/extensions.ss +++ b/collects/macro-debugger/view/extensions.ss @@ -1,7 +1,9 @@ - #lang scheme/base (require scheme/class - macro-debugger/util/class-iop + (rename-in unstable/class-iop + [send/i send:] + [send*/i send*:] + [init-field/i init-field:]) scheme/unit scheme/list scheme/match @@ -20,7 +22,7 @@ "../model/trace.ss" "../model/steps.ss" "cursor.ss" - "../util/notify.ss") + unstable/gui/notify) (provide stepper-keymap% stepper-syntax-widget%) diff --git a/collects/macro-debugger/view/frame.ss b/collects/macro-debugger/view/frame.ss index 9c5eb54..301bcf4 100644 --- a/collects/macro-debugger/view/frame.ss +++ b/collects/macro-debugger/view/frame.ss @@ -1,7 +1,8 @@ - #lang scheme/base (require scheme/class - macro-debugger/util/class-iop + (rename-in unstable/class-iop + [define/i define:] + [send/i send:]) scheme/unit scheme/list scheme/file @@ -21,7 +22,7 @@ "../model/trace.ss" "../model/steps.ss" "cursor.ss" - "../util/notify.ss") + unstable/gui/notify) (provide macro-stepper-frame-mixin) (define (macro-stepper-frame-mixin base-frame%) diff --git a/collects/macro-debugger/view/hiding-panel.ss b/collects/macro-debugger/view/hiding-panel.ss index be6b248..6522fcd 100644 --- a/collects/macro-debugger/view/hiding-panel.ss +++ b/collects/macro-debugger/view/hiding-panel.ss @@ -1,14 +1,15 @@ - #lang scheme/base (require scheme/class - macro-debugger/util/class-iop + (rename-in unstable/class-iop + [send/i send:] + [init-field/i init-field:]) scheme/gui scheme/list syntax/boundmap "interfaces.ss" "../model/hiding-policies.ss" "../util/mpi.ss" - "../util/notify.ss") + unstable/gui/notify) (provide macro-hiding-prefs-widget%) (define mode:disable "Disable") diff --git a/collects/macro-debugger/view/interfaces.ss b/collects/macro-debugger/view/interfaces.ss index 4c7ddae..747c930 100644 --- a/collects/macro-debugger/view/interfaces.ss +++ b/collects/macro-debugger/view/interfaces.ss @@ -1,6 +1,5 @@ - #lang scheme/base -(require macro-debugger/util/class-iop +(require unstable/class-iop (prefix-in sb: "../syntax-browser/interfaces.ss")) (provide (all-defined-out)) diff --git a/collects/macro-debugger/view/prefs.ss b/collects/macro-debugger/view/prefs.ss index 2986b19..5dd1bf0 100644 --- a/collects/macro-debugger/view/prefs.ss +++ b/collects/macro-debugger/view/prefs.ss @@ -4,8 +4,8 @@ framework/framework "interfaces.ss" "../syntax-browser/prefs.ss" - "../util/notify.ss" - "../util/misc.ss") + unstable/gui/notify + unstable/gui/prefs) (provide pref:macro-step-limit macro-stepper-config-base% macro-stepper-config/prefs% diff --git a/collects/macro-debugger/view/step-display.ss b/collects/macro-debugger/view/step-display.ss index 5a9196a..65be319 100644 --- a/collects/macro-debugger/view/step-display.ss +++ b/collects/macro-debugger/view/step-display.ss @@ -1,7 +1,9 @@ - #lang scheme/base (require scheme/class - macro-debugger/util/class-iop + (rename-in unstable/class-iop + [send/i send:] + [send*/i send*:] + [init-field/i init-field:]) scheme/unit scheme/list scheme/match @@ -20,7 +22,7 @@ "../model/reductions-config.ss" "../model/reductions.ss" "../model/steps.ss" - "../util/notify.ss" + unstable/gui/notify (prefix-in sb: "../syntax-browser/interfaces.ss") "cursor.ss" "debug-format.ss") diff --git a/collects/macro-debugger/view/stepper.ss b/collects/macro-debugger/view/stepper.ss index ccc8992..ecab49d 100644 --- a/collects/macro-debugger/view/stepper.ss +++ b/collects/macro-debugger/view/stepper.ss @@ -1,7 +1,10 @@ - #lang scheme/base (require scheme/class - macro-debugger/util/class-iop + (rename-in unstable/class-iop + [define/i define:] + [send/i send:] + [send*/i send*:] + [init-field/i init-field:]) scheme/unit scheme/list scheme/match @@ -22,7 +25,7 @@ "../model/reductions.ss" "../model/steps.ss" "cursor.ss" - "../util/notify.ss" + unstable/gui/notify (only-in mzscheme [#%top-interaction mz-top-interaction])) (provide macro-stepper-widget% macro-stepper-widget/process-mixin) diff --git a/collects/macro-debugger/view/term-record.ss b/collects/macro-debugger/view/term-record.ss index 2fc5637..fe404ad 100644 --- a/collects/macro-debugger/view/term-record.ss +++ b/collects/macro-debugger/view/term-record.ss @@ -1,6 +1,9 @@ #lang scheme/base (require scheme/class - macro-debugger/util/class-iop + (rename-in unstable/class-iop + [define/i define:] + [send/i send:] + [init-field/i init-field:]) scheme/unit scheme/list scheme/match @@ -22,7 +25,7 @@ "../model/reductions-config.ss" "../model/reductions.ss" "../model/steps.ss" - "../util/notify.ss" + unstable/gui/notify "cursor.ss" "debug-format.ss") diff --git a/collects/macro-debugger/view/view.ss b/collects/macro-debugger/view/view.ss index 3d831bd..7162a98 100644 --- a/collects/macro-debugger/view/view.ss +++ b/collects/macro-debugger/view/view.ss @@ -1,7 +1,7 @@ - #lang scheme/base (require scheme/class - macro-debugger/util/class-iop + (rename-in unstable/class-iop + [send/i send:]) scheme/pretty scheme/gui framework/framework diff --git a/collects/unstable/scribblings/find.scrbl b/collects/unstable/scribblings/find.scrbl index b82de30..36ce5d2 100644 --- a/collects/unstable/scribblings/find.scrbl +++ b/collects/unstable/scribblings/find.scrbl @@ -60,7 +60,7 @@ mutable table. [#:default default any/c (lambda () (error ....))]) any/c]{ -Like @scheme[find-first], but only returns the first match. If no +Like @scheme[find], but only returns the first match. If no matches are found, @scheme[default] is applied as a thunk if it is a procedure or returned otherwise.