projects / elisp / flim.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7a99ebf)
Fix last change.
authorueno <ueno>
Wed, 16 Aug 2000 17:42:37 +0000 (17:42 +0000)
committerueno <ueno>
Wed, 16 Aug 2000 17:42:37 +0000 (17:42 +0000)
tram.el patch | blob | history

diff --git a/tram.el b/tram.el
index 5bcfee5..f20018e 100644 (file)
--- a/tram.el
+++ b/tram.el
@@ -57,14 +57,12 @@
   "Multiplicative combinator which composes LEFT and RIGHT operations."
   `(lambda (trans)
      (let ((next
   "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."
 
 (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
        (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))))
+                        `(closure-call ',left trans)))
               nil))
        (if error
               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)
         next))))
 
 (defun tram-fold-left (function accu sequence)