From a96f32041c8e04bff8c3168c12c814a1f2d6aba5 Mon Sep 17 00:00:00 2001
From: wlott <wlott>
Date: Sun, 18 Nov 1990 07:43:08 +0000
Subject: [PATCH] Changed uses of lisp::parse-defmacro to conform to what
 Blaine's parse-defmacro expects now that it's installed.

---
 compiler/ir1tran.lisp |  9 ++++-----
 compiler/macros.lisp  | 30 +++++++++++++++---------------
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/compiler/ir1tran.lisp b/compiler/ir1tran.lisp
index 4713d93f3..b01aff4cb 100644
--- a/compiler/ir1tran.lisp
+++ b/compiler/ir1tran.lisp
@@ -2163,11 +2163,10 @@
 	(let ((name (first def))
 	      (arglist (second def))
 	      (body (cddr def)))
-	  (multiple-value-bind (body local-decs)
-			       (lisp::parse-defmacro
-				arglist whole body name
-				:environment environment
-				:error-string 'lisp::defmacro-error-string)
+	  (multiple-value-bind
+	      (body local-decs)
+	      (lisp::parse-defmacro arglist whole body name 'macrolet
+				    :environment environment)
 	    (unless (symbolp name)
 	      (compiler-error "Macro name ~S is not a symbol." name))
 	    (when (< (length def) 3)
diff --git a/compiler/macros.lisp b/compiler/macros.lisp
index 5444679a6..35bf8deca 100644
--- a/compiler/macros.lisp
+++ b/compiler/macros.lisp
@@ -147,12 +147,11 @@
   (let ((fn-name (symbolicate "IR1-CONVERT-" name))
 	(n-form (gensym))
 	(n-env (gensym)))
-    (multiple-value-bind (body decls doc)
-			 (lisp::parse-defmacro
-			  lambda-list n-form body name
-			  :error-string "Wrong number of arguments to special form ~S: ~D."
-			  :doc-string-allowed t
-			  :environment n-env)
+    (multiple-value-bind
+	(body decls doc)
+	(lisp::parse-defmacro lambda-list n-form body name 'special-form
+			      :doc-string-allowed t
+			      :environment n-env)
       `(progn
 	 (proclaim '(function ,fn-name (continuation continuation t) void))
 	 (defun ,fn-name (,start-var ,cont-var ,n-form)
@@ -193,10 +192,11 @@
   (let ((fn-name (symbolicate "SOURCE-TRANSFORM-" name))
 	(n-form (gensym))
 	(n-env (gensym)))
-    (multiple-value-bind (body decls)
-			 (lisp::parse-defmacro lambda-list n-form body name
-					       :error-string "Foo!"
-					       :environment n-env)
+    (multiple-value-bind
+	(body decls)
+	(lisp::parse-defmacro lambda-list n-form body name
+			      'def-source-transform
+			      :environment n-env)
       `(progn
 	 (defun ,fn-name (,n-form)
 	   (let ((,n-env *lexical-environment*))
@@ -215,11 +215,11 @@
   (let ((fn-name (symbolicate "PRIMITIVE-TRANSLATE-" name))
 	(n-form (gensym))
 	(n-env (gensym)))
-    (multiple-value-bind (body decls)
-			 (lisp::parse-defmacro
-			  lambda-list n-form body name
-			  :error-string "Wrong number of arguments to primitive ~S: ~D."
-			  :environment n-env)
+    (multiple-value-bind
+	(body decls)
+	(lisp::parse-defmacro lambda-list n-form body name
+			      'def-primitive-translator
+			      :environment n-env)
       `(progn
 	 (defun ,fn-name (,n-form)
 	   (let ((,n-env *lexical-environment*))
-- 
GitLab