Test additional branches in @u_str

Author: MilesCranmer

src/uparse.jl

@@ -66,27 +66,20 @@ function map_to_scope(ex::Expr)
     elseif ex.head == :tuple
         ex.args[:] = map(map_to_scope, ex.args)
         return ex
-    elseif ex.head == :.
-        if ex.args[1] == :Constants
-            @assert ex.args[2] isa QuoteNode
-            return lookup_constant(ex.args[2].value)
-        else
-            return ex
-        end
+    elseif ex.head == :. && ex.args[1] == :Constants
+        @assert ex.args[2] isa QuoteNode
+        return lookup_constant(ex.args[2].value)
     else
-        throw(ArgumentError("Unexpected expression: $ex. Only `:call`, `:tuple`, and `:.` are expected."))
-        return ex
+        throw(ArgumentError("Unexpected expression: $ex. Only `:call`, `:tuple`, and `:.` (for `Constants`) are expected."))
     end
 end
 function map_to_scope(sym::Symbol)
     if sym in UNIT_SYMBOLS
         return lookup_unit(sym)
     elseif sym in CONSTANT_SYMBOLS
         throw(ArgumentError("Symbol $sym found in `Constants` but not `Units`. Please access the `Constants` module. For example, `u\"Constants.$sym\"`."))
-        return sym
     else
         throw(ArgumentError("Symbol $sym not found in `Units` or `Constants`."))
-        return sym
     end
 end
 function map_to_scope(ex)

test/unittests.jl

@@ -471,9 +471,13 @@ end
     @test typeof(u"fm") == DEFAULT_QUANTITY_TYPE
     @test typeof(u"fm"^2) == DEFAULT_QUANTITY_TYPE
 
+    # Can also use tuples:
+    @test typeof(u"(m, s)") == Tuple{DEFAULT_QUANTITY_TYPE, DEFAULT_QUANTITY_TYPE}
+
     @test_throws LoadError eval(:(u"x"))
     VERSION >= v"1.9" && @test_throws "Symbol x not found" uparse("x")
     VERSION >= v"1.9" && @test_throws "Symbol c found in `Constants` but not `Units`" uparse("c")
+    VERSION >= v"1.9" && @test_throws "Unexpected expression" uparse("import ..Units")
 end
 
 @testset "Constants" begin