Remove buggy `optimization' of (<= x y) into (not (> x y)).

diff --git a/src/sf/usiexp.scm b/src/sf/usiexp.scm
index b9f3fe10de51f85165e9c0884e5124ebb777677f..034ec2ed5a8ec8ec1ca4c190647d7f4f8339d9cd 100644 (file)
--- a/src/sf/usiexp.scm
+++ b/src/sf/usiexp.scm
@@ -111,14 +111,6 @@ USA.
               (make-combination expr block binary-predicate operands)))
        #f)))
 
-(define (pairwise-test-inverse inverse-expansion)
-  (lambda (expr operands block)
-    (let ((inverse (inverse-expansion expr operands block)))
-      (if inverse
-         (make-combination expr block (ucode-primitive not)
-                           (list inverse))
-         #f))))
-
 (define =-expansion
   (pairwise-test (ucode-primitive &=)
                 (ucode-primitive zero?)
@@ -133,9 +125,6 @@ USA.
   (pairwise-test (ucode-primitive &>)
                 (ucode-primitive negative?)
                 (ucode-primitive positive?)))
-
-(define <=-expansion (pairwise-test-inverse >-expansion))
-(define >=-expansion (pairwise-test-inverse <-expansion))
 \f
 ;;;; Fixnum Operations
 
@@ -703,10 +692,8 @@ USA.
            /
            1+
            <
-           <=
            =
            >
-           >=
            apply
            caaaar
            caaadr
@@ -787,10 +774,8 @@ USA.
           /-expansion
           1+-expansion
           <-expansion
-          <=-expansion
           =-expansion
           >-expansion
-          >=-expansion
           apply*-expansion
           caaaar-expansion
           caaadr-expansion

diff --git a/tests/runtime/test-arith.scm b/tests/runtime/test-arith.scm
index fdb949b1f552bd15ab0bb7daf27c3f48401faca8..c4198e57702599f8bd7018914b129dcf3873aa8b 100644 (file)
--- a/tests/runtime/test-arith.scm
+++ b/tests/runtime/test-arith.scm
@@ -136,17 +136,17 @@ USA.
       (assert-false (= x (flo:nan.0)))
       (assert-false (< x (flo:nan.0)))
       (assert-false ((id >=) x (flo:nan.0)))
-      (expect-failure (lambda () (assert-false (>= x (flo:nan.0)))))
+      (assert-false (>= x (flo:nan.0)))
       (assert-false (> x (flo:nan.0)))
       (assert-false ((id <=) x (flo:nan.0)))
-      (expect-failure (lambda () (assert-false (<= x (flo:nan.0)))))
+      (assert-false (<= x (flo:nan.0)))
       (assert-false (= (flo:nan.0) x))
       (assert-false (< (flo:nan.0) x))
       (assert-false ((id >=) (flo:nan.0) x))
-      (expect-failure (lambda () (assert-false (>= (flo:nan.0) x))))
+      (assert-false (>= (flo:nan.0) x))
       (assert-false (> (flo:nan.0) x))
       (assert-false ((id <=) (flo:nan.0) x))
-      (expect-failure (lambda () (assert-false (<= (flo:nan.0) x)))))))
+      (assert-false (<= (flo:nan.0) x)))))
 
 (define-enumerated-test 'inf*0-exact
   (vector (list 0 (flo:+inf.0))