Skip to content

Commit 033ea36

Browse files
committed
More unitful compatibility
1 parent 25d1a94 commit 033ea36

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

src/DynamicQuantities.jl

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,15 @@ import .Units
2828
import .Constants
2929
import .UnitsParse: uparse, @u_str
3030

31+
using .Units: UNIT_SYMBOLS
32+
_units_import_expr = :(using .Units: m, g)
33+
append!(
34+
_units_import_expr.args[1].args,
35+
map(s -> Expr(:(.), s), UNIT_SYMBOLS)
36+
)
37+
eval(_units_import_expr)
38+
39+
3140
function __init__()
3241
@require_extensions
3342
end

src/units.jl

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ end
5959
@add_prefixes mol (m,)
6060

6161
@doc(
62-
"Length in meters. Available variants: `fm`, `pm`, `nm`, `μm` (/`um`), `cm`, `dm`, `mm`, `km`, `Mm`, `Gm`.",
62+
"Length in meters. Available variants: `fm`, `pm`, `nm`, `μm` (/`um`), `cm`, `inch`, `dm`, `mm`, `ft`, `km`, `mi`, `Mm`, `Gm`.",
6363
m,
6464
)
6565
@doc(
@@ -104,7 +104,7 @@ end
104104
@add_prefixes N ()
105105
@add_prefixes Pa (k,)
106106
@add_prefixes J (k,)
107-
@add_prefixes W (k, M, G)
107+
@add_prefixes W (m, k, M, G)
108108
@add_prefixes C ()
109109
@add_prefixes V (m, k, M, G)
110110
@add_prefixes F ()
@@ -130,7 +130,7 @@ end
130130
J,
131131
)
132132
@doc(
133-
"Power in Watts. Available variants: `kW`, `MW`, `GW`.",
133+
"Power in Watts. Available variants: `mW`, `kW`, `MW`, `GW`.",
134134
W,
135135
)
136136
@doc(
@@ -164,6 +164,9 @@ end
164164
@register_unit d day
165165
@register_unit wk 7 * day
166166
@register_unit yr 365.25 * day
167+
@register_unit inch 2.54 * cm
168+
@register_unit ft 12 * inch
169+
@register_unit mi 5280 * ft
167170

168171
@add_prefixes min ()
169172
@add_prefixes minute ()

0 commit comments

Comments
 (0)