From a9301386437e4bb09067a3f8528012ad2a83f745 Mon Sep 17 00:00:00 2001
From: Ryan Culpepper <ryanc@racket-lang.org>
Date: Mon, 9 Oct 2006 15:38:20 +0000
Subject: [PATCH] Fixed linking bug

svn: r4532
---
 collects/macro-debugger/tool.ss      | 14 +++-----------
 collects/macro-debugger/view/gui.ss  | 19 ++++++++++++++++++-
 collects/macro-debugger/view/view.ss | 11 +++--------
 3 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/collects/macro-debugger/tool.ss b/collects/macro-debugger/tool.ss
index 51e9d7f693..729606cf36 100644
--- a/collects/macro-debugger/tool.ss
+++ b/collects/macro-debugger/tool.ss
@@ -23,17 +23,9 @@
   (define stepper@
     (compound-unit/sig
       (import)
-      (link [PREFS : view:prefs^ (view:prefs@)]
-            [SBKEYMAP : sb:keymap^ (sb:keymap@)]
-            [SBMENU : sb:context-menu^ (sb:context-menu@ SBSNIP)]
-            [SBSNIP : sb:snip^ (sb:global-snip@)]
-            [SBWMENU : sb:context-menu^ (sb:widget-context-menu-extension@ SBMENU)]
-            [VMENU : sb:context-menu^ (view:context-menu-extension@ SBWMENU)]
-            [SBWIDGET : sb:widget^ (sb:widget@ SBKEYMAP SBWMENU)]
-            [VWIDGET : sb:widget^ (view:browser-extension@ SBWIDGET VMENU)]
-            [BASE : view:view-base^ (view-base/tool@)]
-            [VIEW : view:view^ (view:view@ PREFS BASE VWIDGET)])
-      (export (open VIEW))))
+      (link [BASE : view:view-base^ (view-base/tool@)]
+            [STEPPER : view:view^ (view:pre-stepper@ BASE)])
+      (export (open STEPPER))))
 
   #;(define stepper@
       (compound-unit/sig
diff --git a/collects/macro-debugger/view/gui.ss b/collects/macro-debugger/view/gui.ss
index fd5b8f5cb2..0b3fb7f42a 100644
--- a/collects/macro-debugger/view/gui.ss
+++ b/collects/macro-debugger/view/gui.ss
@@ -7,10 +7,10 @@
            (lib "framework.ss" "framework")
            (lib "boundmap.ss" "syntax")
            "interfaces.ss"
+           "prefs.ss"
            "warning.ss"
            "hiding-panel.ss"
            (prefix sb: "../syntax-browser/embed.ss")
-           "../syntax-browser/util.ss"
            "../model/deriv-util.ss"
            "../model/trace.ss"
            "../model/hide.ss"
@@ -20,6 +20,7 @@
            "util.ss")
 
   (provide catch-errors?
+           pre-stepper@
            view@
            context-menu-extension@
            browser-extension@)
@@ -575,4 +576,20 @@
                  (widget this)
                  (macro-stepper macro-stepper)))
           (super-new)))))
+  
+  (define pre-stepper@
+    (compound-unit/sig
+      (import [BASE : view-base^])
+      (link [PREFS : prefs^ (prefs@)]
+            [SBKEYMAP : sb:keymap^ (sb:keymap@)]
+            [SBMENU : sb:context-menu^ (sb:context-menu@ SBSNIP)]
+            [SBSNIP : sb:snip^ (sb:global-snip@)]
+            [SBWMENU : sb:context-menu^ (sb:widget-context-menu-extension@ SBMENU)]
+            [VMENU : sb:context-menu^ (context-menu-extension@ SBWMENU)]
+            [SBWIDGET : sb:widget^ (sb:widget@ SBKEYMAP SBWMENU)]
+            [VWIDGET : sb:widget^ (browser-extension@ SBWIDGET VMENU)]
+            [VIEW : view^ (view@ PREFS BASE VWIDGET)])
+      (export (open VIEW))))
+    
+  
   )
diff --git a/collects/macro-debugger/view/view.ss b/collects/macro-debugger/view/view.ss
index 502a2bce31..8842013ae7 100644
--- a/collects/macro-debugger/view/view.ss
+++ b/collects/macro-debugger/view/view.ss
@@ -1,12 +1,9 @@
 
 (module view mzscheme
   (require (lib "unitsig.ss")
-           (lib "class.ss")
            (lib "mred.ss" "mred")
            (lib "framework.ss" "framework")
-           (prefix sb: "../syntax-browser/embed.ss")
            "interfaces.ss"
-           "prefs.ss"
            "gui.ss")
   (provide (all-defined))
 
@@ -19,9 +16,7 @@
   (define-values/invoke-unit/sig view^
     (compound-unit/sig
       (import)
-      (link (PREFS : prefs^ (prefs@))
-            (SB   : sb:implementation^ (sb:implementation@))
-            (BASE : view-base^ (view-base@))
-            (VIEW : view^ (view@ BASE SB)))
-      (export (open VIEW))))
+      (link [BASE : view-base^ (view-base@)]
+            [STEPPER : view^ (pre-stepper@ BASE)])
+      (export (open STEPPER))))
   )