fix (rnrs eval) to be phase-insensitive
svn: r8955
This commit is contained in:
parent
1f38a6cb0a
commit
1abcf7c313
|
@ -24,7 +24,7 @@
|
||||||
v)
|
v)
|
||||||
|
|
||||||
(define (r6rs:eval expr env)
|
(define (r6rs:eval expr env)
|
||||||
(eval #`(#%expression #,(datum->syntax #f (mpair->pair expr))) env))
|
(eval (datum->syntax #f `(#%expression ,(mpair->pair expr))) env))
|
||||||
|
|
||||||
(define (environment . specs)
|
(define (environment . specs)
|
||||||
(let ([reqs
|
(let ([reqs
|
||||||
|
@ -42,6 +42,7 @@
|
||||||
;; Make sure all modules are instantiated here:
|
;; Make sure all modules are instantiated here:
|
||||||
(parameterize ([current-namespace ns])
|
(parameterize ([current-namespace ns])
|
||||||
(namespace-require '(rename scheme/base #%base-require require))
|
(namespace-require '(rename scheme/base #%base-require require))
|
||||||
|
(namespace-require '(only scheme/base #%expression))
|
||||||
(eval `(#%base-require r6rs/private/prelims
|
(eval `(#%base-require r6rs/private/prelims
|
||||||
. ,(datum->syntax #'here (apply append reqs)))))
|
. ,(datum->syntax #'here (apply append reqs)))))
|
||||||
ns)))
|
ns)))
|
||||||
|
|
Loading…
Reference in New Issue
Block a user