diff --git a/scheme/Makefile.am b/scheme/Makefile.am index 8257e94..055b7a7 100644 --- a/scheme/Makefile.am +++ b/scheme/Makefile.am @@ -23,8 +23,7 @@ EXTRA_DIST=ikarus.boot.prebuilt ikarus.enumerations.ss \ psyntax.compat.ss psyntax.config.ss psyntax.expander.ss \ psyntax.internal.ss psyntax.library-manager.ss \ unicode/unicode-char-cases.ss unicode/unicode-charinfo.ss \ - ikarus.io.ss ikarus.time-and-date.ss \ - ikarus.separate-compilation.ss + ikarus.io.ss ikarus.time-and-date.ss all: $(nodist_pkglib_DATA) diff --git a/scheme/Makefile.in b/scheme/Makefile.in index cc76fc0..9106662 100644 --- a/scheme/Makefile.in +++ b/scheme/Makefile.in @@ -177,8 +177,7 @@ EXTRA_DIST = ikarus.boot.prebuilt ikarus.enumerations.ss \ psyntax.compat.ss psyntax.config.ss psyntax.expander.ss \ psyntax.internal.ss psyntax.library-manager.ss \ unicode/unicode-char-cases.ss unicode/unicode-charinfo.ss \ - ikarus.io.ss ikarus.time-and-date.ss \ - ikarus.separate-compilation.ss + ikarus.io.ss ikarus.time-and-date.ss revno = "$(shell sed 's/ .*//' ../.bzr/branch/last-revision 2>/dev/null)" CLEANFILES = $(nodist_pkglib_DATA) ikarus.config.ss diff --git a/scheme/ikarus.boot.prebuilt b/scheme/ikarus.boot.prebuilt index 62d948d..4da5842 100644 Binary files a/scheme/ikarus.boot.prebuilt and b/scheme/ikarus.boot.prebuilt differ diff --git a/scheme/ikarus.separate-compilation.ss b/scheme/ikarus.separate-compilation.ss deleted file mode 100644 index 05687f0..0000000 --- a/scheme/ikarus.separate-compilation.ss +++ /dev/null @@ -1,39 +0,0 @@ - -(library (ikarus separate-compilation) - (export compile-library-to-port install-library-from-file) - (import - (except (ikarus) library - compile-library-to-port - install-library-from-file) - (only (ikarus.compiler) compile-core-expr) - (only (psyntax library-manager) - install-library current-library-expander)) - - (define-struct library - (id name ver imp* vis* inv* export-subst export-env - visit-code invoke-code visible?)) - - (define (install-library-from-file filename) - (let ([p (open-file-input-port filename)]) - (let ([L (fasl-read p)]) - (unless (library? L) - (error 'install-library - "file does not contain a valid library" - filename)) - (install-library (library-id L) (library-name L) - (library-ver L) (library-imp* L) (library-vis* L) - (library-inv* L) (library-export-subst L) - (library-export-env L) (library-visit-code L) - (library-invoke-code L) (library-visible? L))))) - - (define (compile-library-to-port x p) - (let-values (((id name ver imp* vis* inv* - invoke-code visit-code export-subst export-env) - ((current-library-expander) x))) - (let ([L (make-library id name ver imp* vis* inv* - export-subst export-env - (compile-core-expr visit-code) - (compile-core-expr invoke-code) - #t)]) - (fasl-write L p))))) - diff --git a/scheme/last-revision b/scheme/last-revision index 581aa82..1a7d37e 100644 --- a/scheme/last-revision +++ b/scheme/last-revision @@ -1 +1 @@ -1396 +1397 diff --git a/scheme/makefile.ss b/scheme/makefile.ss index e483c93..11a48a7 100755 --- a/scheme/makefile.ss +++ b/scheme/makefile.ss @@ -89,7 +89,6 @@ "psyntax.builders.ss" "psyntax.expander.ss" - "ikarus.separate-compilation.ss" "ikarus.load.ss" "ikarus.pretty-print.ss" "ikarus.cafe.ss" @@ -1401,8 +1400,6 @@ [scc-letrec i] [optimize-cp i] [optimize-level i] - [compile-library-to-port i] - [install-library-from-file i] )) (define (macro-identifier? x)