diff --git a/src/ikarus.boot b/src/ikarus.boot index 4cef2ee..17960ae 100644 Binary files a/src/ikarus.boot and b/src/ikarus.boot differ diff --git a/src/library-manager.ss b/src/library-manager.ss index 45f48f7..e9bb5cf 100644 --- a/src/library-manager.ss +++ b/src/library-manager.ss @@ -406,7 +406,6 @@ [eval-core eval-core-label (core-prim . eval-core)] [load load-label (core-prim . load)] [assembler-output assembler-output-label (core-prim . assembler-output)] - [current-expand current-expand-label (core-prim . current-expand)] [expand expand-label (core-prim . expand)] [fasl-write fasl-write-label (core-prim . fasl-write)] [new-cafe new-cafe-label (core-prim . new-cafe)] diff --git a/src/libtoplevel.ss b/src/libtoplevel.ss index 89be40a..1493e2c 100644 --- a/src/libtoplevel.ss +++ b/src/libtoplevel.ss @@ -15,16 +15,9 @@ (cadr x) (chi-top-library x)))) - (primitive-set! 'current-expand - (make-parameter sc-expand - (lambda (f) - (if (procedure? f) - f - (error 'current-expand "~s is not a procedure" f))))) - (primitive-set! 'expand (lambda (x) - ((current-expand) x))) + (sc-expand x))) (let-values ([(files script args) (let f ([args (command-line-arguments)])