Refactor disambiguities

Author: MilesCranmer

src/disambiguities.jl

@@ -47,33 +47,29 @@ 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))
     end
 end
-for type in (Complex, Complex{Bool})
+for type in (:(Complex), :(Complex{Bool}))
     @eval begin
         function Base.:*(l::$type, r::AbstractRealQuantity)
             new_quantity(typeof(r), l * ustrip(r), dimension(r))
         end
         function Base.:*(l::AbstractRealQuantity, r::$type)
             new_quantity(typeof(l), ustrip(l) * r, dimension(l))
         end
+        function $type(q::AbstractRealQuantity)
+            @assert iszero(dimension(q)) "$(typeof(q)): $(q) has dimensions! Use `ustrip` instead."
+            return $type(ustrip(q))
+        end
     end
 end
+function Bool(q::AbstractRealQuantity)
+    @assert iszero(dimension(q)) "$(typeof(q)): $(q) has dimensions! Use `ustrip` instead."
+    return Bool(ustrip(q))
+end
 function Base.:/(l::Complex, r::AbstractRealQuantity)
     new_quantity(typeof(r), l / ustrip(r), inv(dimension(r)))
 end

test/unittests.jl

@@ -863,8 +863,8 @@ end
             x = Q(1.0u"1")
             @test Bool(x) == true
             @test Bool(ustrip(x)) == true
-            @test Bool(Q(0.0u"m")) == false
-            @test Bool(ustrip(Q(0.0u"m"))) == false
+            @test Bool(Q(0.0u"1")) == false
+            @test Bool(ustrip(Q(0.0u"1"))) == false
             x = Q(1.0u"m")
             @test_throws AssertionError Bool(x)
         end
@@ -1315,14 +1315,14 @@ end
                         # Also do test without dimensions (need dimensionless)
                         qx_dimensionless = Q(x, D)
                         qy_dimensionless = Q(y, D)
-                        @eval @test $f($x, $qy_dimensionless) == $Q($f($x, $y), $D)
-                        @eval @test $f($qx_dimensionless, $y) == $Q($f($x, $y), $D)
+                        @eval @test $f($x, $qy_dimensionless) ≈ $Q($f($x, $y), $D)
+                        @eval @test $f($qx_dimensionless, $y) ≈ $Q($f($x, $y), $D)
                         @eval @test_throws DimensionError $f($qx_dimensions, $y)
                         @eval @test_throws DimensionError $f($x, $qy_dimensions)
                         if f == :rem
                             # Can also do other rounding modes
                             for r in (:RoundFromZero, :RoundNearest, :RoundUp, :RoundDown)
-                                @eval @test $f($qx_dimensions, $qy_dimensions, $r) == $Q($f($x, $y, $r), $dim)
+                                @eval @test $f($qx_dimensions, $qy_dimensions, $r) ≈ $Q($f($x, $y, $r), $dim)
                             end
                         end
                     end