From 402886bc181ff7c4b0eb6a8066cadd0579ac13f9 Mon Sep 17 00:00:00 2001 From: Robby Findler Date: Mon, 1 Feb 2010 17:09:22 +0000 Subject: [PATCH] fixed the macro stepper so that it shows up in the new module language svn: r17927 --- collects/drscheme/private/drsig.ss | 1 - collects/drscheme/private/language-configuration.ss | 4 ++-- collects/drscheme/private/module-language.ss | 4 +--- collects/macro-debugger/tool.ss | 2 +- collects/string-constants/english-string-constants.ss | 1 + 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/collects/drscheme/private/drsig.ss b/collects/drscheme/private/drsig.ss index 3dbb60f8ce..3131312b0f 100644 --- a/collects/drscheme/private/drsig.ss +++ b/collects/drscheme/private/drsig.ss @@ -83,7 +83,6 @@ (module-language<%>)) (define-signature drscheme:module-language^ extends drscheme:module-language-cm^ (add-module-language - module-language-name module-language-put-file-mixin)) (define-signature drscheme:module-language-tools-cm^ diff --git a/collects/drscheme/private/language-configuration.ss b/collects/drscheme/private/language-configuration.ss index 05936ea9f7..3294cfcbf6 100644 --- a/collects/drscheme/private/language-configuration.ss +++ b/collects/drscheme/private/language-configuration.ss @@ -521,7 +521,7 @@ positions numbers)) (when (null? (cdr positions)) - (unless (equal? positions (list drscheme:module-language:module-language-name)) + (unless (equal? positions (list (string-constant module-language-name))) (error 'drscheme:language "Only the module language may be at the top level. Other languages must have at least two levels"))) @@ -592,7 +592,7 @@ (get/set-settings (send language default-settings))]))))) (cond - [(equal? positions (list drscheme:module-language:module-language-name)) + [(equal? positions (list (string-constant module-language-name))) (set! module-language*language language) (set! module-language*get-language-details-panel get-language-details-panel) (set! module-language*get/set-settings get/set-settings)] diff --git a/collects/drscheme/private/module-language.ss b/collects/drscheme/private/module-language.ss index 690c85e3a0..ff09b119ed 100644 --- a/collects/drscheme/private/module-language.ss +++ b/collects/drscheme/private/module-language.ss @@ -53,8 +53,6 @@ (define default-full-trace? #t) (define default-auto-text "#lang scheme\n") - (define module-language-name "Determine language from source") - ;; module-mixin : (implements drscheme:language:language<%>) ;; -> (implements drscheme:language:language<%>) (define (module-mixin %) @@ -352,7 +350,7 @@ (super-new [module #f] - [language-position (list module-language-name)] + [language-position (list (string-constant module-language-name))] [language-numbers (list -32768)]))) ;; can be called with #f to just kill the repl (in case we want to kill it diff --git a/collects/macro-debugger/tool.ss b/collects/macro-debugger/tool.ss index 0524d45045..3dceaa0f33 100644 --- a/collects/macro-debugger/tool.ss +++ b/collects/macro-debugger/tool.ss @@ -310,7 +310,7 @@ (let ([main-group (car lang)] [second (and (pair? (cdr lang)) (cadr lang))] [third (and (pair? (cdr lang)) (pair? (cddr lang)) (caddr lang))]) - (or (equal? main-group "Module") + (or (equal? main-group (string-constant module-language-name)) (and (equal? main-group (string-constant legacy-languages)) (or (member second (list (string-constant r5rs-language-name) diff --git a/collects/string-constants/english-string-constants.ss b/collects/string-constants/english-string-constants.ss index fbba384ba1..d67433e980 100644 --- a/collects/string-constants/english-string-constants.ss +++ b/collects/string-constants/english-string-constants.ss @@ -1055,6 +1055,7 @@ please adhere to these guidelines: (initial-language-category "Initial language") (no-language-chosen "No language chosen") + (module-language-name "Determine language from source") (module-language-one-line-summary "Reads the #lang line to specify the actual language") (module-language-auto-text "Automatic #lang line") ;; shows up in the details section of the module language