X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=contrib%2Fsb-cltl2%2Ftests.lisp;h=ec09e7295cc23129ee80a4b08c4a95a2da09c570;hb=a8a79584f77a1ca0b1f651c27d219678e44c3f4d;hp=3a9bd8c1d71dac29b0c545b33ab6bb9947e13ec5;hpb=0794cd3908a441222f430ba0cf3bb7c3e1a96c63;p=sbcl.git diff --git a/contrib/sb-cltl2/tests.lisp b/contrib/sb-cltl2/tests.lisp index 3a9bd8c..ec09e72 100644 --- a/contrib/sb-cltl2/tests.lisp +++ b/contrib/sb-cltl2/tests.lisp @@ -47,10 +47,10 @@ (1)) (defun smv (env) - (multiple-value-bind (expansion macro-p) - (macroexpand 'srlt env) + (multiple-value-bind (expansion macro-p) + (macroexpand 'srlt env) (when macro-p (eval expansion)))) -(defmacro testr (&environment env) +(defmacro testr (&environment env) `',(getf (smv env) nil)) (deftest macroexpand-all.4 @@ -61,21 +61,21 @@ `',(declaration-information thing env)) (macrolet ((def (x) - `(macrolet ((frob (suffix answer &optional declaration) - `(deftest ,(intern (concatenate 'string - "DECLARATION-INFORMATION." - (symbol-name ',x) - suffix)) - (locally (declare ,@(when declaration - (list declaration))) - (cadr (assoc ',',x (dinfo optimize)))) - ,answer))) - (frob ".DEFAULT" 1) - (frob ".0" 0 (optimize (,x 0))) - (frob ".1" 1 (optimize (,x 1))) - (frob ".2" 2 (optimize (,x 2))) - (frob ".3" 3 (optimize (,x 3))) - (frob ".IMPLICIT" 3 (optimize ,x))))) + `(macrolet ((frob (suffix answer &optional declaration) + `(deftest ,(intern (concatenate 'string + "DECLARATION-INFORMATION." + (symbol-name ',x) + suffix)) + (locally (declare ,@(when declaration + (list declaration))) + (cadr (assoc ',',x (dinfo optimize)))) + ,answer))) + (frob ".DEFAULT" 1) + (frob ".0" 0 (optimize (,x 0))) + (frob ".1" 1 (optimize (,x 1))) + (frob ".2" 2 (optimize (,x 2))) + (frob ".3" 3 (optimize (,x 3))) + (frob ".IMPLICIT" 3 (optimize ,x))))) (def speed) (def safety) (def debug) @@ -93,8 +93,8 @@ (locally (declare (sb-ext:muffle-conditions warning)) (locally (declare (sb-ext:unmuffle-conditions style-warning)) (let ((dinfo (dinfo sb-ext:muffle-conditions))) - (not - (not - (and (subtypep dinfo '(and warning (not style-warning))) - (subtypep '(and warning (not style-warning)) dinfo))))))) + (not + (not + (and (subtypep dinfo '(and warning (not style-warning))) + (subtypep '(and warning (not style-warning)) dinfo))))))) t)