From bc5ced58e2f35c94c0fe3cb865eeecf1be3cc8ae Mon Sep 17 00:00:00 2001 From: Robby Findler Date: Fri, 18 Jun 2010 21:16:48 -0500 Subject: [PATCH] More Racketying --- collects/drracket/drracket.rkt | 2 +- collects/drracket/private/app.rkt | 2 +- collects/drracket/private/auto-language.rkt | 2 +- collects/drracket/private/debug.rkt | 2 +- collects/drracket/private/drsig.rkt | 11 ++-- collects/drracket/private/eval.rkt | 2 +- collects/drracket/private/font.rkt | 2 +- collects/drracket/private/frame.rkt | 2 +- collects/drracket/private/get-extend.rkt | 2 +- collects/drracket/private/help-desk.rkt | 2 +- collects/drracket/private/init.rkt | 2 +- .../drracket/private/insert-large-letters.rkt | 2 +- .../private/language-configuration.rkt | 12 ++--- collects/drracket/private/language.rkt | 2 +- collects/drracket/private/link.rkt | 2 +- collects/drracket/private/main.rkt | 4 +- collects/drracket/private/modes.rkt | 2 +- collects/drracket/private/module-browser.rkt | 4 +- .../private/module-language-tools.rkt | 2 +- collects/drracket/private/module-language.rkt | 2 +- .../drracket/private/multi-file-search.rkt | 2 +- collects/drracket/private/rep.rkt | 2 +- collects/drracket/private/text.rkt | 2 +- collects/drracket/private/tools-drs.rkt | 2 +- collects/drracket/private/tools.rkt | 2 +- collects/drracket/private/tracing.rkt | 2 +- collects/drracket/private/unit.rkt | 33 ++++++------ collects/drracket/sprof.rkt | 8 +-- collects/drracket/syncheck.rkt | 12 ++--- collects/drracket/tool-lib.rkt | 54 ++++++++++++++++--- 30 files changed, 113 insertions(+), 69 deletions(-) diff --git a/collects/drracket/drracket.rkt b/collects/drracket/drracket.rkt index be94819ab1..669521fd0f 100644 --- a/collects/drracket/drracket.rkt +++ b/collects/drracket/drracket.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require scheme/gui/base "private/key.rkt") +(require racket/gui/base "private/key.rkt") (define debugging? (getenv "PLTDRDEBUG")) (define profiling? (getenv "PLTDRPROFILE")) diff --git a/collects/drracket/private/app.rkt b/collects/drracket/private/app.rkt index 3e8b7c1820..b6fe9acca8 100644 --- a/collects/drracket/private/app.rkt +++ b/collects/drracket/private/app.rkt @@ -1,4 +1,4 @@ -#lang scheme/unit +#lang racket/unit (require racket/class string-constants diff --git a/collects/drracket/private/auto-language.rkt b/collects/drracket/private/auto-language.rkt index 97691ac3b2..35088ef977 100644 --- a/collects/drracket/private/auto-language.rkt +++ b/collects/drracket/private/auto-language.rkt @@ -2,7 +2,7 @@ (require typed/framework/framework typed/mred/mred - scheme/class) + racket/class) (provide pick-new-language looks-like-module?) diff --git a/collects/drracket/private/debug.rkt b/collects/drracket/private/debug.rkt index a918b09ee7..c38d787b9c 100644 --- a/collects/drracket/private/debug.rkt +++ b/collects/drracket/private/debug.rkt @@ -9,7 +9,7 @@ profile todo: |# (require errortrace/errortrace-key - scheme/unit + racket/unit racket/contract errortrace/stacktrace racket/class diff --git a/collects/drracket/private/drsig.rkt b/collects/drracket/private/drsig.rkt index 565683f674..8d055756a4 100644 --- a/collects/drracket/private/drsig.rkt +++ b/collects/drracket/private/drsig.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require scheme/unit) +(require racket/unit) (provide drracket:eval^ drracket:debug^ @@ -39,6 +39,7 @@ (add-mode get-modes add-initial-modes + make-mode (struct mode (name surrogate repl-submit matches-language) #:omit-constructor))) @@ -126,6 +127,7 @@ (add-language get-languages (struct language-settings (language settings)) + make-language-settings get-settings-preferences-symbol language-dialog fill-language-dialog)) @@ -143,6 +145,7 @@ ()) (define-signature drracket:tools^ extends drracket:tools-cm^ ((struct successful-tool (spec bitmap name url)) + make-successful-tool get-successful-tools only-in-phase load/invoke-all-tools @@ -185,7 +188,8 @@ add-to-program-editor-mixin forget-saved-bug-report record-saved-bug-report - (struct teachpack-callbacks (get-names remove add)))) + (struct teachpack-callbacks (get-names remove add)) + make-teachpack-callbacks)) (define-signature drracket:frame-cm^ (<%> @@ -280,8 +284,9 @@ put-executable ;(struct loc (source position line column span)) - + make-text/pos (struct text/pos (text start end)) + make-simple-settings (struct simple-settings (case-sensitive printing-style fraction-style diff --git a/collects/drracket/private/eval.rkt b/collects/drracket/private/eval.rkt index 6354c7825b..a3bd9931c2 100644 --- a/collects/drracket/private/eval.rkt +++ b/collects/drracket/private/eval.rkt @@ -1,7 +1,7 @@ #lang racket/base (require mred - scheme/unit + racket/unit racket/port racket/class syntax/toplevel diff --git a/collects/drracket/private/font.rkt b/collects/drracket/private/font.rkt index 44e7880a5d..6955cdd1b9 100644 --- a/collects/drracket/private/font.rkt +++ b/collects/drracket/private/font.rkt @@ -1,5 +1,5 @@ #lang racket/base - (require scheme/unit + (require racket/unit racket/class racket/gui/base "drsig.rkt" diff --git a/collects/drracket/private/frame.rkt b/collects/drracket/private/frame.rkt index cf5f662fbe..a4e991a418 100644 --- a/collects/drracket/private/frame.rkt +++ b/collects/drracket/private/frame.rkt @@ -1,4 +1,4 @@ -#lang scheme/unit +#lang racket/unit (require string-constants racket/match racket/class diff --git a/collects/drracket/private/get-extend.rkt b/collects/drracket/private/get-extend.rkt index fa14ea3d67..eab8fb5d8a 100644 --- a/collects/drracket/private/get-extend.rkt +++ b/collects/drracket/private/get-extend.rkt @@ -1,4 +1,4 @@ -#lang scheme/unit +#lang racket/unit (require racket/class "drsig.rkt") diff --git a/collects/drracket/private/help-desk.rkt b/collects/drracket/private/help-desk.rkt index 02ff7c1203..84d2c00223 100644 --- a/collects/drracket/private/help-desk.rkt +++ b/collects/drracket/private/help-desk.rkt @@ -1,4 +1,4 @@ -#lang scheme/unit +#lang racket/unit (require racket/gui/base browser/external diff --git a/collects/drracket/private/init.rkt b/collects/drracket/private/init.rkt index c100d966ef..bf7d7f5772 100644 --- a/collects/drracket/private/init.rkt +++ b/collects/drracket/private/init.rkt @@ -1,4 +1,4 @@ -#lang scheme/unit +#lang racket/unit (require string-constants "drsig.rkt" racket/gui/base) diff --git a/collects/drracket/private/insert-large-letters.rkt b/collects/drracket/private/insert-large-letters.rkt index b69abdd273..34f0a7ea66 100644 --- a/collects/drracket/private/insert-large-letters.rkt +++ b/collects/drracket/private/insert-large-letters.rkt @@ -1,4 +1,4 @@ -#lang typed/scheme/base +#lang typed/racket/base (require typed/mred/mred typed/framework/framework diff --git a/collects/drracket/private/language-configuration.rkt b/collects/drracket/private/language-configuration.rkt index 2e1fd95651..5bc24bdcea 100644 --- a/collects/drracket/private/language-configuration.rkt +++ b/collects/drracket/private/language-configuration.rkt @@ -1,5 +1,5 @@ #lang racket/base - (require scheme/unit + (require racket/unit mrlib/hierlist racket/class racket/contract @@ -127,9 +127,9 @@ x)) (get-languages)) (list-ref (get-languages) 0))]) - (make-language-settings lang (send lang default-settings)))) + (language-settings lang (send lang default-settings)))) - ;; type language-settings = (make-language-settings (instanceof language<%>) settings) + ;; type language-settings = (language-settings (instanceof language<%>) settings) (define-struct language-settings (language settings)) @@ -262,7 +262,7 @@ (send dialog show #t) (if cancelled? #f - (make-language-settings + (language-settings (get-selected-language) (get-selected-language-settings))))) @@ -1977,8 +1977,8 @@ (let ([new-lang (language-dialog #f - (make-language-settings lang - (send lang default-settings)) + (language-settings lang + (send lang default-settings)) drs-frame)]) (when new-lang (set! language-chosen? #t) diff --git a/collects/drracket/private/language.rkt b/collects/drracket/private/language.rkt index b3bf62d88c..b7ec95507e 100644 --- a/collects/drracket/private/language.rkt +++ b/collects/drracket/private/language.rkt @@ -1,4 +1,4 @@ -#lang scheme/unit +#lang racket/unit ;; WARNING: printf is rebound in this module to always use the ;; original stdin/stdout of drscheme, instead of the ;; user's io ports, to aid any debugging printouts. diff --git a/collects/drracket/private/link.rkt b/collects/drracket/private/link.rkt index ec0b53cc40..c4f79cbb99 100644 --- a/collects/drracket/private/link.rkt +++ b/collects/drracket/private/link.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require scheme/unit +(require racket/unit "modes.rkt" "font.rkt" "eval.rkt" diff --git a/collects/drracket/private/main.rkt b/collects/drracket/private/main.rkt index 1acd6cefa6..b247d4c2ee 100644 --- a/collects/drracket/private/main.rkt +++ b/collects/drracket/private/main.rkt @@ -1,4 +1,4 @@ -#lang scheme/unit +#lang racket/unit (require string-constants mzlib/contract @@ -487,7 +487,7 @@ (drracket:language-configuration:get-languages))]) (and lang (let ([settings (send lang unmarshall-settings marshalled-settings)]) - (drracket:language-configuration:make-language-settings + (drracket:language-configuration:language-settings lang (or settings (send lang default-settings))))))))) diff --git a/collects/drracket/private/modes.rkt b/collects/drracket/private/modes.rkt index 22bc8b2ec8..30a323346e 100644 --- a/collects/drracket/private/modes.rkt +++ b/collects/drracket/private/modes.rkt @@ -1,4 +1,4 @@ -#lang scheme/unit +#lang racket/unit (require string-constants racket/class racket/list diff --git a/collects/drracket/private/module-browser.rkt b/collects/drracket/private/module-browser.rkt index 35ec9e7163..5da7ae9c2c 100644 --- a/collects/drracket/private/module-browser.rkt +++ b/collects/drracket/private/module-browser.rkt @@ -8,7 +8,7 @@ string-constants mrlib/graph "drsig.rkt" - scheme/unit + racket/unit racket/async-channel setup/private/lib-roots) @@ -667,7 +667,7 @@ (define text/pos (let ([t (make-object text:basic%)]) (send t load-file filename) - (drracket:language:make-text/pos + (drracket:language:text/pos t 0 (send t last-position)))) diff --git a/collects/drracket/private/module-language-tools.rkt b/collects/drracket/private/module-language-tools.rkt index 22a57683a6..334ee52445 100644 --- a/collects/drracket/private/module-language-tools.rkt +++ b/collects/drracket/private/module-language-tools.rkt @@ -4,7 +4,7 @@ mrlib/bitmap-label racket/contract framework - scheme/unit + racket/unit racket/class racket/gui/base "drsig.rkt") diff --git a/collects/drracket/private/module-language.rkt b/collects/drracket/private/module-language.rkt index 3362f4370c..756e6ddf69 100644 --- a/collects/drracket/private/module-language.rkt +++ b/collects/drracket/private/module-language.rkt @@ -1,7 +1,7 @@ #lang racket/base (provide module-language@) -(require scheme/unit +(require racket/unit racket/class racket/list racket/path diff --git a/collects/drracket/private/multi-file-search.rkt b/collects/drracket/private/multi-file-search.rkt index 9c237101ec..804cc7f408 100644 --- a/collects/drracket/private/multi-file-search.rkt +++ b/collects/drracket/private/multi-file-search.rkt @@ -1,4 +1,4 @@ -#lang scheme/unit +#lang racket/unit (require framework mzlib/class mred diff --git a/collects/drracket/private/rep.rkt b/collects/drracket/private/rep.rkt index 8bf0316976..15b07cada2 100644 --- a/collects/drracket/private/rep.rkt +++ b/collects/drracket/private/rep.rkt @@ -23,7 +23,7 @@ TODO (require racket/class racket/path racket/pretty - scheme/unit + racket/unit racket/list string-constants diff --git a/collects/drracket/private/text.rkt b/collects/drracket/private/text.rkt index 6d7df03140..75f3b96b89 100644 --- a/collects/drracket/private/text.rkt +++ b/collects/drracket/private/text.rkt @@ -1,4 +1,4 @@ -#lang scheme/unit +#lang racket/unit (require mzlib/class "drsig.rkt" framework) diff --git a/collects/drracket/private/tools-drs.rkt b/collects/drracket/private/tools-drs.rkt index 752e55e8d9..c01b02bb6c 100644 --- a/collects/drracket/private/tools-drs.rkt +++ b/collects/drracket/private/tools-drs.rkt @@ -1,4 +1,4 @@ -#lang scheme/unit +#lang racket/unit #| diff --git a/collects/drracket/private/tools.rkt b/collects/drracket/private/tools.rkt index c7f43fe5b4..65777a6858 100644 --- a/collects/drracket/private/tools.rkt +++ b/collects/drracket/private/tools.rkt @@ -1,4 +1,4 @@ -#lang scheme/unit +#lang racket/unit (require racket/class racket/list diff --git a/collects/drracket/private/tracing.rkt b/collects/drracket/private/tracing.rkt index 403152bb9b..77064a6317 100644 --- a/collects/drracket/private/tracing.rkt +++ b/collects/drracket/private/tracing.rkt @@ -1,7 +1,7 @@ #lang racket/base (require racket/contract - scheme/unit + racket/unit racket/class racket/path racket/port diff --git a/collects/drracket/private/unit.rkt b/collects/drracket/private/unit.rkt index c48b0ffdab..738e9e9d8e 100644 --- a/collects/drracket/private/unit.rkt +++ b/collects/drracket/private/unit.rkt @@ -12,7 +12,7 @@ module browser threading seems wrong. |# (require racket/contract - scheme/unit + racket/unit racket/class racket/path racket/port @@ -575,7 +575,7 @@ module browser threading seems wrong. module-language-settings)]) (when matching-language (set-next-settings - (drracket:language-configuration:make-language-settings + (drracket:language-configuration:language-settings matching-language settings) #f)))) @@ -834,17 +834,18 @@ module browser threading seems wrong. ;; test cases for is-lang-line? #; - (list (is-lang-line? "#lang x") - (is-lang-line? "#lang scheme") - (is-lang-line? "#lang scheme ") - (not (is-lang-line? "#lang schemeα")) - (not (is-lang-line? "#lang scheme/ ")) - (not (is-lang-line? "#lang /scheme ")) - (is-lang-line? "#lang sch/eme ") - (is-lang-line? "#lang r6rs") - (is-lang-line? "#!r6rs") - (is-lang-line? "#!r6rs ") - (not (is-lang-line? "#!/bin/sh"))) + (printf "~s\n" + (list (is-lang-line? "#lang x") + (is-lang-line? "#lang racket") + (is-lang-line? "#lang racket ") + (not (is-lang-line? "#lang racketα")) + (not (is-lang-line? "#lang racket/ ")) + (not (is-lang-line? "#lang /racket ")) + (is-lang-line? "#lang rac/ket ") + (is-lang-line? "#lang r6rs") + (is-lang-line? "#!r6rs") + (is-lang-line? "#!r6rs ") + (not (is-lang-line? "#!/bin/sh")))) (define (get-module-language/settings) (let* ([module-language @@ -2690,7 +2691,7 @@ module browser threading seems wrong. (let-values ([(module-language module-language-settings) (get-module-language/settings)]) (when (and module-language module-language-settings) (send definitions-text set-next-settings - (drracket:language-configuration:make-language-settings + (drracket:language-configuration:language-settings module-language module-language-settings))))))) @@ -3600,7 +3601,7 @@ module browser threading seems wrong. [update-settings (λ (settings) (send (get-definitions-text) set-next-settings - (drracket:language-configuration:make-language-settings language settings)) + (drracket:language-configuration:language-settings language settings)) (send (get-definitions-text) teachpack-changed))]) (set! teachpack-items (list* @@ -4438,7 +4439,7 @@ module browser threading seems wrong. (λ (x y) (send (send frame get-definitions-text) set-next-settings - (drracket:language-configuration:make-language-settings + (drracket:language-configuration:language-settings lang settings)))])))))) (preferences:get 'drracket:recent-language-names)) diff --git a/collects/drracket/sprof.rkt b/collects/drracket/sprof.rkt index 5f66b0c1ea..50f83d7406 100644 --- a/collects/drracket/sprof.rkt +++ b/collects/drracket/sprof.rkt @@ -1,7 +1,7 @@ #lang racket/base -(require scheme/gui/base +(require racket/gui/base framework - scheme/class) + racket/class) ;; how long between samples (define pause-time 0.1) @@ -261,8 +261,8 @@ ;; tool code, for integration with drscheme (begin - (require drscheme/tool - scheme/unit + (require drracket/tool + racket/unit string-constants/string-constant) (define sc-show-sprof "Show SProfile") diff --git a/collects/drracket/syncheck.rkt b/collects/drracket/syncheck.rkt index 10ee172ad6..4d66b4b097 100644 --- a/collects/drracket/syncheck.rkt +++ b/collects/drracket/syncheck.rkt @@ -18,11 +18,11 @@ If the namespace does not, they are colored the unbound color. (require string-constants - scheme/unit - scheme/contract - scheme/class - scheme/list - scheme/promise + racket/unit + racket/contract + racket/class + racket/list + racket/promise drracket/tool syntax/toplevel syntax/boundmap @@ -37,7 +37,7 @@ If the namespace does not, they are colored the unbound color. net/url net/uri-codec browser/external - (for-syntax scheme/base) + (for-syntax racket/base) "syncheck-drracket-button.rkt") (provide tool@) diff --git a/collects/drracket/tool-lib.rkt b/collects/drracket/tool-lib.rkt index 154e4f8abd..96130b2c16 100644 --- a/collects/drracket/tool-lib.rkt +++ b/collects/drracket/tool-lib.rkt @@ -8,7 +8,7 @@ all of the names in the tools library, for use defining keybindings (require racket/class racket/gui/base - (except-in scheme/unit struct) + racket/unit racket/contract racket/class @@ -24,13 +24,13 @@ all of the names in the tools library, for use defining keybindings mrlib/switchable-button scribble/srcdoc) -(require (for-syntax scheme/base)) +(require (for-syntax racket/base)) (require/doc drracket/private/ts ;; probably this also has to be an absolute require - scheme/base scribble/manual) + racket/base scribble/manual) (require/doc (for-label errortrace/errortrace-key - scheme/pretty + racket/pretty mzlib/pconvert)) (define-values/invoke-unit/infer drracket@) @@ -310,7 +310,7 @@ all of the names in the tools library, for use defining keybindings The @racket[language-settings] argument is the current language and its settings. See - @racket[drracket:language-configuration:make-language-settings] + @racket[drracket:language-configuration:language-settings] for details on that structure. If the program is associated with a DrRacket @@ -1023,7 +1023,7 @@ all of the names in the tools library, for use defining keybindings @racket[preferences:set].}) (proc-doc/names - drracket:language-configuration:make-language-settings + drracket:language-configuration:language-settings ((or/c (is-a?/c drracket:language:language<%>) drracket:language:object/c) any/c . -> . @@ -1042,6 +1042,17 @@ all of the names in the tools library, for use defining keybindings @racket[drracket:language-configuration:language-settings-settings], and a predicate, @racket[drracket:language-configuration:language-settings?]}) + #; + (proc-doc/names + drracket:language-configuration:make-language-settings + ((or/c (is-a?/c drracket:language:language<%>) drracket:language:object/c) + any/c + . -> . + drracket:language-configuration:language-settings?) + (language settings) + + @{This is an alias for @racket[drrracket:language-configuration:language-settings]}) + (proc-doc/names drracket:language-configuration:language-settings-settings (-> drracket:language-configuration:language-settings? @@ -1529,7 +1540,7 @@ all of the names in the tools library, for use defining keybindings otherwise.}) (proc-doc/names - drracket:language:make-text/pos + drracket:language:text/pos ((is-a?/c text%) number? number? . -> . drracket:language:text/pos?) @@ -1537,6 +1548,15 @@ all of the names in the tools library, for use defining keybindings @{Constructs a text/pos.}) + (proc-doc/names + drracket:language:make-text/pos + ((is-a?/c text%) number? number? + . -> . + drracket:language:text/pos?) + (text start end) + + @{An alias for @racket[drracket:language:text/pos]}) + (proc-doc/names drracket:language:simple-settings-case-sensitive (drracket:language:simple-settings? . -> . boolean?) @@ -1600,7 +1620,7 @@ all of the names in the tools library, for use defining keybindings @{Determines if @racket[val] is a simple-settings.}) (proc-doc/names - drracket:language:make-simple-settings + drracket:language:simple-settings (-> boolean? (symbols 'constructor 'quasiquote 'write 'trad-write 'print) (symbols 'mixed-fraction 'mixed-fraction-e 'repeating-decimal 'repeating-decimal-e) @@ -1617,6 +1637,24 @@ all of the names in the tools library, for use defining keybindings @{Constructs a simple settings.}) + (proc-doc/names + drracket:language:make-simple-settings + (-> boolean? + (symbols 'constructor 'quasiquote 'write 'trad-write 'print) + (symbols 'mixed-fraction 'mixed-fraction-e 'repeating-decimal 'repeating-decimal-e) + boolean? + boolean? + (symbols 'none 'debug 'debug/profile 'test-coverage) + drracket:language:simple-settings?) + (case-sensitive + printing-style + fraction-style + show-sharing + insert-newlines + annotations) + + @{An alias for @racket[drracket:language:simple-settings].}) + (proc-doc/names drracket:language:simple-settings->vector (drracket:language:simple-settings? . -> . vector?)