Simplify optimisation code for cascaded comparisons and improve its test coverage.

2 files changed, 38 insertions, 17 deletions

diff --git a/tests/compile/cascmp.pyx b/tests/compile/cascmp.pyx
deleted file mode 100644
index c36997fbb..000000000
--- a/tests/compile/cascmp.pyx
+++ /dev/null
@@ -1,17 +0,0 @@
-# mode: compile
-
-cdef void foo():
-    cdef int bool, int1=0, int2=0, int3=0, int4=0
-    cdef object obj1, obj2, obj3, obj4
-    obj1 = 1
-    obj2 = 2
-    obj3 = 3
-    obj4 = 4
-    bool = int1 < int2 < int3
-    bool = obj1 < obj2 < obj3
-    bool = int1 < int2 < obj3
-    bool = obj1 < 2 < 3
-    bool = obj1 < 2 < 3 < 4
-    bool = int1 < (int2 == int3) < int4
-
-foo()
diff --git a/tests/run/cascmp.pyx b/tests/run/cascmp.pyx
new file mode 100644
index 000000000..becae3fc5
--- /dev/null
+++ b/tests/run/cascmp.pyx
@@ -0,0 +1,38 @@
+# mode: run
+# tag: cascade, compare
+
+def ints_and_objects():
+    """
+    >>> ints_and_objects()
+    (0, 1, 0, 1, 1, 0)
+    """
+    cdef int int1=0, int2=0, int3=0, int4=0
+    cdef int r1, r2, r3, r4, r5, r6
+    cdef object obj1, obj2, obj3, obj4
+    obj1 = 1
+    obj2 = 2
+    obj3 = 3
+    obj4 = 4
+    r1 = int1 < int2 < int3
+    r2 = obj1 < obj2 < obj3
+    r3 = int1 < int2 < obj3
+    r4 = obj1 < 2 < 3
+    r5 = obj1 < 2 < 3 < 4
+    r6 = int1 < (int2 == int3) < int4
+    return r1, r2, r3, r4, r5, r6
+
+
+def const_cascade(x):
+    """
+    >>> const_cascade(2)
+    (True, False, True, False, False, True, False)
+    """
+    return (
+        0 <= 1,
+        1 <= 0,
+        1 <= 1 <= 2,
+        1 <= 0 < 1,
+        1 <= 1 <= 0,
+        1 <= 1 <= x <= 2 <= 3 > x <= 2 <= 2,
+        1 <= 1 <= x <= 1 <= 1 <= x <= 2,
+    )