From 7b6c5351e14be6fba73be7c2a1cab48cf0d58e6f Mon Sep 17 00:00:00 2001 From: Chris Hanson Date: Fri, 17 Aug 2001 12:51:00 +0000 Subject: [PATCH] Rename PACKAGE/SYSTEM-LOADER to LOAD-PACKAGE-SET. That will allow us to have an operation named UNLOAD-PACKAGE-SET. --- v7/src/runtime/make.scm | 3 ++- v7/src/runtime/packag.scm | 7 +++++-- v7/src/runtime/runtime.pkg | 3 ++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/v7/src/runtime/make.scm b/v7/src/runtime/make.scm index 6d32a9972..2f33f0318 100644 --- a/v7/src/runtime/make.scm +++ b/v7/src/runtime/make.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: make.scm,v 14.71 2001/08/15 02:55:59 cph Exp $ +$Id: make.scm,v 14.72 2001/08/17 12:51:00 cph Exp $ Copyright (c) 1988-2001 Massachusetts Institute of Technology @@ -295,6 +295,7 @@ USA. (export 'CONSTRUCT-PACKAGES-FROM-FILE) (export 'ENVIRONMENT->PACKAGE) (export 'FIND-PACKAGE) + (export 'LOAD-PACKAGE-SET) (export 'LOAD-PACKAGES-FROM-FILE) (export 'NAME->PACKAGE) (export 'PACKAGE/ADD-CHILD!) diff --git a/v7/src/runtime/packag.scm b/v7/src/runtime/packag.scm index 5285a75d8..c67fcf14e 100644 --- a/v7/src/runtime/packag.scm +++ b/v7/src/runtime/packag.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: packag.scm,v 14.30 2001/08/16 20:02:35 cph Exp $ +$Id: packag.scm,v 14.31 2001/08/17 12:50:15 cph Exp $ Copyright (c) 1988-1999, 2001 Massachusetts Institute of Technology @@ -161,7 +161,7 @@ USA. (define system-loader/enable-query? #f) -(define (package/system-loader filename #!optional options load-interpreted?) +(define (load-package-set filename #!optional options load-interpreted?) (let* ((options (if (default-object? options) '() options)) (pathname (let ((rewrite (lookup-option 'REWRITE-PACKAGE-FILE-NAME options)) @@ -205,6 +205,9 @@ USA. ;; can end up being purified also. (flush-purification-queue!)) +(define package/system-loader + load-package-set) + (define (filename->compiled-object system component) (let ((prim (ucode-primitive initialize-c-compiled-block 1))) (and (implemented-primitive-procedure? prim) diff --git a/v7/src/runtime/runtime.pkg b/v7/src/runtime/runtime.pkg index e5397387b..88bc3bb84 100644 --- a/v7/src/runtime/runtime.pkg +++ b/v7/src/runtime/runtime.pkg @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: runtime.pkg,v 14.373 2001/08/15 02:56:21 cph Exp $ +$Id: runtime.pkg,v 14.374 2001/08/17 12:50:52 cph Exp $ Copyright (c) 1988-2001 Massachusetts Institute of Technology @@ -54,6 +54,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA construct-packages-from-file environment->package find-package + load-package-set load-packages-from-file name->package package/add-child! -- 2.25.1