X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftarget-package.lisp;h=24149ee5799d30a26a5fdbfad9c93ed9faaf3aa2;hb=1513b29bfbe948e7b431b5f67f1ff10769c192cf;hp=ebac39b7f9365690afcc671231265220e0a5c093;hpb=02ce4b1b927f1312c300047bd5a0db6663a1d2c6;p=sbcl.git

diff --git a/src/code/target-package.lisp b/src/code/target-package.lisp
index ebac39b..24149ee 100644
--- a/src/code/target-package.lisp
+++ b/src/code/target-package.lisp
@@ -261,7 +261,7 @@
 	 DOIT
 	 (return (progn ,@forms))))))
 
-;;; Delete the entry for String in Table. The entry must exist.
+;;; Delete the entry for STRING in TABLE. The entry must exist.
 (defun nuke-symbol (table string)
   (declare (simple-string string))
   (let* ((length (length string))
@@ -273,11 +273,11 @@
       (setf (aref (package-hashtable-table table) index) nil)
       (incf (package-hashtable-deleted table)))))
 
-;;; Enter any new Nicknames for Package into *package-names*.
+;;; Enter any new NICKNAMES for PACKAGE into *PACKAGE-NAMES*.
 ;;; If there is a conflict then give the user a chance to do
 ;;; something about it.
 (defun enter-new-nicknames (package nicknames)
-  (check-type nicknames list)
+  (declare (type list nicknames))
   (dolist (n nicknames)
     (let* ((n (package-namify n))
 	   (found (gethash n *package-names*)))
@@ -921,8 +921,8 @@
     (let* ((pkg (apply #'make-package (first spec)))
 	   (internal (package-internal-symbols pkg))
 	   (external (package-external-symbols pkg)))
-      (/show0 "back from MAKE-PACKAGE")
-      #!+sb-show (sb!sys:%primitive print (package-name pkg))
+      (/show0 "back from MAKE-PACKAGE, PACKAGE-NAME=..")
+      (/primitive-print (package-name pkg))
 
       ;; Put internal symbols in the internal hashtable and set package.
       (dolist (symbol (second spec))
@@ -959,7 +959,7 @@
   ;; nicknames that we don't want in our target SBCL. For that reason,
   ;; we handle it specially, not dumping the host Lisp version at
   ;; genesis time..
-  (assert (not (find-package "COMMON-LISP-USER")))
+  (aver (not (find-package "COMMON-LISP-USER")))
   ;; ..but instead making our own from scratch here.
   (/show0 "about to MAKE-PACKAGE COMMON-LISP-USER")
   (make-package "COMMON-LISP-USER"