suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

create-embedding-executable: fix namespace and module-declaration problem

Browse Source
This commit is contained in:
Matthew Flatt 2014-03-09 08:43:40 -06:00
parent 252e4ce590
commit 8253994434
3 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me24.rkt Normal file
View File

@ -0,0 +1,3 @@
#lang racket
"Ok"

13
pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/test.rkt
View File

@ -620,3 +620,16 @@
(try-reader) (try-reader)
(try-planet) (try-planet)
(try-*sl) (try-*sl)
;; ----------------------------------------
;; Make sure that embedding does not break future module declarations
(let ()
(parameterize ([current-output-port (open-output-bytes)])
(write-module-bundle
#:modules (list (list #f (collection-file-path "embed-me24.rkt" "tests" "compiler" "embed")))))
(parameterize ([read-accept-reader #t]
[current-namespace (make-base-namespace)])
(eval (read (open-input-string "#lang racket 10")))))

12
racket/collects/compiler/embed.rkt
View File

@ -489,10 +489,16 @@
;; avoid potentially trying to redeclare cross-phase persistent modules, ;; avoid potentially trying to redeclare cross-phase persistent modules,
;; since redeclaration isn't allowed: ;; since redeclaration isn't allowed:
null null
;; check for run-time paths by visinting the module in a fresh ;; check for run-time paths by visiting the module in an
;; namespace: ;; expand-time namespace:
(parameterize ([current-namespace expand-namespace]) (parameterize ([current-namespace expand-namespace])
(eval code) (define no-submodule-code
;; Strip away submodules to avoid re-declaring them:
(module-compiled-submodules
(module-compiled-submodules code #f null)
#t
null))
(eval no-submodule-code)
(let ([module-path (let ([module-path
(if (path? module-path) (if (path? module-path)
(path->complete-path module-path) (path->complete-path module-path)