From 162cc338a021272f705a23b866f798532b378cfb Mon Sep 17 00:00:00 2001 From: ueno Date: Wed, 16 Aug 2000 17:42:37 +0000 Subject: [PATCH] Fix last change. --- tram.el | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/tram.el b/tram.el index 5bcfee5..f20018e 100644 --- a/tram.el +++ b/tram.el @@ -57,14 +57,12 @@ "Multiplicative combinator which composes LEFT and RIGHT operations." `(lambda (trans) (let ((next - ,(macroexpand - (if (functionp left) - `(closure-call #',left trans) - `(closure-call ',left trans))))) - ,(macroexpand - (if (functionp right) - `(closure-call #',right next) - `(closure-call ',right next)))))) + ,(if (functionp left) + `(closure-call #',left trans) + `(closure-call ',left trans)))) + ,(if (functionp right) + `(closure-call #',right next) + `(closure-call ',right next))))) (defun tram-compose-|| (left right) "Additive combinator which composes LEFT and RIGHT operations." @@ -73,16 +71,14 @@ (setq error (catch (tram-stream-error-name trans) (setq next - ,(macroexpand - (if (functionp left) + ,(if (functionp left) `(closure-call #',left trans) - `(closure-call ',left trans)))) + `(closure-call ',left trans))) nil)) (if error - ,(macroexpand - (if (functionp right) - `(closure-call #',right next) - `(closure-call ',right next))) + ,(if (functionp right) + `(closure-call #',right next) + `(closure-call ',right next)) next)))) (defun tram-fold-left (function accu sequence) -- 1.7.10.4