From 1c93e0f023d08406f0f2480f2a1ba76bd6d763e2 Mon Sep 17 00:00:00 2001 From: Sam Tobin-Hochstadt Date: Sun, 30 Jun 2013 10:04:34 -0400 Subject: [PATCH] Remove most uses of `mzscheme` in the core. Remaining are: - parts of unit200 that Matthew plans to remove. - the `mzscheme` implementation itself. The implementation of `mzscheme` has been moved to the `mzscheme` collection (from the `racket` and `scheme` collections). The `scheme/mzscheme` language, which was undocumented, has been removed. This is slightly backwards-incompatible, because the `xform` handling of precompiled headers now evaluates code in a `racket/base`-like namespace, instead of in a `mzscheme`-like namespace. original commit: d54c1e4e4942c26dcbaaebcc43d5c92d507a8112 --- racket/lib/collects/compiler/bundle-dist.rkt | 8 ++++---- racket/lib/collects/compiler/embed-sig.rkt | 2 +- racket/lib/collects/compiler/sig.rkt | 3 +-- racket/lib/collects/setup/option-sig.rkt | 3 +-- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/racket/lib/collects/compiler/bundle-dist.rkt b/racket/lib/collects/compiler/bundle-dist.rkt index e7b596d260..af419cf515 100644 --- a/racket/lib/collects/compiler/bundle-dist.rkt +++ b/racket/lib/collects/compiler/bundle-dist.rkt @@ -1,7 +1,7 @@ -(module bundle-dist mzscheme +(module bundle-dist racket/base (require racket/file - (only racket/base lambda) + (only-in racket/base lambda) racket/path racket/system file/zip @@ -80,8 +80,8 @@ "-mode" "555" "-volname" (path->string (path-replace-suffix (file-name-from-path target) #"")) - "-srcfolder" (path->string (expand-path (path->complete-path dir))) - (path->string (expand-path (path->complete-path target))))]) + "-srcfolder" (path->string (cleanse-path (path->complete-path dir))) + (path->string (cleanse-path (path->complete-path target))))]) ((list-ref p 4) 'wait) (unless (eq? ((list-ref p 4) 'status) 'done-ok) (error 'bundle-directory diff --git a/racket/lib/collects/compiler/embed-sig.rkt b/racket/lib/collects/compiler/embed-sig.rkt index e7cac31ad2..aeded68b62 100644 --- a/racket/lib/collects/compiler/embed-sig.rkt +++ b/racket/lib/collects/compiler/embed-sig.rkt @@ -1,5 +1,5 @@ -(module embed-sig mzscheme +(module embed-sig racket/base (require racket/unit) (provide compiler:embed^) diff --git a/racket/lib/collects/compiler/sig.rkt b/racket/lib/collects/compiler/sig.rkt index 860a07eb70..87f1af4dda 100644 --- a/racket/lib/collects/compiler/sig.rkt +++ b/racket/lib/collects/compiler/sig.rkt @@ -1,5 +1,4 @@ - -#lang mzscheme +#lang racket/base (require racket/unit) diff --git a/racket/lib/collects/setup/option-sig.rkt b/racket/lib/collects/setup/option-sig.rkt index d9f5b43bf5..2900009479 100644 --- a/racket/lib/collects/setup/option-sig.rkt +++ b/racket/lib/collects/setup/option-sig.rkt @@ -1,5 +1,4 @@ - -(module option-sig mzscheme +(module option-sig scheme/base (require racket/unit) (provide setup-option^)