Eliminate references to SYNTAX-TABLE-DEFINE and SYNTAX-TABLE-REF.

diff --git a/v7/src/runtime/runtime.pkg b/v7/src/runtime/runtime.pkg
index 9ec622c0b173abbbe3a55a23210f85037cd76683..20cbbb0bea000b9243a8ddbfc8fd63acb34b6b01 100644 (file)
--- a/v7/src/runtime/runtime.pkg
+++ b/v7/src/runtime/runtime.pkg
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: runtime.pkg,v 14.392 2001/12/20 06:49:06 cph Exp $
+$Id: runtime.pkg,v 14.393 2001/12/20 06:52:30 cph Exp $
 
 Copyright (c) 1988-2001 Massachusetts Institute of Technology
 
@@ -3739,8 +3739,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
          guarantee-syntax-table
          make-syntax-table
          set-environment-syntax-table!
-         syntax-table-define
-         syntax-table-ref
          syntax-table/copy
          syntax-table/define
          syntax-table/defined-names

diff --git a/v7/src/runtime/syntab.scm b/v7/src/runtime/syntab.scm
index e27535d7eb17c2b3887e24e299d9ff55d3ce2fbc..a5fb7627606d3d422628dd9a1a5afc1a66e9b390 100644 (file)
--- a/v7/src/runtime/syntab.scm
+++ b/v7/src/runtime/syntab.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: syntab.scm,v 14.7 2001/12/19 01:39:41 cph Exp $
+$Id: syntab.scm,v 14.8 2001/12/20 06:52:49 cph Exp $
 
 Copyright (c) 1988-1999, 2001 Massachusetts Institute of Technology
 
@@ -57,9 +57,6 @@ USA.
               (cdr entry)
               (loop (syntax-table/%parent table)))))))
 
-(define syntax-table-ref
-  syntax-table/ref)
-
 (define (syntax-table/define table name transform)
   (let ((table (guarantee-syntax-table table 'SYNTAX-TABLE/DEFINE)))
     (let ((entry (assq name (syntax-table/alist table))))
@@ -69,9 +66,6 @@ USA.
                                   (cons (cons name transform)
                                         (syntax-table/alist table)))))))
 
-(define syntax-table-define
-  syntax-table/define)
-
 (define (syntax-table/defined-names table)
   (map car
        (syntax-table/alist

diff --git a/v7/src/runtime/syntax.scm b/v7/src/runtime/syntax.scm
index 34544c83c26080c716634597f88eedbe8b4d7a08..a9073ecc2276e20144a3d8ba8bc7f0b94e862e3f 100644 (file)
--- a/v7/src/runtime/syntax.scm
+++ b/v7/src/runtime/syntax.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: syntax.scm,v 14.40 2001/12/20 06:49:28 cph Exp $
+$Id: syntax.scm,v 14.41 2001/12/20 06:52:03 cph Exp $
 
 Copyright (c) 1988-2001 Massachusetts Institute of Technology
 
@@ -144,7 +144,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    ((pair? expression)
     (if (not (list? expression))
        (error "syntax-expression: not a valid expression" expression))
-    (let ((transform (syntax-table-ref syntax-table (car expression))))
+    (let ((transform (syntax-table/ref syntax-table (car expression))))
       (if transform
          (if (primitive-syntaxer? transform)
              (transform-apply (primitive-syntaxer/transform transform)
@@ -307,7 +307,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
   top-level?
   (let ((make-definition
         (lambda (name value)
-          (if (syntax-table-ref *syntax-table* name)
+          (if (syntax-table/ref *syntax-table* name)
               (syntax-error "redefinition of syntactic keyword" name))
           (make-definition name value))))
     (cond ((symbol? pattern)
@@ -461,14 +461,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
   top-level?
   (if (not (symbol? name))
       (syntax-error "illegal name" name))
-  (syntax-table-define *syntax-table* name
+  (syntax-table/define *syntax-table* name
     (syntax-eval (syntax-subexpression value)))
   name)
 
 (define (syntax/define-macro top-level? pattern . body)
   top-level?
   (let ((keyword (car pattern)))
-    (syntax-table-define *syntax-table* keyword
+    (syntax-table/define *syntax-table* keyword
       (syntax-eval (apply syntax/named-lambda #f pattern body)))
     keyword))
 

diff --git a/v7/src/sicp/studen.scm b/v7/src/sicp/studen.scm
index fde89c78669329b4f7018bb75180f19cd0732123..2af705ba89de4ff2fa030205fd821abee75b3eeb 100644 (file)
--- a/v7/src/sicp/studen.scm
+++ b/v7/src/sicp/studen.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: studen.scm,v 1.10 1999/01/02 06:19:10 cph Exp $
+$Id: studen.scm,v 1.11 2001/12/20 06:51:21 cph Exp $
 
 Copyright (c) 1987-1999 Massachusetts Institute of Technology
 
@@ -122,8 +122,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
   ;; Now, hack the syntax (special form) table.
   (let ((move
         (lambda (from to)
-          (syntax-table-define sicp-syntax-table to
-            (or (syntax-table-ref system-global-syntax-table from)
+          (syntax-table/define sicp-syntax-table to
+            (or (syntax-table/ref system-global-syntax-table from)
                 (error "Missing syntactic keyword" from))))))
     (for-each (lambda (name) (move name name))
              '(