From: Chris Hanson <org/chris-hanson/cph>
Date: Thu, 20 Dec 2001 06:49:28 +0000 (+0000)
Subject: Eliminate references to SYSTEM-GLOBAL-SYNTAX-TABLE.
X-Git-Tag: 20090517-FFI~2339
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=4c20ce9e01cf6f45a8823860a8f43ac24f49f1b5;p=mit-scheme.git

Eliminate references to SYSTEM-GLOBAL-SYNTAX-TABLE.
---

diff --git a/v7/src/runtime/defstr.scm b/v7/src/runtime/defstr.scm
index 4bfd48a87..9252033fa 100644
--- a/v7/src/runtime/defstr.scm
+++ b/v7/src/runtime/defstr.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: defstr.scm,v 14.33 2000/01/04 05:14:22 cph Exp $
+$Id: defstr.scm,v 14.34 2001/12/20 06:34:28 cph Exp $
 
-Copyright (c) 1988-1999 Massachusetts Institute of Technology
+Copyright (c) 1988-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,7 +16,8 @@ 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.
 |#
 
 ;;;; Structure Definition Macro
@@ -70,11 +71,12 @@ differences:
 |#
 
 (define (initialize-define-structure-macro!)
-  (syntax-table-define system-global-syntax-table 'DEFINE-STRUCTURE
-    transform/define-structure))
+  (syntax-table/define system-global-environment
+		       'DEFINE-STRUCTURE
+		       transform/define-structure))
 
 (define transform/define-structure
-  (macro (name-and-options . slot-descriptions)
+  (lambda (name-and-options . slot-descriptions)
     (let ((structure
 	   (with-values
 	       (lambda ()
diff --git a/v7/src/runtime/macros.scm b/v7/src/runtime/macros.scm
index b2392cd06..be7d05116 100644
--- a/v7/src/runtime/macros.scm
+++ b/v7/src/runtime/macros.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: macros.scm,v 1.3 1999/01/02 06:11:34 cph Exp $
+$Id: macros.scm,v 1.4 2001/12/20 06:34:37 cph Exp $
 
-Copyright (c) 1988-1999 Massachusetts Institute of Technology
+Copyright (c) 1988-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,7 +16,8 @@ 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.
 |#
 
 ;;;; More Special Forms
@@ -26,8 +27,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define (initialize-package!)
   (for-each (lambda (keyword transform)
-	      (syntax-table-define system-global-syntax-table keyword
-		transform))
+	      (syntax-table/define system-global-environment
+				   keyword
+				   transform))
 	    '(AND
 	      CASE
 	      CONS-STREAM
@@ -300,7 +302,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 	      ,rest))))
 
 (define transform/define-integrable
-  (macro (pattern . body)
+  (lambda (pattern . body)
     (parse-define-syntax pattern body
       (lambda (name body)
 	`(BEGIN (DECLARE (INTEGRATE ,pattern))
diff --git a/v7/src/runtime/runtime.pkg b/v7/src/runtime/runtime.pkg
index ab9a4a23d..9ec622c0b 100644
--- a/v7/src/runtime/runtime.pkg
+++ b/v7/src/runtime/runtime.pkg
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: runtime.pkg,v 14.391 2001/12/19 21:41:07 cph Exp $
+$Id: runtime.pkg,v 14.392 2001/12/20 06:49:06 cph Exp $
 
 Copyright (c) 1988-2001 Massachusetts Institute of Technology
 
@@ -3765,8 +3765,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 	  syntax*
 	  syntax-closure/expression
 	  syntax-closure?
-	  syntax/top-level?
-	  system-global-syntax-table)
+	  syntax/top-level?)
   (export (runtime defstruct)
 	  parse-lambda-list)
   (initialization (initialize-package!)))
diff --git a/v7/src/runtime/syntax.scm b/v7/src/runtime/syntax.scm
index acf0136f2..34544c83c 100644
--- a/v7/src/runtime/syntax.scm
+++ b/v7/src/runtime/syntax.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: syntax.scm,v 14.39 2001/12/19 05:22:09 cph Exp $
+$Id: syntax.scm,v 14.40 2001/12/20 06:49:28 cph Exp $
 
 Copyright (c) 1988-2001 Massachusetts Institute of Technology
 
@@ -30,61 +30,58 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
   (enable-scan-defines!)
   (set! *disallow-illegal-definitions?* #t)
   (set! hook/syntax-expression default/syntax-expression)
-  (set! system-global-syntax-table (make-system-global-syntax-table))
-  (set-environment-syntax-table! system-global-environment
-				 system-global-syntax-table)
+  (set-environment-syntax-table! system-global-environment (make-syntax-table))
+  (install-system-global-syntax!)
   (set-environment-syntax-table! user-initial-environment
 				 (make-syntax-table system-global-environment))
   (set! syntaxer/default-environment
 	(extend-interpreter-environment system-global-environment))
   unspecific)
 
-(define system-global-syntax-table)
 (define *syntax-table*)
 (define *current-keyword* #f)
 (define *syntax-top-level?*)
 (define *disallow-illegal-definitions?*)
 
-(define (make-system-global-syntax-table)
-  (let ((table (make-syntax-table)))
-    (for-each (lambda (entry)
-		(syntax-table-define table (car entry)
-		  (make-primitive-syntaxer (cadr entry))))
-	      `(
-		;; R*RS special forms
-		(BEGIN ,syntax/begin)
-		(COND ,syntax/cond)
-		(DEFINE ,syntax/define)
-		(DELAY ,syntax/delay)
-		(IF ,syntax/if)
-		(LAMBDA ,syntax/lambda)
-		(LET ,syntax/let)
-		(OR ,syntax/or)
-		(QUOTE ,syntax/quote)
-		(SET! ,syntax/set!)
-
-		;; Syntax extensions
-		(DEFINE-SYNTAX ,syntax/define-syntax)
-		(DEFINE-MACRO ,syntax/define-macro)
-		(LET-SYNTAX ,syntax/let-syntax)
-		(MACRO ,syntax/lambda)
-		(USING-SYNTAX ,syntax/using-syntax)
-
-		;; Environment extensions
-		(ACCESS ,syntax/access)
-		(IN-PACKAGE ,syntax/in-package)
-		(THE-ENVIRONMENT ,syntax/the-environment)
-		(UNASSIGNED? ,syntax/unassigned?)
-		;; To facilitate upgrade to new option argument mechanism.
-		(DEFAULT-OBJECT? ,syntax/unassigned?)
-
-		;; Miscellaneous extensions
-		(DECLARE ,syntax/declare)
-		(FLUID-LET ,syntax/fluid-let)
-		(LOCAL-DECLARE ,syntax/local-declare)
-		(NAMED-LAMBDA ,syntax/named-lambda)
-		(SCODE-QUOTE ,syntax/scode-quote)))
-    table))
+(define (install-system-global-syntax!)
+  (for-each (lambda (entry)
+	      (syntax-table/define system-global-environment
+				   (car entry)
+				   (make-primitive-syntaxer (cadr entry))))
+	    `(
+	      ;; R*RS special forms
+	      (BEGIN ,syntax/begin)
+	      (COND ,syntax/cond)
+	      (DEFINE ,syntax/define)
+	      (DELAY ,syntax/delay)
+	      (IF ,syntax/if)
+	      (LAMBDA ,syntax/lambda)
+	      (LET ,syntax/let)
+	      (OR ,syntax/or)
+	      (QUOTE ,syntax/quote)
+	      (SET! ,syntax/set!)
+
+	      ;; Syntax extensions
+	      (DEFINE-SYNTAX ,syntax/define-syntax)
+	      (DEFINE-MACRO ,syntax/define-macro)
+	      (LET-SYNTAX ,syntax/let-syntax)
+	      (MACRO ,syntax/lambda)
+	      (USING-SYNTAX ,syntax/using-syntax)
+
+	      ;; Environment extensions
+	      (ACCESS ,syntax/access)
+	      (IN-PACKAGE ,syntax/in-package)
+	      (THE-ENVIRONMENT ,syntax/the-environment)
+	      (UNASSIGNED? ,syntax/unassigned?)
+	      ;; To facilitate upgrade to new option argument mechanism.
+	      (DEFAULT-OBJECT? ,syntax/unassigned?)
+
+	      ;; Miscellaneous extensions
+	      (DECLARE ,syntax/declare)
+	      (FLUID-LET ,syntax/fluid-let)
+	      (LOCAL-DECLARE ,syntax/local-declare)
+	      (NAMED-LAMBDA ,syntax/named-lambda)
+	      (SCODE-QUOTE ,syntax/scode-quote))))
 
 ;;;; Top Level Syntaxers
 
diff --git a/v7/src/sf/pardec.scm b/v7/src/sf/pardec.scm
index 50212ca64..03a67ac19 100644
--- a/v7/src/sf/pardec.scm
+++ b/v7/src/sf/pardec.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: pardec.scm,v 4.12 2001/07/19 18:24:33 cph Exp $
+$Id: pardec.scm,v 4.13 2001/12/20 06:35:49 cph Exp $
 
 Copyright (c) 1988-2001 Massachusetts Institute of Technology
 
@@ -273,8 +273,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
      (append-map (lambda (specification)
 		   (let ((value
 			  (scode-eval
-			   (syntax specification
-				   system-global-syntax-table)
+			   (syntax specification system-global-environment)
 			   syntaxer/default-environment)))
 		     (if (pair? value)
 			 (map ->pathname value)
diff --git a/v7/src/sf/toplev.scm b/v7/src/sf/toplev.scm
index 292f8f024..f051a6178 100644
--- a/v7/src/sf/toplev.scm
+++ b/v7/src/sf/toplev.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: toplev.scm,v 4.18 2001/12/19 05:26:28 cph Exp $
+$Id: toplev.scm,v 4.19 2001/12/20 06:36:23 cph Exp $
 
 Copyright (c) 1988-2001 Massachusetts Institute of Technology
 
@@ -313,7 +313,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
   (syntax* s-expression
 	   (make-syntax-table
 	    (if (or (default-object? syntax-table) (not syntax-table))
-		system-global-syntax-table
+		system-global-environment
 		syntax-table))))
 
 (define (phase:transform scode)
diff --git a/v7/src/sicp/strmac.scm b/v7/src/sicp/strmac.scm
index 778d76f29..28999bbe4 100644
--- a/v7/src/sicp/strmac.scm
+++ b/v7/src/sicp/strmac.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: strmac.scm,v 1.2 1999/01/02 06:19:10 cph Exp $
+$Id: strmac.scm,v 1.3 2001/12/20 06:37:25 cph Exp $
 
-Copyright (c) 1987, 1988, 1989, 1990, 1999 Massachusetts Institute of Technology
+Copyright (c) 1987-1990, 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,14 +16,15 @@ 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.
 |#
 
 ;;;; Stream Macros
 
 (declare (usual-integrations))
-
-(syntax-table-define system-global-syntax-table 'COLLECT
+
+(syntax-table/define system-global-environment 'COLLECT
   (let ()
     (define (collect-macro-kernel result bindings filter)
       (if (null? bindings)
@@ -63,5 +64,5 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 	       (receiver (cons (caar bindings) names)
 			 (cons (cadar bindings) sets)))))))
 
-    (macro (result bindings . filter)
-      (collect-macro-kernel result bindings filter))))
+    (lambda (result bindings . filter)
+      (collect-macro-kernel result bindings filter))))
\ No newline at end of file
diff --git a/v7/src/sos/load.scm b/v7/src/sos/load.scm
index bf2d90ff5..4c6e44a58 100644
--- a/v7/src/sos/load.scm
+++ b/v7/src/sos/load.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: load.scm,v 1.8 2001/12/19 04:03:54 cph Exp $
+;;; $Id: load.scm,v 1.9 2001/12/20 06:38:18 cph Exp $
 ;;;
 ;;; Copyright (c) 1995-1999, 2001 Massachusetts Institute of Technology
 ;;;
@@ -26,7 +26,7 @@
 (let ((install
        (let ((environment (package/environment (find-package '(SOS MACROS)))))
 	 (lambda (mname tname)
-	   (syntax-table/define system-global-syntax-table
+	   (syntax-table/define system-global-environment
 				mname
 				(environment-lookup environment tname))))))
   (install 'DEFINE-CLASS 'TRANSFORM:DEFINE-CLASS)
diff --git a/v7/src/star-parser/ed-ffi.scm b/v7/src/star-parser/ed-ffi.scm
index d76d8b257..fc8c8080d 100644
--- a/v7/src/star-parser/ed-ffi.scm
+++ b/v7/src/star-parser/ed-ffi.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: ed-ffi.scm,v 1.4 2001/11/11 06:00:26 cph Exp $
+;;; $Id: ed-ffi.scm,v 1.5 2001/12/20 06:38:42 cph Exp $
 ;;;
 ;;; Copyright (c) 2001 Massachusetts Institute of Technology
 ;;;
@@ -22,11 +22,7 @@
 ;;;; Parser language: Edwin buffer packaging info
 
 (standard-scheme-find-file-initialization
- '#(("matcher"	(runtime *parser)
-		system-global-syntax-table)
-    ("parser"	(runtime *parser)
-		system-global-syntax-table)
-    ("shared"	(runtime *parser)
-		system-global-syntax-table)
-    ("synchk"	(runtime *parser)
-		system-global-syntax-table)))
\ No newline at end of file
+ '#(("matcher"	(runtime *parser))
+    ("parser"	(runtime *parser))
+    ("shared"	(runtime *parser))
+    ("synchk"	(runtime *parser))))
\ No newline at end of file
diff --git a/v7/src/star-parser/matcher.scm b/v7/src/star-parser/matcher.scm
index 4dbbcd205..bb712b1df 100644
--- a/v7/src/star-parser/matcher.scm
+++ b/v7/src/star-parser/matcher.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: matcher.scm,v 1.25 2001/11/20 04:07:05 cph Exp $
+;;; $Id: matcher.scm,v 1.26 2001/12/20 06:39:41 cph Exp $
 ;;;
 ;;; Copyright (c) 2001 Massachusetts Institute of Technology
 ;;;
@@ -74,7 +74,7 @@
       (hash-table/put! matcher-preprocessors name procedure))
   name)
 
-(syntax-table/define system-global-syntax-table 'DEFINE-*MATCHER-MACRO
+(syntax-table/define system-global-environment 'DEFINE-*MATCHER-MACRO
   (lambda (bvl expression)
     (cond ((symbol? bvl)
 	   `(DEFINE-*MATCHER-EXPANDER ',bvl
@@ -184,7 +184,7 @@
 
 ;;;; Compiler
 
-(syntax-table/define system-global-syntax-table '*MATCHER
+(syntax-table/define system-global-environment '*MATCHER
   (lambda (expression)
     (generate-matcher-code expression)))
 
diff --git a/v7/src/star-parser/parser.pkg b/v7/src/star-parser/parser.pkg
index 35a2bd24c..59574be6a 100644
--- a/v7/src/star-parser/parser.pkg
+++ b/v7/src/star-parser/parser.pkg
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: parser.pkg,v 1.15 2001/11/11 05:59:19 cph Exp $
+;;; $Id: parser.pkg,v 1.16 2001/12/20 06:39:03 cph Exp $
 ;;;
 ;;; Copyright (c) 2001 Massachusetts Institute of Technology
 ;;;
@@ -25,7 +25,7 @@
 
 (define-package (runtime *parser)
   (files "synchk" "shared" "matcher" "parser")
-  (parent ())
+  (parent (runtime))
   (export ()
 	  current-parser-macros
 	  define-*matcher-expander
diff --git a/v7/src/star-parser/parser.scm b/v7/src/star-parser/parser.scm
index 53d69c739..edcfc1b5f 100644
--- a/v7/src/star-parser/parser.scm
+++ b/v7/src/star-parser/parser.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: parser.scm,v 1.28 2001/11/20 04:07:08 cph Exp $
+;;; $Id: parser.scm,v 1.29 2001/12/20 06:40:11 cph Exp $
 ;;;
 ;;; Copyright (c) 2001 Massachusetts Institute of Technology
 ;;;
@@ -71,7 +71,7 @@
       (hash-table/put! parser-preprocessors name procedure))
   name)
 
-(syntax-table/define system-global-syntax-table 'DEFINE-*PARSER-MACRO
+(syntax-table/define system-global-environment 'DEFINE-*PARSER-MACRO
   (lambda (bvl expression)
     (cond ((symbol? bvl)
 	   `(DEFINE-*PARSER-EXPANDER ',bvl
@@ -173,7 +173,7 @@
 
 ;;;; Compiler
 
-(syntax-table/define system-global-syntax-table '*PARSER
+(syntax-table/define system-global-environment '*PARSER
   (lambda (expression)
     (generate-parser-code expression)))
 
diff --git a/v7/src/swat/scheme/scc-macros.scm b/v7/src/swat/scheme/scc-macros.scm
index f6a7303bd..c692a7384 100644
--- a/v7/src/swat/scheme/scc-macros.scm
+++ b/v7/src/swat/scheme/scc-macros.scm
@@ -1,22 +1,19 @@
 ;;;; -*-Scheme-*-
-;;; $Id: scc-macros.scm,v 1.1 1995/08/02 21:26:49 adams Exp $
+;;; $Id: scc-macros.scm,v 1.2 2001/12/20 06:43:25 cph Exp $
 
-(syntax-table-define system-global-syntax-table
-    'DEFINE-CONSTANT
-  (macro (name value) `(DEFINE-INTEGRABLE ,name ,value)))
+(syntax-table/define system-global-environment 'DEFINE-CONSTANT
+  (lambda (name value)
+    `(DEFINE-INTEGRABLE ,name ,value)))
 
-(syntax-table-define system-global-syntax-table
-    'DEFINE-IN-LINE
-  (macro (arg-list . body)
+(syntax-table/define system-global-environment 'DEFINE-IN-LINE
+  (lambda (arg-list . body)
     `(DEFINE-INTEGRABLE ,arg-list . ,body)))
 
-(syntax-table-define system-global-syntax-table
-    'SCC-DEFINE-SYNTAX
-  (macro (name-and-arglist . body)
+(syntax-table/define system-global-environment 'SCC-DEFINE-SYNTAX
+  (lambda (name-and-arglist . body)
     (let ((name (car name-and-arglist))
 	  (arglist (cdr name-and-arglist)))
-      `(SYNTAX-TABLE-DEFINE SYSTEM-GLOBAL-SYNTAX-TABLE
-	   ',name
-	 (MACRO ,arglist ,@body)))))
+      `(SYNTAX-TABLE/DEFINE SYSTEM-GLOBAL-ENVIRONMENT ',name
+	 (LAMBDA ,arglist ,@body)))))
 
-(define-integrable *running-in-mit-scheme* #T)
+(define-integrable *running-in-mit-scheme* #t)
\ No newline at end of file
diff --git a/v7/src/win32/ffimacro.scm b/v7/src/win32/ffimacro.scm
index 3f4f12ab7..3df3c25d7 100644
--- a/v7/src/win32/ffimacro.scm
+++ b/v7/src/win32/ffimacro.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: ffimacro.scm,v 1.3 1999/01/02 06:19:10 cph Exp $
+$Id: ffimacro.scm,v 1.4 2001/12/20 06:45:48 cph Exp $
 
-Copyright (c) 1993, 1999 Massachusetts Institute of Technology
+Copyright (c) 1993, 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,7 +16,8 @@ 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.
 |#
 
 #|
@@ -75,16 +76,19 @@ n-place higher order procedure parameterized with the check&convert functions.
 No reversion code is inserted.  If any of the argument types has a reversion
 procedure then the first form should not be used.
 
-The other versions generate faster code by using macro expansion to insert the
-type handling functions.  As the type handling functions generated by DEFINE-WINDOWS-TYPE
-are declared integrable and are often simple or trivial, this removes the cost of a
-general function call to convert each parameter.  EXPAND and WITH-REVERSIONS have the
-same effect, but allow the user to `document' the reason for using the expanded form.
+The other versions generate faster code by using macro expansion to
+insert the type handling functions.  As the type handling functions
+generated by DEFINE-WINDOWS-TYPE are declared integrable and are often
+simple or trivial, this removes the cost of a general function call to
+convert each parameter.  EXPAND and WITH-REVERSIONS have the same
+effect, but allow the user to `document' the reason for using the
+expanded form.
 
-The final form also generates an expanded form, and inserts <CODE> after the type
-checking but before the type conversion.  This allows extra consistency checks to be
-placed, especially checks that several arguments are mutualy consistent (e.g. an index
-into a buffer indexes to inside a string that is being used as the buffer).
+The final form also generates an expanded form, and inserts <CODE>
+after the type checking but before the type conversion.  This allows
+extra consistency checks to be placed, especially checks that several
+arguments are mutualy consistent (e.g. an index into a buffer indexes
+to inside a string that is being used as the buffer).
 
 |#
 
@@ -141,11 +145,12 @@ into a buffer indexes to inside a string that is being used as the buffer).
 				    `(,cvt-name
 				      ,(make-conversion arg-type arg-name)))
 				  cvt-names arg-types arg-names))
-	       (reversions   (map make-reversion arg-types arg-names cvt-names))
-	       (additional-checks (if (and (pair? additional-specifications)
-					   (symbol? (car additional-specifications)))
-				      (cdr additional-specifications)
-				      additional-specifications))
+	       (reversions (map make-reversion arg-types arg-names cvt-names))
+	       (additional-checks
+		(if (and (pair? additional-specifications)
+			 (symbol? (car additional-specifications)))
+		    (cdr additional-specifications)
+		    additional-specifications))
 	       )
 
 	  `((access parameterize-with-module-entry ())
@@ -189,7 +194,7 @@ into a buffer indexes to inside a string that is being used as the buffer).
 		 (,(type->converter name) x)
 		 (windows-procedure-argument-type-check-error ',name x)))
 	   (define-integrable (,(type->return-converter name) x) (,return x))
-	   (define-integrable (,(type->reverter name) x y)       (,revert x y))))))
+	   (define-integrable (,(type->reverter name) x y) (,revert x y))))))
 
 
   (define (expand/define-similar-windows-type
@@ -212,14 +217,15 @@ into a buffer indexes to inside a string that is being used as the buffer).
 		 (,(type->converter name) x)
 		 (windows-procedure-argument-type-check-error ',name x)))
 	   (define-integrable (,(type->return-converter name) x) (,return x))
-	   (define-integrable (,(type->reverter name) x y)       (,revert x y))))))
+	   (define-integrable (,(type->reverter name) x y) (,revert x y))))))
 
-  (syntax-table-define system-global-syntax-table 'WINDOWS-PROCEDURE
+  (syntax-table/define system-global-environment 'WINDOWS-PROCEDURE
     expand/windows-procedure)
 
-  (syntax-table-define system-global-syntax-table 'DEFINE-WINDOWS-TYPE
+  (syntax-table/define system-global-environment 'DEFINE-WINDOWS-TYPE
     expand/define-windows-type)
 
-  (syntax-table-define system-global-syntax-table 'DEFINE-SIMILAR-WINDOWS-TYPE
+  (syntax-table/define system-global-environment 'DEFINE-SIMILAR-WINDOWS-TYPE
     expand/define-similar-windows-type)
-)
+
+)
\ No newline at end of file
diff --git a/v7/src/xml/ed-ffi.scm b/v7/src/xml/ed-ffi.scm
index c96248ad9..f6bfc8f42 100644
--- a/v7/src/xml/ed-ffi.scm
+++ b/v7/src/xml/ed-ffi.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: ed-ffi.scm,v 1.3 2001/07/16 20:40:23 cph Exp $
+;;; $Id: ed-ffi.scm,v 1.4 2001/12/20 06:46:16 cph Exp $
 ;;;
 ;;; Copyright (c) 2001 Massachusetts Institute of Technology
 ;;;
@@ -22,7 +22,7 @@
 ;;;; XML: Edwin buffer packaging info
 
 (standard-scheme-find-file-initialization
- '#(("xml-chars" (runtime xml parser) system-global-syntax-table)
-    ("xml-struct" (runtime xml structure) system-global-syntax-table)
-    ("xml-output" (runtime xml output) system-global-syntax-table)
-    ("xml-parser" (runtime xml parser) system-global-syntax-table)))
\ No newline at end of file
+ '#(("xml-chars" (runtime xml parser))
+    ("xml-struct" (runtime xml structure))
+    ("xml-output" (runtime xml output))
+    ("xml-parser" (runtime xml parser))))
\ No newline at end of file
diff --git a/v7/src/xml/xml.pkg b/v7/src/xml/xml.pkg
index 77826dfec..92572e6ad 100644
--- a/v7/src/xml/xml.pkg
+++ b/v7/src/xml/xml.pkg
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: xml.pkg,v 1.8 2001/10/04 16:51:27 cph Exp $
+;;; $Id: xml.pkg,v 1.9 2001/12/20 06:46:58 cph Exp $
 ;;;
 ;;; Copyright (c) 2001 Massachusetts Institute of Technology
 ;;;
@@ -26,12 +26,11 @@
 (global-definitions "../star-parser/parser")
 
 (define-package (runtime xml)
-  (files)
-  (parent ()))
+  (parent (runtime)))
 
 (define-package (runtime xml structure)
   (files "xml-struct")
-  (parent ())
+  (parent (runtime xml))
   (export ()
 	  make-xml-!attlist
 	  make-xml-!element
@@ -142,12 +141,12 @@
 
 (define-package (runtime xml parser)
   (files "xml-chars" "xml-parser")
-  (parent ())
+  (parent (runtime xml))
   (export ()
 	  parse-xml-document))
 
 (define-package (runtime xml output)
   (files "xml-output")
-  (parent ())
+  (parent (runtime xml))
   (export ()
 	  write-xml))
\ No newline at end of file