Skip to content

Commit d6f5cc1

Browse files
committed
Clean up diff
1 parent ac1889a commit d6f5cc1

File tree

4 files changed

+13
-16
lines changed

4 files changed

+13
-16
lines changed

src/DynamicQuantities.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export QuantityArray
99
export DimensionError
1010
export ustrip, dimension
1111
export ulength, umass, utime, ucurrent, utemperature, uluminosity, uamount
12-
export uparse, @u_str, sym_uparse, @us_str, uexpand, uconvert
12+
export uparse, @u_str, sym_uparse, @us_str, uexpand, uconvert, @register_unit
1313

1414

1515
include("internal_utils.jl")
@@ -24,11 +24,11 @@ include("constants.jl")
2424
include("uparse.jl")
2525
include("symbolic_dimensions.jl")
2626
include("complex.jl")
27-
include("disambiguities.jl")
2827
include("register_units.jl")
28+
include("disambiguities.jl")
29+
2930
include("deprecated.jl")
3031
export expand_units
31-
export @register_unit
3232

3333
import PackageExtensionCompat: @require_extensions
3434
import .Units

src/symbolic_dimensions.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -367,8 +367,8 @@ module SymbolicUnits
367367
import ..UNIT_SYMBOLS
368368
import ..CONSTANT_SYMBOLS
369369
import ..SymbolicDimensionsSingleton
370-
import ..DEFAULT_SYMBOLIC_QUANTITY_TYPE
371370
import ..constructorof
371+
import ..DEFAULT_SYMBOLIC_QUANTITY_TYPE
372372
import ..DEFAULT_SYMBOLIC_QUANTITY_OUTPUT_TYPE
373373
import ..DEFAULT_VALUE_TYPE
374374
import ..DEFAULT_DIM_BASE_TYPE
@@ -426,7 +426,7 @@ module SymbolicUnits
426426
push!(SYMBOLIC_UNIT_VALUES, unit)
427427
end
428428

429-
"""
429+
"""
430430
sym_uparse(raw_string::AbstractString)
431431
432432
Parse a string containing an expression of units and return the

src/units.jl

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ function _lazy_register_unit(name::Symbol, value)
2828
end
2929
end
3030

31-
3231
function _add_prefixes(base_unit::Symbol, prefixes, register_function)
3332
all_prefixes = (
3433
f=1e-15, p=1e-12, n=1e-9, μ=1e-6, u=1e-6, m=1e-3, c=1e-2, d=1e-1,
@@ -44,13 +43,13 @@ function _add_prefixes(base_unit::Symbol, prefixes, register_function)
4443
end
4544

4645
# SI base units
47-
@_lazy_register_unit m DEFAULT_QUANTITY_TYPE(1.0, length = 1)
48-
@_lazy_register_unit g DEFAULT_QUANTITY_TYPE(1e-3, mass = 1)
49-
@_lazy_register_unit s DEFAULT_QUANTITY_TYPE(1.0, time = 1)
50-
@_lazy_register_unit A DEFAULT_QUANTITY_TYPE(1.0, current = 1)
51-
@_lazy_register_unit K DEFAULT_QUANTITY_TYPE(1.0, temperature = 1)
52-
@_lazy_register_unit cd DEFAULT_QUANTITY_TYPE(1.0, luminosity = 1)
53-
@_lazy_register_unit mol DEFAULT_QUANTITY_TYPE(1.0, amount = 1)
46+
@_lazy_register_unit m DEFAULT_QUANTITY_TYPE(1.0, length=1)
47+
@_lazy_register_unit g DEFAULT_QUANTITY_TYPE(1e-3, mass=1)
48+
@_lazy_register_unit s DEFAULT_QUANTITY_TYPE(1.0, time=1)
49+
@_lazy_register_unit A DEFAULT_QUANTITY_TYPE(1.0, current=1)
50+
@_lazy_register_unit K DEFAULT_QUANTITY_TYPE(1.0, temperature=1)
51+
@_lazy_register_unit cd DEFAULT_QUANTITY_TYPE(1.0, luminosity=1)
52+
@_lazy_register_unit mol DEFAULT_QUANTITY_TYPE(1.0, amount=1)
5453

5554
@add_prefixes m (f, p, n, μ, u, c, d, m, k, M, G)
5655
@add_prefixes g (p, n, μ, u, m, k)

test/unittests.jl

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using DynamicQuantities
22
using DynamicQuantities: FixedRational, NoDims, AbstractSymbolicDimensions
3-
using DynamicQuantities:
4-
DEFAULT_QUANTITY_TYPE, DEFAULT_DIM_BASE_TYPE, DEFAULT_DIM_TYPE, DEFAULT_VALUE_TYPE
3+
using DynamicQuantities: DEFAULT_QUANTITY_TYPE, DEFAULT_DIM_BASE_TYPE, DEFAULT_DIM_TYPE, DEFAULT_VALUE_TYPE
54
using DynamicQuantities: array_type, value_type, dim_type, quantity_type
65
using DynamicQuantities: GenericQuantity, with_type_parameters, constructorof
76
using DynamicQuantities: promote_quantity_on_quantity, promote_quantity_on_value
@@ -1731,7 +1730,6 @@ end
17311730
) isa SymbolicDimensions{Int32}
17321731

17331732
@test copy(km) == km
1734-
17351733
# Any operation should immediately convert it:
17361734
@test km ^ -1 isa Quantity{T,DynamicQuantities.SymbolicDimensions{R}} where {T,R}
17371735

0 commit comments

Comments
 (0)