diff --git a/src/ikarus.boot b/src/ikarus.boot index dd5fd27..9a002a2 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 d58e3c1..7bbe6b9 100644 --- a/src/ikarus.library-manager.ss +++ b/src/ikarus.library-manager.ss @@ -2,7 +2,7 @@ (library (ikarus library-manager) - (export imported-label->binding library-subst/env + (export imported-label->binding library-subst current-library-collection installed-libraries find-library-by-name install-library library-spec invoke-library) @@ -41,9 +41,12 @@ [(pred (car ls)) (car ls)] [else (f (cdr ls))]))) + (define (install-library-by-name name) + #f) + (define (find-library-by-name name) (find-library-by - (lambda (x) (equal? (library-name x) name)))) + (lambda (x) (equal? (library-name x) name)))) (define (library-exists? name) (and (find-library-by @@ -102,11 +105,6 @@ (define installed-libraries (lambda () ((current-library-collection)))) - (define library-subst/env - (lambda (x) - (unless (library? x) - (error 'library-subst/env "~s is not a library" x)) - (values (library-subst x) (library-env x)))) (define library-spec (lambda (x) (unless (library? x) diff --git a/src/ikarus.syntax.ss b/src/ikarus.syntax.ss index 9bd3c76..b0b0323 100644 --- a/src/ikarus.syntax.ss +++ b/src/ikarus.syntax.ss @@ -595,9 +595,9 @@ (stx-error x))]))) (define scheme-stx (lambda (sym) - (let-values ([(subst env) - (library-subst/env - (find-library-by-name '(ikarus system $all)))]) + (let ([subst + (library-subst + (find-library-by-name '(ikarus system $all)))]) (cond [(assq sym subst) => (lambda (x) @@ -2096,7 +2096,7 @@ (let ([lib (find-library-by-name spec)]) (unless lib (error 'import "cannot find library satisfying ~s" spec)) - (let-values ([(s _r) (library-subst/env lib)]) + (let ([s (library-subst lib)]) (values s lib)))])) (cond [(null? imp*) (values '() '())]