Merge pull request #15 from Deduction42/DEV

qparse no longer applies ubase (improves consistency with uparse)

Author: RGonTheNoble

Project.toml

@@ -1,7 +1,7 @@
 name = "FlexUnits"
 uuid = "76e01b6b-c995-4ce6-8559-91e72a3d4e95"
 authors = ["Ruben Gonzalez <[email protected]> and contributors"]
-version = "0.2.4"
+version = "0.2.5"
 
 [compat]
 julia = "1.10"

src/RegistryTools.jl

@@ -207,7 +207,7 @@ function uparse(str::String, reg::AbstractDict{Symbol, U}) where {U<:AbstractUni
 end
 
 function qparse(str::String, reg::AbstractDict{Symbol,U}) where {U<:AbstractUnitLike}
-    return eval(qparse_expr(str, reg)) :: Quantity{Float64, dimtype(U)}
+    return eval(qparse_expr(str, reg)) :: Quantity{Float64, U}
 end
 
 # Expression parsing (for dynamic and macros) ==============================================================
@@ -239,9 +239,9 @@ end
 
 
 function qparse_expr(ex::PARSE_CASES, reg::AbstractDict{Symbol, U}) where U <: AbstractUnitLike
-    Q  = Quantity{Float64, dimtype(U)}
-    ex = _parse_expr(ex, reg)
-    return :($convert($Q, ubase($ex)))
+    Q  = Quantity{Float64, U}
+    ex_new = _parse_expr(ex, reg)
+    return :($convert($Q, $ex_new))
 end
 
 # Casing out parsing ======================================================================================

test/runtests.jl

@@ -259,8 +259,8 @@ end
     @test ustrip(x) == 1.3
     @test ustrip_base(x) == 1300  # SI base units
     @test x == q"1.3km/s^2"
-    @test x !== q"1.3km/s^2"
-    @test abs(x) === q"1.3km/s^2"
+    @test typeof(x) == typeof(q"1.3km/s^2")
+    @test abs(x) === ubase(q"1.3km/s^2")
 
     y = 0.9u"sqrt(mΩ)"
     @test typeof(y) == Quantity{Float64, AffineUnits{Dimensions{DEFAULT_RATIONAL}}}
@@ -275,11 +275,11 @@ end
     y32 = convert(Quantity{Float32, AffineUnits{Dimensions{DEFAULT_RATIONAL}}}, y)
     @test typeof(y32) == Quantity{Float32, AffineUnits{Dimensions{DEFAULT_RATIONAL}}}
 
-    z = 1*u"yr"
+    z = 1.0*u"yr"
     @test ustrip_base(z) ≈ 60 * 60 * 24 * 365.25
-    @test z == 1*uparse("yr")
-    @test z == qparse("1yr")
-    @test 1/z == qparse("1/yr")
+    @test z === 1.0*uparse("yr")
+    @test z === qparse("1yr")
+    @test 1/z === ubase(qparse("1/yr"))
     @test_throws MethodError qparse("yr")
 
     # Test type stability of extreme range of units