0.8.19.13:

[sbcl.git] / src / code / defpackage.lisp

diff --git a/src/code/defpackage.lisp b/src/code/defpackage.lisp
index cb83743..c7772c8 100644 (file)
--- a/src/code/defpackage.lisp
+++ b/src/code/defpackage.lisp
@@ -154,15 +154,15 @@
       for z = (remove-duplicates (intersection (cdr x)(cdr y) :test #'string=))
       when z do (error 'simple-program-error
                       :format-control "Parameters ~S and ~S must be disjoint ~
-                                       but have common elements ~%   ~S"
+                                        but have common elements ~%   ~S"
                       :format-arguments (list (car x)(car y) z)))))
 
 (defun stringify-name (name kind)
   (typecase name
-    (simple-base-string name)
-    (string (coerce name 'simple-base-string))
+    (simple-string name)
+    (string (coerce name 'simple-string))
     (symbol (symbol-name name))
-    (base-char (string name))
+    (character (string name))
     (t
      (error "bogus ~A name: ~S" kind name))))
 
@@ -173,11 +173,11 @@
 
 (defun %defpackage (name nicknames size shadows shadowing-imports
                    use imports interns exports implement lock doc-string)
-  (declare (type simple-base-string name)
+  (declare (type simple-string name)
           (type list nicknames shadows shadowing-imports
                 imports interns exports)
           (type (or list (member :default)) use)
-          (type (or simple-base-string null) doc-string)
+          (type (or simple-string null) doc-string)
           #!-sb-package-locks
           (ignore implement lock))
   (let ((package (or (find-package name)