Restrict round signature to avoid ambiguities

Nemocas · Oct 18, 2023 · c27c988 · c27c988
1 parent 4f99e9e
commit c27c988
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/HeckeMiscInteger.jl b/src/HeckeMiscInteger.jl
@@ -258,6 +258,8 @@ for sym in (:trunc, :round, :ceil, :floor)
         # support `trunc(ZZRingElem, 1.23)` etc. for arbitrary reals
         Base.$sym(::Type{ZZRingElem}, a::Real) = ZZRingElem(Base.$sym(BigInt, a))
         Base.$sym(::Type{ZZRingElem}, a::Rational) = ZZRingElem(Base.$sym(BigInt, a))
+        Base.$sym(::Type{ZZRingElem}, a::Rational{T}) where T = ZZRingElem(Base.$sym(BigInt, a))
+        Base.$sym(::Type{ZZRingElem}, a::Rational{Bool}) = ZZRingElem(Base.$sym(BigInt, a))
 
         # for integers we don't need to round in between
         Base.$sym(::Type{ZZRingElem}, a::Integer) = ZZRingElem(a)

diff --git a/src/flint/fmpq.jl b/src/flint/fmpq.jl
@@ -190,13 +190,13 @@ Base.trunc(::Type{QQFieldElem}, a::QQFieldElem) = QQFieldElem(trunc(ZZRingElem,
 Base.trunc(::Type{ZZRingElem}, a::QQFieldElem) = is_positive(a) ? floor(ZZRingElem, a) : ceil(ZZRingElem, a)
 
 Base.round(x::QQFieldElem, ::RoundingMode{:Up}) = ceil(x)
-Base.round(::Type{T}, x::QQFieldElem, ::RoundingMode{:Up}) where T = ceil(T, x)
+Base.round(::Type{T}, x::QQFieldElem, ::RoundingMode{:Up}) where T <: RingElement = ceil(T, x)
 
 Base.round(x::QQFieldElem, ::RoundingMode{:Down}) = floor(x)
-Base.round(::Type{T}, x::QQFieldElem, ::RoundingMode{:Down}) where T = floor(T, x)
+Base.round(::Type{T}, x::QQFieldElem, ::RoundingMode{:Down}) where T <: RingElement = floor(T, x)
 
 Base.round(x::QQFieldElem, ::RoundingMode{:Nearest}) = round(QQFieldElem, x, RoundNearest)
-function Base.round(::Type{T}, x::QQFieldElem, ::RoundingMode{:Nearest}) where T
+function Base.round(::Type{T}, x::QQFieldElem, ::RoundingMode{:Nearest}) where T <: RingElement
     d = denominator(x)
     n = numerator(x)
     if d == 2
@@ -219,13 +219,13 @@ function Base.round(::Type{T}, x::QQFieldElem, ::RoundingMode{:Nearest}) where T
 end
 
 Base.round(x::QQFieldElem, ::RoundingMode{:NearestTiesAway}) = sign(x) * floor(abs(x) + 1 // 2)
-function Base.round(::Type{T}, x::QQFieldElem, ::RoundingMode{:NearestTiesAway}) where T
+function Base.round(::Type{T}, x::QQFieldElem, ::RoundingMode{:NearestTiesAway}) where T <: RingElement
     tmp = floor(T, abs(x) + 1 // 2)
     return is_positive(x) ? tmp : -tmp
 end
 
 Base.round(a::QQFieldElem) = round(QQFieldElem, a)
-Base.round(::Type{T}, a::QQFieldElem) where T =  round(T, a, RoundNearestTiesAway)
+Base.round(::Type{T}, a::QQFieldElem) where T <: RingElement =  round(T, a, RoundNearestTiesAway)
 
 
 nbits(a::QQFieldElem) = nbits(numerator(a)) + nbits(denominator(a))