Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/user.jl
Original file line number Diff line number Diff line change
Expand Up @@ -657,7 +657,7 @@ julia> uparse("1.0*dB")
1.0 dB
```
"""
function uparse(str; unit_context=Unitful)
function uparse(str; unit_context=vcat(Unitful, Unitful.unitmodules))
ex = Meta.parse(str)
eval(lookup_units(unit_context, ex))
end
Expand Down
12 changes: 12 additions & 0 deletions test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2193,10 +2193,22 @@ end

# Tests for unit extension modules in unit parsing
@test_throws ArgumentError uparse("foo", unit_context=Unitful)
@test uparse("foo") === u"foo" #This work, because default `unit_context` is now `vcat(Unitful, Unitful.unitmodules)`
@test uparse("foo", unit_context=FooUnits) === u"foo"
@test uparse("foo", unit_context=[Unitful, FooUnits]) === u"foo"
@test uparse("foo", unit_context=[FooUnits, Unitful]) === u"foo"

module BazUnits
using Unitful
@unit baz "baz" MyBaz 1u"m" false
end
# Tests unit parsing for unit extension modules in which Unitful.register(BazUnits) was not done
@test_throws ArgumentError uparse("baz", unit_context=Unitful)
@test_throws ArgumentError uparse("baz") #This not work, because BazUnits is not registered to Unitful.unitmodules ( and default `unit_context` argument )
@test uparse("baz", unit_context=BazUnits) === BazUnits.baz
@test uparse("baz", unit_context=[Unitful, BazUnits]) === BazUnits.baz
@test uparse("baz", unit_context=[BazUnits, Unitful]) === BazUnits.baz

# Test for #272
module OnlyUstrImported
import Unitful: @u_str
Expand Down
Loading