diff --git a/scheme/ikarus.boot.orig b/scheme/ikarus.boot.orig index f2e80ba..5b5e09a 100644 Binary files a/scheme/ikarus.boot.orig and b/scheme/ikarus.boot.orig differ diff --git a/scheme/makefile.ss b/scheme/makefile.ss index 84696a6..383a9f7 100755 --- a/scheme/makefile.ss +++ b/scheme/makefile.ss @@ -1443,7 +1443,7 @@ [visible? (caddr legend-entry)]) (let ([id (gensym)] [name name] - [version '()] + [version (if (eq? (car name) 'rnrs) '(6) '())] [import-libs '()] [visit-libs '()] [invoke-libs '()]) diff --git a/scheme/psyntax.expander.ss b/scheme/psyntax.expander.ss index db9656e..093cad3 100644 --- a/scheme/psyntax.expander.ss +++ b/scheme/psyntax.expander.ss @@ -2791,6 +2791,7 @@ (cdr x))) subst))) ((library name) (eq? library 'library) + ;;; FIXME: versioning stuff (let ((lib (find-library-by-name name))) (unless lib (error 'import diff --git a/scheme/psyntax.library-manager.ss b/scheme/psyntax.library-manager.ss index 5545408..acb0440 100644 --- a/scheme/psyntax.library-manager.ss +++ b/scheme/psyntax.library-manager.ss @@ -52,7 +52,10 @@ (unless (library? x) (error 'record-type-printer "not a library")) (display - (format "#" (append (library-name x) (library-ver x))) + (format "#" + (if (null? (library-ver x)) + (library-name x) + (append (library-name x) (list (library-ver x))))) p))) (define (find-dependencies ls)