Merge pull request #12 from Deduction42/DEV

Dev

Author: RGonTheNoble

src/RegistryTools.jl

@@ -211,9 +211,8 @@ function qparse(str::String, reg::AbstractDict{Symbol,U}) where {U<:AbstractUnit
 end
 
 # Expression parsing (for dynamic and macros) ==============================================================
-function uparse_expr(str0::String, reg::AbstractDict{Symbol, U}) where U <: AbstractUnitLike
-    str = _expr_preprocessing(str0)
-    parsed = Meta.parse(str)
+function uparse_expr(str::String, reg::AbstractDict{Symbol, U}) where U <: AbstractUnitLike
+    parsed = Meta.parse(_expr_preprocessing(str))
 
     if !(parsed isa PARSE_CASES)
         throw(ArgumentError("Unexpected expression: String input \"$(str)\" was not parsed as $(PARSE_CASES)"))
@@ -223,9 +222,8 @@ function uparse_expr(str0::String, reg::AbstractDict{Symbol, U}) where U <: Abst
     end
 end
 
-function qparse_expr(str0::String, reg::AbstractDict{Symbol, U}) where U <: AbstractUnitLike
-    str = _expr_preprocessing(str0)
-    parsed = Meta.parse(str)
+function qparse_expr(str::String, reg::AbstractDict{Symbol, U}) where U <: AbstractUnitLike
+    parsed = Meta.parse(_expr_preprocessing(str))
 
     if !(parsed isa PARSE_CASES)
         throw(ArgumentError("Unexpected expression: String input \"$(str)\" was not parsed as $(PARSE_CASES)"))
@@ -288,7 +286,12 @@ function change_symbol(u::U, s::Symbol) where U<:AbstractAffineUnits
     return constructorof(U)(scale=uscale(u), offset=uoffset(u), dims=dimension(u), symbol=s)
 end
 
-_expr_preprocessing(str::String) = replace(str, " "=>"", "%"=>"percent")
+function _expr_preprocessing(str1::AbstractString)
+    space2mult = r"([\%\w]) +([\%\w])" => s"\1*\2"
+    str2 = replace(str1, space2mult) #Spaces between words are multiplications
+    str3 = replace(str2, space2mult) #Spaces between words are multiplications
+    return replace(str3, " "=>"", "%"=>"percent") #Eliminates extra spaces 
+end
 
 end
 

test/runtests.jl

@@ -445,6 +445,7 @@ end
     @test q"1.0" == 1.0u""
     @test qparse("1%") == 0.01u""
     @test qparse("1.0") == 1.0u""
+    @test qparse("5  5kg") == 25u"kg"
 
     #Test showerror 
     testio = IOBuffer()