From: Joe Marshall <eval.apply@gmail.com>
Date: Wed, 25 Jan 2012 08:38:56 +0000 (-0800)
Subject: Don't bother flipping the sense of negative conditionals.
X-Git-Tag: release-9.2.0~332^2~7
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=4c475fb64ce8a779e6e0c61547076e034e485bb9;p=mit-scheme.git

Don't bother flipping the sense of negative conditionals.
---

diff --git a/src/sf/subst.scm b/src/sf/subst.scm
index 1258c41a8..87d6cbf9b 100644
--- a/src/sf/subst.scm
+++ b/src/sf/subst.scm
@@ -181,14 +181,7 @@ USA.
                                integrated-predicate
                                consequent
                                alternative)
-  (cond ((expression/call-to-not? integrated-predicate)
-         ;; (if (not <e1>) <e2> <e3>) => (if <e1> <e3> <e2>)
-         (integrate/conditional
-          operations environment expression
-          (first (combination/operands integrated-predicate))
-          alternative consequent))
-
-        ((sequence? integrated-predicate)
+  (cond ((sequence? integrated-predicate)
          (sequence/make
           (and expression (object/scode expression))
           (append (except-last-pair (sequence/actions integrated-predicate))
@@ -263,15 +256,7 @@ USA.
 
 (define (integrate/disjunction operations environment expression
                                integrated-predicate alternative)
-  (cond ((expression/call-to-not? integrated-predicate)
-         ;; (or (not e1) e2) => (if e1 e2 #t)
-         (integrate/conditional
-          operations environment expression
-          (first (combination/operands integrated-predicate))
-          alternative
-          (constant/make #f #t)))
-
-        ((and (expression/never-false? integrated-predicate)
+  (cond ((and (expression/never-false? integrated-predicate)
               (noisy-test sf:enable-disjunction-folding?
                           "Fold constant true disjunction"))
          ;; (or <exp1> <exp2>) => <exp1> if <exp1> is never false