change syntax/toplevel to use scheme/base instead of mzscheme, which avoids some namespace problems
svn: r16785
This commit is contained in:
parent
21c6e08e4d
commit
cad5d85354
|
@ -1,5 +1,5 @@
|
||||||
|
|
||||||
(module toplevel mzscheme
|
(module toplevel scheme/base
|
||||||
(require "kerncase.ss")
|
(require "kerncase.ss")
|
||||||
|
|
||||||
(provide eval-compile-time-part-of-top-level
|
(provide eval-compile-time-part-of-top-level
|
||||||
|
@ -42,7 +42,7 @@
|
||||||
(map expand-syntax-top-level-with-compile-time-evals
|
(map expand-syntax-top-level-with-compile-time-evals
|
||||||
(syntax->list (syntax (expr ...))))]
|
(syntax->list (syntax (expr ...))))]
|
||||||
[(beg . _) e])
|
[(beg . _) e])
|
||||||
(datum->syntax-object e (syntax-e (syntax (beg expr ...))) e e))]
|
(datum->syntax e (syntax-e (syntax (beg expr ...))) e e))]
|
||||||
[else
|
[else
|
||||||
(let ([e (expand-syntax e)])
|
(let ([e (expand-syntax e)])
|
||||||
(compile-and-eval-compile-time-part e #f)
|
(compile-and-eval-compile-time-part e #f)
|
||||||
|
@ -63,7 +63,7 @@
|
||||||
[(#%require req ...)
|
[(#%require req ...)
|
||||||
(begin0
|
(begin0
|
||||||
(when compile? (compile-syntax stx))
|
(when compile? (compile-syntax stx))
|
||||||
(for-each (lambda (req) (namespace-require/expansion-time (syntax-object->datum req)))
|
(for-each (lambda (req) (namespace-require/expansion-time (syntax->datum req)))
|
||||||
(syntax->list (syntax (req ...)))))]
|
(syntax->list (syntax (req ...)))))]
|
||||||
[(module . _)
|
[(module . _)
|
||||||
(eval/compile stx)]
|
(eval/compile stx)]
|
||||||
|
|
Loading…
Reference in New Issue
Block a user