Skip to content

Commit 2c869e3

Browse files
committed
fix: import of vars into SymbolicUnits sybmodule
1 parent 04d2b14 commit 2c869e3

File tree

4 files changed

+13
-15
lines changed

4 files changed

+13
-15
lines changed

src/register_units.jl

-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
import .Units: UNIT_MAPPING, UNIT_SYMBOLS, UNIT_VALUES, _lazy_register_unit
32
import .SymbolicUnits:
43
SymbolicDimensionsSingleton, SYMBOLIC_UNIT_VALUES, update_symbolic_unit_values!
@@ -14,7 +13,6 @@ function update_all_values(name_symbol, unit)
1413
ALL_MAPPING[name_symbol] = INDEX_TYPE(length(ALL_MAPPING) + 1)
1514
end
1615

17-
1816
# Register
1917
macro register_unit(name, value)
2018
return esc(_register_unit(name, value))

src/symbolic_dimensions.jl

+8-11
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ end
9090
function SymbolicDimensionsSingleton{R}(s::Symbol) where {R}
9191
i = get(ALL_MAPPING, s, INDEX_TYPE(0))
9292
iszero(i) && error("$s is not available as a symbol in `SymbolicDimensionsSingleton`. Symbols available: $(ALL_SYMBOLS).")
93-
SymbolicDimensionsSingleton{R}(i)
93+
return SymbolicDimensionsSingleton{R}(i)
9494
end
9595

9696
# Traits:
@@ -367,15 +367,14 @@ to enable pretty-printing of units.
367367
"""
368368
module SymbolicUnits
369369

370-
371370
import ..UNIT_SYMBOLS
372371
import ..CONSTANT_SYMBOLS
373372
import ..SymbolicDimensionsSingleton
374-
import ...constructorof
375-
import ...DEFAULT_SYMBOLIC_QUANTITY_TYPE
376-
import ...DEFAULT_SYMBOLIC_QUANTITY_OUTPUT_TYPE
377-
import ...DEFAULT_VALUE_TYPE
378-
import ...DEFAULT_DIM_BASE_TYPE
373+
import ..DEFAULT_SYMBOLIC_QUANTITY_TYPE
374+
import ..constructorof
375+
import ..DEFAULT_SYMBOLIC_QUANTITY_OUTPUT_TYPE
376+
import ..DEFAULT_VALUE_TYPE
377+
import ..DEFAULT_DIM_BASE_TYPE
379378

380379
# Lazily create unit symbols (since there are so many)
381380
module Constants
@@ -393,9 +392,7 @@ module SymbolicUnits
393392
@eval begin
394393
const $unit = constructorof(DEFAULT_SYMBOLIC_QUANTITY_TYPE)(
395394
DEFAULT_VALUE_TYPE(1.0),
396-
SymbolicDimensionsSingleton{DEFAULT_DIM_BASE_TYPE}(
397-
$(QuoteNode(disambiguate_symbol(unit))),
398-
),
395+
SymbolicDimensionsSingleton{DEFAULT_DIM_BASE_TYPE}($(QuoteNode(disambiguate_symbol(unit))))
399396
)
400397
push!(_SYMBOLIC_CONSTANT_VALUES, $unit)
401398
end
@@ -412,7 +409,7 @@ module SymbolicUnits
412409
@eval begin
413410
const $unit = constructorof(DEFAULT_SYMBOLIC_QUANTITY_TYPE)(
414411
DEFAULT_VALUE_TYPE(1.0),
415-
SymbolicDimensionsSingleton{DEFAULT_DIM_BASE_TYPE}($(QuoteNode(unit))),
412+
SymbolicDimensionsSingleton{DEFAULT_DIM_BASE_TYPE}($(QuoteNode(unit)))
416413
)
417414
push!($symbolic_unit_values, $unit)
418415
end

test/runtests.jl

+3
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ else
1919
@safetestset "Measurements.jl integration tests" begin
2020
include("test_measurements.jl")
2121
end
22+
@safetestset "Meshes.jl integration tests" begin
23+
include("test_meshes.jl")
24+
end
2225
@safetestset "Unit tests" begin
2326
include("unittests.jl")
2427
end

test/unittests.jl

+2-2
Original file line numberDiff line numberDiff line change
@@ -689,8 +689,8 @@ end
689689
@test !iszero(sym)
690690
end
691691

692-
q = 1.5us"km/s"
693-
@test q == 1.5 * us"km" / us"s"
692+
q = 1.5us"km/s"
693+
@test q == 1.5 * us"km" / us"s"
694694
@test typeof(q) <: with_type_parameters(DEFAULT_QUANTITY_TYPE, Float64, SymbolicDimensions{DEFAULT_DIM_BASE_TYPE})
695695
@test string(dimension(q)) == "s⁻¹ km"
696696
@test uexpand(q) == 1.5u"km/s"

0 commit comments

Comments
 (0)