#lang racket' -> #lang racket/base' conversions in demodularizer.

collects/compiler/demodularizer/alpha.rkt

@@ -1,5 +1,6 @@
-#lang racket
+#lang racket/base
-(require compiler/zo-parse)
+
+(require racket/match racket/contract compiler/zo-parse)
 
 (define (alpha-vary-ctop top)
   (match top

collects/compiler/demodularizer/batch.rkt

@@ -1,4 +1,5 @@
-#lang racket
+#lang racket/base
+
 #|
 Here's the idea:
 
@@ -40,6 +41,7 @@ Here's the idea:
 
 (require racket/pretty
          racket/system
+         racket/cmdline
          "mpi.rkt"
          "util.rkt"
          "nodep.rkt"

collects/compiler/demodularizer/gc-toplevels.rkt

@@ -1,5 +1,10 @@
-#lang racket
+#lang racket/base
-(require compiler/zo-parse
+
+(require racket/match
+         racket/list
+         racket/dict
+         racket/contract
+         compiler/zo-parse
          "util.rkt")
 
 ; XXX Use efficient set structure
@@ -150,8 +155,7 @@
         (match (dict-ref g n)
           [(struct refs (n-tls n-stxs))
            (hash-set! visited? n #t)
-           (local
+           (define-values (new-tls1 new-stxs1)
-             [(define-values (new-tls1 new-stxs1)
              (for/fold ([new-tls tls]
                         [new-stxs stxs])
                        ([tl (in-list n-tls)])
@@ -162,9 +166,9 @@
                (define this-stx (visit-stx stx))
                (if this-stx
                    (list* this-stx new-stxs)
-                      new-stxs)))]          
+                   new-stxs)))
            (values (list* n new-tls1)
-                     new-stxs2))])))
+                   new-stxs2)])))
   (define stx-visited? (make-hasheq))
   (define (visit-stx n)
     (if (hash-has-key? stx-visited? n)

collects/compiler/demodularizer/merge.rkt

@@ -1,5 +1,9 @@
-#lang racket
+#lang racket/base
-(require compiler/zo-parse
+
+(require racket/list
+         racket/match
+         racket/contract
+         compiler/zo-parse
          "util.rkt"
          "mpi.rkt"
          "nodep.rkt"
@@ -156,12 +160,12 @@
                     (cond
                       [(mod-lift-start . <= . n)
                        ; This is a lift
-                       (local [(define which-lift (- n mod-lift-start))
+                       (define which-lift (- n mod-lift-start))
-                               (define lift-tl (+ top-lift-start lift-offset which-lift))]
+                       (define lift-tl (+ top-lift-start lift-offset which-lift))
                        (when (lift-tl . >= . max-toplevel)
                          (error 'merge-module "[~S] lift error: orig(~a) which(~a) max(~a) lifts(~a) now(~a)" 
                                 name n which-lift num-mod-toplevels mod-num-lifts lift-tl))
-                         lift-tl)]
+                       lift-tl]
                       [else
                        (list-ref toplevel-remap n)]))
                   (lambda (n)

collects/compiler/demodularizer/module.rkt

@@ -1,5 +1,9 @@
-#lang racket
+#lang racket/base
-(require compiler/zo-parse
+
+(require racket/list
+         racket/match
+         racket/contract
+         compiler/zo-parse
          "util.rkt")
 
 (define (->module-path-index s)

collects/compiler/demodularizer/mpi.rkt

@@ -1,5 +1,7 @@
-#lang racket
+#lang racket/base
-(require syntax/modresolve)
+
+(require racket/contract
+         syntax/modresolve)
 
 (define current-module-path (make-parameter #f))
 

collects/compiler/demodularizer/nodep.rkt

@@ -1,5 +1,9 @@
-#lang racket
+#lang racket/base
-(require compiler/zo-parse
+
+(require racket/list
+         racket/match
+         racket/contract
+         compiler/zo-parse
          "util.rkt"
          "mpi.rkt"
          racket/set)
@@ -92,7 +96,8 @@
 
 (define (nodep-form form phase)
   (if (mod? form)
-      (local [(define-values (modvar-rewrite lang-info mods) (nodep-module form phase))]
+      (let-values ([(modvar-rewrite lang-info mods)
+                    (nodep-module form phase)])
         (values modvar-rewrite lang-info (make-splice mods)))
       (error 'nodep-form "Doesn't support non mod forms")))
 

collects/compiler/demodularizer/replace-modidx.rkt

@@ -1,6 +1,10 @@
-#lang racket
+#lang racket/base
-(require unstable/struct
+
+(require racket/match
+         racket/vector
+         unstable/struct
          "util.rkt")
+
 (provide replace-modidx)
 
 (define (replace-modidx expr self-modidx)

collects/compiler/demodularizer/update-toplevels.rkt

@@ -1,5 +1,8 @@
-#lang racket
+#lang racket/base
-(require compiler/zo-structs
+
+(require racket/match
+         racket/contract
+         compiler/zo-structs
          "util.rkt")
 
 (define (update-toplevels toplevel-updater topsyntax-updater topsyntax-new-midpt)

collects/compiler/demodularizer/util.rkt

@@ -1,5 +1,7 @@
-#lang racket
+#lang racket/base
-(require compiler/zo-parse)
+
+(require racket/contract
+         compiler/zo-parse)
 
 (define (prefix-syntax-start pre)
   (length (prefix-toplevels pre)))