Use flintify some more

src/flint/fmpq.jl

@@ -299,7 +299,7 @@ for T in (ZZRingElem, Int, UInt)
   end
 end
 
-+(a::QQFieldElem, b::Integer) = a + ZZRingElem(b)
++(a::QQFieldElem, b::Integer) = a + flintify(b)
 +(a::Integer, b::QQFieldElem) = b + a
 
 +(a::QQFieldElem, b::Rational{T}) where {T <: Integer} = a + QQFieldElem(b)
@@ -312,8 +312,8 @@ for T in (ZZRingElem, Int, UInt)
   end
 end
 
--(a::QQFieldElem, b::Integer) = a - ZZRingElem(b)
--(a::Integer, b::QQFieldElem) = ZZRingElem(a) - b
+-(a::QQFieldElem, b::Integer) = a - flintify(b)
+-(a::Integer, b::QQFieldElem) = flintify(a) - b
 
 -(a::QQFieldElem, b::Rational{T}) where {T <: Integer} = a - QQFieldElem(b)
 -(a::Rational{T}, b::QQFieldElem) where {T <: Integer} = QQFieldElem(a) - b
@@ -325,7 +325,7 @@ for T in (ZZRingElem, Int, UInt)
   end
 end
 
-*(a::QQFieldElem, b::Integer) = a * ZZRingElem(b)
+*(a::QQFieldElem, b::Integer) = a * flintify(b)
 *(a::Integer, b::QQFieldElem) = b * a
 
 *(a::QQFieldElem, b::Rational{T}) where {T <: Integer} = a * QQFieldElem(b)
@@ -356,7 +356,7 @@ function cmp(a::QQFieldElemOrPtr, b::UInt)
   @ccall libflint.fmpq_cmp_ui(a::Ref{QQFieldElem}, b::UInt)::Cint
 end
 
-cmp(a::QQFieldElemOrPtr, b::Integer) = cmp(a, ZZRingElem(b))
+cmp(a::QQFieldElemOrPtr, b::Integer) = cmp(a, flintify(b))
 
 cmp(a::Union{ZZRingElemOrPtr, Integer}, b::QQFieldElemOrPtr) = -cmp(b, a)
 

src/flint/fmpq_mat.jl

@@ -100,31 +100,11 @@ end
   return v
 end
 
-@inline function setindex!(a::QQMatrix, d::ZZRingElem, r::Int, c::Int)
+@inline function setindex!(a::QQMatrix, d::RationalUnion, r::Int, c::Int)
   @boundscheck _checkbounds(a, r, c)
   GC.@preserve a begin
     z = mat_entry_ptr(a, r, c)
-    set!(z, d)
-  end
-end
-
-@inline function setindex!(a::QQMatrix, d::QQFieldElem, r::Int, c::Int)
-  @boundscheck _checkbounds(a, r, c)
-  GC.@preserve a begin
-    z = mat_entry_ptr(a, r, c)
-    set!(z, d)
-  end
-end
-
-Base.@propagate_inbounds setindex!(a::QQMatrix, d::Integer,
-                                   r::Int, c::Int) =
-  setindex!(a, ZZRingElem(d), r, c)
-
-@inline function setindex!(a::QQMatrix, d::Int, r::Int, c::Int)
-  @boundscheck _checkbounds(a, r, c)
-  GC.@preserve a begin
-    z = mat_entry_ptr(a, r, c)
-    set!(z, d)
+    set!(z, flintify(d))
   end
 end
 
@@ -136,10 +116,6 @@ function setindex!(a::QQMatrix, b::QQMatrix, r::UnitRange{Int64}, c::UnitRange{I
         (Ref{QQMatrix}, Ref{QQMatrix}), A, b)
 end
 
-Base.@propagate_inbounds setindex!(a::QQMatrix, d::Rational,
-                                   r::Int, c::Int) =
-setindex!(a, QQFieldElem(d), r, c)
-
 number_of_rows(a::QQMatrix) = a.r
 
 number_of_columns(a::QQMatrix) = a.c

src/flint/fmpz.jl

@@ -2569,8 +2569,8 @@ function add!(a::ZZRingElem, b::ZZRingElem, c::Ptr{Int})
   return a
 end
 
-add!(z::ZZRingElem, a::ZZRingElem, b::Integer) = add!(z, a, ZZRingElem(b))
-add!(z::ZZRingElem, x::Int, y::ZZRingElem) = add!(z, y, x)
+add!(z::ZZRingElemOrPtr, a::ZZRingElemOrPtr, b::Integer) = add!(z, a, flintify(b))
+add!(z::ZZRingElemOrPtr, x::Int, y::ZZRingElemOrPtr) = add!(z, y, x)
 
 function neg!(z::ZZRingElemOrPtr, a::ZZRingElemOrPtr)
   ccall((:fmpz_neg, libflint), Nothing,
@@ -2603,7 +2603,7 @@ function sub!(z::ZZRingElemOrPtr, a::ZZRingElemOrPtr, b::UInt)
 end
 
 function sub!(z::ZZRingElemOrPtr, a::ZZRingElemOrPtr, b::Integer)
-  return sub!(z, a, ZZRingElem(b))
+  return sub!(z, a, flintify(b))
 end
 
 function sub!(z::ZZRingElemOrPtr, b::Integer, a::ZZRingElemOrPtr)
@@ -2630,7 +2630,7 @@ function mul!(z::ZZRingElemOrPtr, x::ZZRingElemOrPtr, y::UInt)
   return z
 end
 
-mul!(z::ZZRingElemOrPtr, a::ZZRingElemOrPtr, b::Integer) = mul!(z, a, ZZRingElem(b))
+mul!(z::ZZRingElemOrPtr, a::ZZRingElemOrPtr, b::Integer) = mul!(z, a, flintify(b))
 
 mul!(z::ZZRingElemOrPtr, x::Integer, y::ZZRingElemOrPtr) = mul!(z, y, x)
 

src/flint/fmpz_mat.jl

@@ -120,21 +120,11 @@ end
   return v
 end
 
-@inline function setindex!(a::ZZMatrix, d::ZZRingElem, r::Int, c::Int)
+@inline function setindex!(a::ZZMatrix, d::IntegerUnion, r::Int, c::Int)
   @boundscheck _checkbounds(a, r, c)
   GC.@preserve a begin
     z = mat_entry_ptr(a, r, c)
-    set!(z, d)
-  end
-end
-
-@inline setindex!(a::ZZMatrix, d::Integer, r::Int, c::Int) = setindex!(a, ZZRingElem(d), r, c)
-
-@inline function setindex!(a::ZZMatrix, d::Int, r::Int, c::Int)
-  @boundscheck _checkbounds(a, r, c)
-  GC.@preserve a begin
-    z = mat_entry_ptr(a, r, c)
-    set!(z, d)
+    set!(z, flintify(d))
   end
 end