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

expander: fix namespace-require/copy

Browse Source
This commit is contained in:
Matthew Flatt 2018-03-09 16:32:19 -07:00
parent 0d06ba2848
commit 3f2fd06cb0
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/racket-test-core/tests/racket/namespac.rktl
View File

@ -307,6 +307,16 @@
(namespace-require/constant 'racket/base) (namespace-require/constant 'racket/base)
(err/rt-test (eval '(define + -)) #rx"cannot change constant")) (err/rt-test (eval '(define + -)) #rx"cannot change constant"))
;; ----------------------------------------
;; Check that `namespace-require/copy` does define variables
;; but doesn't bind as required
(parameterize ([current-namespace (make-base-empty-namespace)])
(namespace-require/copy 'racket/base)
(test (void) eval '(void))
(test #f identifier-binding (namespace-syntax-introduce (datum->syntax #f 'void)))
(test #t list? (identifier-binding (namespace-syntax-introduce (datum->syntax #f 'lambda)))))
;; ---------------------------------------- ;; ----------------------------------------
;; Check that bulk `require` replaces individual bindings ;; Check that bulk `require` replaces individual bindings

5
racket/src/expander/expand/require.rkt
View File

@ -343,11 +343,10 @@
#:as-transformer? as-transformer?)) #:as-transformer? as-transformer?))
skip-bind?] skip-bind?]
[else #f])) [else #f]))
(when (and adjusted-sym (when (and copy-variable-phase-level
copy-variable-phase-level
(not as-transformer?) (not as-transformer?)
(equal? provide-phase copy-variable-phase-level)) (equal? provide-phase copy-variable-phase-level))
(copy-namespace-value m-ns adjusted-sym binding copy-variable-phase-level phase-shift (copy-namespace-value m-ns sym binding copy-variable-phase-level phase-shift
copy-variable-as-constant?)) copy-variable-as-constant?))
(and (not skip-bind?) adjusted-sym)))) (and (not skip-bind?) adjusted-sym))))
;; Now that a bulk binding is in place, update to merge nominals: ;; Now that a bulk binding is in place, update to merge nominals:

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

@ -25310,8 +25310,7 @@ static const char *startup_source =
"(let-values()" "(let-values()"
" #f))))" " #f))))"
"(begin" "(begin"
"(if(if adjusted-sym_0" "(if(if copy-variable-phase-level_1"
"(if copy-variable-phase-level_1"
"(if(not" "(if(not"
" as-transformer?_3)" " as-transformer?_3)"
"(equal?" "(equal?"
@ -25319,11 +25318,10 @@ static const char *startup_source =
" copy-variable-phase-level_1)" " copy-variable-phase-level_1)"
" #f)" " #f)"
" #f)" " #f)"
" #f)"
"(let-values()" "(let-values()"
"(copy-namespace-value" "(copy-namespace-value"
" m-ns_10" " m-ns_10"
" adjusted-sym_0" " sym_42"
" binding_16" " binding_16"
" copy-variable-phase-level_1" " copy-variable-phase-level_1"
" phase-shift_11" " phase-shift_11"