diff --git a/src/ikarus.boot b/src/ikarus.boot index 90e8fcc..083e9e2 100644 Binary files a/src/ikarus.boot and b/src/ikarus.boot differ diff --git a/src/ikarus.library-manager.ss b/src/ikarus.library-manager.ss index 493c474..a3be6ad 100644 --- a/src/ikarus.library-manager.ss +++ b/src/ikarus.library-manager.ss @@ -447,7 +447,6 @@ [new-cafe new-cafe-label (core-prim . new-cafe)] [command-line-arguments command-line-arguments-label (core-prim . command-line-arguments)] [list*->code* list*->code*-label (core-prim . list*->code*)] - [install-library install-library-label (core-prim . install-library)] [eval-top-level eval-top-level-label (core-prim . eval-top-level)] [current-primitive-locations current-primitive-locations-label (core-prim . current-primitive-locations)] ;;; record/mid-level diff --git a/src/ikarus.syntax.ss b/src/ikarus.syntax.ss index 5a77d02..b364d2a 100644 --- a/src/ikarus.syntax.ss +++ b/src/ikarus.syntax.ss @@ -4,7 +4,9 @@ generate-temporaries free-identifier=? syntax-error boot-library-expand eval-top-level) (import - (rename (except (ikarus) boot-library-expand syntax-error eval-top-level) + (only (ikarus library-manager) install-library) + (rename (except (ikarus) boot-library-expand syntax-error + eval-top-level install-library) (free-identifier=? sys:free-identifier=?) (identifier? sys:identifier?) (generate-temporaries sys:generate-temporaries))) diff --git a/src/makefile.ss b/src/makefile.ss index b6ef0e3..cdfa3e2 100755 --- a/src/makefile.ss +++ b/src/makefile.ss @@ -55,12 +55,12 @@ "ikarus.intel-assembler.ss" "ikarus.fasl.ss" "ikarus.compiler.ss" + "ikarus.library-manager.ss" "ikarus.syntax.ss" "ikarus.pretty-print.ss" "ikarus.cafe.ss" "ikarus.posix.ss" "ikarus.timer.ss" - "ikarus.library-manager.ss" "libtoplevel.ss")) (define ikarus-system-macros @@ -386,7 +386,6 @@ [new-cafe s i] [command-line-arguments s i] [list*->code* s i] - [install-library s i] [eval-top-level s i] [current-primitive-locations s i] [record? s i] @@ -943,7 +942,6 @@ [new-cafe new-cafe-label (core-prim . new-cafe)] [command-line-arguments command-line-arguments-label (core-prim . command-line-arguments)] [list*->code* list*->code*-label (core-prim . list*->code*)] - [install-library install-library-label (core-prim . install-library)] [eval-top-level eval-top-level-label (core-prim . eval-top-level)] [current-primitive-locations current-primitive-locations-label (core-prim . current-primitive-locations)] ;;; record/mid-level @@ -1111,7 +1109,11 @@ ',subst ',env void void)))) (let ([code `(library (ikarus primlocs) (export) ;;; must be empty - (import (scheme)) + (import + (only (ikarus library-manager) + install-library) + (except (ikarus) + install-library)) (current-primitive-locations (lambda (x) (cond