X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Ftime.lisp;h=98a6b898de327de01db40ef6dbf39970a243700b;hb=a92a8d84d5b97d7504437bdcb04917162609a66c;hp=b7a4e95e68be3627a52fbf7367adc04a38973a0a;hpb=942e45e3bb73fd55786e4a0ab4590324063c0c89;p=sbcl.git

diff --git a/src/pcl/time.lisp b/src/pcl/time.lisp
index b7a4e95..98a6b89 100644
--- a/src/pcl/time.lisp
+++ b/src/pcl/time.lisp
@@ -75,8 +75,8 @@
 (push (cons "Time default-initargs."
             '(time-default-initargs (find-class 'plist-mixin) 1000))
       *tests*)
-(defun time-default-initargs (class n)
-  (time (dotimes-fixnum (i n) (default-initargs class nil))))
+(defun time-default-initargs (n)
+  (time (dotimes-fixnum (i n) (default-initargs nil nil))))
 
 (push (cons "Time make-instance."
             '(time-make-instance (find-class 'plist-mixin) 1000))
@@ -99,12 +99,8 @@
 
 (defun expand-all-macros (form)
   (walk-form form nil (lambda (form context env)
-                        (if (and (eq context :eval)
-                                 (consp form)
-                                 (symbolp (car form))
-                                 (not (special-form-p (car form)))
-                                 (macro-function (car form)))
-                            (values (macroexpand form env))
+                        (if (eq context :eval)
+                            (values (%macroexpand form env))
                             form))))
 
 (push (cons "Macroexpand meth-structure-slot-value"