From 0753399f96a4ae291810bac53633cfcda1086b60 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Tue, 1 Jun 2004 13:33:41 +0000 Subject: [PATCH] . original commit: f708a5f520ca9567ba4dbc160fa166eda0c7c88a --- collects/mred/mred.ss | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/collects/mred/mred.ss b/collects/mred/mred.ss index 9d234a4e..15f00c9a 100644 --- a/collects/mred/mred.ss +++ b/collects/mred/mred.ss @@ -7705,6 +7705,11 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +(define mred-module-name ((current-module-name-resolver) + '(lib "mred.ss" "mred") #f #f)) +(define class-module-name ((current-module-name-resolver) + '(lib "class.ss") #f #f)) + (define make-namespace-with-mred (opt-lambda ([flag 'mred]) (unless (memq flag '(initial mred empty)) @@ -7712,14 +7717,12 @@ "flag symbol, one of 'mred, 'initial, or 'empty" flag)) (let ([orig (current-namespace)] - [mred-name ((current-module-name-resolver) - '(lib "mred.ss" "mred") #f #f)] [ns (make-namespace (if (eq? flag 'empty) 'empty 'initial))]) (parameterize ([current-namespace ns]) - (namespace-attach-module orig mred-name) + (namespace-attach-module orig mred-module-name) (when (eq? flag 'mred) - (namespace-require '(lib "mred.ss" "mred")) - (namespace-require '(lib "class.ss")))) + (namespace-require mred-module-name) + (namespace-require class-module-name))) ns))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;