Tweaked macro %IN-SUITE

adlai · Sep 1, 2009 · c30abb6 · c30abb6
1 parent ee25414
commit c30abb6
Showing 1 changed file with 10 additions and 11 deletions.
diff --git a/src/suite.lisp b/src/suite.lisp
@@ -56,14 +56,13 @@ See also: DEF-SUITE *SUITE*"
   `(%in-suite ,suite-name :in ,in :fail-on-error nil))
 
 (defmacro %in-suite (suite-name &key (fail-on-error t) in)
-  (with-unique-names (suite)
-    `(progn
-       (if-bind ,suite (get-test ',suite-name)
-           (setf *suite* ,suite)
-           (progn
-             (when ,fail-on-error
-               (cerror "Create a new suite named ~A."
-                       "Unkown suite ~A." ',suite-name))
-             (setf (get-test ',suite-name) (make-suite ',suite-name :in ',in)
-                   *suite* (get-test ',suite-name))))
-       ',suite-name)))
+  `(progn
+     (aif (get-test ',suite-name)
+          (setf *suite* it)
+          (progn
+            (when ,fail-on-error
+              (cerror "Create a new suite named ~A."
+                      "Unkown suite ~A." ',suite-name))
+            (setf (get-test ',suite-name) (make-suite ',suite-name :in ',in)
+                  *suite* (get-test ',suite-name))))
+     ',suite-name))