From: Chris Hanson <org/chris-hanson/cph>
Date: Wed, 19 Dec 2001 20:52:48 +0000 (+0000)
Subject: Eliminate references to SYNTAX-TABLE/SYSTEM-INTERNAL.
X-Git-Tag: 20090517-FFI~2355
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=568784e74dc40207d697c60520b0089fb3da231d;p=mit-scheme.git

Eliminate references to SYNTAX-TABLE/SYSTEM-INTERNAL.
---

diff --git a/v7/src/runtime/option.scm b/v7/src/runtime/option.scm
index a7719b1ea..464be922d 100644
--- a/v7/src/runtime/option.scm
+++ b/v7/src/runtime/option.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: option.scm,v 14.38 2001/10/10 05:10:33 cph Exp $
+$Id: option.scm,v 14.39 2001/12/19 20:50:44 cph Exp $
 
 Copyright (c) 1988-2001 Massachusetts Institute of Technology
 
@@ -48,13 +48,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 		(load-latest (merge-pathnames file
 					      (library-directory-pathname ""))
 			     (make-load-environment)
-			     system-global-syntax-table
+			     'DEFAULT
 			     #f))
 	      (values *options* *parent*)))
 	find-option))
 
     (define (make-load-environment)
-      (eval '(LET () (THE-ENVIRONMENT)) system-global-environment))
+      (extend-interpreter-environment system-global-environment))
 
     (fluid-let ((*parser-canonicalize-symbols?* #t))
       (if (memq name loaded-options)
@@ -122,7 +122,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 			      (lambda ()
 				(load pathname
 				      environment
-				      syntax-table/system-internal
+				      'DEFAULT
 				      #t))))))))))
 		files)
       (flush-purification-queue!)
diff --git a/v7/src/sos/compile.scm b/v7/src/sos/compile.scm
index 8289164ee..bdcdc4a6f 100644
--- a/v7/src/sos/compile.scm
+++ b/v7/src/sos/compile.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: compile.scm,v 1.4 2001/08/15 03:10:42 cph Exp $
+;;; $Id: compile.scm,v 1.5 2001/12/19 20:49:57 cph Exp $
 ;;;
 ;;; Copyright (c) 1995-1999, 2001 Massachusetts Institute of Technology
 ;;;
@@ -24,7 +24,7 @@
 (with-working-directory-pathname (directory-pathname (current-load-pathname))
   (lambda ()
     (compile-file "class")
-    (compile-file "instance" '() syntax-table/system-internal)
+    (compile-file "instance")
     (compile-file "macros")
     (compile-file "method")
     (compile-file "printer")
diff --git a/v7/src/sos/ed-ffi.scm b/v7/src/sos/ed-ffi.scm
index 8fa1f2a5a..ccc685f90 100644
--- a/v7/src/sos/ed-ffi.scm
+++ b/v7/src/sos/ed-ffi.scm
@@ -1,8 +1,8 @@
 #| -*- Scheme -*-
 
-$Id: ed-ffi.scm,v 1.2 1999/01/02 06:19:10 cph Exp $
+$Id: ed-ffi.scm,v 1.3 2001/12/19 20:50:01 cph Exp $
 
-Copyright (c) 1997, 1999 Massachusetts Institute of Technology
+Copyright (c) 1997, 1999, 2001 Massachusetts Institute of Technology
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -16,16 +16,17 @@ General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
 |#
 
 ;;;; Edwin buffer packaging info
 
 (standard-scheme-find-file-initialization
  '#(
-    ("class"	(sos class)	system-global-syntax-table)
-    ("instance"	(sos instance)	syntax-table/system-internal)
-    ("macros"	(sos macros)	system-global-syntax-table)
-    ("method"	(sos method)	system-global-syntax-table)
-    ("printer"	(sos printer)	system-global-syntax-table)
-    ("slot"	(sos slot)	system-global-syntax-table)))
\ No newline at end of file
+    ("class"	(sos class))
+    ("instance"	(sos instance))
+    ("macros"	(sos macros))
+    ("method"	(sos method))
+    ("printer"	(sos printer))
+    ("slot"	(sos slot))))
\ No newline at end of file
diff --git a/v7/src/sos/instance.scm b/v7/src/sos/instance.scm
index c9c7bf2fb..fea00921d 100644
--- a/v7/src/sos/instance.scm
+++ b/v7/src/sos/instance.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: instance.scm,v 1.9 2000/02/21 22:10:33 cph Exp $
+;;; $Id: instance.scm,v 1.10 2001/12/19 20:50:04 cph Exp $
 ;;;
 ;;; Copyright (c) 1995-2000 Massachusetts Institute of Technology
 ;;;
@@ -89,6 +89,9 @@
 	  `(IF INITIALIZATION
 	       ,(generator '((INITIALIZATION INSTANCE)))
 	       ,(generator '())))))))
+
+(define-macro (ucode-type name)
+  (apply microcode-type name))
 
 (define-macro (instance-constructor-3 test arity initialization ixs)
   `(LETREC
diff --git a/v7/src/sos/sos.pkg b/v7/src/sos/sos.pkg
index b217d7776..9fdc4952f 100644
--- a/v7/src/sos/sos.pkg
+++ b/v7/src/sos/sos.pkg
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: sos.pkg,v 1.9 2000/02/21 23:13:11 cph Exp $
+$Id: sos.pkg,v 1.10 2001/12/19 20:50:08 cph Exp $
 
 Copyright (c) 1995-2000 Massachusetts Institute of Technology
 
@@ -29,7 +29,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define-package (sos slot)
   (files "slot")
-  (parent ())
+  (parent (sos))
   (export ()
 	  set-slot-value!
 	  slot-accessor
@@ -58,7 +58,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define-package (sos class)
   (files "class")
-  (parent ())
+  (parent (sos))
   (export ()
 	  <%record>
 	  <bignum>
@@ -116,7 +116,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define-package (sos instance)
   (files "instance")
-  (parent ())
+  (parent (sos))
   (export ()
 	  initialize-instance
 	  instance-class
@@ -127,7 +127,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define-package (sos method)
   (files "method")
-  (parent ())
+  (parent (sos))
   (export ()
 	  <chained-method>
 	  <computed-emp>
@@ -162,11 +162,11 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define-package (sos printer)
   (files "printer")
-  (parent ())
+  (parent (sos))
   (export ()
 	  write-instance
 	  write-instance-helper))
 
 (define-package (sos macros)
   (files "macros")
-  (parent ()))
\ No newline at end of file
+  (parent (sos)))
\ No newline at end of file
diff --git a/v7/src/swat/scheme/other/unhash-testing.scm b/v7/src/swat/scheme/other/unhash-testing.scm
index 108519e3e..5376c0670 100644
--- a/v7/src/swat/scheme/other/unhash-testing.scm
+++ b/v7/src/swat/scheme/other/unhash-testing.scm
@@ -3,14 +3,13 @@
 (declare (usual-integrations)
 	 (integrate-external "/scheme/700/runtime/hash"))
 
-(using-syntax syntax-table/system-internal
-  (define foo-1 'invalid-rehash)
-  (define foo-2 'invalid-bucket)
-  (define foo-3 'unhash-table)
-  (define (foo)
-    (set! foo-1 3)
-    (set! foo-2 3)
-    (set! foo-3 3))
+(define foo-1 'invalid-rehash)
+(define foo-2 'invalid-bucket)
+(define foo-3 'unhash-table)
+(define (foo)
+  (set! foo-1 3)
+  (set! foo-2 3)
+  (set! foo-3 3))
 
 (define *do-validation?* #T)
 
@@ -122,6 +121,4 @@
 			 table))))
 	      (let ((result (old-unhash number table)))
 		(validate table 'unhash #T)
-		result)))))
-	      
-)
+		result)))))
\ No newline at end of file