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

expander: correct scope of added #%module-begin wrapper

Browse Source 
Also, fix a problem rendering module path indexes.
This commit is contained in:
Matthew Flatt 2018-03-02 15:11:13 -07:00
parent 34189b38f7
commit 88b066e1b2
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
racket/src/expander/common/module-path.rkt
View File

@ -167,7 +167,7 @@
(eq? 'submod (car v))) (eq? 'submod (car v)))
(format-submod (loop (cadr v)) (cddr v))] (format-submod (loop (cadr v)) (cddr v))]
[else [else
(format "~.s" (module-path-index-path r))])) (format "~.s" v)]))
(loop (module-path-index-base r)))] (loop (module-path-index-base r)))]
[(module-path-index-resolved r) [(module-path-index-resolved r)
(list (list

4
racket/src/expander/expand/module.rkt
View File

@ -472,8 +472,8 @@
(define mb-scopes-s (define mb-scopes-s
(if keep-enclosing-scope-at-phase (if keep-enclosing-scope-at-phase
;; for `(module* name #f)`, use the `(module* ...)` form ;; for `(module* name #f)`, use the `(module* ...)` form:
disarmed-s (apply-module-scopes disarmed-s)
;; otherwise, use the initial require ;; otherwise, use the initial require
all-scopes-s)) all-scopes-s))

6
racket/src/racket/src/startup.inc
View File

@ -3952,8 +3952,7 @@ static const char *startup_source =
"(let-values()" "(let-values()"
"(format" "(format"
" \"~.s\"" " \"~.s\""
"(module-path-index-path" " v_40))))))))"
" r_13)))))))))"
" loop_57)" " loop_57)"
"(module-path-index-path r_13))" "(module-path-index-path r_13))"
"(loop_56(module-path-index-base r_13))))" "(loop_56(module-path-index-base r_13))))"
@ -72378,7 +72377,8 @@ static const char *startup_source =
" the-struct_104))))))" " the-struct_104))))))"
"(let-values(((mb-scopes-s_0)" "(let-values(((mb-scopes-s_0)"
"(if keep-enclosing-scope-at-phase_0" "(if keep-enclosing-scope-at-phase_0"
" disarmed-s_24" "(apply-module-scopes_0"
" disarmed-s_24)"
" all-scopes-s_0)))" " all-scopes-s_0)))"
"(let-values(((mb-def-ctx-scopes_0)" "(let-values(((mb-def-ctx-scopes_0)"
"(box" "(box"