X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Ffixture.lisp;h=3805e91b8add25bdbaebe76706c3b38f20b47d7a;hb=855211b99bbee4c524f392b368820bec99698852;hp=b43cb1e553ba6fd8fe1f84c312771e289a96b5cb;hpb=d58c9adefaafa525332590fb38f9faefa4490612;p=fiveam.git diff --git a/src/fixture.lisp b/src/fixture.lisp index b43cb1e..3805e91 100644 --- a/src/fixture.lisp +++ b/src/fixture.lisp @@ -22,32 +22,28 @@ (gethash key *fixture* default)) (defun (setf get-fixture) (value key) - (when (gethash key *fixture*) - (warn "Redefining ~A in deflookup-table named ~S" - (let ((*package* (find-package :keyword))) - (format nil "~S" key)) - 'fixture)) (setf (gethash key *fixture*) value)) (defun rem-fixture (key) (remhash key *fixture*)) (defmacro def-fixture (name (&rest args) &body body) - "Defines a fixture named NAME. A fixture is very much like a -macro but is used only for simple templating. A fixture created -with DEF-FIXTURE is a macro which can use the special macrolet -&BODY to specify where the body should go. + "Defines a fixture named NAME. At \"evaluation time\" (not macro +expansion time) `BODY` will be run, however `BODY` can call the local +macro `&body` which will expand to the body passed to the +`with-fixture` call. -See Also: WITH-FIXTURE -" +See Also: `WITH-FIXTURE`" `(eval-when (:compile-toplevel :load-toplevel :execute) (setf (get-fixture ',name) (cons ',args ',body)) ',name)) (defmacro with-fixture (fixture-name (&rest args) &body body) - "Insert BODY into the fixture named FIXTURE-NAME. + "Lookup a fixture named `NAME` (at macro expansion time), +replace the fixture's `&body` with `BODY` and compile the resulting +form. -See Also: DEF-FIXTURE" +See Also: `DEF-FIXTURE`" (assert (get-fixture fixture-name) (fixture-name) "Unknown fixture ~S." fixture-name)