fix: import of vars into SymbolicUnits sybmodule

SymbolicML · Feb 2, 2024 · 192288c · 192288c
1 parent 3b6525f
commit 192288c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 15 deletions.
diff --git a/src/register_units.jl b/src/register_units.jl
@@ -14,7 +14,6 @@ function update_all_values(name_symbol, unit)
     ALL_MAPPING[name_symbol] = INDEX_TYPE(length(ALL_MAPPING) + 1)
 end
 
-
 # Register
 macro register_unit(name, value)
     return esc(_register_unit(name, value))

diff --git a/src/symbolic_dimensions.jl b/src/symbolic_dimensions.jl
@@ -90,7 +90,7 @@ end
 function SymbolicDimensionsSingleton{R}(s::Symbol) where {R}
     i = get(ALL_MAPPING, s, INDEX_TYPE(0))
     iszero(i) && error("$s is not available as a symbol in `SymbolicDimensionsSingleton`. Symbols available: $(ALL_SYMBOLS).")
-    SymbolicDimensionsSingleton{R}(i)
+    return SymbolicDimensionsSingleton{R}(i)
 end
 
 # Traits:
@@ -367,15 +367,14 @@ to enable pretty-printing of units.
 """
 module SymbolicUnits
 
-
     import ..UNIT_SYMBOLS
     import ..CONSTANT_SYMBOLS
     import ..SymbolicDimensionsSingleton
-    import ...constructorof
-    import ...DEFAULT_SYMBOLIC_QUANTITY_TYPE
-    import ...DEFAULT_SYMBOLIC_QUANTITY_OUTPUT_TYPE
-    import ...DEFAULT_VALUE_TYPE
-    import ...DEFAULT_DIM_BASE_TYPE
+    import ..DEFAULT_SYMBOLIC_QUANTITY_TYPE
+    import ..constructorof
+    import ..DEFAULT_SYMBOLIC_QUANTITY_OUTPUT_TYPE
+    import ..DEFAULT_VALUE_TYPE
+    import ..DEFAULT_DIM_BASE_TYPE
 
     # Lazily create unit symbols (since there are so many)
     module Constants
@@ -393,10 +392,7 @@ module SymbolicUnits
             @eval begin
                 const $unit = constructorof(DEFAULT_SYMBOLIC_QUANTITY_TYPE)(
                     DEFAULT_VALUE_TYPE(1.0),
-                    SymbolicDimensionsSingleton{DEFAULT_DIM_BASE_TYPE}(
-                        $(QuoteNode(disambiguate_symbol(unit))),
-                    ),
-                )
+                    SymbolicDimensionsSingleton{DEFAULT_DIM_BASE_TYPE}($(QuoteNode(disambiguate_symbol(unit)))))
                 push!(_SYMBOLIC_CONSTANT_VALUES, $unit)
             end
         end
@@ -412,7 +408,7 @@ module SymbolicUnits
         @eval begin
             const $unit = constructorof(DEFAULT_SYMBOLIC_QUANTITY_TYPE)(
                 DEFAULT_VALUE_TYPE(1.0),
-                SymbolicDimensionsSingleton{DEFAULT_DIM_BASE_TYPE}($(QuoteNode(unit))),
+                SymbolicDimensionsSingleton{DEFAULT_DIM_BASE_TYPE}($(QuoteNode(unit)))
             )
             push!($symbolic_unit_values, $unit)
         end

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -19,6 +19,9 @@ else
     @safetestset "Measurements.jl integration tests" begin
         include("test_measurements.jl")
     end
+    @safetestset "Meshes.jl integration tests" begin
+        include("test_meshes.jl")
+    end
     @safetestset "Unit tests" begin
         include("unittests.jl")
     end

diff --git a/test/unittests.jl b/test/unittests.jl
@@ -688,8 +688,8 @@ end
         @test !iszero(sym)
     end
 
-            q = 1.5us"km/s"
-            @test q == 1.5 * us"km" / us"s"
+    q = 1.5us"km/s"
+    @test q == 1.5 * us"km" / us"s"
     @test typeof(q) <: with_type_parameters(DEFAULT_QUANTITY_TYPE, Float64, SymbolicDimensions{DEFAULT_DIM_BASE_TYPE})
     @test string(dimension(q)) == "s⁻¹ km"
     @test uexpand(q) == 1.5u"km/s"