More Racketying

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"))

collects/drracket/private/app.rkt

@@ -1,4 +1,4 @@
-#lang scheme/unit
+#lang racket/unit
 
 (require racket/class
          string-constants

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?)
 

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

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

collects/drracket/private/eval.rkt

@@ -1,7 +1,7 @@
 #lang racket/base
 
   (require mred
-           scheme/unit
+           racket/unit
            racket/port
            racket/class
            syntax/toplevel

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"

collects/drracket/private/frame.rkt

@@ -1,4 +1,4 @@
-#lang scheme/unit
+#lang racket/unit
   (require string-constants
            racket/match
            racket/class

collects/drracket/private/get-extend.rkt

@@ -1,4 +1,4 @@
-#lang scheme/unit
+#lang racket/unit
 
 (require racket/class
          "drsig.rkt")

collects/drracket/private/help-desk.rkt

@@ -1,4 +1,4 @@
-#lang scheme/unit
+#lang racket/unit
 
 (require racket/gui/base
          browser/external

collects/drracket/private/init.rkt

@@ -1,4 +1,4 @@
-#lang scheme/unit
+#lang racket/unit
   (require string-constants
            "drsig.rkt"
            racket/gui/base)

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

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
+                                  (language-settings lang
-                                                          (send lang default-settings))
+                                                     (send lang default-settings))
                                   drs-frame)])
             (when new-lang
               (set! language-chosen? #t)

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.

collects/drracket/private/link.rkt

@@ -1,5 +1,5 @@
 #lang racket/base
-(require scheme/unit
+(require racket/unit
          "modes.rkt"
          "font.rkt"
          "eval.rkt"

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)))))))))
 

collects/drracket/private/modes.rkt

@@ -1,4 +1,4 @@
-#lang scheme/unit
+#lang racket/unit
   (require string-constants
            racket/class
 	   racket/list

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))))

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")

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

collects/drracket/private/multi-file-search.rkt

@@ -1,4 +1,4 @@
-#lang scheme/unit
+#lang racket/unit
   (require framework
            mzlib/class
            mred

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

collects/drracket/private/text.rkt

@@ -1,4 +1,4 @@
-#lang scheme/unit
+#lang racket/unit
   (require mzlib/class
            "drsig.rkt"
            framework)

collects/drracket/private/tools-drs.rkt

@@ -1,4 +1,4 @@
-#lang scheme/unit
+#lang racket/unit
 
 #|
 

collects/drracket/private/tools.rkt

@@ -1,4 +1,4 @@
-#lang scheme/unit
+#lang racket/unit
 
 (require racket/class
          racket/list

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

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")
+    (printf "~s\n"
-          (is-lang-line? "#lang scheme")
+            (list (is-lang-line? "#lang x")
-          (is-lang-line? "#lang scheme ")
+                  (is-lang-line? "#lang racket")
-          (not (is-lang-line? "#lang schemeα"))
+                  (is-lang-line? "#lang racket ")
-          (not (is-lang-line? "#lang scheme/ "))
+                  (not (is-lang-line? "#lang racketα"))
-          (not (is-lang-line? "#lang /scheme "))
+                  (not (is-lang-line? "#lang racket/ "))
-          (is-lang-line? "#lang sch/eme ")
+                  (not (is-lang-line? "#lang /racket "))
-          (is-lang-line? "#lang r6rs")
+                  (is-lang-line? "#lang rac/ket ")
-          (is-lang-line? "#!r6rs")
+                  (is-lang-line? "#lang r6rs")
-          (is-lang-line? "#!r6rs ")
+                  (is-lang-line? "#!r6rs")
-          (not (is-lang-line? "#!/bin/sh")))
+                  (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))

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
+  (require drracket/tool
-           scheme/unit
+           racket/unit
            string-constants/string-constant)
   
   (define sc-show-sprof "Show SProfile")

collects/drracket/syncheck.rkt

@@ -18,11 +18,11 @@ If the namespace does not, they are colored the unbound color.
 
 
 (require string-constants
-         scheme/unit
+         racket/unit
-         scheme/contract
+         racket/contract
-         scheme/class
+         racket/class
-         scheme/list
+         racket/list
-         scheme/promise
+         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@)
 

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?)