Sun Feb 7 08:42:39 UTC 2010 pix@kepibu.org * Marginally more straightforward? diff -rN -u old-cl-unification/match-block.lisp new-cl-unification/match-block.lisp --- old-cl-unification/match-block.lisp 2014-07-13 16:19:46.000000000 +0000 +++ new-cl-unification/match-block.lisp 2014-07-13 16:19:46.000000000 +0000 @@ -86,7 +86,7 @@ (,(clean-unify-var-name v) ,v))) (expand-clause (clause) (destructuring-bind (template object &rest body) - clause + (munge-clause clause) (let* ((template (ensure-template template)) (variables (collect-template-vars template))) `((setf (values ,match-environment ,match-error) @@ -112,7 +112,7 @@ (declare (dynamic-extent ,match-environment ,base-environment) (ignorable ,case-keyform)) (cond - ,@(mapcar (lambda (c) (expand-clause (munge-clause c))) match-clauses) + ,@(mapcar #'expand-clause match-clauses) ,@(when errorp `((,errorp ,(or error-form `(error ,match-error))))) ,@(when default-clauses `((t ,@(cdar default-clauses)))) ,@(when default `((t ,default))))))))))