Clean up conversion to numbers

Author: MilesCranmer

src/disambiguities.jl

@@ -47,6 +47,18 @@ end
 # Assorted calls found by Aqua: ################################################
 ################################################################################
 
+function Complex(q::AbstractRealQuantity)
+    @assert iszero(dimension(q)) "$(typeof(q)): $(q) has dimensions! Use `ustrip` instead."
+    return Complex(ustrip(q))
+end
+function Complex{T}(q::AbstractRealQuantity) where {T<:Real}
+    @assert iszero(dimension(q)) "$(typeof(q)): $(q) has dimensions! Use `ustrip` instead."
+    return Complex{T}(ustrip(q))
+end
+function Bool(q::AbstractRealQuantity)
+    @assert iszero(dimension(q)) "$(typeof(q)): $(q) has dimensions! Use `ustrip` instead."
+    return Bool(ustrip(q))
+end
 for type in (Signed, Float64, Float32, Rational), op in (:flipsign, :copysign)
     @eval function Base.$(op)(x::$type, y::AbstractRealQuantity)
         return $(op)(x, ustrip(y))

src/utils.jl

@@ -25,13 +25,6 @@ end
     return output
 end
 
-for (type, base_type, _) in ABSTRACT_QUANTITY_TYPES
-    @eval Base.convert(::Type{$base_type}, q::$type) = q
-end
-function Base.convert(::Type{T}, q::UnionAbstractQuantity) where {T<:Number}
-    @assert iszero(dimension(q)) "$(typeof(q)): $(q) has dimensions! Use `ustrip` instead."
-    return convert(T, ustrip(q))
-end
 function Base.promote_rule(::Type{Dimensions{R1}}, ::Type{Dimensions{R2}}) where {R1,R2}
     return Dimensions{promote_type(R1,R2)}
 end
@@ -110,6 +103,21 @@ for (type, _, _) in ABSTRACT_QUANTITY_TYPES
     end
 end
 
+for (type, base_type, _) in ABSTRACT_QUANTITY_TYPES
+    @eval begin
+        function (::Type{T})(q::$type) where {T<:Number}
+            @assert iszero(dimension(q)) "$(typeof(q)): $(q) has dimensions! Use `ustrip` instead."
+            return convert(T, ustrip(q))
+        end
+        function Base.convert(::Type{T}, q::$type) where {T<:Number}
+            return T(q)
+        end
+        function Base.convert(::Type{$base_type}, q::$type)
+            return q
+        end
+    end
+end
+
 """
     promote_except_value(q1::UnionAbstractQuantity, q2::UnionAbstractQuantity)
 
@@ -298,9 +306,13 @@ tryrationalize(::Type{R}, x) where {R} = isinteger(x) ? convert(R, round(Int, x)
 Base.showerror(io::IO, e::DimensionError) = print(io, "DimensionError: ", e.q1, " and ", e.q2, " have incompatible dimensions")
 Base.showerror(io::IO, e::DimensionError{<:Any,Nothing}) = print(io, "DimensionError: ", e.q1, " is not dimensionless")
 
-Base.convert(::Type{Q}, q::UnionAbstractQuantity) where {Q<:UnionAbstractQuantity} = q
-Base.convert(::Type{Q}, q::UnionAbstractQuantity) where {T,Q<:UnionAbstractQuantity{T}} = new_quantity(Q, convert(T, ustrip(q)), dimension(q))
-Base.convert(::Type{Q}, q::UnionAbstractQuantity) where {T,D,Q<:UnionAbstractQuantity{T,D}} = new_quantity(Q, convert(T, ustrip(q)), convert(D, dimension(q)))
+for (type, _, _) in ABSTRACT_QUANTITY_TYPES
+    @eval begin
+        Base.convert(::Type{Q}, q::$type) where {Q<:UnionAbstractQuantity} = q
+        Base.convert(::Type{Q}, q::$type) where {T,Q<:UnionAbstractQuantity{T}} = new_quantity(Q, convert(T, ustrip(q)), dimension(q))
+        Base.convert(::Type{Q}, q::$type) where {T,D,Q<:UnionAbstractQuantity{T,D}} = new_quantity(Q, convert(T, ustrip(q)), convert(D, dimension(q)))
+    end
+end
 
 Base.convert(::Type{D}, d::AbstractDimensions) where {D<:AbstractDimensions} = d
 Base.convert(::Type{D}, d::AbstractDimensions) where {R,D<:AbstractDimensions{R}} = D(d)

test/unittests.jl

@@ -1258,9 +1258,9 @@ end
     functions = (
         :float, :abs, :real, :imag, :conj, :adjoint, :unsigned,
         :nextfloat, :prevfloat, :identity, :transpose,
-        :copysign, :flipsign, :mod, :modf,
+        :copysign, :flipsign, :modf,
         :floor, :trunc, :ceil, :significand,
-        :ldexp, :round,
+        :ldexp, :round, # :mod
     )
     for Q in (RealQuantity, Quantity, GenericQuantity), D in (Dimensions, SymbolicDimensions), f in functions
         T = f in (:abs, :real, :imag, :conj) ? ComplexF64 : Float64
@@ -1274,7 +1274,7 @@ end
                     @eval @test $f($qx_dimensions)[$i] == $Q($f($x)[$i], $dim)
                 end
             end
-        elseif f in (:copysign, :flipsign, :rem, :mod)  # Functions that need multiple inputs
+        elseif f in (:copysign, :flipsign, :rem)  # Functions that need multiple inputs
             for x in 5rand(T, 3) .- 2.5
                 for y in 5rand(T, 3) .- 2.5
                     dim = convert(D, dimension(u"m/s"))