Turn bind and one-of into macros to avoid eagerly evaluating arguments

1 files changed, 15 insertions, 15 deletions

diff --git a/base.lisp b/base.lisp
index 61c47bc..bbfab80 100644
--- a/base.lisp
+++ b/base.lisp
@@ -13,18 +13,18 @@
     (declare (ignore lazy))
     (make-parsing :tree tree :left input)))
 
-(defun bind (parser f)
-  (lambda (input &key lazy)
-    (let ((r (funcall parser input)))
-      (cond ((parsing-p r)
-             (if lazy
-               (lambda (ignored-input &key lazy)
-                 (declare (ignore ignored-input))
-                 (funcall (funcall f (parsing-tree r) input)
-                          (parsing-left r)
-                          :lazy lazy))
-               (funcall (funcall f (parsing-tree r) input)
-                        (parsing-left r))))
-            ((failure-p r)
-             r)
-            (t (error (format nil "Invalid return value: ~a" r)))))))
+(defmacro bind (parser f)
+  `(lambda (input &key lazy)
+     (let ((r (funcall ,parser input)))
+       (cond ((parsing-p r)
+              (if lazy
+                (lambda (ignored-input &key lazy)
+                  (declare (ignore ignored-input))
+                  (funcall (funcall ,f (parsing-tree r) input)
+                           (parsing-left r)
+                           :lazy lazy))
+                (funcall (funcall ,f (parsing-tree r) input)
+                         (parsing-left r))))
+             ((failure-p r)
+              r)
+             (t (error (format nil "Invalid return value: ~a" r)))))))