0.7.1.19:

[sbcl.git] / src / code / parse-defmacro.lisp

diff --git a/src/code/parse-defmacro.lisp b/src/code/parse-defmacro.lisp
index db903f3..a4eb1bc 100644 (file)
--- a/src/code/parse-defmacro.lisp
+++ b/src/code/parse-defmacro.lisp
@@ -27,9 +27,9 @@
 (defvar *ignorable-vars*)
 (declaim (type list *ignorable-vars*))
 
-;;; Return, as multiple-values, a body, possibly a declare form to put where
-;;; this code is inserted, the documentation for the parsed body, and bounds
-;;; on the number of arguments.
+;;; Return, as multiple values, a body, possibly a declare form to put
+;;; where this code is inserted, the documentation for the parsed
+;;; body, and bounds on the number of arguments.
 (defun parse-defmacro (lambda-list arg-list-name body name error-kind
                                   &key
                                   (anonymousp nil)
@@ -61,7 +61,7 @@
                maximum)))))
 
 ;;; partial reverse-engineered documentation:
-;;;   TOP-LEVEL is true for calls through PARSE-DEFMACRO from DEFSETF and
+;;;   TOPLEVEL is true for calls through PARSE-DEFMACRO from DEFSETF and
 ;;;     DESTRUCTURING-BIND, false otherwise.
 ;;; -- WHN 19990620
 (defun parse-defmacro-lambda-list (possibly-dotted-lambda-list
@@ -70,13 +70,13 @@
                                   error-kind
                                   error-fun
                                   &optional
-                                  top-level
+                                  toplevel
                                   env-illegal
                                   env-arg-name)
   (let* (;; PATH is a sort of pointer into the part of the lambda list we're
         ;; considering at this point in the code. PATH-0 is the root of the
         ;; lambda list, which is the initial value of PATH.
-        (path-0 (if top-level
+        (path-0 (if toplevel
                   `(cdr ,arg-list-name)
                   arg-list-name))
         (path path-0) ; (will change below)
@@ -110,7 +110,7 @@
              ((eq var '&environment)
               (cond (env-illegal
                      (error "&ENVIRONMENT is not valid with ~S." error-kind))
-                    ((not top-level)
+                    ((not toplevel)
                      (error "&ENVIRONMENT is only valid at top level of ~
                              lambda-list.")))
               (cond ((and (cdr rest-of-args) (symbolp (cadr rest-of-args)))
@@ -212,7 +212,7 @@
                  `(,error-fun 'arg-count-error
                               :kind ',error-kind
                               ,@(when name `(:name ',name))
-                              :argument ,path-0
+                              :args ,path-0
                               :lambda-list ',lambda-list
                               :minimum ,minimum
                               ,@(unless restp