Simplify (and robustify) regular PACKing

[sbcl.git] / src / pcl / macros.lisp

diff --git a/src/pcl/macros.lisp b/src/pcl/macros.lisp
index 996e05f..437e802 100644 (file)
--- a/src/pcl/macros.lisp
+++ b/src/pcl/macros.lisp
@@ -29,15 +29,10 @@
 (/show "starting pcl/macros.lisp")
 
 (declaim (declaration
-          ;; As of sbcl-0.7.0.6, SBCL actively uses this declaration
-          ;; to propagate information needed to set up nice debug
-          ;; names (as seen e.g. in BACKTRACE) for method functions.
-          %method-name
           ;; These nonstandard declarations seem to be used privately
           ;; within PCL itself to pass information around, so we can't
           ;; just delete them.
           %class
-          %method-lambda-list
           ;; This declaration may also be used within PCL to pass
           ;; information around, I'm not sure. -- WHN 2000-12-30
           %variable-rebinding))
@@ -52,15 +47,6 @@
 
 (/show "pcl/macros.lisp 85")
 
-(defmacro doplist ((key val) plist &body body)
-  `(let ((.plist-tail. ,plist) ,key ,val)
-     (loop (when (null .plist-tail.) (return nil))
-           (setq ,key (pop .plist-tail.))
-           (when (null .plist-tail.)
-             (error "malformed plist, odd number of elements"))
-           (setq ,val (pop .plist-tail.))
-           (progn ,@body))))
-
 (/show "pcl/macros.lisp 101")
 
 (defmacro dolist-carefully ((var list improper-list-handler) &body body)
@@ -96,7 +82,8 @@
                   (ensure-non-standard-class symbol classoid))))))
       (cond ((null errorp) nil)
             ((legal-class-name-p symbol)
-             (error "There is no class named ~S." symbol))
+             (error "There is no class named ~
+                     ~/sb-impl::print-symbol-with-prefix/." symbol))
             (t
              (error "~S is not a legal class name." symbol)))))