Browse files

Case 288 : fixed compiler macros for conjoin and disjoin (should neve…

…r have worked!)

darcs-hash:20081204174155-3cc5d-a4748d3765806631906d3c5bdc6ff66d00e067e3.gz
  • Loading branch information...
1 parent 2bf5dd9 commit 4b91e21a6331ceceb1ae11aef9f976fa25977b4c @gwkkwg committed Dec 4, 2008
Showing with 6 additions and 8 deletions.
  1. +6 −8 dev/utilities/utilities.lisp
View
14 dev/utilities/utilities.lisp
@@ -607,11 +607,10 @@ of the curry."
(define-compiler-macro conjoin (&whole form &rest fns)
(cond ((every #'(lambda (x) (or (symbolp x) (function-expression-p x))) fns)
- (with-unique-names (args)
- `#'(lambda (,args)
+ (with-unique-names (arg)
+ `#'(lambda (,arg)
(and ,@(mapcar #'(lambda (x)
- `(apply ,(extract-head-form x)
- ,args))
+ `(,(extract-head-form x) ,arg))
fns)))))
(t form)))
@@ -629,11 +628,10 @@ of the curry."
(define-compiler-macro disjoin (&whole form &rest fns)
(cond ((every #'(lambda (x) (or (symbolp x) (function-expression-p x))) fns)
- (with-unique-names (args)
- `#'(lambda (,args)
+ (with-unique-names (arg)
+ `#'(lambda (,arg)
(or ,@(mapcar #'(lambda (x)
- `(apply ,(extract-head-form x)
- ,args))
+ `(,(extract-head-form x) ,arg))
fns)))))
(t form)))

0 comments on commit 4b91e21

Please sign in to comment.