Mirrors/rink-rs
2
0
Fork 0
mirror of https://github.com/tiffany352/rink-rs synced 2024-09-20 06:01:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Better reciprocal unit formatting (Fixes #91)

Browse source
This commit is contained in:
Tiffany Bennett 2021-10-31 15:00:53 -07:00
parent 61814eeb72
commit aa303062f9
2 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
core/src/number.rs
View file

@ -379,6 +379,7 @@ impl<'a> NumberPartsFmt<'a> {
let parts = self.number;
let mut last_was_ws = true;
for tok in parse_pattern(self.pattern) {
match tok {
PatternToken::Exact => {
@ -419,6 +420,7 @@ impl<'a> NumberPartsFmt<'a> {
tokens.push(Span::plain("* "));
tokens.push(Span::number(f));
tokens.push(Span::plain(" "));
last_was_ws = true;
}
let mut first = true;
for (dim, &exp) in unit {
@ -434,10 +436,15 @@ impl<'a> NumberPartsFmt<'a> {
if exp != 1 {
tokens.push(Span::pow(format!("^{}", exp)));
}
last_was_ws = false;
}
}
if !frac.is_empty() || parts.divfactor.is_some() {
tokens.push(Span::plain(" /"));
if last_was_ws {
tokens.push(Span::plain("/"));
} else {
tokens.push(Span::plain(" /"));
}
if let Some(ref d) = parts.divfactor {
tokens.push(Span::plain(" "));
tokens.push(Span::number(d));
@ -536,11 +543,14 @@ impl<'a> NumberPartsFmt<'a> {
},
PatternToken::Whitespace => {
tokens.push(Span::plain(" "));
last_was_ws = true;
continue;
}
PatternToken::Passthrough(text) => {
tokens.push(Span::plain(text));
}
}
last_was_ws = false;
}
// Remove trailing whitespace
loop {

7
core/tests/spans.rs
View file

@ -41,3 +41,10 @@ fn correct_whitespace() {
test("m s", "1 meter second");
test("kg m / s", "1 kilogram meter / second (impulse)");
}
#[test]
fn correct_reciprocal_units() {
test("1 mpg", "approx. 425143.7 / meter^2 (fuel_efficiency)");
test("1 Hz", "1 / second (frequency)");
test("1 GHz", "1.0e9 / second (frequency)");
}