Add temporary workaround for fmpz_or bug

Author: oscarbenjamin

src/flint/fmpz.pyx

@@ -487,29 +487,45 @@ cdef class fmpz(flint_scalar):
             fmpz_clear(tval)
         return u
 
+    # This is the correct code when fmpz_or is fixed (in flint 3.0.0)
+    #
+    #def __or__(self, other):
+    #    cdef fmpz_struct tval[1]
+    #    cdef int ttype = FMPZ_UNKNOWN
+    #    ttype = fmpz_set_any_ref(tval, other)
+    #    if ttype == FMPZ_UNKNOWN:
+    #        return NotImplemented
+    #    u = fmpz.__new__(fmpz)
+    #    fmpz_or((<fmpz>u).val, self.val, tval)
+    #    if ttype == FMPZ_TMP:
+    #        fmpz_clear(tval)
+    #    return u
+    #
+    #def __ror__(self, other):
+    #    cdef fmpz_struct tval[1]
+    #    cdef int ttype = FMPZ_UNKNOWN
+    #    ttype = fmpz_set_any_ref(tval, other)
+    #    if ttype == FMPZ_UNKNOWN:
+    #        return NotImplemented
+    #    u = fmpz.__new__(fmpz)
+    #    fmpz_or((<fmpz>u).val, tval, self.val)
+    #    if ttype == FMPZ_TMP:
+    #        fmpz_clear(tval)
+    #    return u
+
     def __or__(self, other):
-        cdef fmpz_struct tval[1]
-        cdef int ttype = FMPZ_UNKNOWN
-        ttype = fmpz_set_any_ref(tval, other)
-        if ttype == FMPZ_UNKNOWN:
+        if typecheck(other, fmpz):
+            other = int(other)
+        if typecheck(other, int):
+            return fmpz(int(self) | other)
+        else:
             return NotImplemented
-        u = fmpz.__new__(fmpz)
-        fmpz_or((<fmpz>u).val, self.val, tval)
-        if ttype == FMPZ_TMP:
-            fmpz_clear(tval)
-        return u
 
     def __ror__(self, other):
-        cdef fmpz_struct tval[1]
-        cdef int ttype = FMPZ_UNKNOWN
-        ttype = fmpz_set_any_ref(tval, other)
-        if ttype == FMPZ_UNKNOWN:
+        if typecheck(other, int):
+            return fmpz(other | int(self))
+        else:
             return NotImplemented
-        u = fmpz.__new__(fmpz)
-        fmpz_or((<fmpz>u).val, tval, self.val)
-        if ttype == FMPZ_TMP:
-            fmpz_clear(tval)
-        return u
 
     def __xor__(self, other):
         cdef fmpz_struct tval[1]

test/test.py

@@ -85,23 +85,22 @@ def test_fmpz():
         for t in L:
             for ltype in (flint.fmpz, int, long):
                 for rtype in (flint.fmpz, int, long):
+
+                    assert (ltype(s) == rtype(t)) == (s == t)
+                    assert (ltype(s) != rtype(t)) == (s != t)
+                    assert (ltype(s) < rtype(t)) == (s < t)
+                    assert (ltype(s) <= rtype(t)) == (s <= t)
+                    assert (ltype(s) > rtype(t)) == (s > t)
+                    assert (ltype(s) >= rtype(t)) == (s >= t)
+
                     assert ltype(s) + rtype(t) == s + t
                     assert ltype(s) - rtype(t) == s - t
                     assert ltype(s) * rtype(t) == s * t
                     assert ltype(s) & rtype(t) == s & t
+                    assert ltype(s) | rtype(t) == s | t
+                    assert ltype(s) ^ rtype(t) == s ^ t
                     assert ~ltype(s) == ~s
 
-                    # XXX: Some sort of bug here means that the following fails
-                    # for values of s and t bigger than the word size.
-                    if abs(s) < 2**62 and abs(t) < 2**62:
-                        assert ltype(s) | rtype(t) == s | t
-                    else:
-                        # This still works so somehow the internal representation
-                        # of the fmpz made by fmpz_or is such that fmpz_equal
-                        # returns false even though the values look the same.
-                        assert str(ltype(s) | rtype(t)) == str(s | t)
-
-                    assert ltype(s) ^ rtype(t) == s ^ t
                     if t == 0:
                         assert raises(lambda: ltype(s) // rtype(t), ZeroDivisionError)
                         assert raises(lambda: ltype(s) % rtype(t), ZeroDivisionError)
@@ -110,12 +109,7 @@ def test_fmpz():
                         assert ltype(s) // rtype(t) == s // t
                         assert ltype(s) % rtype(t) == s % t
                         assert divmod(ltype(s), rtype(t)) == divmod(s, t)
-                    assert (ltype(s) == rtype(t)) == (s == t)
-                    assert (ltype(s) != rtype(t)) == (s != t)
-                    assert (ltype(s) < rtype(t)) == (s < t)
-                    assert (ltype(s) <= rtype(t)) == (s <= t)
-                    assert (ltype(s) > rtype(t)) == (s > t)
-                    assert (ltype(s) >= rtype(t)) == (s >= t)
+
                     if 0 <= t < 10:
                         assert (ltype(s) ** rtype(t)) == (s ** t)
                         assert ltype(s) << rtype(t) == s << t