From 60ab3ffe85773a597bb90ff429f4cf62599ea899 Mon Sep 17 00:00:00 2001 From: Ryan Culpepper Date: Thu, 14 Dec 2006 23:29:57 +0000 Subject: [PATCH] Ported macro-debugger collection to new unit system svn: r5123 original commit: 201d34d3c7e319210cc6589beca20b30ba09c596 --- .../macro-debugger/syntax-browser/frame.ss | 7 +++-- .../syntax-browser/interfaces.ss | 6 +--- .../macro-debugger/syntax-browser/keymap.ss | 8 +++-- .../macro-debugger/syntax-browser/prefs.ss | 5 +-- .../syntax-browser/syntax-snip.ss | 31 +++++-------------- .../macro-debugger/syntax-browser/widget.ss | 23 ++++++++------ collects/macro-debugger/view/interfaces.ss | 2 +- collects/macro-debugger/view/prefs.ss | 5 +-- collects/macro-debugger/view/view.ss | 18 ++++++----- 9 files changed, 49 insertions(+), 56 deletions(-) diff --git a/collects/macro-debugger/syntax-browser/frame.ss b/collects/macro-debugger/syntax-browser/frame.ss index e6a6af2..eb478d1 100644 --- a/collects/macro-debugger/syntax-browser/frame.ss +++ b/collects/macro-debugger/syntax-browser/frame.ss @@ -1,7 +1,7 @@ (module frame mzscheme (require (lib "class.ss") - (lib "unitsig.ss") + (lib "unit.ss") (lib "mred.ss" "mred") (lib "framework.ss" "framework") (lib "list.ss") @@ -10,10 +10,11 @@ (provide frame@) (define frame@ - (unit/sig browser^ + (unit (import prefs^ widget^) - + (export browser^) + ;; browse-syntax : syntax -> void (define (browse-syntax stx) (browse-syntaxes (list stx))) diff --git a/collects/macro-debugger/syntax-browser/interfaces.ss b/collects/macro-debugger/syntax-browser/interfaces.ss index 2b41baa..babd7b6 100644 --- a/collects/macro-debugger/syntax-browser/interfaces.ss +++ b/collects/macro-debugger/syntax-browser/interfaces.ss @@ -1,7 +1,7 @@ (module interfaces mzscheme (require (lib "class.ss") - (lib "unitsig.ss")) + (lib "unit.ss")) (provide (all-defined)) ;; Signatures @@ -55,10 +55,6 @@ (;; syntax-widget% syntax-widget%)) - (define-signature implementation^ - ([unit widget : widget^] - [unit snip : snip^])) - ;; Class Interfaces ;; syntax-controller<%> diff --git a/collects/macro-debugger/syntax-browser/keymap.ss b/collects/macro-debugger/syntax-browser/keymap.ss index 79e8480..4ca331f 100644 --- a/collects/macro-debugger/syntax-browser/keymap.ss +++ b/collects/macro-debugger/syntax-browser/keymap.ss @@ -1,7 +1,7 @@ (module keymap mzscheme (require (lib "class.ss") - (lib "unitsig.ss") + (lib "unit.ss") (lib "mred.ss" "mred") "interfaces.ss" "partition.ss") @@ -9,8 +9,9 @@ context-menu@) (define context-menu@ - (unit/sig context-menu^ + (unit (import) + (export context-menu^) (define context-menu% (class popup-menu% @@ -103,8 +104,9 @@ )))) (define keymap@ - (unit/sig keymap^ + (unit (import context-menu^ snip^) + (export keymap^) (define syntax-keymap% (class keymap% diff --git a/collects/macro-debugger/syntax-browser/prefs.ss b/collects/macro-debugger/syntax-browser/prefs.ss index 944ec9e..233b356 100644 --- a/collects/macro-debugger/syntax-browser/prefs.ss +++ b/collects/macro-debugger/syntax-browser/prefs.ss @@ -1,6 +1,6 @@ (module prefs mzscheme - (require (lib "unitsig.ss") + (require (lib "unit.ss") (lib "framework.ss" "framework") "interfaces.ss") (provide prefs@) @@ -14,8 +14,9 @@ [(newval) (preferences:set 'prop newval)]))])) (define prefs@ - (unit/sig prefs^ + (unit (import) + (export prefs^) (preferences:set-default 'SyntaxBrowser:Width 700 number?) (preferences:set-default 'SyntaxBrowser:Height 600 number?) diff --git a/collects/macro-debugger/syntax-browser/syntax-snip.ss b/collects/macro-debugger/syntax-browser/syntax-snip.ss index 440e02b..097a2e9 100644 --- a/collects/macro-debugger/syntax-browser/syntax-snip.ss +++ b/collects/macro-debugger/syntax-browser/syntax-snip.ss @@ -1,7 +1,7 @@ (module syntax-snip mzscheme (require (lib "class.ss") - (lib "unitsig.ss") + (lib "unit.ss") (lib "mred.ss" "mred") (lib "framework.ss" "framework") "interfaces.ss" @@ -12,12 +12,13 @@ snip-keymap-extension@) (define snip@ - (unit/sig snip^ + (unit (import prefs^ keymap^ context-menu^ snipclass^) - + (export snip^) + ;; syntax-snip : syntax -> snip (define (syntax-snip stx) (new syntax-snip% (syntax stx))) @@ -201,9 +202,10 @@ )) (define snip-keymap-extension@ - (unit/sig keymap^ - (import (pre : keymap^)) - + (unit + (import (prefix pre: keymap^)) + (export keymap^) + (define syntax-keymap% (class pre:syntax-keymap% (init-field snip) @@ -214,23 +216,6 @@ (lambda (i e) (send snip show-props))))))) - #; - (define snip-context-menu-extension@ - (unit/sig context-menu^ - (import (pre : context-menu^)) - - (define context-menu% - (class pre:context-menu% - (init-field snip) - - (define/override (after-selection-items) - (super after-selection-items) - (new menu-item% (label "Show syntax properties") - (parent this) - (callback (lambda _ (send snip show-props)))) - (void)) - - (super-new (controller (send snip get-controller))))))) (define style:normal (make-object style-delta% 'change-normal)) diff --git a/collects/macro-debugger/syntax-browser/widget.ss b/collects/macro-debugger/syntax-browser/widget.ss index 91c541f..40dc3e8 100644 --- a/collects/macro-debugger/syntax-browser/widget.ss +++ b/collects/macro-debugger/syntax-browser/widget.ss @@ -1,7 +1,7 @@ (module widget mzscheme (require (lib "class.ss") - (lib "unitsig.ss") + (lib "unit.ss") (lib "mred.ss" "mred") (lib "framework.ss" "framework") (lib "list.ss") @@ -17,9 +17,10 @@ widget-context-menu-extension@) (define widget@ - (unit/sig widget^ + (unit (import keymap^) - + (export widget^) + ;; syntax-widget% ;; A syntax-widget creates its own syntax-controller. (define syntax-widget% @@ -140,9 +141,10 @@ )) (define widget-keymap-extension@ - (unit/sig keymap^ - (import (pre : keymap^)) - + (unit + (import (prefix pre: keymap^)) + (export keymap^) + (define syntax-keymap% (class pre:syntax-keymap% (init-field widget) @@ -157,14 +159,15 @@ )))) (define widget-context-menu-extension@ - (unit/sig context-menu^ - (import (pre : context-menu^)) - + (unit + (import (prefix pre: context-menu^)) + (export context-menu^) + (define context-menu% (class pre:context-menu% (inherit-field keymap) (inherit-field props-menu) - + (define/override (on-demand) (send props-menu set-label (if (send (send keymap get-widget) props-shown?) diff --git a/collects/macro-debugger/view/interfaces.ss b/collects/macro-debugger/view/interfaces.ss index 5159411..16698a2 100644 --- a/collects/macro-debugger/view/interfaces.ss +++ b/collects/macro-debugger/view/interfaces.ss @@ -1,6 +1,6 @@ (module interfaces mzscheme - (require (lib "unitsig.ss")) + (require (lib "unit.ss")) (provide (all-defined)) ;; Signatures diff --git a/collects/macro-debugger/view/prefs.ss b/collects/macro-debugger/view/prefs.ss index 4d0e2dd..391b741 100644 --- a/collects/macro-debugger/view/prefs.ss +++ b/collects/macro-debugger/view/prefs.ss @@ -1,6 +1,6 @@ (module prefs mzscheme - (require (lib "unitsig.ss") + (require (lib "unit.ss") (lib "framework.ss" "framework") "interfaces.ss") (provide prefs@) @@ -14,8 +14,9 @@ [(newval) (preferences:set 'prop newval)]))])) (define prefs@ - (unit/sig prefs^ + (unit (import) + (export prefs^) (preferences:set-default 'MacroStepper:Frame:Width 700 number?) (preferences:set-default 'MacroStepper:Frame:Height 600 number?) diff --git a/collects/macro-debugger/view/view.ss b/collects/macro-debugger/view/view.ss index 8842013..e45a4c8 100644 --- a/collects/macro-debugger/view/view.ss +++ b/collects/macro-debugger/view/view.ss @@ -1,6 +1,6 @@ (module view mzscheme - (require (lib "unitsig.ss") + (require (lib "unit.ss") (lib "mred.ss" "mred") (lib "framework.ss" "framework") "interfaces.ss" @@ -8,15 +8,19 @@ (provide (all-defined)) (define view-base@ - (unit/sig view-base^ + (unit (import) + (export view-base^) + (define base-frame% (frame:standard-menus-mixin (frame:basic-mixin frame%))))) - (define-values/invoke-unit/sig view^ - (compound-unit/sig + (define-values/invoke-unit + (compound-unit (import) - (link [BASE : view-base^ (view-base@)] - [STEPPER : view^ (pre-stepper@ BASE)]) - (export (open STEPPER)))) + (link [((BASE : view-base^)) view-base@] + [((STEPPER : view^)) pre-stepper@ BASE]) + (export STEPPER)) + (import) + (export view^)) )