diff --git a/collects/compiler/demodularizer/alpha.rkt b/collects/compiler/demodularizer/alpha.rkt index 9b459b6ca3..2f3c71398d 100644 --- a/collects/compiler/demodularizer/alpha.rkt +++ b/collects/compiler/demodularizer/alpha.rkt @@ -1,5 +1,6 @@ -#lang racket -(require compiler/zo-parse) +#lang racket/base + +(require racket/match racket/contract compiler/zo-parse) (define (alpha-vary-ctop top) (match top diff --git a/collects/compiler/demodularizer/batch.rkt b/collects/compiler/demodularizer/batch.rkt index afb495a473..bd98894ad3 100644 --- a/collects/compiler/demodularizer/batch.rkt +++ b/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" diff --git a/collects/compiler/demodularizer/gc-toplevels.rkt b/collects/compiler/demodularizer/gc-toplevels.rkt index aa6b780389..ad8c74faee 100644 --- a/collects/compiler/demodularizer/gc-toplevels.rkt +++ b/collects/compiler/demodularizer/gc-toplevels.rkt @@ -1,5 +1,10 @@ -#lang racket -(require compiler/zo-parse +#lang racket/base + +(require racket/match + racket/list + racket/dict + racket/contract + compiler/zo-parse "util.rkt") ; XXX Use efficient set structure @@ -150,21 +155,20 @@ (match (dict-ref g n) [(struct refs (n-tls n-stxs)) (hash-set! visited? n #t) - (local - [(define-values (new-tls1 new-stxs1) - (for/fold ([new-tls tls] - [new-stxs stxs]) - ([tl (in-list n-tls)]) - (visit-tl tl new-tls new-stxs))) - (define new-stxs2 - (for/fold ([new-stxs new-stxs1]) - ([stx (in-list n-stxs)]) - (define this-stx (visit-stx stx)) - (if this-stx - (list* this-stx new-stxs) - new-stxs)))] - (values (list* n new-tls1) - new-stxs2))]))) + (define-values (new-tls1 new-stxs1) + (for/fold ([new-tls tls] + [new-stxs stxs]) + ([tl (in-list n-tls)]) + (visit-tl tl new-tls new-stxs))) + (define new-stxs2 + (for/fold ([new-stxs new-stxs1]) + ([stx (in-list n-stxs)]) + (define this-stx (visit-stx stx)) + (if this-stx + (list* this-stx new-stxs) + new-stxs))) + (values (list* n new-tls1) + new-stxs2)]))) (define stx-visited? (make-hasheq)) (define (visit-stx n) (if (hash-has-key? stx-visited? n) diff --git a/collects/compiler/demodularizer/merge.rkt b/collects/compiler/demodularizer/merge.rkt index 5b087e257f..f118e6b9e4 100644 --- a/collects/compiler/demodularizer/merge.rkt +++ b/collects/compiler/demodularizer/merge.rkt @@ -1,5 +1,9 @@ -#lang racket -(require compiler/zo-parse +#lang racket/base + +(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 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)] + (define which-lift (- n mod-lift-start)) + (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] [else (list-ref toplevel-remap n)])) (lambda (n) diff --git a/collects/compiler/demodularizer/module.rkt b/collects/compiler/demodularizer/module.rkt index 9c907a5153..dca4498fec 100644 --- a/collects/compiler/demodularizer/module.rkt +++ b/collects/compiler/demodularizer/module.rkt @@ -1,5 +1,9 @@ -#lang racket -(require compiler/zo-parse +#lang racket/base + +(require racket/list + racket/match + racket/contract + compiler/zo-parse "util.rkt") (define (->module-path-index s) diff --git a/collects/compiler/demodularizer/mpi.rkt b/collects/compiler/demodularizer/mpi.rkt index 10f8cd23a5..bb430570dc 100644 --- a/collects/compiler/demodularizer/mpi.rkt +++ b/collects/compiler/demodularizer/mpi.rkt @@ -1,5 +1,7 @@ -#lang racket -(require syntax/modresolve) +#lang racket/base + +(require racket/contract + syntax/modresolve) (define current-module-path (make-parameter #f)) diff --git a/collects/compiler/demodularizer/nodep.rkt b/collects/compiler/demodularizer/nodep.rkt index 60afbaf7ec..4e55b46545 100644 --- a/collects/compiler/demodularizer/nodep.rkt +++ b/collects/compiler/demodularizer/nodep.rkt @@ -1,5 +1,9 @@ -#lang racket -(require compiler/zo-parse +#lang racket/base + +(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"))) diff --git a/collects/compiler/demodularizer/replace-modidx.rkt b/collects/compiler/demodularizer/replace-modidx.rkt index 7ad45cbc56..f470e2b8f1 100644 --- a/collects/compiler/demodularizer/replace-modidx.rkt +++ b/collects/compiler/demodularizer/replace-modidx.rkt @@ -1,6 +1,10 @@ -#lang racket -(require unstable/struct +#lang racket/base + +(require racket/match + racket/vector + unstable/struct "util.rkt") + (provide replace-modidx) (define (replace-modidx expr self-modidx) diff --git a/collects/compiler/demodularizer/update-toplevels.rkt b/collects/compiler/demodularizer/update-toplevels.rkt index 3cc4ef9e14..6c1c83704e 100644 --- a/collects/compiler/demodularizer/update-toplevels.rkt +++ b/collects/compiler/demodularizer/update-toplevels.rkt @@ -1,5 +1,8 @@ -#lang racket -(require compiler/zo-structs +#lang racket/base + +(require racket/match + racket/contract + compiler/zo-structs "util.rkt") (define (update-toplevels toplevel-updater topsyntax-updater topsyntax-new-midpt) diff --git a/collects/compiler/demodularizer/util.rkt b/collects/compiler/demodularizer/util.rkt index 1865bc133f..e18966798e 100644 --- a/collects/compiler/demodularizer/util.rkt +++ b/collects/compiler/demodularizer/util.rkt @@ -1,5 +1,7 @@ -#lang racket -(require compiler/zo-parse) +#lang racket/base + +(require racket/contract + compiler/zo-parse) (define (prefix-syntax-start pre) (length (prefix-toplevels pre)))