diff --git a/src/ikarus.boot b/src/ikarus.boot index 9372fae..cad7039 100644 Binary files a/src/ikarus.boot and b/src/ikarus.boot differ diff --git a/src/makefile.ss b/src/makefile.ss index 93a25c3..611de35 100755 --- a/src/makefile.ss +++ b/src/makefile.ss @@ -248,6 +248,7 @@ ["libtrace.ss" "libtrace.fasl" p0 onepass] ["libcompile.ss" "libcompile.fasl" p1 onepass] ["psyntax-7.1.ss" "psyntax.fasl" p0 onepass] + ["syntax.ss" "syntax.fasl" p0 onepass] ["libpp.ss" "libpp.fasl" p0 onepass] ["libcafe.ss" "libcafe.fasl" p0 onepass] ["libposix.ss" "libposix.fasl" p0 onepass] diff --git a/src/psyntax-7.1.ss b/src/psyntax-7.1.ss index cb00b7c..843a0fa 100644 --- a/src/psyntax-7.1.ss +++ b/src/psyntax-7.1.ss @@ -1998,11 +1998,11 @@ (else (error 'sc-expand-internal "unexpected module binding type ~s" t))))) (loop bs)))))))))))) -(define chi-top-library - (let () - (include "syntax.ss") - (primitive-set! 'chi-top-library library-expander) - library-expander)) +;(define chi-top-library +; (let () +; (include "syntax.ss") +; (primitive-set! 'chi-top-library library-expander) +; library-expander)) (define id-set-diff (lambda (exports defs) diff --git a/src/syntax.ss b/src/syntax.ss index 357336c..fccbe2b 100644 --- a/src/syntax.ss +++ b/src/syntax.ss @@ -1,4 +1,7 @@ +(library (ikarus syntax) + (export) + (import (scheme)) (define who 'chi-top-library) (define noexpand "noexpand") @@ -2517,4 +2520,6 @@ (apply string-append args) (strip x '())))) (primitive-set! 'x:syntax-dispatch syntax-dispatch) + (primitive-set! 'chi-top-library library-expander)) +