Remove explicit references to syntax tables.

diff --git a/v7/src/compiler/back/asmmac.scm b/v7/src/compiler/back/asmmac.scm
index 519c64a8f5d6efcbe6175f711368a20fc1c3290c..08516ca2223dfaafc96580c20452548048cd4c13 100644 (file)
--- a/v7/src/compiler/back/asmmac.scm
+++ b/v7/src/compiler/back/asmmac.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: asmmac.scm,v 1.8 1999/01/02 06:06:43 cph Exp $
+$Id: asmmac.scm,v 1.9 2001/12/19 21:39:29 cph Exp $
 
-Copyright (c) 1988, 1990, 1999 Massachusetts Institute of Technology
+Copyright (c) 1988, 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,15 +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.
 |#
 
 ;;;; Assembler Syntax Macros
 
 (declare (usual-integrations))
 \f
-(syntax-table-define assembler-syntax-table 'DEFINE-INSTRUCTION
-  (macro (keyword . rules)
+(syntax-table/define (->environment '(COMPILER LAP-SYNTAXER))
+                    'DEFINE-INSTRUCTION
+  (lambda (keyword . rules)
     `(ADD-INSTRUCTION!
       ',keyword
       ,(compile-database rules

diff --git a/v7/src/compiler/base/macros.scm b/v7/src/compiler/base/macros.scm
index 2fd45449dd5a88e78ef70cf0c29625555d6ff6fd..a165f471e63388cc56c6cf21408920ed9c5db3ba 100644 (file)
--- a/v7/src/compiler/base/macros.scm
+++ b/v7/src/compiler/base/macros.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: macros.scm,v 4.16 1999/01/02 06:06:43 cph Exp $
+$Id: macros.scm,v 4.17 2001/12/19 21:39:29 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.
 |#
 
 ;;;; Compiler Macros
@@ -25,46 +26,40 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 (declare (usual-integrations))
 \f
 (define (initialize-package!)
-  (for-each (lambda (entry)
-             (syntax-table-define compiler-syntax-table (car entry)
-               (cadr entry)))
-           `((CFG-NODE-CASE ,transform/cfg-node-case)
-             (DEFINE-ENUMERATION ,transform/define-enumeration)
-             (DEFINE-EXPORT ,transform/define-export)
-             (DEFINE-LVALUE ,transform/define-lvalue)
-             (DEFINE-PNODE ,transform/define-pnode)
-             (DEFINE-ROOT-TYPE ,transform/define-root-type)
-             (DEFINE-RTL-EXPRESSION ,transform/define-rtl-expression)
-             (DEFINE-RTL-PREDICATE ,transform/define-rtl-predicate)
-             (DEFINE-RTL-STATEMENT ,transform/define-rtl-statement)
-             (DEFINE-RULE ,transform/define-rule)
-             (DEFINE-RVALUE ,transform/define-rvalue)
-             (DEFINE-SNODE ,transform/define-snode)
-             (DEFINE-VECTOR-SLOTS ,transform/define-vector-slots)
-             (DESCRIPTOR-LIST ,transform/descriptor-list)
-             (ENUMERATION-CASE ,transform/enumeration-case)
-             (INST-EA ,transform/inst-ea)
-             (LAP ,transform/lap)
-             (LAST-REFERENCE ,transform/last-reference)
-             (MAKE-LVALUE ,transform/make-lvalue)
-             (MAKE-PNODE ,transform/make-pnode)
-             (MAKE-RVALUE ,transform/make-rvalue)
-             (MAKE-SNODE ,transform/make-snode)
-             (PACKAGE ,transform/package)))
-  (syntax-table-define lap-generator-syntax-table 'DEFINE-RULE
-    transform/define-rule))
-
-(define compiler-syntax-table
-  (make-syntax-table syntax-table/system-internal))
-
-(define lap-generator-syntax-table
-  (make-syntax-table compiler-syntax-table))
-
-(define assembler-syntax-table
-  (make-syntax-table compiler-syntax-table))
-
-(define early-syntax-table
-  (make-syntax-table compiler-syntax-table))
+  (let ((compiler-env (->environment '(COMPILER)))
+       (lap-syntaxer-env (->environment '(COMPILER LAP-SYNTAXER))))
+    (set-environment-syntax-table! compiler-env
+                                  (make-syntax-table (->environment '())))
+    (for-each (lambda (entry)
+               (syntax-table/define compiler-env (car entry) (cadr entry)))
+             `((CFG-NODE-CASE ,transform/cfg-node-case)
+               (DEFINE-ENUMERATION ,transform/define-enumeration)
+               (DEFINE-EXPORT ,transform/define-export)
+               (DEFINE-LVALUE ,transform/define-lvalue)
+               (DEFINE-PNODE ,transform/define-pnode)
+               (DEFINE-ROOT-TYPE ,transform/define-root-type)
+               (DEFINE-RTL-EXPRESSION ,transform/define-rtl-expression)
+               (DEFINE-RTL-PREDICATE ,transform/define-rtl-predicate)
+               (DEFINE-RTL-STATEMENT ,transform/define-rtl-statement)
+               (DEFINE-RULE ,transform/define-rule)
+               (DEFINE-RVALUE ,transform/define-rvalue)
+               (DEFINE-SNODE ,transform/define-snode)
+               (DEFINE-VECTOR-SLOTS ,transform/define-vector-slots)
+               (DESCRIPTOR-LIST ,transform/descriptor-list)
+               (ENUMERATION-CASE ,transform/enumeration-case)
+               (INST-EA ,transform/inst-ea)
+               (LAP ,transform/lap)
+               (LAST-REFERENCE ,transform/last-reference)
+               (MAKE-LVALUE ,transform/make-lvalue)
+               (MAKE-PNODE ,transform/make-pnode)
+               (MAKE-RVALUE ,transform/make-rvalue)
+               (MAKE-SNODE ,transform/make-snode)
+               (PACKAGE ,transform/package)))
+    (set-environment-syntax-table! lap-syntaxer-env
+                                  (make-syntax-table compiler-env))
+    (syntax-table/define lap-syntaxer-env
+                        'DEFINE-RULE
+                        transform/define-rule)))
 \f
 (define transform/last-reference
   (macro (name)

diff --git a/v7/src/compiler/machines/C/compiler.pkg b/v7/src/compiler/machines/C/compiler.pkg
index fced4907d9f7990b497afc1d5379abef7d40a5ca..4efda9e16f70fc014c2efbe496596fbb9871514f 100644 (file)
--- a/v7/src/compiler/machines/C/compiler.pkg
+++ b/v7/src/compiler/machines/C/compiler.pkg
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: compiler.pkg,v 1.10 1999/01/02 06:06:43 cph Exp $
+$Id: compiler.pkg,v 1.11 2001/12/19 21:39:29 cph Exp $
 
 Copyright (c) 1992-1999 Massachusetts Institute of Technology
 
@@ -109,11 +109,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 (define-package (compiler macros)
   (files "base/macros")
   (parent ())
-  (export (compiler)
-         assembler-syntax-table
-         compiler-syntax-table
-         early-syntax-table
-         lap-generator-syntax-table)
   (import (runtime macros)
          parse-define-syntax)
   (initialization (initialize-package!)))

diff --git a/v7/src/compiler/machines/C/compiler.sf b/v7/src/compiler/machines/C/compiler.sf
index d7766e65b892fcef1883f5be48ce88a6ef9e45d3..cb532981edf9966ae956b0c28e78bad1c3aee6f4 100644 (file)
--- a/v7/src/compiler/machines/C/compiler.sf
+++ b/v7/src/compiler/machines/C/compiler.sf
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: compiler.sf,v 1.8 2001/12/17 17:40:58 cph Exp $
+$Id: compiler.sf,v 1.9 2001/12/19 21:39:29 cph Exp $
 
 Copyright (c) 1992-1999, 2001 Massachusetts Institute of Technology
 
@@ -55,9 +55,7 @@ USA.
       (sf-and-load '("base/pmlook") '(COMPILER PATTERN-MATCHER/LOOKUP))
       (sf-and-load '("base/pmpars") '(COMPILER PATTERN-MATCHER/PARSER))
       (sf-and-load '("rtlbase/valclass") '(COMPILER))
-      (fluid-let ((sf/default-syntax-table
-                  (access compiler-syntax-table
-                          (->environment '(COMPILER MACROS)))))
+      (fluid-let ((sf/default-syntax-table (->environment '(COMPILER))))
        (sf-and-load '("machines/C/machin") '(COMPILER)))
       (set! (access endianness (->environment '(COMPILER))) 'BIG)
       (sf-and-load '("back/syntax") '(COMPILER LAP-SYNTAXER))

diff --git a/v7/src/compiler/machines/C/decls.scm b/v7/src/compiler/machines/C/decls.scm
index 788bee1dacd7a4cc269cb3ce58d08d4d68782657..199936b1bcfb6e02a724399c85abbf187da5dae8 100644 (file)
--- a/v7/src/compiler/machines/C/decls.scm
+++ b/v7/src/compiler/machines/C/decls.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: decls.scm,v 1.4 1999/01/02 06:06:43 cph Exp $
+$Id: decls.scm,v 1.5 2001/12/19 21:39:29 cph Exp $
 
-Copyright (c) 1992-1999 Massachusetts Institute of Technology
+Copyright (c) 1992-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.
 |#
 
 ;;;; Compiler File Dependencies
@@ -343,12 +344,12 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
                              "ralloc" "rcompr" "rcse1" "rcse2" "rcseep"
                              "rcseht" "rcserq" "rcsesr" "rdebug" "rdflow"
                              "rerite" "rinvex" "rlife" "rtlcsm"))
-     compiler-syntax-table)
+     (->environment '(COMPILER)))
     (file-dependency/syntax/join
      (filename/append "machines/C"
                      "lapgen"
                      "rules1" "rules2" "rules3" "rules4" "rulfix" "rulflo" "cout")
-     lap-generator-syntax-table)))
+     (->environment '(COMPILER LAP-SYNTAXER)))))
 \f
 ;;;; Integration Dependencies
 

diff --git a/v7/src/compiler/machines/alpha/compiler.pkg b/v7/src/compiler/machines/alpha/compiler.pkg
index e6c3c1e92e417e64ba71ac8e0eecf5264cb580f4..e8b3f3eaba52220368e201c04e3a658f2d48fcc6 100644 (file)
--- a/v7/src/compiler/machines/alpha/compiler.pkg
+++ b/v7/src/compiler/machines/alpha/compiler.pkg
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: compiler.pkg,v 1.13 1999/01/02 06:48:57 cph Exp $
+$Id: compiler.pkg,v 1.14 2001/12/19 21:39:29 cph Exp $
 
-Copyright (c) 1992-1999 Massachusetts Institute of Technology
+Copyright (c) 1992-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,8 +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.
 |#
 
 ;;;; Compiler Packaging
@@ -109,11 +109,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 (define-package (compiler macros)
   (files "base/macros")
   (parent ())
-  (export (compiler)
-         assembler-syntax-table
-         compiler-syntax-table
-         early-syntax-table
-         lap-generator-syntax-table)
   (import (runtime macros)
          parse-define-syntax)
   (initialization (initialize-package!)))

diff --git a/v7/src/compiler/machines/alpha/compiler.sf b/v7/src/compiler/machines/alpha/compiler.sf
index bd57de3c3d28f8718596bfe92ed0c45a99f9682d..52a5a3e94362f121c9614e48f794ef8ff9f04013 100644 (file)
--- a/v7/src/compiler/machines/alpha/compiler.sf
+++ b/v7/src/compiler/machines/alpha/compiler.sf
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: compiler.sf,v 1.8 2001/12/17 17:40:58 cph Exp $
+$Id: compiler.sf,v 1.9 2001/12/19 21:39:29 cph Exp $
 
 Copyright (c) 1992-1999, 2001 Massachusetts Institute of Technology
 
@@ -55,9 +55,7 @@ USA.
       (sf-and-load '("base/pmlook") '(COMPILER PATTERN-MATCHER/LOOKUP))
       (sf-and-load '("base/pmpars") '(COMPILER PATTERN-MATCHER/PARSER))
       (sf-and-load '("rtlbase/valclass") '(COMPILER))
-      (fluid-let ((sf/default-syntax-table
-                  (access compiler-syntax-table
-                          (->environment '(COMPILER MACROS)))))
+      (fluid-let ((sf/default-syntax-table (->environment '(COMPILER))))
        (sf-and-load '("machines/alpha/machin") '(COMPILER)))
       (set! (access endianness (->environment '(COMPILER))) 'LITTLE)
       (fluid-let ((sf/default-declarations
@@ -87,8 +85,7 @@ USA.
        (newline)
        (for-each (lambda (name)
                    (load (string-append "machines/alpha/" name ".scm")
-                         '(COMPILER LAP-SYNTAXER)
-                         early-syntax-table))
+                         '(COMPILER LAP-SYNTAXER)))
                  '("instr1" "instr2" "instr3")))))
 
 ;; Resyntax any files that need it.

diff --git a/v7/src/compiler/machines/alpha/decls.scm b/v7/src/compiler/machines/alpha/decls.scm
index 917ffcd87c8c0c52acd2cdfd1cd68711e8fb2e88..a33329a46599ff1ac48730d445a7295f5c5973cb 100644 (file)
--- a/v7/src/compiler/machines/alpha/decls.scm
+++ b/v7/src/compiler/machines/alpha/decls.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: decls.scm,v 1.6 1999/01/02 06:48:57 cph Exp $
+$Id: decls.scm,v 1.7 2001/12/19 21:39:29 cph Exp $
 
-Copyright (c) 1992-1999 Massachusetts Institute of Technology
+Copyright (c) 1992-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,8 +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.
 |#
 
 ;;;; Compiler File Dependencies
@@ -347,16 +347,13 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
                              "ralloc" "rcompr" "rcse1" "rcse2" "rcseep"
                              "rcseht" "rcserq" "rcsesr" "rdebug" "rdflow"
                              "rerite" "rinvex" "rlife" "rtlcsm"))
-     compiler-syntax-table)
+     (->environment '(COMPILER)))
     (file-dependency/syntax/join
      (filename/append "machines/alpha"
                      "lapgen"
                      "rules1" "rules2" "rules3" "rules4" "rulfix" "rulflo"
-                     )
-     lap-generator-syntax-table)
-    (file-dependency/syntax/join
-     (filename/append "machines/alpha" "instr1" "instr2" "instr3")
-     assembler-syntax-table)))
+                     "instr1" "instr2" "instr3")
+     (->environment '(COMPILER LAP-SYNTAXER)))))
 \f
 ;;;; Integration Dependencies
 

diff --git a/v7/src/compiler/machines/alpha/inerly.scm b/v7/src/compiler/machines/alpha/inerly.scm
index c6ac73e0e311508edc5d054ee10ba846ae9e5fc4..102b3307d131278aae5492fd9ebc25f3a9307f3b 100644 (file)
--- a/v7/src/compiler/machines/alpha/inerly.scm
+++ b/v7/src/compiler/machines/alpha/inerly.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: inerly.scm,v 1.2 1999/01/02 06:48:57 cph Exp $
+$Id: inerly.scm,v 1.3 2001/12/19 21:39:29 cph Exp $
 
-Copyright (c) 1992-1999 Massachusetts Institute of Technology
+Copyright (c) 1992-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,8 +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.
 |#
 
 ;;; Alpha Instruction Set Macros.  Early version
@@ -44,8 +44,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 ;;; Instruction and addressing mode macros
 
-(syntax-table-define early-syntax-table 'DEFINE-INSTRUCTION
-  (macro (opcode . patterns)
+(syntax-table/define (->environment '(COMPILER))
+                    'DEFINE-INSTRUCTION
+  (lambda (opcode . patterns)
     `(SET! EARLY-INSTRUCTIONS
           (CONS
            (LIST ',opcode

diff --git a/v7/src/compiler/machines/alpha/insmac.scm b/v7/src/compiler/machines/alpha/insmac.scm
index b8d2e7c6322d91132af452ad16e7dbe603eaa1aa..d4cdf560dc7d161ce38f27be5993c2460be387ea 100644 (file)
--- a/v7/src/compiler/machines/alpha/insmac.scm
+++ b/v7/src/compiler/machines/alpha/insmac.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: insmac.scm,v 1.2 1999/01/02 06:48:57 cph Exp $
+$Id: insmac.scm,v 1.3 2001/12/19 21:39:29 cph Exp $
 
-Copyright (c) 1992-1999 Massachusetts Institute of Technology
+Copyright (c) 1992-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,8 +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.
 |#
 
 ;;;; Alpha Instruction Set Macros
@@ -27,8 +27,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 \f
 ;;;; Definition macros
 
-(syntax-table-define assembler-syntax-table 'DEFINE-SYMBOL-TRANSFORMER
-  (macro (name . alist)
+(syntax-table/define (->environment '(COMPILER LAP-SYNTAXER))
+                    'DEFINE-SYMBOL-TRANSFORMER
+  (lambda (name . alist)
     `(BEGIN
        (DECLARE (INTEGRATE-OPERATOR ,name))
        (DEFINE (,name SYMBOL)
@@ -38,8 +39,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
               #F
               (CDR PLACE)))))))
 
-(syntax-table-define assembler-syntax-table 'DEFINE-TRANSFORMER
-  (macro (name value)
+(syntax-table/define (->environment '(COMPILER LAP-SYNTAXER))
+                    'DEFINE-TRANSFORMER
+  (lambda (name value)
     `(DEFINE ,name ,value)))
 
 ;;;; Fixed width instruction parsing

diff --git a/v7/src/compiler/machines/alpha/lapgen.scm b/v7/src/compiler/machines/alpha/lapgen.scm
index 594b8b66d399743eb235e197a09e169826104bcc..42b8fd97635bd52d0231d720113f6c52bc330e27 100644 (file)
--- a/v7/src/compiler/machines/alpha/lapgen.scm
+++ b/v7/src/compiler/machines/alpha/lapgen.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: lapgen.scm,v 1.6 1999/01/02 06:48:57 cph Exp $
+$Id: lapgen.scm,v 1.7 2001/12/19 21:39:29 cph Exp $
 
-Copyright (c) 1992-1999 Massachusetts Institute of Technology
+Copyright (c) 1992-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,13 +16,12 @@ 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.
 |#
 
 ;;;; RTL Rules for Alpha.  Shared utilities.
 ;; Package: (compiler lap-syntaxer)
-;; Syntax: lap-generator-syntax-table
 
 (declare (usual-integrations))
 \f

diff --git a/v7/src/compiler/machines/alpha/rules1.scm b/v7/src/compiler/machines/alpha/rules1.scm
index a28477d0debb97f84dd34b5dedf31063fdf8c173..29cad2e554632aaed0678af4296317adf11d824a 100644 (file)
--- a/v7/src/compiler/machines/alpha/rules1.scm
+++ b/v7/src/compiler/machines/alpha/rules1.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: rules1.scm,v 1.3 1999/01/02 06:48:57 cph Exp $
+$Id: rules1.scm,v 1.4 2001/12/19 21:39:29 cph Exp $
 
-Copyright (c) 1992-1999 Massachusetts Institute of Technology
+Copyright (c) 1992-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,13 +16,12 @@ 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.
 |#
 
 ;;;; LAP Generation Rules: Data Transfers
 ;; Package: (compiler lap-syntaxer)
-;; Syntax: lap-generator-syntax-table
 
 (declare (usual-integrations))
 \f

diff --git a/v7/src/compiler/machines/alpha/rules2.scm b/v7/src/compiler/machines/alpha/rules2.scm
index 89220ca691e5e7ec42924e156d6f7764abdf0b0f..4111b7a261e7b0539467908040bf091000e8a3cf 100644 (file)
--- a/v7/src/compiler/machines/alpha/rules2.scm
+++ b/v7/src/compiler/machines/alpha/rules2.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: rules2.scm,v 1.2 1999/01/02 06:48:57 cph Exp $
+$Id: rules2.scm,v 1.3 2001/12/19 21:39:30 cph Exp $
 
-Copyright (c) 1992-1999 Massachusetts Institute of Technology
+Copyright (c) 1992-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,13 +16,12 @@ 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.
 |#
 
 ;;;; LAP Generation Rules: Predicates
 ;; Package: (compiler lap-syntaxer)
-;; Syntax: lap-generator-syntax-table
 
 (declare (usual-integrations))
 \f

diff --git a/v7/src/compiler/machines/alpha/rules3.scm b/v7/src/compiler/machines/alpha/rules3.scm
index 7f6ec8f5f68e6108bfaad68475be02d8821f1ab1..46f63fcf8506fd2dc049af323f5e4bdcea569696 100644 (file)
--- a/v7/src/compiler/machines/alpha/rules3.scm
+++ b/v7/src/compiler/machines/alpha/rules3.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: rules3.scm,v 1.7 1999/01/02 06:48:57 cph Exp $
+$Id: rules3.scm,v 1.8 2001/12/19 21:39:30 cph Exp $
 
-Copyright (c) 1992-1999 Massachusetts Institute of Technology
+Copyright (c) 1992-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,13 +16,12 @@ 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.
 |#
 
 ;;;; LAP Generation Rules: Invocations and Entries (Alpha)
 ;; Package: (compiler lap-syntaxer)
-;; Syntax: lap-generator-syntax-table
 
 (declare (usual-integrations))
 \f

diff --git a/v7/src/compiler/machines/alpha/rules4.scm b/v7/src/compiler/machines/alpha/rules4.scm
index 6e32f68faacfcfdd8adc130576561bf7c281ca59..71a22b3213a587e37b11ea7cc68bfd1534907152 100644 (file)
--- a/v7/src/compiler/machines/alpha/rules4.scm
+++ b/v7/src/compiler/machines/alpha/rules4.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: rules4.scm,v 1.3 1999/01/02 06:48:57 cph Exp $
+$Id: rules4.scm,v 1.4 2001/12/19 21:39:30 cph Exp $
 
-Copyright (c) 1992-1999 Massachusetts Institute of Technology
+Copyright (c) 1992-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,13 +16,12 @@ 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.
 |#
 
 ;;;; LAP Generation Rules: Interpreter Calls
 ;; Package: (compiler lap-syntaxer)
-;; Syntax: lap-generator-syntax-table
 
 (declare (usual-integrations))
 \f

diff --git a/v7/src/compiler/machines/alpha/rulfix.scm b/v7/src/compiler/machines/alpha/rulfix.scm
index d280fb45a41a28f9f12e0ecd0aa03a1f4c31bcd8..d86dd5069b50a3965dfebd8c2b98ef4092b0f43a 100644 (file)
--- a/v7/src/compiler/machines/alpha/rulfix.scm
+++ b/v7/src/compiler/machines/alpha/rulfix.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: rulfix.scm,v 1.4 1999/01/02 06:48:57 cph Exp $
+$Id: rulfix.scm,v 1.5 2001/12/19 21:39:30 cph Exp $
 
-Copyright (c) 1992-1999 Massachusetts Institute of Technology
+Copyright (c) 1992-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,13 +16,12 @@ 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.
 |#
 
 ;;;; LAP Generation Rules: Fixnum Rules
 ;; Package: (compiler lap-syntaxer)
-;; Syntax: lap-generator-syntax-table
 
 (declare (usual-integrations))
 \f

diff --git a/v7/src/compiler/machines/alpha/rulflo.scm b/v7/src/compiler/machines/alpha/rulflo.scm
index 0146d9f752569c8ad7d726ed99e40694752e5aa3..0fed1c9fa7bb83281b95bdc70f81e810b20e1a8d 100644 (file)
--- a/v7/src/compiler/machines/alpha/rulflo.scm
+++ b/v7/src/compiler/machines/alpha/rulflo.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: rulflo.scm,v 1.3 1999/01/02 06:48:57 cph Exp $
+$Id: rulflo.scm,v 1.4 2001/12/19 21:39:30 cph Exp $
 
-Copyright (c) 1992-1999 Massachusetts Institute of Technology
+Copyright (c) 1992-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,13 +16,12 @@ 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.
 |#
 
 ;;;; LAP Generation Rules: Flonum rules
 ;; Package: (compiler lap-syntaxer)
-;; Syntax: lap-generator-syntax-table
 
 (declare (usual-integrations))
 \f

diff --git a/v7/src/compiler/machines/bobcat/compiler.pkg b/v7/src/compiler/machines/bobcat/compiler.pkg
index cd34e17f22067fd9a48551279879a0096a1f80bf..26e7a192c9f148a60c7b692c73aa1bdf58ba0a5f 100644 (file)
--- a/v7/src/compiler/machines/bobcat/compiler.pkg
+++ b/v7/src/compiler/machines/bobcat/compiler.pkg
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: compiler.pkg,v 1.50 1999/01/02 06:06:43 cph Exp $
+$Id: compiler.pkg,v 1.51 2001/12/19 21:39:30 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.
 |#
 
 ;;;; Compiler Packaging
@@ -109,11 +110,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 (define-package (compiler macros)
   (files "base/macros")
   (parent ())
-  (export (compiler)
-         assembler-syntax-table
-         compiler-syntax-table
-         early-syntax-table
-         lap-generator-syntax-table)
   (import (runtime macros)
          parse-define-syntax)
   (initialization (initialize-package!)))

diff --git a/v7/src/compiler/machines/bobcat/compiler.sf b/v7/src/compiler/machines/bobcat/compiler.sf
index db637802ab9c374d616d0e1167234f9bfbd0406c..819e186009017be5295490d3e5a8696fbb8e5a78 100644 (file)
--- a/v7/src/compiler/machines/bobcat/compiler.sf
+++ b/v7/src/compiler/machines/bobcat/compiler.sf
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: compiler.sf,v 1.20 2001/12/17 17:40:58 cph Exp $
+$Id: compiler.sf,v 1.21 2001/12/19 21:39:30 cph Exp $
 
 Copyright (c) 1988-1999, 2001 Massachusetts Institute of Technology
 
@@ -54,9 +54,7 @@ USA.
        ((access initialize-package! environment)))
       (sf-and-load '("base/pmlook") '(COMPILER PATTERN-MATCHER/LOOKUP))
       (sf-and-load '("base/pmpars") '(COMPILER PATTERN-MATCHER/PARSER))
-      (fluid-let ((sf/default-syntax-table
-                  (access compiler-syntax-table
-                          (->environment '(COMPILER MACROS)))))
+      (fluid-let ((sf/default-syntax-table (->environment '(COMPILER))))
        (sf-and-load '("machines/bobcat/machin") '(COMPILER)))
       (fluid-let ((sf/default-declarations
                   '((integrate-external "insseq")
@@ -85,8 +83,7 @@ USA.
        (newline)
        (for-each (lambda (name)
                    (load (string-append "machines/bobcat/" name ".scm")
-                         '(COMPILER LAP-SYNTAXER)
-                         early-syntax-table))
+                         '(COMPILER LAP-SYNTAXER)))
                  '("instr1" "instr2" "instr3" "instr4"
                             "flinstr1" "flinstr2")))))
 

diff --git a/v7/src/compiler/machines/bobcat/decls.scm b/v7/src/compiler/machines/bobcat/decls.scm
index 783b1b542629e399c48b6f89072892d732134238..a6e936bc807c8a8e4569ae7c3dc352f2eec6d1b0 100644 (file)
--- a/v7/src/compiler/machines/bobcat/decls.scm
+++ b/v7/src/compiler/machines/bobcat/decls.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: decls.scm,v 4.37 1999/01/02 06:06:43 cph Exp $
+$Id: decls.scm,v 4.38 2001/12/19 21:39:30 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.
 |#
 
 ;;;; Compiler File Dependencies
@@ -346,16 +347,13 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
                              "ralloc" "rcompr" "rcse1" "rcse2" "rcseep"
                              "rcseht" "rcserq" "rcsesr" "rdebug" "rdflow"
                              "rerite" "rinvex" "rlife" "rtlcsm"))
-     compiler-syntax-table)
-    (file-dependency/syntax/join
-     (filename/append "machines/bobcat"
-                     "lapgen" "rules1" "rules2" "rules3" "rules4")
-     lap-generator-syntax-table)
+     (->environment '(COMPILER)))
     (file-dependency/syntax/join
      (filename/append "machines/bobcat"
+                     "lapgen" "rules1" "rules2" "rules3" "rules4"
                      "insutl" "instr1" "instr2" "instr3" "instr4"
                      "flinstr1" "flinstr2")
-     assembler-syntax-table)))
+     (->environment '(COMPILER LAP-SYNTAXER)))))
 \f
 ;;;; Integration Dependencies
 

diff --git a/v7/src/compiler/machines/bobcat/inerly.scm b/v7/src/compiler/machines/bobcat/inerly.scm
index aa491bddd111a0331ca1740f3bb2f4a6ddd77396..b5b1f1389e676ff6c56633bf3d5bd32abbebc7e8 100644 (file)
--- a/v7/src/compiler/machines/bobcat/inerly.scm
+++ b/v7/src/compiler/machines/bobcat/inerly.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: inerly.scm,v 1.8 1999/01/02 06:06:43 cph Exp $
+$Id: inerly.scm,v 1.9 2001/12/19 21:39:30 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.
 |#
 
 ;;;; 68000 Instruction Set Macros.  Early version
@@ -53,23 +54,27 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
       (and (memq (car s1) s2)
           (eq-subset? (cdr s1) s2))))
 
-(syntax-table-define early-syntax-table 'DEFINE-EA-TRANSFORMER
-  (macro (name . restrictions)
+(syntax-table/define (->environment '(COMPILER))
+                    'DEFINE-EA-TRANSFORMER
+  (lambda (name . restrictions)
     `(DEFINE-EARLY-TRANSFORMER ',name
        (APPLY MAKE-EA-TRANSFORMER ',restrictions))))
 
-(syntax-table-define early-syntax-table 'DEFINE-SYMBOL-TRANSFORMER
-  (macro (name . assoc)
+(syntax-table/define (->environment '(COMPILER))
+                    'DEFINE-SYMBOL-TRANSFORMER
+  (lambda (name . assoc)
     `(DEFINE-EARLY-TRANSFORMER ',name (MAKE-SYMBOL-TRANSFORMER ',assoc))))
 
-(syntax-table-define early-syntax-table 'DEFINE-REG-LIST-TRANSFORMER
-  (macro (name . assoc)
+(syntax-table/define (->environment '(COMPILER))
+                    'DEFINE-REG-LIST-TRANSFORMER
+  (lambda (name . assoc)
     `(DEFINE-EARLY-TRANSFORMER ',name (MAKE-BIT-MASK-TRANSFORMER 16 ',assoc))))
 \f
 ;;;; Instruction and addressing mode macros
 
-(syntax-table-define early-syntax-table 'DEFINE-INSTRUCTION
-  (macro (opcode . patterns)
+(syntax-table/define (->environment '(COMPILER))
+                    'DEFINE-INSTRUCTION
+  (lambda (opcode . patterns)
     `(SET! EARLY-INSTRUCTIONS
           (CONS
            (LIST ',opcode
@@ -88,8 +93,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
                         patterns))
                 EARLY-INSTRUCTIONS))))
 
-(syntax-table-define early-syntax-table 'EXTENSION-WORD
-  (macro descriptors
+(syntax-table/define (->environment '(COMPILER))
+                    'EXTENSION-WORD
+  (lambda descriptors
     (expand-descriptors descriptors
       (lambda (instruction size source destination)
        (if (or source destination)
@@ -98,8 +104,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
            (error "EXTENSION-WORD: Extensions must be 16 bit multiples" size))
        (optimize-group-syntax instruction true)))))
 
-(syntax-table-define early-syntax-table 'VARIABLE-EXTENSION
-  (macro (binding . clauses)
+(syntax-table/define (->environment '(COMPILER))
+                    'VARIABLE-EXTENSION
+  (lambda (binding . clauses)
     (variable-width-expression-syntaxer
      (car binding)
      (cadr binding)
@@ -113,8 +120,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 ;;; *** NOTE: If this format changes, insutl.scm must also be changed! ***
 
-(syntax-table-define early-syntax-table 'DEFINE-EA-DATABASE
-  (macro rules
+(syntax-table/define (->environment '(COMPILER))
+                    'DEFINE-EA-DATABASE
+  (lambda rules
     `(SET! EARLY-EA-DATABASE
           (LIST
            ,@(map (lambda (rule)

diff --git a/v7/src/compiler/machines/bobcat/insmac.scm b/v7/src/compiler/machines/bobcat/insmac.scm
index 13697622980deeca8c8ff3d7e1ccc3adba3cce21..8749a5ccaea0919614a095f74e4fedb8ce9d194c 100644 (file)
--- a/v7/src/compiler/machines/bobcat/insmac.scm
+++ b/v7/src/compiler/machines/bobcat/insmac.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: insmac.scm,v 1.127 1999/01/02 06:06:43 cph Exp $
+$Id: insmac.scm,v 1.128 2001/12/19 21:39:30 cph Exp $
 
-Copyright (c) 1988, 1990, 1999 Massachusetts Institute of Technology
+Copyright (c) 1988, 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,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.
 |#
 
 ;;;; 68000 Instruction Set Macros
@@ -28,8 +29,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 (define ea-database-name
   'EA-DATABASE)
 
-(syntax-table-define assembler-syntax-table 'DEFINE-EA-DATABASE
-  (macro rules
+(syntax-table/define (->environment '(COMPILER LAP-SYNTAXER))
+                    'DEFINE-EA-DATABASE
+  (lambda rules
     `(DEFINE ,ea-database-name
        ,(compile-database rules
         (lambda (pattern actions)
@@ -37,8 +39,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
               (make-position-dependent pattern actions)
               (make-position-independent pattern actions)))))))
 
-(syntax-table-define assembler-syntax-table 'EXTENSION-WORD
-  (macro descriptors
+(syntax-table/define (->environment '(COMPILER LAP-SYNTAXER))
+                    'EXTENSION-WORD
+  (lambda descriptors
     (expand-descriptors descriptors
       (lambda (instruction size source destination)
        (if (or source destination)
@@ -48,8 +51,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
                (error "EXTENSION-WORD: Extensions must be 16 bit multiples"
                       size)))))))
 
-(syntax-table-define assembler-syntax-table 'VARIABLE-EXTENSION
-  (macro (binding . clauses)
+(syntax-table/define (->environment '(COMPILER LAP-SYNTAXER))
+                    'VARIABLE-EXTENSION
+  (lambda (binding . clauses)
     (variable-width-expression-syntaxer
      (car binding)
      (cadr binding)
@@ -114,8 +118,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 \f
 ;;;; Transformers
 
-(syntax-table-define assembler-syntax-table 'DEFINE-EA-TRANSFORMER
-  (macro (name #!optional categories keywords)
+(syntax-table/define (->environment '(COMPILER LAP-SYNTAXER))
+                    'DEFINE-EA-TRANSFORMER
+  (lambda (name #!optional categories keywords)
     (define (filter special generator extraction)
       (define (multiple rem)
        (if (null? rem)
@@ -148,8 +153,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
                                          `(ea-keyword ea)))
                            ea))))))))
 
-(syntax-table-define assembler-syntax-table 'DEFINE-SYMBOL-TRANSFORMER
-  (macro (name . alist)
+(syntax-table/define (->environment '(COMPILER LAP-SYNTAXER))
+                    'DEFINE-SYMBOL-TRANSFORMER
+  (lambda (name . alist)
     `(begin
        (declare (integrate-operator ,name))
        (define (,name symbol)
@@ -159,8 +165,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
               #F
               (cdr place)))))))
 
-(syntax-table-define assembler-syntax-table 'DEFINE-REG-LIST-TRANSFORMER
-  (macro (name . alist)
+(syntax-table/define (->environment '(COMPILER LAP-SYNTAXER))
+                    'DEFINE-REG-LIST-TRANSFORMER
+  (lambda (name . alist)
     `(begin
        (declare (integrate-operator ,name))
        (define (,name reg-list)

diff --git a/v7/src/compiler/machines/i386/compiler.pkg b/v7/src/compiler/machines/i386/compiler.pkg
index f1bed1284f1e42aeeabacc9a598b490c61134841..bd7bcab2bca416787628b9ab054ef4ad8e4195a9 100644 (file)
--- a/v7/src/compiler/machines/i386/compiler.pkg
+++ b/v7/src/compiler/machines/i386/compiler.pkg
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: compiler.pkg,v 1.24 1999/01/02 06:06:43 cph Exp $
+$Id: compiler.pkg,v 1.25 2001/12/19 21:39:30 cph Exp $
 
-Copyright (c) 1992-1999 Massachusetts Institute of Technology
+Copyright (c) 1992-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.
 |#
 
 ;;;; Compiler Packaging
@@ -109,12 +110,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define-package (compiler macros)
   (files "base/macros")
-  (parent ())
-  (export (compiler)
-         assembler-syntax-table
-         compiler-syntax-table
-         early-syntax-table
-         lap-generator-syntax-table)
+  (parent (compiler))
   (import (runtime macros)
          parse-define-syntax)
   (initialization (initialize-package!)))

diff --git a/v7/src/compiler/machines/i386/compiler.sf b/v7/src/compiler/machines/i386/compiler.sf
index 907a517dcec5db4466723fa948f1dfe196aab056..8908f92e32fc5331a708574afd4f408256b32c86 100644 (file)
--- a/v7/src/compiler/machines/i386/compiler.sf
+++ b/v7/src/compiler/machines/i386/compiler.sf
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: compiler.sf,v 1.14 2001/12/17 17:40:58 cph Exp $
+$Id: compiler.sf,v 1.15 2001/12/19 21:39:30 cph Exp $
 
 Copyright (c) 1992-2001 Massachusetts Institute of Technology
 
@@ -54,9 +54,7 @@ USA.
        ((access initialize-package! environment)))
       (sf-and-load '("base/pmlook") '(COMPILER PATTERN-MATCHER/LOOKUP))
       (sf-and-load '("base/pmpars") '(COMPILER PATTERN-MATCHER/PARSER))
-      (fluid-let ((sf/default-syntax-table
-                  (access compiler-syntax-table
-                          (->environment '(COMPILER MACROS)))))
+      (fluid-let ((sf/default-syntax-table (->environment '(COMPILER))))
        (sf-and-load '("machines/i386/machin") '(COMPILER)))
       (fluid-let ((sf/default-declarations
                   '((integrate-external "insseq")
@@ -85,8 +83,7 @@ USA.
        (newline)
        (for-each (lambda (name)
                    (load (string-append "machines/i386/" name ".scm")
-                         '(COMPILER LAP-SYNTAXER)
-                         early-syntax-table))
+                         '(COMPILER LAP-SYNTAXER)))
                  '("insutl" "instr1" "instr2" "instrf")))))
 
 ;; Resyntax any files that need it.

diff --git a/v7/src/compiler/machines/i386/decls.scm b/v7/src/compiler/machines/i386/decls.scm
index 92a1bd0ef5c13961b1a83dbf962bd109be68c610..19b4e94a6f5fd577fe395e2e71d2cd474e361e57 100644 (file)
--- a/v7/src/compiler/machines/i386/decls.scm
+++ b/v7/src/compiler/machines/i386/decls.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: decls.scm,v 1.9 2000/01/10 03:54:25 cph Exp $
+$Id: decls.scm,v 1.10 2001/12/19 21:39:30 cph Exp $
 
 Copyright (c) 1992-2000 Massachusetts Institute of Technology
 
@@ -363,15 +363,13 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
                              "ralloc" "rcompr" "rcse1" "rcse2" "rcseep"
                              "rcseht" "rcserq" "rcsesr" "rdebug" "rdflow"
                              "rerite" "rinvex" "rlife" "rtlcsm"))
-     compiler-syntax-table)
+     (->environment '(COMPILER)))
     (file-dependency/syntax/join
      (filename/append "machines/i386"
                      "lapgen"
-                     "rules1" "rules2" "rules3" "rules4" "rulfix" "rulflo")
-     lap-generator-syntax-table)
-    (file-dependency/syntax/join
-     (filename/append "machines/i386" "insutl" "instr1" "instr2" "instrf")
-     assembler-syntax-table)))
+                     "rules1" "rules2" "rules3" "rules4" "rulfix" "rulflo"
+                     "insutl" "instr1" "instr2" "instrf")
+     (->environment '(COMPILER LAP-SYNTAXER)))))
 \f
 ;;;; Integration Dependencies
 

diff --git a/v7/src/compiler/machines/i386/inerly.scm b/v7/src/compiler/machines/i386/inerly.scm
index e33d053bc15233ae9ac6b8b19b6e33d0201f26c2..3023d35918c6b0e7a20a1add3115cf4ca00cb5a1 100644 (file)
--- a/v7/src/compiler/machines/i386/inerly.scm
+++ b/v7/src/compiler/machines/i386/inerly.scm
@@ -1,9 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: inerly.scm,v 1.3 1999/01/02 06:06:43 cph Exp $
-$MC68020-Header: inerly.scm,v 1.6 88/08/31 06:00:59 GMT cph Exp $
+$Id: inerly.scm,v 1.4 2001/12/19 21:39:30 cph Exp $
 
-Copyright (c) 1992, 1999 Massachusetts Institute of Technology
+Copyright (c) 1992, 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
@@ -17,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.
 |#
 
 ;;; i386 Instruction Set Macros.  Early version
 ;;; NOPs for now.
 
 (declare (usual-integrations))
-\f
+
 ;;;; Transformers and utilities
 
 (define early-instructions '())
@@ -42,8 +42,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 ;;; Instruction and addressing mode macros
 
-(syntax-table-define early-syntax-table 'DEFINE-INSTRUCTION
-  (macro (opcode . patterns)
+(syntax-table/define (->environment '(COMPILER LAP-SYNTAXER))
+                    'DEFINE-INSTRUCTION
+  (lambda (opcode . patterns)
     `(SET! EARLY-INSTRUCTIONS
           (CONS
            (LIST ',opcode

diff --git a/v7/src/compiler/machines/i386/insmac.scm b/v7/src/compiler/machines/i386/insmac.scm
index 1d147fecad49d17d85512b471e94b8c15e42e817..5f8849196a6f1317fd9e6398d3cc3b68445bd5ca 100644 (file)
--- a/v7/src/compiler/machines/i386/insmac.scm
+++ b/v7/src/compiler/machines/i386/insmac.scm
@@ -1,9 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: insmac.scm,v 1.11 1999/01/02 06:06:43 cph Exp $
-$Vax-Header: insmac.scm,v 1.12 89/05/17 20:29:15 GMT jinx Exp $
+$Id: insmac.scm,v 1.12 2001/12/19 21:39:30 cph Exp $
 
-Copyright (c) 1992, 1999 Massachusetts Institute of Technology
+Copyright (c) 1992, 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
@@ -17,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.
 |#
 
 ;;;; Intel 386 Instruction Set Macros
@@ -29,8 +29,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 (define ea-database-name
   'EA-DATABASE)
 
-(syntax-table-define assembler-syntax-table 'DEFINE-EA-DATABASE
-  (macro rules
+(syntax-table/define (->environment '(COMPILER LAP-SYNTAXER))
+                    'DEFINE-EA-DATABASE
+  (lambda rules
     `(DEFINE ,ea-database-name
        ,(compile-database rules
                          (lambda (pattern actions)
@@ -54,8 +55,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 ;; This one is necessary to distinguish between r/mW mW, etc.
 
-(syntax-table-define assembler-syntax-table 'DEFINE-EA-TRANSFORMER
-  (macro (name #!optional restriction)
+(syntax-table/define (->environment '(COMPILER LAP-SYNTAXER))
+                    'DEFINE-EA-TRANSFORMER
+  (lambda (name #!optional restriction)
     (if (default-object? restriction)
        `(define (,name expression)
           (let ((match-result (pattern-lookup ,ea-database-name expression)))

diff --git a/v7/src/compiler/machines/mips/compiler.pkg b/v7/src/compiler/machines/mips/compiler.pkg
index ec7862dc9f165c32090fde3734ebd979f341f515..50dde456c0ace9a0a5ba5a717dc654771254971d 100644 (file)
--- a/v7/src/compiler/machines/mips/compiler.pkg
+++ b/v7/src/compiler/machines/mips/compiler.pkg
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: compiler.pkg,v 1.20 1999/01/02 06:06:43 cph Exp $
+$Id: compiler.pkg,v 1.21 2001/12/19 21:39:30 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.
 |#
 
 ;;;; Compiler Packaging
@@ -109,11 +110,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 (define-package (compiler macros)
   (files "base/macros")
   (parent ())
-  (export (compiler)
-         assembler-syntax-table
-         compiler-syntax-table
-         early-syntax-table
-         lap-generator-syntax-table)
   (import (runtime macros)
          parse-define-syntax)
   (initialization (initialize-package!)))

diff --git a/v7/src/compiler/machines/mips/compiler.sf-big b/v7/src/compiler/machines/mips/compiler.sf-big
index 7dce83ba19645af40f5c191c10f04c570eb6de16..7375b4c7dc1311318ebaf4b908eccf92ae45b9b1 100644 (file)
--- a/v7/src/compiler/machines/mips/compiler.sf-big
+++ b/v7/src/compiler/machines/mips/compiler.sf-big
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: compiler.sf-big,v 1.10 2001/12/17 17:40:58 cph Exp $
+$Id: compiler.sf-big,v 1.11 2001/12/19 21:39:30 cph Exp $
 
 Copyright (c) 1988-1999, 2001 Massachusetts Institute of Technology
 
@@ -55,9 +55,7 @@ USA.
       (sf-and-load '("base/pmlook") '(COMPILER PATTERN-MATCHER/LOOKUP))
       (sf-and-load '("base/pmpars") '(COMPILER PATTERN-MATCHER/PARSER))
       (sf-and-load '("rtlbase/valclass") '(COMPILER))
-      (fluid-let ((sf/default-syntax-table
-                  (access compiler-syntax-table
-                          (->environment '(COMPILER MACROS)))))
+      (fluid-let ((sf/default-syntax-table (->environment '(COMPILER))))
        (sf-and-load '("machines/mips/machin") '(COMPILER)))
       (set! (access endianness (->environment '(COMPILER))) 'BIG)
       (fluid-let ((sf/default-declarations
@@ -87,8 +85,7 @@ USA.
        (newline)
        (for-each (lambda (name)
                    (load (string-append "machines/mips/" name ".scm")
-                         '(COMPILER LAP-SYNTAXER)
-                         early-syntax-table))
+                         '(COMPILER LAP-SYNTAXER)))
                  '("instr1" "instr2a" "instr2b" "instr3")))))
 
 ;; Resyntax any files that need it.

diff --git a/v7/src/compiler/machines/mips/compiler.sf-little b/v7/src/compiler/machines/mips/compiler.sf-little
index 18da376f8b3ca95830a0f994255cbd3d8aa4e7ff..d776ce8f5ae8644c75c7db669a038413c1d52e36 100644 (file)
--- a/v7/src/compiler/machines/mips/compiler.sf-little
+++ b/v7/src/compiler/machines/mips/compiler.sf-little
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: compiler.sf-little,v 1.10 2001/12/17 17:40:58 cph Exp $
+$Id: compiler.sf-little,v 1.11 2001/12/19 21:39:30 cph Exp $
 
 Copyright (c) 1988-1999, 2001 Massachusetts Institute of Technology
 
@@ -55,9 +55,7 @@ USA.
       (sf-and-load '("base/pmlook") '(COMPILER PATTERN-MATCHER/LOOKUP))
       (sf-and-load '("base/pmpars") '(COMPILER PATTERN-MATCHER/PARSER))
       (sf-and-load '("rtlbase/valclass") '(COMPILER))
-      (fluid-let ((sf/default-syntax-table
-                  (access compiler-syntax-table
-                          (->environment '(COMPILER MACROS)))))
+      (fluid-let ((sf/default-syntax-table (->environment '(COMPILER))))
        (sf-and-load '("machines/mips/machin") '(COMPILER)))
       (set! (access endianness (->environment '(COMPILER))) 'LITTLE)
       (fluid-let ((sf/default-declarations
@@ -87,8 +85,7 @@ USA.
        (newline)
        (for-each (lambda (name)
                    (load (string-append "machines/mips/" name ".scm")
-                         '(COMPILER LAP-SYNTAXER)
-                         early-syntax-table))
+                         '(COMPILER LAP-SYNTAXER)))
                  '("instr1" "instr2a" "instr2b" "instr3")))))
 
 ;; Resyntax any files that need it.

diff --git a/v7/src/compiler/machines/mips/decls.scm b/v7/src/compiler/machines/mips/decls.scm
index 70b7f6914983096e1469c20e99b0dbe58144748b..076d488394f1c3d96705eb7203f1ce0eaa7c99fb 100644 (file)
--- a/v7/src/compiler/machines/mips/decls.scm
+++ b/v7/src/compiler/machines/mips/decls.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: decls.scm,v 1.10 1999/01/02 06:06:43 cph Exp $
+$Id: decls.scm,v 1.11 2001/12/19 21:39:30 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.
 |#
 
 ;;;; Compiler File Dependencies
@@ -346,16 +347,13 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
                              "ralloc" "rcompr" "rcse1" "rcse2" "rcseep"
                              "rcseht" "rcserq" "rcsesr" "rdebug" "rdflow"
                              "rerite" "rinvex" "rlife" "rtlcsm"))
-     compiler-syntax-table)
+     (->environment '(COMPILER)))
     (file-dependency/syntax/join
      (filename/append "machines/mips"
                      "lapgen"
                      "rules1" "rules2" "rules3" "rules4" "rulfix" "rulflo"
-                     )
-     lap-generator-syntax-table)
-    (file-dependency/syntax/join
-     (filename/append "machines/mips" "instr1" "instr2a" "instr2b" "instr3")
-     assembler-syntax-table)))
+                     "instr1" "instr2a" "instr2b" "instr3")
+     (->environment '(COMPILER LAP-SYNTAXER)))))
 \f
 ;;;; Integration Dependencies
 

diff --git a/v7/src/compiler/machines/mips/inerly.scm b/v7/src/compiler/machines/mips/inerly.scm
index d1e31ca21dd3ae66e1a0fa978246227940242734..429c5767aac44e21eedf0063fc373b4425e6aa01 100644 (file)
--- a/v7/src/compiler/machines/mips/inerly.scm
+++ b/v7/src/compiler/machines/mips/inerly.scm
@@ -1,9 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: inerly.scm,v 1.2 1999/01/02 06:06:43 cph Exp $
-$MC68020-Header: inerly.scm,v 1.6 88/08/31 06:00:59 GMT cph Exp $
+$Id: inerly.scm,v 1.3 2001/12/19 21:39:30 cph Exp $
 
-Copyright (c) 1988, 1989, 1990, 1999 Massachusetts Institute of Technology
+Copyright (c) 1988, 1989, 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
@@ -17,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.
 |#
 
 ;;; MIPS Instruction Set Macros.  Early version
@@ -42,8 +42,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 ;;; Instruction and addressing mode macros
 
-(syntax-table-define early-syntax-table 'DEFINE-INSTRUCTION
-  (macro (opcode . patterns)
+(syntax-table/define (->environment '(COMPILER))
+                    'DEFINE-INSTRUCTION
+  (lambda (opcode . patterns)
     `(SET! EARLY-INSTRUCTIONS
           (CONS
            (LIST ',opcode

diff --git a/v7/src/compiler/machines/mips/insmac.scm b/v7/src/compiler/machines/mips/insmac.scm
index 6055010f62129cf5b7bc5426f300566310c5cba3..61611a8dd9de910f784b155beaf7dda7191a58be 100644 (file)
--- a/v7/src/compiler/machines/mips/insmac.scm
+++ b/v7/src/compiler/machines/mips/insmac.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: insmac.scm,v 1.3 1999/01/02 06:06:43 cph Exp $
+$Id: insmac.scm,v 1.4 2001/12/19 21:39:30 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.
 |#
 
 ;;;; MIPS Instruction Set Macros
@@ -25,8 +26,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 \f
 ;;;; Definition macros
 
-(syntax-table-define assembler-syntax-table 'DEFINE-SYMBOL-TRANSFORMER
-  (macro (name . alist)
+(syntax-table/define (->environment '(COMPILER LAP-SYNTAXER))
+                    'DEFINE-SYMBOL-TRANSFORMER
+  (lambda (name . alist)
     `(BEGIN
        (DECLARE (INTEGRATE-OPERATOR ,name))
        (DEFINE (,name SYMBOL)
@@ -36,8 +38,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
               #F
               (CDR PLACE)))))))
 
-(syntax-table-define assembler-syntax-table 'DEFINE-TRANSFORMER
-  (macro (name value)
+(syntax-table/define (->environment '(COMPILER LAP-SYNTAXER))
+                    'DEFINE-TRANSFORMER
+  (lambda (name value)
     `(DEFINE ,name ,value)))
 
 ;;;; Fixed width instruction parsing

diff --git a/v7/src/compiler/machines/sparc/decls.scm b/v7/src/compiler/machines/sparc/decls.scm
index ce1b2eaefb6c6a91e9046b557bc7cc3e1956122e..054fe2f69e55fbad18d08c1a076cf30e08616c23 100644 (file)
--- a/v7/src/compiler/machines/sparc/decls.scm
+++ b/v7/src/compiler/machines/sparc/decls.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: decls.scm,v 1.4 1999/01/02 06:06:43 cph Exp $
+$Id: decls.scm,v 1.5 2001/12/19 21:39:30 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.
 |#
 
 ;;;; Compiler File Dependencies
@@ -340,16 +341,13 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
                              "ralloc" "rcompr" "rcse1" "rcse2" "rcseep"
                              "rcseht" "rcserq" "rcsesr" "rdebug" "rdflow"
                              "rerite" "rinvex" "rlife" "rtlcsm"))
-     compiler-syntax-table)
+     (->environment '(COMPILER)))
     (file-dependency/syntax/join
      (filename/append "machines/sparc"
                      "lapgen"
-                     "rules1" "rules2" "rules3" "rules4" "rulfix" "rulflo")
-     lap-generator-syntax-table)
-    (file-dependency/syntax/join
-     (filename/append "machines/sparc"
+                     "rules1" "rules2" "rules3" "rules4" "rulfix" "rulflo"
                      "instr1" "instr2a" "instr2b" "instr3")
-     assembler-syntax-table)))
+     (->environment '(COMPILER LAP-SYNTAXER)))))
 \f
 ;;;; Integration Dependencies
 

diff --git a/v7/src/compiler/machines/sparc/inerly.scm b/v7/src/compiler/machines/sparc/inerly.scm
index 9695e13c96f5658c00b66739bebab8163a97d5f9..4c7ea5c8e4d360d943332923eb87bc0e3b43d959 100644 (file)
--- a/v7/src/compiler/machines/sparc/inerly.scm
+++ b/v7/src/compiler/machines/sparc/inerly.scm
@@ -1,9 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: inerly.scm,v 1.2 1999/01/02 06:06:43 cph Exp $
-$MC68020-Header: inerly.scm,v 1.6 88/08/31 06:00:59 GMT cph Exp $
+$Id: inerly.scm,v 1.3 2001/12/19 21:39:30 cph Exp $
 
-Copyright (c) 1988, 1989, 1990, 1999 Massachusetts Institute of Technology
+Copyright (c) 1988, 1989, 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
@@ -17,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.
 |#
 
 ;;; SPARC Instruction Set Macros.  Early version
@@ -42,8 +42,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 ;;; Instruction and addressing mode macros
 
-(syntax-table-define early-syntax-table 'DEFINE-INSTRUCTION
-  (macro (opcode . patterns)
+(syntax-table/define (->environment '(COMPILER))
+                    'DEFINE-INSTRUCTION
+  (lambda (opcode . patterns)
     `(SET! EARLY-INSTRUCTIONS
           (CONS
            (LIST ',opcode

diff --git a/v7/src/compiler/machines/sparc/insmac.scm b/v7/src/compiler/machines/sparc/insmac.scm
index 766fbff964e5bbf4987e35ef1e6cd3f1af379215..d695125e453f62d36a3f33cb31b2b3868eb62830 100644 (file)
--- a/v7/src/compiler/machines/sparc/insmac.scm
+++ b/v7/src/compiler/machines/sparc/insmac.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: insmac.scm,v 1.2 1999/01/02 06:06:43 cph Exp $
+$Id: insmac.scm,v 1.3 2001/12/19 21:39:30 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.
 |#
 
 ;;;; SPARC Instruction Set Macros
@@ -25,8 +26,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 \f
 ;;;; Definition macros
 
-(syntax-table-define assembler-syntax-table 'DEFINE-SYMBOL-TRANSFORMER
-  (macro (name . alist)
+(syntax-table/define (->environment '(COMPILER LAP-SYNTAXER))
+                    'DEFINE-SYMBOL-TRANSFORMER
+  (lambda (name . alist)
     `(BEGIN
        (DECLARE (INTEGRATE-OPERATOR ,name))
        (DEFINE (,name SYMBOL)
@@ -36,8 +38,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
               #F
               (CDR PLACE)))))))
 
-(syntax-table-define assembler-syntax-table 'DEFINE-TRANSFORMER
-  (macro (name value)
+(syntax-table/define (->environment '(COMPILER LAP-SYNTAXER))
+                    'DEFINE-TRANSFORMER
+  (lambda (name value)
     `(DEFINE ,name ,value)))
 
 ;;;; Fixed width instruction parsing

diff --git a/v7/src/compiler/machines/spectrum/compiler.pkg b/v7/src/compiler/machines/spectrum/compiler.pkg
index e96f0a1f83330552254dbe2022acb2da7dbc5cf2..22875dcce8b731073bbc351ad5bbcfbffed262b8 100644 (file)
--- a/v7/src/compiler/machines/spectrum/compiler.pkg
+++ b/v7/src/compiler/machines/spectrum/compiler.pkg
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: compiler.pkg,v 1.50 1999/01/02 06:06:43 cph Exp $
+$Id: compiler.pkg,v 1.51 2001/12/19 21:39:30 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.
 |#
 
 ;;;; Compiler Packaging
@@ -109,11 +110,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 (define-package (compiler macros)
   (files "base/macros")
   (parent ())
-  (export (compiler)
-         assembler-syntax-table
-         compiler-syntax-table
-         early-syntax-table
-         lap-generator-syntax-table)
   (import (runtime macros)
          parse-define-syntax)
   (initialization (initialize-package!)))

diff --git a/v7/src/compiler/machines/spectrum/compiler.sf b/v7/src/compiler/machines/spectrum/compiler.sf
index 02a1ec3f9e8ac9f52325071035394be48163f261..abe79096cf60edc6a54cdc0645d78205ba96b881 100644 (file)
--- a/v7/src/compiler/machines/spectrum/compiler.sf
+++ b/v7/src/compiler/machines/spectrum/compiler.sf
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: compiler.sf,v 1.20 2001/12/17 17:40:58 cph Exp $
+$Id: compiler.sf,v 1.21 2001/12/19 21:39:30 cph Exp $
 
 Copyright (c) 1988-1999, 2001 Massachusetts Institute of Technology
 
@@ -54,9 +54,7 @@ USA.
        ((access initialize-package! environment)))
       (sf-and-load '("base/pmlook") '(COMPILER PATTERN-MATCHER/LOOKUP))
       (sf-and-load '("base/pmpars") '(COMPILER PATTERN-MATCHER/PARSER))
-      (fluid-let ((sf/default-syntax-table
-                  (access compiler-syntax-table
-                          (->environment '(COMPILER MACROS)))))
+      (fluid-let ((sf/default-syntax-table (->environment '(COMPILER))))
        (sf-and-load '("machines/spectrum/machin") '(COMPILER)))
       (fluid-let ((sf/default-declarations
                   '((integrate-external "insseq")
@@ -85,8 +83,7 @@ USA.
        (newline)
        (for-each (lambda (name)
                    (load (string-append "machines/spectrum/" name ".scm")
-                         '(COMPILER LAP-SYNTAXER)
-                         early-syntax-table))
+                         '(COMPILER LAP-SYNTAXER)))
                  '("instr1" "instr2" "instr3")))))
 
 ;; Resyntax any files that need it.

diff --git a/v7/src/compiler/machines/spectrum/decls.scm b/v7/src/compiler/machines/spectrum/decls.scm
index bc7ab06bc46f13838dff28f379a82bdc45d1df63..501935e2a85cae78e851a380280e022778613e37 100644 (file)
--- a/v7/src/compiler/machines/spectrum/decls.scm
+++ b/v7/src/compiler/machines/spectrum/decls.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: decls.scm,v 4.35 1999/01/02 06:06:43 cph Exp $
+$Id: decls.scm,v 4.36 2001/12/19 21:39:30 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.
 |#
 
 ;;;; Compiler File Dependencies
@@ -346,15 +347,13 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
                              "ralloc" "rcompr" "rcse1" "rcse2" "rcseep"
                              "rcseht" "rcserq" "rcsesr" "rdebug" "rdflow"
                              "rerite" "rinvex" "rlife" "rtlcsm"))
-     compiler-syntax-table)
+     (->environment '(COMPILER)))
     (file-dependency/syntax/join
      (filename/append "machines/spectrum"
                      "lapgen"
-                     "rules1" "rules2" "rules3" "rules4" "rulfix" "rulflo")
-     lap-generator-syntax-table)
-    (file-dependency/syntax/join
-     (filename/append "machines/spectrum" "instr1" "instr2" "instr3")
-     assembler-syntax-table)))
+                     "rules1" "rules2" "rules3" "rules4" "rulfix" "rulflo"
+                     "instr1" "instr2" "instr3")
+     (->environment '(COMPILER LAP-SYNTAXER)))))
 \f
 ;;;; Integration Dependencies
 

diff --git a/v7/src/compiler/machines/spectrum/inerly.scm b/v7/src/compiler/machines/spectrum/inerly.scm
index ab06d3f0794b13366f09a8fe71aaa8dc17291f4e..56fa57329ef60c2c770558672b8c5fda651cedc3 100644 (file)
--- a/v7/src/compiler/machines/spectrum/inerly.scm
+++ b/v7/src/compiler/machines/spectrum/inerly.scm
@@ -1,9 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: inerly.scm,v 1.2 1999/01/02 06:06:43 cph Exp $
-$MC68020-Header: inerly.scm,v 1.6 88/08/31 06:00:59 GMT cph Exp $
+$Id: inerly.scm,v 1.3 2001/12/19 21:39:30 cph Exp $
 
-Copyright (c) 1988, 1989, 1990, 1999 Massachusetts Institute of Technology
+Copyright (c) 1988, 1989, 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
@@ -17,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.
 |#
 
 ;;; Spectrum Instruction Set Macros.  Early version
@@ -42,8 +42,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 ;;; Instruction and addressing mode macros
 
-(syntax-table-define early-syntax-table 'DEFINE-INSTRUCTION
-  (macro (opcode . patterns)
+(syntax-table/define (->environment '(COMPILER))
+                    'DEFINE-INSTRUCTION
+  (lambda (opcode . patterns)
     `(SET! EARLY-INSTRUCTIONS
           (CONS
            (LIST ',opcode

diff --git a/v7/src/compiler/machines/spectrum/insmac.scm b/v7/src/compiler/machines/spectrum/insmac.scm
index 1157f484e7439c251d559ed891a3a070eafcc061..cc4873bd94cc029716dd8e70be1512ff376a05cc 100644 (file)
--- a/v7/src/compiler/machines/spectrum/insmac.scm
+++ b/v7/src/compiler/machines/spectrum/insmac.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: insmac.scm,v 1.3 1999/01/02 06:06:43 cph Exp $
+$Id: insmac.scm,v 1.4 2001/12/19 21:39:30 cph Exp $
 
-Copyright (c) 1988, 1989, 1990, 1999 Massachusetts Institute of Technology
+Copyright (c) 1988, 1989, 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,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.
 |#
 
 ;;;; Spectrum Instruction Set Macros
@@ -25,8 +26,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 \f
 ;;;; Definition macros
 
-(syntax-table-define assembler-syntax-table 'DEFINE-SYMBOL-TRANSFORMER
-  (macro (name . alist)
+(syntax-table/define (->environment '(COMPILER LAP-SYNTAXER))
+                    'DEFINE-SYMBOL-TRANSFORMER
+  (lambda (name . alist)
     `(begin
        (declare (integrate-operator ,name))
        (define (,name symbol)
@@ -36,8 +38,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
               #F
               (cdr place)))))))
 
-(syntax-table-define assembler-syntax-table 'DEFINE-TRANSFORMER
-  (macro (name value)
+(syntax-table/define (->environment '(COMPILER LAP-SYNTAXER))
+                    'DEFINE-TRANSFORMER
+  (lambda (name value)
     `(define ,name ,value)))
 \f
 ;;;; Fixed width instruction parsing

diff --git a/v7/src/compiler/machines/vax/compiler.pkg b/v7/src/compiler/machines/vax/compiler.pkg
index 2eb5203a1ba1be9cc511492067116ff39933dab5..40c7ed7723e22728c0ade4e7114306bbda93a9d0 100644 (file)
--- a/v7/src/compiler/machines/vax/compiler.pkg
+++ b/v7/src/compiler/machines/vax/compiler.pkg
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: compiler.pkg,v 1.22 1999/01/02 06:06:43 cph Exp $
+$Id: compiler.pkg,v 1.23 2001/12/19 21:39:30 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.
 |#
 
 ;;;; Compiler Packaging
@@ -109,11 +110,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 (define-package (compiler macros)
   (files "base/macros")
   (parent ())
-  (export (compiler)
-         assembler-syntax-table
-         compiler-syntax-table
-         early-syntax-table
-         lap-generator-syntax-table)
   (import (runtime macros)
          parse-define-syntax)
   (initialization (initialize-package!)))
@@ -654,14 +650,4 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
          dbg-info/labels
          dbg-label/external?
          dbg-label/name
-         dbg-labels/find-offset))
-
-#|
-(define-package (compiler disassembler macros)
-  (files "machines/vax/dsyn"
-        )
-  (parent (compiler disassembler))
-  (export (compiler)
-         disassembler-syntax-table)
-  (initialization (initialize-package!)))
-|#
\ No newline at end of file
+         dbg-labels/find-offset))
\ No newline at end of file

diff --git a/v7/src/compiler/machines/vax/compiler.sf b/v7/src/compiler/machines/vax/compiler.sf
index 0a00410417ca86539182d2661b493b4dc710f6c9..9d8c9e2f2ac051e2750c05067df91c574ed3b112 100644 (file)
--- a/v7/src/compiler/machines/vax/compiler.sf
+++ b/v7/src/compiler/machines/vax/compiler.sf
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: compiler.sf,v 1.11 2001/12/17 17:40:58 cph Exp $
+$Id: compiler.sf,v 1.12 2001/12/19 21:39:30 cph Exp $
 
 Copyright (c) 1988-1999, 2001 Massachusetts Institute of Technology
 
@@ -54,9 +54,7 @@ USA.
        ((access initialize-package! environment)))
       (sf-and-load '("base/pmlook") '(COMPILER PATTERN-MATCHER/LOOKUP))
       (sf-and-load '("base/pmpars") '(COMPILER PATTERN-MATCHER/PARSER))
-      (fluid-let ((sf/default-syntax-table
-                  (access compiler-syntax-table
-                          (->environment '(COMPILER MACROS)))))
+      (fluid-let ((sf/default-syntax-table (->environment '(COMPILER))))
        (sf-and-load '("machines/vax/machin") '(COMPILER)))
       (fluid-let ((sf/default-declarations
                   '((integrate-external "insseq")
@@ -89,8 +87,7 @@ USA.
        (newline)
        (for-each (lambda (name)
                    (load (string-append "machines/vax/" name ".scm")
-                         '(COMPILER LAP-SYNTAXER)
-                         early-syntax-table))
+                         '(COMPILER LAP-SYNTAXER)))
                  '("insutl" "instr1" "instr2" "instr3")))))
 
 ;; Resyntax any files that need it.

diff --git a/v7/src/compiler/machines/vax/decls.scm b/v7/src/compiler/machines/vax/decls.scm
index 87d7a63faac6af325b49f344522b68d04fa4b135..5e4c0722ff5a008f7b64b8cb48ef29d3d83bbd7c 100644 (file)
--- a/v7/src/compiler/machines/vax/decls.scm
+++ b/v7/src/compiler/machines/vax/decls.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: decls.scm,v 4.13 1999/01/02 06:06:43 cph Exp $
+$Id: decls.scm,v 4.14 2001/12/19 21:39:30 cph Exp $
 
-Copyright (c) 1987-1999 Massachusetts Institute of Technology
+Copyright (c) 1987-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.
 |#
 
 ;;;; Compiler File Dependencies.  VAX version.
@@ -346,19 +347,16 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
                              "ralloc" "rcompr" "rcse1" "rcse2" "rcseep"
                              "rcseht" "rcserq" "rcsesr" "rdebug" "rdflow"
                              "rerite" "rinvex" "rlife" "rtlcsm"))
-     compiler-syntax-table)
-    (file-dependency/syntax/join
-     (filename/append "machines/vax"
-                     "lapgen" "rules1" "rules2" "rules3" "rules4" "rulfix")
-     lap-generator-syntax-table)
+     (->environment '(COMPILER)))
     (file-dependency/syntax/join
      (filename/append "machines/vax"
+                     "lapgen" "rules1" "rules2" "rules3" "rules4" "rulfix"
                      "insutl" "instr1" "instr2" "instr3")
-     assembler-syntax-table)
+     (->environment '(COMPILER LAP-SYNTAXER)))
     (file-dependency/syntax/join
      (filename/append "machines/vax"
                      "dinstr1" "dinstr2" "dinstr3")
-     disassembler-syntax-table)))
+     (->environment '(COMPILER DISASSEMBLER)))))
 \f
 ;;;; Integration Dependencies
 

diff --git a/v7/src/compiler/machines/vax/dsyn.scm b/v7/src/compiler/machines/vax/dsyn.scm
index 823348714881e63141a2f9681a3260c0ac3f9fe9..d231fe3d470bb7f3257e9d345e04f53465c3f583 100644 (file)
--- a/v7/src/compiler/machines/vax/dsyn.scm
+++ b/v7/src/compiler/machines/vax/dsyn.scm
@@ -1,9 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: dsyn.scm,v 1.8 1999/01/02 06:06:43 cph Exp $
-This file has no counterpart in the MC68020 compiler
+$Id: dsyn.scm,v 1.9 2001/12/19 21:39:30 cph Exp $
 
-Copyright (c) 1987, 1989, 1999 Massachusetts Institute of Technology
+Copyright (c) 1987, 1989, 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
@@ -27,18 +26,18 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 ;;;; Instruction decoding
 
 (define (initialize-package!)
-  (syntax-table-define disassembler-syntax-table
-      'DEFINE-INSTRUCTION
+  (set-environment-syntax-table!
+   (->environment '(COMPILER DISASSEMBLER))
+   (make-syntax-table (->environment '(COMPILER))))
+  (syntax-table/define (->environment '(COMPILER DISASSEMBLER))
+                      'DEFINE-INSTRUCTION
     transform/define-instruction))
 
 (define instructions-disassembled-specially
   '(BYTE WORD LONG BUG B BR BSB))
 
-(define disassembler-syntax-table
-  (make-syntax-table system-global-syntax-table))
-
 (define transform/define-instruction
-  (macro (name . patterns)
+  (lambda (name . patterns)
     (if (memq name instructions-disassembled-specially)
        ''()
        `(begin ,@(map (lambda (pattern)

diff --git a/v7/src/compiler/machines/vax/inerly.scm b/v7/src/compiler/machines/vax/inerly.scm
index 83cd08c7774c7b81e3f6eb99abb0fafe5c6cc232..3c010fa0b28bffc8d1279dd5864ae35af2a79270 100644 (file)
--- a/v7/src/compiler/machines/vax/inerly.scm
+++ b/v7/src/compiler/machines/vax/inerly.scm
@@ -1,9 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: inerly.scm,v 1.7 1999/01/02 06:06:43 cph Exp $
-$MC68020-Header: inerly.scm,v 1.6 88/08/31 06:00:59 GMT cph Exp $
+$Id: inerly.scm,v 1.8 2001/12/19 21:39:30 cph Exp $
 
-Copyright (c) 1987-1999 Massachusetts Institute of Technology
+Copyright (c) 1987-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
@@ -17,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.
 |#
 
 ;;;; VAX Instruction Set Macros.  Early version
@@ -30,8 +30,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 (define early-transformers '())
 (define early-ea-database '())
 
-(syntax-table-define early-syntax-table 'DEFINE-INSTRUCTION
-  (macro (opcode . patterns)
+(syntax-table/define (->environment '(COMPILER))
+                    'DEFINE-INSTRUCTION
+  (lambda (opcode . patterns)
     `(SET! EARLY-INSTRUCTIONS
           (CONS
            (LIST ',opcode
@@ -57,18 +58,21 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
        (cons (cons name transformer)
              early-transformers)))
 
-(syntax-table-define early-syntax-table 'DEFINE-SYMBOL-TRANSFORMER
-  (macro (name . assoc)
+(syntax-table/define (->environment '(COMPILER))
+                    'DEFINE-SYMBOL-TRANSFORMER
+  (lambda (name . assoc)
     `(DEFINE-EARLY-TRANSFORMER ',name (MAKE-SYMBOL-TRANSFORMER ',assoc))))
 
 ;; *** Is this right? ***
 
-(syntax-table-define early-syntax-table 'DEFINE-TRANSFORMER
-  (macro (name value)
+(syntax-table/define (->environment '(COMPILER))
+                    'DEFINE-TRANSFORMER
+  (lambda (name value)
     `(DEFINE-EARLY-TRANSFORMER ',name ,value)))
 
-(syntax-table-define early-syntax-table 'DEFINE-EA-TRANSFORMER
-  (macro (name category type)
+(syntax-table/define (->environment '(COMPILER))
+                    'DEFINE-EA-TRANSFORMER
+  (lambda (name category type)
     `(DEFINE-EARLY-TRANSFORMER ',name
        (MAKE-EA-TRANSFORMER ',category ',type))))
 
@@ -88,8 +92,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 ;;; *** NOTE: If this format changes, insutl.scm must also be changed! ***
 
-(syntax-table-define early-syntax-table 'DEFINE-EA-DATABASE
-  (macro rules
+(syntax-table/define (->environment '(COMPILER))
+                    'DEFINE-EA-DATABASE
+  (lambda rules
     `(SET! EARLY-EA-DATABASE
        (LIST
        ,@(map (lambda (rule)

diff --git a/v7/src/compiler/machines/vax/insmac.scm b/v7/src/compiler/machines/vax/insmac.scm
index 3e2eed3d14560a98f84b7c4e43ed0b07773b2a36..8fc9fbf7716bb02d539bc21cde0198af37b23d39 100644 (file)
--- a/v7/src/compiler/machines/vax/insmac.scm
+++ b/v7/src/compiler/machines/vax/insmac.scm
@@ -1,9 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: insmac.scm,v 1.13 1999/01/02 06:06:43 cph Exp $
-$MC68020-Header: insmac.scm,v 1.124 88/06/14 08:47:02 GMT cph Exp $
+$Id: insmac.scm,v 1.14 2001/12/19 21:39:30 cph Exp $
 
-Copyright (c) 1987, 1989, 1999 Massachusetts Institute of Technology
+Copyright (c) 1987, 1989, 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
@@ -17,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.
 |#
 
 ;;;; VAX Instruction Set Macros
@@ -29,8 +29,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 (define ea-database-name
   'EA-DATABASE)
 
-(syntax-table-define assembler-syntax-table 'DEFINE-EA-DATABASE
-  (macro rules
+(syntax-table/define (->environment '(COMPILER LAP-SYNTAXER))
+                    'DEFINE-EA-DATABASE
+  (lambda rules
     `(DEFINE ,ea-database-name
        ,(compile-database rules
         (lambda (pattern actions)
@@ -43,16 +44,18 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
               ',categories
               ,(process-fields value false))))))))
 
-(syntax-table-define assembler-syntax-table 'DEFINE-EA-TRANSFORMER
-  (macro (name category type)
+(syntax-table/define (->environment '(COMPILER LAP-SYNTAXER))
+                    'DEFINE-EA-TRANSFORMER
+  (lambda (name category type)
     `(define (,name expression)
        (let ((ea (process-ea expression ',type)))
         (and ea
              (memq ',category (ea-categories ea))
              ea)))))
 
-(syntax-table-define assembler-syntax-table 'DEFINE-SYMBOL-TRANSFORMER
-  (macro (name . alist)
+(syntax-table/define (->environment '(COMPILER LAP-SYNTAXER))
+                    'DEFINE-SYMBOL-TRANSFORMER
+  (lambda (name . alist)
     `(begin
        (declare (integrate-operator ,name))
        (define (,name symbol)
@@ -62,8 +65,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
               #F
               (cdr place)))))))
 
-(syntax-table-define assembler-syntax-table 'DEFINE-TRANSFORMER
-  (macro (name value)
+(syntax-table/define (->environment '(COMPILER LAP-SYNTAXER))
+                    'DEFINE-TRANSFORMER
+  (lambda (name value)
     `(define ,name ,value)))
 \f
 (define (parse-instruction opcode tail early?)