Integrate into MIT Scheme.

diff --git a/v7/src/star-parser/load.scm b/v7/src/star-parser/load.scm
index 74a6834b974769a82d5648c6015b66ed596a40b5..ede5693d8f4248466d280c3c012b3b5f62344f05 100644 (file)
--- a/v7/src/star-parser/load.scm
+++ b/v7/src/star-parser/load.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: load.scm,v 1.8 2001/10/04 16:51:16 cph Exp $
+;;; $Id: load.scm,v 1.9 2001/10/04 16:52:12 cph Exp $
 ;;;
 ;;; Copyright (c) 2001 Massachusetts Institute of Technology
 ;;;
@@ -22,6 +22,5 @@
 (load-option 'HASH-TABLE)
 (with-working-directory-pathname (directory-pathname (current-load-pathname))
   (lambda ()
-    (fluid-let ((*allow-package-redefinition?* #t))
-      (package/system-loader "parser" '() 'QUERY))))
+    (package/system-loader "parser" '() 'QUERY)))
 (add-subsystem-identification! "*Parser" '(0 8))
\ No newline at end of file

diff --git a/v7/src/star-parser/parser.pkg b/v7/src/star-parser/parser.pkg
index 95adca7d5e54c9f6d772548cf4935c698c72350f..d746e4e63721da9df16e2a37cb8b1a6789308e00 100644 (file)
--- a/v7/src/star-parser/parser.pkg
+++ b/v7/src/star-parser/parser.pkg
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: parser.pkg,v 1.13 2001/10/04 16:28:13 cph Exp $
+;;; $Id: parser.pkg,v 1.14 2001/10/04 16:51:20 cph Exp $
 ;;;
 ;;; Copyright (c) 2001 Massachusetts Institute of Technology
 ;;;
@@ -21,7 +21,7 @@
 
 ;;;; Parser language: packaging
 
-(global-definitions "$brun/runtime")
+(global-definitions "../runtime/runtime")
 
 (define-package (runtime *parser buffer)
   (files "buffer")

diff --git a/v7/src/xml/load.scm b/v7/src/xml/load.scm
index b174440f9edeef91b04fde6611090f7ccbc974cb..19f08abb28d88bb3fca71e2c36f2e5c4f886b0b0 100644 (file)
--- a/v7/src/xml/load.scm
+++ b/v7/src/xml/load.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: load.scm,v 1.1 2001/07/06 20:50:41 cph Exp $
+;;; $Id: load.scm,v 1.2 2001/10/04 16:52:18 cph Exp $
 ;;;
 ;;; Copyright (c) 2001 Massachusetts Institute of Technology
 ;;;
@@ -19,6 +19,8 @@
 ;;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ;;; 02111-1307, USA.
 
+(load-option '*PARSER)
 (with-working-directory-pathname (directory-pathname (current-load-pathname))
   (lambda ()
-    (package/system-loader "xml" '() 'QUERY)))
\ No newline at end of file
+    (package/system-loader "xml" '() 'QUERY)))
+(add-subsystem-identification! "XML" '(0 1))
\ No newline at end of file

diff --git a/v7/src/xml/xml.pkg b/v7/src/xml/xml.pkg
index 2818aa50bf9c5a32652a500d9c4261c75f255e5e..77826dfec1937de875a78aace1bcf1e72becaae0 100644 (file)
--- a/v7/src/xml/xml.pkg
+++ b/v7/src/xml/xml.pkg
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: xml.pkg,v 1.7 2001/07/16 20:41:29 cph Exp $
+;;; $Id: xml.pkg,v 1.8 2001/10/04 16:51:27 cph Exp $
 ;;;
 ;;; Copyright (c) 2001 Massachusetts Institute of Technology
 ;;;
@@ -21,9 +21,9 @@
 
 ;;;; XML: packaging
 
-(global-definitions "$brun/runtime")
-(global-definitions "$bscm/sos/sos")
-(global-definitions "../parser/parser")
+(global-definitions "../runtime/runtime")
+(global-definitions "../sos/sos")
+(global-definitions "../star-parser/parser")
 
 (define-package (runtime xml)
   (files)