Fix parsing issue

Author: MilesCranmer

src/symbolic_dimensions.jl

@@ -414,14 +414,11 @@ module SymbolicUnits
         if ex.head == :call
             ex.args[2:end] = map(map_to_scope, ex.args[2:end])
             return ex
-        elseif ex.head == :tuple
-            ex.args[:] = map(map_to_scope, ex.args)
-            return ex
         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 `:.` (for `SymbolicConstants`) are expected."))
+            throw(ArgumentError("Unexpected expression: $ex. Only `:call` and `:.` (for `SymbolicConstants`) are expected."))
         end
     end
     function map_to_scope(sym::Symbol)

src/uparse.jl

@@ -66,14 +66,11 @@ function map_to_scope(ex::Expr)
     if ex.head == :call
         ex.args[2:end] = map(map_to_scope, ex.args[2:end])
         return ex
-    elseif ex.head == :tuple
-        ex.args[:] = map(map_to_scope, ex.args)
-        return ex
     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 `:.` (for `Constants`) are expected."))
+        throw(ArgumentError("Unexpected expression: $ex. Only `:call` and `:.` (for `Constants`) are expected."))
     end
 end
 function map_to_scope(sym::Symbol)

test/unittests.jl

@@ -462,26 +462,26 @@ end
     @test utime(z) == 1
     @test ustrip(z) ≈ 60 * 60 * 24 * 365.25
 
-    # Test that `u_str` respects original type:
-    @test typeof(u"1") == Int
-    @test typeof(u"1f0") == Float32
+    # Test type stability of extreme range of units
+    @test typeof(u"1") == DEFAULT_QUANTITY_TYPE
+    @test typeof(u"1f0") == DEFAULT_QUANTITY_TYPE
     @test typeof(u"s"^2) == DEFAULT_QUANTITY_TYPE
     @test typeof(u"Ω") == DEFAULT_QUANTITY_TYPE
     @test typeof(u"Gyr") == DEFAULT_QUANTITY_TYPE
     @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 ErrorException eval(:(u":x"))
 
-    @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")
+    VERSION >= v"1.9" && @test_throws "Unexpected expression" uparse("(m, m)")
     @test_throws LoadError eval(:(us"x"))
     VERSION >= v"1.9" && @test_throws "Symbol x not found" sym_uparse("x")
     VERSION >= v"1.9" && @test_throws "Symbol c found in `SymbolicConstants` but not `SymbolicUnits`" sym_uparse("c")
     VERSION >= v"1.9" && @test_throws "Unexpected expression" sym_uparse("import ..Units")
+    VERSION >= v"1.9" && @test_throws "Unexpected expression" sym_uparse("(m, m)")
 end
 
 @testset "Constants" begin