From ffa97036a87abf266bd8279c4771dabe2a079fa2 Mon Sep 17 00:00:00 2001
From: Ryan Culpepper <ryanc@racket-lang.org>
Date: Wed, 3 Feb 2010 14:43:23 +0000
Subject: [PATCH] macro-stepper: removed drscheme,etc dep on macro-debugger  
 (changed capability to normal symbol constant)

svn: r17953
---
 collects/drscheme/private/language-configuration.ss | 3 +--
 collects/drscheme/private/module-language.ss        | 3 +--
 collects/macro-debugger/capability.ss               | 7 -------
 collects/macro-debugger/tool.ss                     | 7 ++++---
 collects/swindle/tool.ss                            | 3 +--
 5 files changed, 7 insertions(+), 16 deletions(-)
 delete mode 100644 collects/macro-debugger/capability.ss

diff --git a/collects/drscheme/private/language-configuration.ss b/collects/drscheme/private/language-configuration.ss
index b4e127dace..4bb454330d 100644
--- a/collects/drscheme/private/language-configuration.ss
+++ b/collects/drscheme/private/language-configuration.ss
@@ -6,7 +6,6 @@
            scheme/string
            scheme/list
            "drsig.ss"
-           macro-debugger/capability
            string-constants
            mred
            framework
@@ -1338,7 +1337,7 @@
         (super-new)
         (define/augment (capability-value key)
           (cond
-           [(eq? key macro-stepper-capability-key) #t]
+           [(eq? key 'macro-stepper:enabled) #t]
            [else (inner (drscheme:language:get-capability-default key)
                         capability-value key)]))))
 
diff --git a/collects/drscheme/private/module-language.ss b/collects/drscheme/private/module-language.ss
index ebefb4a619..b6235eeca3 100644
--- a/collects/drscheme/private/module-language.ss
+++ b/collects/drscheme/private/module-language.ss
@@ -13,7 +13,6 @@
          framework
          string-constants
          planet/config
-         macro-debugger/capability
          "drsig.ss"
          "rep.ss")
 
@@ -86,7 +85,7 @@
         (cond
           [(eq? key 'drscheme:autocomplete-words)
            (drscheme:language-configuration:get-all-manual-keywords)]
-          [(eq? key macro-stepper-capability-key) #t]
+          [(eq? key 'macro-stepper:enabled) #t]
           [else (drscheme:language:get-capability-default key)]))
       
       ;; config-panel : as in super class
diff --git a/collects/macro-debugger/capability.ss b/collects/macro-debugger/capability.ss
deleted file mode 100644
index 506f1afbbc..0000000000
--- a/collects/macro-debugger/capability.ss
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang scheme/base
-
-(provide macro-stepper-capability-key)
-
-(define macro-stepper-capability-key
-  (string->uninterned-symbol "Enable Macro Stepper"))
-
diff --git a/collects/macro-debugger/tool.ss b/collects/macro-debugger/tool.ss
index 7b864cc291..0f737f7de7 100644
--- a/collects/macro-debugger/tool.ss
+++ b/collects/macro-debugger/tool.ss
@@ -8,7 +8,6 @@
          drscheme/tool
          mrlib/switchable-button
          string-constants
-         "capability.ss"
          "model/trace.ss"
          "model/deriv.ss"
          "model/deriv-util.ss"
@@ -17,6 +16,8 @@
          "view/stepper.ss"
          "view/prefs.ss")
 
+;; Capability name: 'macro-stepper:enabled
+
 (provide tool@)
 
 (define-local-member-name allow-macro-stepper?)
@@ -82,7 +83,7 @@
 
     (define (phase1)
       (drscheme:language:register-capability
-       macro-stepper-capability-key
+       'macro-stepper:enabled
        boolean?
        #f))
     (define (phase2) (void))
@@ -163,7 +164,7 @@
           (let ([lang
                  (drscheme:language-configuration:language-settings-language
                   (send (get-definitions-text) get-next-settings))])
-            (send lang capability-value macro-stepper-capability-key)))
+            (send lang capability-value 'macro-stepper:enabled)))
 
         (define/private (enable/disable-stuff enable?)
           (if enable?
diff --git a/collects/swindle/tool.ss b/collects/swindle/tool.ss
index ee8673c16a..6b87d0ce57 100644
--- a/collects/swindle/tool.ss
+++ b/collects/swindle/tool.ss
@@ -9,7 +9,6 @@
          mzlib/list
          mred
          net/sendurl
-         macro-debugger/capability
          string-constants)
 (provide tool@)
 
@@ -37,7 +36,7 @@
                  (super-instantiate ()))))
         (define/augment (capability-value key)
           (cond
-           [(eq? key macro-stepper-capability-key) #t]
+           [(eq? key 'macro-stepper:enabled) #t]
            [else (inner (drscheme:language:get-capability-default key)
                         capability-value key)]))
         (define/override (use-namespace-require/copy?) #t)