From 705228ffdc26c49076f130bd53e928a060ab6ddf Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Thu, 3 Apr 2008 12:05:55 +0000 Subject: [PATCH] fix deserialization in setup-plt's scribble driver, so that it's independent of the current namespace svn: r9148 --- collects/setup/scribble.ss | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/collects/setup/scribble.ss b/collects/setup/scribble.ss index 6e90b68d46..2f320f5041 100644 --- a/collects/setup/scribble.ss +++ b/collects/setup/scribble.ss @@ -348,11 +348,15 @@ (pair? (car v)) (integer? (caar v)))) v - (deserialize v))) + (with-my-namespace + (lambda () + (deserialize v))))) (let ([v (list-ref v-in 3)]) ; searches (if (hash-table? v) ; temporary compatibility; used to be not serialized v - (deserialize v))) + (with-my-namespace + (lambda () + (deserialize v))))) (map rel->path (list-ref v-in 2)) ; deps, in case we don't need to build... can-run? my-time info-out-time @@ -435,7 +439,9 @@ (render-time "deserialize" (for ([i (info-deps info)]) - (send renderer deserialize-info (info-sci i) ci))) + (with-my-namespace + (lambda () + (send renderer deserialize-info (info-sci i) ci))))) (let* ([ri (render-time "resolve" (send renderer resolve (list v) (list dest-dir) ci))] [sci (render-time "serialize" (send renderer serialize-info ri))] [defs (render-time "defined" (send renderer get-defined ci))] @@ -485,6 +491,10 @@ (define-namespace-anchor anchor) +(define (with-my-namespace thunk) + (parameterize ([current-namespace (namespace-anchor->empty-namespace anchor)]) + (thunk))) + (define (dynamic-require-doc path) ;; Use a separate namespace so that we don't end up with all the ;; documentation loaded at once.