X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fpackage.lisp;h=b1366d66de690a422245219f1d9049b967774d17;hb=395c461b58f0cd484c21913c1e075593c206b5c1;hp=c636fdd4249d7db3df9b1065cf29864bb3672e80;hpb=4898ef32c639b1c7f4ee13a5ba566ce6debd03e6;p=sbcl.git

diff --git a/src/code/package.lisp b/src/code/package.lisp
index c636fdd..b1366d6 100644
--- a/src/code/package.lisp
+++ b/src/code/package.lisp
@@ -104,7 +104,9 @@
   #!+sb-package-locks
   (lock nil :type boolean)
   #!+sb-package-locks
-  (%implementation-packages nil :type list))
+  (%implementation-packages nil :type list)
+  ;; Definition source location
+  (source-location nil :type (or null sb!c:definition-source-location)))
 
 ;;;; iteration macros
 
@@ -206,9 +208,9 @@
                                            &body body)
   #!+sb-doc
   "Within the lexical scope of the body forms, MNAME is defined via macrolet
-   such that successive invocations of (MNAME) will return the symbols,
-   one by one, from the packages in PACKAGE-LIST. SYMBOL-TYPES may be
-   any of :INHERITED :EXTERNAL :INTERNAL."
+such that successive invocations of (MNAME) will return the symbols, one by
+one, from the packages in PACKAGE-LIST. SYMBOL-TYPES may be any
+of :INHERITED :EXTERNAL :INTERNAL."
   (let* ((packages (gensym))
          (these-packages (gensym))
          (ordered-types (let ((res nil))
@@ -234,7 +236,7 @@
                                        (or (find-package package)
                                            (error 'simple-package-error
                                                   ;; could be a character
-                                                  :name (string package)
+                                                  :package (string package)
                                                   :format-control "~@<~S does not name a package ~:>"
                                                   :format-arguments (list package)))))
                                  (if (consp ,these-packages)
@@ -293,10 +295,10 @@
                       :INHERITED must be supplied."))
            ,(dolist (symbol symbol-types)
               (unless (member symbol '(:internal :external :inherited))
-                (error 'program-error
+                (error 'simple-program-error
                        :format-control
                        "~S is not one of :INTERNAL, :EXTERNAL, or :INHERITED."
-                       :format-argument symbol)))
+                       :format-arguments (list symbol))))
            (,init-macro ,(car ordered-types))
            (flet ((,real-symbol-p (number)
                     (> number 1)))