From dbbd2f9ec5b6e871a5448e1abb42d94c209bc53b Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Thu, 20 Dec 2001 21:29:22 +0000
Subject: [PATCH] Eliminate MACRO special form.

---
 v7/src/6001/arith.scm             | 15 ++++++++-------
 v7/src/edwin/buffer.scm           |  4 ++--
 v7/src/edwin/calias.scm           |  4 ++--
 v7/src/edwin/dosproc.scm          |  9 +++++----
 v7/src/edwin/schmod.scm           |  3 +--
 v7/src/edwin/search.scm           | 11 ++++++-----
 v7/src/edwin/tterm.scm            | 11 ++++++-----
 v7/src/runtime/apply.scm          |  9 +++++----
 v7/src/runtime/arith.scm          | 24 ++++++++++++------------
 v7/src/runtime/graphics.scm       |  9 +++++----
 v7/src/runtime/infstr.scm         |  4 ++--
 v7/src/runtime/list.scm           |  4 ++--
 v7/src/runtime/scomb.scm          |  9 +++++----
 v7/src/runtime/starbase.scm       |  9 +++++----
 v7/src/runtime/syntax.scm         |  3 +--
 v7/src/runtime/vector.scm         |  4 ++--
 v7/src/sf/object.scm              |  8 ++++----
 v7/src/sos/class.scm              |  9 +++++----
 v7/src/swat/scheme/mit-xhooks.scm |  4 ++--
 v7/src/wabbit/test-wabbit.scm     |  6 +++---
 20 files changed, 83 insertions(+), 76 deletions(-)

diff --git a/v7/src/6001/arith.scm b/v7/src/6001/arith.scm
index 629a02b34..cdd9b4c6c 100644
--- a/v7/src/6001/arith.scm
+++ b/v7/src/6001/arith.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: arith.scm,v 1.6 1999/01/02 06:06:43 cph Exp $
+$Id: arith.scm,v 1.7 2001/12/20 21:29:22 cph Exp $
 
-Copyright (c) 1989-1999 Massachusetts Institute of Technology
+Copyright (c) 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
@@ -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.
 |#
 
 ;;;; Scheme Arithmetic for 6.001
@@ -45,7 +46,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (let-syntax
     ((define-standard-unary
-       (macro (name flo:op int:op)
+       (lambda (name flo:op int:op)
 	 `(DEFINE (,name X)
 	    (IF (FLONUM? X)
 		(,flo:op X)
@@ -76,7 +77,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (let-syntax
     ((define-standard-binary
-       (macro (name flo:op int:op)
+       (lambda (name flo:op int:op)
 	 `(DEFINE (,name X Y)
 	    (IF (FLONUM? X)
 		(IF (FLONUM? Y)
@@ -183,7 +184,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (let-syntax
     ((define-integer-binary
-       (macro (name operator)
+       (lambda (name operator)
 	 `(DEFINE (,name N M)
 	    (IF (FLONUM? N)
 		(INT:->FLONUM
@@ -214,7 +215,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (let-syntax
     ((define-transcendental-unary
-       (macro (name hole? hole-value function)
+       (lambda (name hole? hole-value function)
 	 `(DEFINE (,name X)
 	    (IF (,hole? X)
 		,hole-value
diff --git a/v7/src/edwin/buffer.scm b/v7/src/edwin/buffer.scm
index db40b31b4..f999a382d 100644
--- a/v7/src/edwin/buffer.scm
+++ b/v7/src/edwin/buffer.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: buffer.scm,v 1.182 2001/06/07 17:43:21 cph Exp $
+;;; $Id: buffer.scm,v 1.183 2001/12/20 21:27:52 cph Exp $
 ;;;
 ;;; Copyright (c) 1986, 1989-2001 Massachusetts Institute of Technology
 ;;;
@@ -46,7 +46,7 @@
 
 (let-syntax
     ((rename
-      (macro (slot-name)
+      (lambda (slot-name)
 	`(DEFINE-INTEGRABLE ,(symbol-append 'BUFFER- slot-name)
 	   ,(symbol-append 'BUFFER-% slot-name)))))
   (rename name)
diff --git a/v7/src/edwin/calias.scm b/v7/src/edwin/calias.scm
index 445f62bed..41c1a5613 100644
--- a/v7/src/edwin/calias.scm
+++ b/v7/src/edwin/calias.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: calias.scm,v 1.21 2001/09/25 03:15:15 cph Exp $
+;;; $Id: calias.scm,v 1.22 2001/12/20 21:27:55 cph Exp $
 ;;;
 ;;; Copyright (c) 1986, 1989-2001 Massachusetts Institute of Technology
 ;;;
@@ -256,7 +256,7 @@
 
 ;; Predefined special keys
 (let-syntax ((make-key
-	      (macro (name)
+	      (lambda (name)
 		`(DEFINE ,name (INTERN-SPECIAL-KEY ',name 0)))))
   (make-key backspace)
   (make-key stop)
diff --git a/v7/src/edwin/dosproc.scm b/v7/src/edwin/dosproc.scm
index 022999816..fe0a2a18a 100644
--- a/v7/src/edwin/dosproc.scm
+++ b/v7/src/edwin/dosproc.scm
@@ -1,8 +1,8 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: dosproc.scm,v 1.5 2000/10/26 02:28:04 cph Exp $
+;;; $Id: dosproc.scm,v 1.6 2001/12/20 21:27:57 cph Exp $
 ;;;
-;;; Copyright (c) 1992-2000 Massachusetts Institute of Technology
+;;; Copyright (c) 1992-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
@@ -16,7 +16,8 @@
 ;;;
 ;;; 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.
 
 ;;;; Dummy subprocess support
 ;; package: (edwin process)
@@ -41,7 +42,7 @@
     (editor-error "Processes not implemented" name process)))
 
 (let-syntax ((define-process-operation
-	       (macro (name)
+	       (lambda (name)
 		 `(define ,name (process-operation ',name)))))
 
   (define-process-operation delete-process))
diff --git a/v7/src/edwin/schmod.scm b/v7/src/edwin/schmod.scm
index d04e6c57b..c8c015fe0 100644
--- a/v7/src/edwin/schmod.scm
+++ b/v7/src/edwin/schmod.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: schmod.scm,v 1.57 2001/12/20 18:01:59 cph Exp $
+;;; $Id: schmod.scm,v 1.58 2001/12/20 21:28:00 cph Exp $
 ;;;
 ;;; Copyright (c) 1986, 1989-2001 Massachusetts Institute of Technology
 ;;;
@@ -166,7 +166,6 @@ The following commands evaluate Scheme expressions:
 	    (FLUID-LET . 1)
 	    (LET-SYNTAX . 1)
 	    (LOCAL-DECLARE . 1)
-	    (MACRO . 1)
 	    (NAMED-LAMBDA . 1)
 
 	    (CALL-WITH-APPEND-FILE . 1)
diff --git a/v7/src/edwin/search.scm b/v7/src/edwin/search.scm
index 6525a32dc..b8ba514ba 100644
--- a/v7/src/edwin/search.scm
+++ b/v7/src/edwin/search.scm
@@ -1,8 +1,8 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;$Id: search.scm,v 1.151 2001/12/20 20:51:16 cph Exp $
+;;;$Id: search.scm,v 1.152 2001/12/20 21:28:02 cph Exp $
 ;;;
-;;; Copyright (c) 1986, 1989-1999 Massachusetts Institute of Technology
+;;; Copyright (c) 1986, 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
@@ -16,7 +16,8 @@
 ;;;
 ;;; 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.
 
 ;;;; Search/Match Primitives
 
@@ -24,7 +25,7 @@
 
 (let-syntax
     ((define-forward-search
-       (macro (name find-next)
+       (lambda (name find-next)
 	 `(DEFINE (,name GROUP START END CHAR)
 	    ;; Assume (FIX:<= START END)
 	    (AND (NOT (FIX:= START END))
@@ -59,7 +60,7 @@
 
 (let-syntax
     ((define-backward-search
-       (macro (name find-previous)
+       (lambda (name find-previous)
 	 `(DEFINE (,name GROUP START END CHAR)
 	    ;; Assume (FIX:<= START END)
 	    (AND (NOT (FIX:= START END))
diff --git a/v7/src/edwin/tterm.scm b/v7/src/edwin/tterm.scm
index 7d138479b..d612c99e7 100644
--- a/v7/src/edwin/tterm.scm
+++ b/v7/src/edwin/tterm.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: tterm.scm,v 1.30 1999/02/18 04:14:36 cph Exp $
+$Id: tterm.scm,v 1.31 2001/12/20 21:28:04 cph Exp $
 
-Copyright (c) 1990-1999 Massachusetts Institute of Technology
+Copyright (c) 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.
 |#
 
 ;;;; Termcap(3) Screen Implementation
@@ -441,12 +442,12 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
   (key-table false))
 
 (let-syntax ((define-accessor
-	       (macro (name)
+	       (lambda (name)
 		 `(DEFINE-INTEGRABLE (,(symbol-append 'SCREEN- name) SCREEN)
 		    (,(symbol-append 'TERMINAL-STATE/ name)
 		     (SCREEN-STATE SCREEN)))))
 	     (define-updater
-	       (macro (name)
+	       (lambda (name)
 		 `(DEFINE-INTEGRABLE
 		    (,(symbol-append 'SET-SCREEN- name '!) SCREEN ,name)
 		    (,(symbol-append 'SET-TERMINAL-STATE/ name '!)
diff --git a/v7/src/runtime/apply.scm b/v7/src/runtime/apply.scm
index da9d2483c..3845c652a 100644
--- a/v7/src/runtime/apply.scm
+++ b/v7/src/runtime/apply.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: apply.scm,v 1.2 1999/01/02 06:11:34 cph Exp $
+$Id: apply.scm,v 1.3 2001/12/20 21:22:05 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.
 |#
 
 ;;;; Definition of APPLY
@@ -33,7 +34,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
     (error "apply: Improper argument list" a0))
 
   (let-syntax ((apply-dispatch&bind
-		(macro (var clause . clauses)
+		(lambda (var clause . clauses)
 		  (if (null? clauses)
 		      (cadr clause)
 		      (let walk ((lv var)
diff --git a/v7/src/runtime/arith.scm b/v7/src/runtime/arith.scm
index f1a9b8b69..31a726c50 100644
--- a/v7/src/runtime/arith.scm
+++ b/v7/src/runtime/arith.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: arith.scm,v 1.46 2001/12/20 20:51:16 cph Exp $
+$Id: arith.scm,v 1.47 2001/12/20 21:22:31 cph Exp $
 
 Copyright (c) 1989-1999, 2001 Massachusetts Institute of Technology
 
@@ -141,7 +141,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 
   (let-syntax
       ((commutative
-	(macro (name generic-binary identity primitive-binary)
+	(lambda (name generic-binary identity primitive-binary)
 	  `(SET! ,name
 		 (MAKE-ENTITY
 		  (NAMED-LAMBDA (,name SELF . ZS)
@@ -161,7 +161,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 
   (let-syntax
       ((non-commutative
-	(macro (name generic-unary generic-binary
+	(lambda (name generic-unary generic-binary
 		     generic-inverse inverse-identity primitive-binary)
 	  `(SET! ,name
 		 (MAKE-ENTITY
@@ -180,7 +180,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 
   (let-syntax
       ((relational
-	(macro (name generic-binary primitive-binary correct-type? negated?)
+	(lambda (name generic-binary primitive-binary correct-type? negated?)
 	  `(SET! ,name
 		 (MAKE-ENTITY
 		  (NAMED-LAMBDA (,name SELF . ZS)
@@ -206,7 +206,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 
   (let-syntax
       ((max/min
-	(macro (name generic-binary)
+	(lambda (name generic-binary)
 	  `(SET! ,name
 		 (MAKE-ENTITY
 		  (NAMED-LAMBDA (,name SELF X . XS)
@@ -510,7 +510,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 
 (let-syntax
     ((define-addition-operator
-       (macro (name int:op)
+       (lambda (name int:op)
 	 `(define (,name u/u* v/v*)
 	    (rat:binary-operator u/u* v/v*
 	      ,int:op
@@ -669,7 +669,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 
 (let-syntax
     ((define-integer-coercion
-       (macro (name operation-name coercion)
+       (lambda (name operation-name coercion)
 	 `(DEFINE (,name Q)
 	    (COND ((RATNUM? Q)
 		   (,coercion (RATNUM-NUMERATOR Q) (RATNUM-DENOMINATOR Q)))
@@ -920,7 +920,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 
 (let-syntax
     ((define-standard-unary
-       (macro (name flo:op rat:op)
+       (lambda (name flo:op rat:op)
 	 `(DEFINE (,name X)
 	    (IF (FLONUM? X)
 		(,flo:op X)
@@ -948,7 +948,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 
 (let-syntax
     ((define-standard-binary
-       (macro (name flo:op rat:op)
+       (lambda (name flo:op rat:op)
 	 `(DEFINE (,name X Y)
 	    (IF (FLONUM? X)
 		(IF (FLONUM? Y)
@@ -1032,7 +1032,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 
 (let-syntax
     ((define-integer-binary
-       (macro (name operator-name operator)
+       (lambda (name operator-name operator)
 	 (let ((flo->int
 		(lambda (n)
 		  `(IF (FLO:INTEGER? ,n)
@@ -1060,7 +1060,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 
 (let-syntax
     ((define-rational-unary
-       (macro (name operator)
+       (lambda (name operator)
 	 `(DEFINE (,name Q)
 	    (IF (FLONUM? Q)
 		(RAT:->INEXACT (,operator (FLO:->RATIONAL Q)))
@@ -1070,7 +1070,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 
 (let-syntax
     ((define-transcendental-unary
-       (macro (name hole? hole-value function)
+       (lambda (name hole? hole-value function)
 	 `(DEFINE (,name X)
 	    (IF (,hole? X)
 		,hole-value
diff --git a/v7/src/runtime/graphics.scm b/v7/src/runtime/graphics.scm
index eeef4a2b5..0933b7c09 100644
--- a/v7/src/runtime/graphics.scm
+++ b/v7/src/runtime/graphics.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: graphics.scm,v 1.17 1999/01/02 06:11:34 cph Exp $
+$Id: graphics.scm,v 1.18 2001/12/20 21:22:55 cph Exp $
 
-Copyright (c) 1989-1999 Massachusetts Institute of Technology
+Copyright (c) 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
@@ -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.
 |#
 
 ;;;; Graphics Operations
@@ -252,7 +253,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (let-syntax
     ((define-graphics-operation
-       (macro (name)
+       (lambda (name)
 	 `(DEFINE-INTEGRABLE
 	    (,(symbol-append 'GRAPHICS-DEVICE/OPERATION/ name) DEVICE)
 	    (,(symbol-append 'GRAPHICS-DEVICE-TYPE/OPERATION/ name)
diff --git a/v7/src/runtime/infstr.scm b/v7/src/runtime/infstr.scm
index 9e33cfa10..2f97dfc3a 100644
--- a/v7/src/runtime/infstr.scm
+++ b/v7/src/runtime/infstr.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: infstr.scm,v 1.11 2001/08/10 17:09:18 cph Exp $
+$Id: infstr.scm,v 1.12 2001/12/20 21:23:14 cph Exp $
 
 Copyright (c) 1988-2001 Massachusetts Institute of Technology
 
@@ -152,7 +152,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 
 (let-syntax
     ((dbg-block-name
-      (macro (name)
+      (lambda (name)
 	(let ((symbol (symbol-append 'DBG-BLOCK-NAME/ name)))
 	  `(DEFINE-INTEGRABLE ,symbol
 	     ',((ucode-primitive string->symbol)
diff --git a/v7/src/runtime/list.scm b/v7/src/runtime/list.scm
index a04d6fa36..56e7c12a5 100644
--- a/v7/src/runtime/list.scm
+++ b/v7/src/runtime/list.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: list.scm,v 14.27 2001/11/02 03:27:50 cph Exp $
+$Id: list.scm,v 14.28 2001/12/20 21:23:31 cph Exp $
 
 Copyright (c) 1988-2001 Massachusetts Institute of Technology
 
@@ -547,7 +547,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 
 (let-syntax
     ((mapping-procedure
-      (macro (name combiner initial-value procedure first rest)
+      (lambda (name combiner initial-value procedure first rest)
 	`(BEGIN
 	   (DEFINE (MAP-1 L)
 	     (COND ((PAIR? L)
diff --git a/v7/src/runtime/scomb.scm b/v7/src/runtime/scomb.scm
index 5b6751b6b..12f356545 100644
--- a/v7/src/runtime/scomb.scm
+++ b/v7/src/runtime/scomb.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: scomb.scm,v 14.16 1999/01/02 06:19:10 cph Exp $
+$Id: scomb.scm,v 14.17 2001/12/20 21:24:08 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.
 |#
 
 ;;;; SCode Combinator Abstractions
@@ -280,7 +281,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (let-syntax
     ((combination-dispatch
-      (macro (name combination case-0 case-1 case-2 case-n)
+      (lambda (name combination case-0 case-1 case-2 case-n)
 	`(COND ((OBJECT-TYPE? (UCODE-TYPE PRIMITIVE-COMBINATION-0)
 			      ,combination)
 		,case-0)
diff --git a/v7/src/runtime/starbase.scm b/v7/src/runtime/starbase.scm
index 2008f3aac..d9ea5c243 100644
--- a/v7/src/runtime/starbase.scm
+++ b/v7/src/runtime/starbase.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: starbase.scm,v 1.13 1999/01/02 06:19:10 cph Exp $
+$Id: starbase.scm,v 1.14 2001/12/20 21:24:28 cph Exp $
 
-Copyright (c) 1989-1999 Massachusetts Institute of Technology
+Copyright (c) 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
@@ -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.
 |#
 
 ;;;; Starbase Graphics Interface
@@ -105,7 +106,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (let-syntax
     ((define-accessors-and-mutators
-       (macro (name)
+       (lambda (name)
 	 `(BEGIN
 	    (DEFINE (,(symbol-append 'STARBASE-DEVICE/ name) DEVICE)
 	      (,(symbol-append 'STARBASE-GRAPHICS-DESCRIPTOR/ name)
diff --git a/v7/src/runtime/syntax.scm b/v7/src/runtime/syntax.scm
index b0c048d0c..9a9ce08b7 100644
--- a/v7/src/runtime/syntax.scm
+++ b/v7/src/runtime/syntax.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: syntax.scm,v 14.45 2001/12/20 20:51:16 cph Exp $
+$Id: syntax.scm,v 14.46 2001/12/20 21:28:41 cph Exp $
 
 Copyright (c) 1988-2001 Massachusetts Institute of Technology
 
@@ -64,7 +64,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 	      ;; Syntax extensions
 	      (DEFINE-SYNTAX ,syntax/define-syntax)
 	      (LET-SYNTAX ,syntax/let-syntax)
-	      (MACRO ,syntax/lambda)
 
 	      ;; Environment extensions
 	      (ACCESS ,syntax/access)
diff --git a/v7/src/runtime/vector.scm b/v7/src/runtime/vector.scm
index 3f3f8e70f..920c10b48 100644
--- a/v7/src/runtime/vector.scm
+++ b/v7/src/runtime/vector.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: vector.scm,v 14.17 2001/12/18 18:40:07 cph Exp $
+$Id: vector.scm,v 14.18 2001/12/20 21:23:45 cph Exp $
 
 Copyright (c) 1988-2001 Massachusetts Institute of Technology
 
@@ -204,7 +204,7 @@ USA.
 
 (let-syntax
     ((iref
-      (macro (name index)
+      (lambda (name index)
 	`(DEFINE-INTEGRABLE (,name VECTOR)
 	   (GUARANTEE-VECTOR VECTOR 'SAFE-VECTOR-REF)
 	   (VECTOR-REF VECTOR ,index)))))
diff --git a/v7/src/sf/object.scm b/v7/src/sf/object.scm
index f0722cd5a..902875fce 100644
--- a/v7/src/sf/object.scm
+++ b/v7/src/sf/object.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: object.scm,v 4.10 2001/12/20 16:28:23 cph Exp $
+$Id: object.scm,v 4.11 2001/12/20 21:24:54 cph Exp $
 
 Copyright (c) 1987-1999, 2001 Massachusetts Institute of Technology
 
@@ -65,7 +65,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 
 (let-syntax
     ((define-enumeration
-       (macro (enumeration-name enumerand-names)
+       (lambda (enumeration-name enumerand-names)
 	 `(BEGIN
 	    (DEFINE ,enumeration-name
 	      (ENUMERATION/MAKE ',enumerand-names))
@@ -120,7 +120,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 
 (let-syntax
     ((define-simple-type
-       (macro (name slots #!optional scode?)
+       (lambda (name slots #!optional scode?)
 	 `(DEFINE-STRUCTURE (,name (TYPE VECTOR)
 				   (NAMED ,(symbol-append name '/ENUMERAND))
 				   (CONC-NAME ,(symbol-append name '/))
@@ -165,7 +165,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 
 (let-syntax
     ((define-flag
-       (macro (name tester setter)
+       (lambda (name tester setter)
 	 `(BEGIN
 	    (DEFINE (,tester VARIABLE)
 	      (MEMQ ',name (VARIABLE/FLAGS VARIABLE)))
diff --git a/v7/src/sos/class.scm b/v7/src/sos/class.scm
index 5f6fe74e2..7536978d7 100644
--- a/v7/src/sos/class.scm
+++ b/v7/src/sos/class.scm
@@ -1,8 +1,8 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: class.scm,v 1.9 1999/01/02 06:19:10 cph Exp $
+;;; $Id: class.scm,v 1.10 2001/12/20 21:25:19 cph Exp $
 ;;;
-;;; Copyright (c) 1995-1999 Massachusetts Institute of Technology
+;;; Copyright (c) 1995-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
@@ -16,7 +16,8 @@
 ;;;
 ;;; 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.
 
 ;;;; Classes
 
@@ -272,7 +273,7 @@
 
 (let-syntax
     ((define-primitive-class
-       (macro (name . superclasses)
+       (lambda (name . superclasses)
 	 `(DEFINE ,name (MAKE-CLASS ',name (LIST ,@superclasses) '())))))
 
 (define-primitive-class <boolean> <object>)
diff --git a/v7/src/swat/scheme/mit-xhooks.scm b/v7/src/swat/scheme/mit-xhooks.scm
index 8a85e6bb7..921518eeb 100644
--- a/v7/src/swat/scheme/mit-xhooks.scm
+++ b/v7/src/swat/scheme/mit-xhooks.scm
@@ -122,7 +122,7 @@ This is some debugging stuff for probing the space usage.
 (define (record-free-pointer trace)
   (if allow-free-trace?
       (let-syntax ((ucode-primitive
-		    (macro arguments
+		    (lambda arguments
 		      (apply make-primitive-procedure arguments))))
 	(vector-set! (cdr trace)
 		     (car trace)
@@ -155,7 +155,7 @@ end of debugging stuff
   (restart-thread uitk-thread #T (lambda () (initial-thread-state 'go))))
 
 (let-syntax ((last-reference
-	      (macro (variable)
+	      (lambda (variable)
 		`(let ((foo ,variable))
 		   (set! ,variable #F)
 		   foo))))
diff --git a/v7/src/wabbit/test-wabbit.scm b/v7/src/wabbit/test-wabbit.scm
index 335c583c4..d498cbf4c 100644
--- a/v7/src/wabbit/test-wabbit.scm
+++ b/v7/src/wabbit/test-wabbit.scm
@@ -2,7 +2,7 @@
 
 (DECLARE (USUAL-INTEGRATIONS))	; MIT Scheme-ism: promise not to redefine prims
 
-;;; $Id: test-wabbit.scm,v 1.1 1995/07/14 04:04:42 ziggy Exp $
+;;; $Id: test-wabbit.scm,v 1.2 2001/12/20 21:26:00 cph Exp $
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;									     ;;
@@ -22,7 +22,7 @@
 ;;	- Document dependencies
 ;;	- [SCREWS] see last page
 
-;;; $Id: test-wabbit.scm,v 1.1 1995/07/14 04:04:42 ziggy Exp $
+;;; $Id: test-wabbit.scm,v 1.2 2001/12/20 21:26:00 cph Exp $
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;									     ;;
@@ -204,7 +204,7 @@
   (access %entity-extra/apply-hook? (->environment '(runtime procedure))))
 |#
 
-(let-syntax ((ucode-type (macro (name) (microcode-type name))))
+(let-syntax ((ucode-type (lambda (name) (microcode-type name))))
 
   (define   apply-hook-tag 
     (access apply-hook-tag (->environment '(runtime procedure))))
-- 
2.25.1