Mirrors/rink-rs
2
0
Fork 0
mirror of https://github.com/tiffany352/rink-rs synced 2024-11-10 13:44:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

web: Add links for unit lists and durations

Browse source
This commit is contained in:
Tiffany Bennett 2016-10-08 12:52:39 -04:00
parent d0c4c65bdc
commit c691608dc7
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/eval.rs
View file

@ -459,10 +459,14 @@ impl Context {
}
Ok(list.into_iter().zip(out.into_iter()).map(|(name, value)| {
let pretty = Number(value, Number::one_unit(Dim::new(name)).1).to_parts(self);
let unit = pretty.unit.or(pretty.dimensions)
.map(|x| self.canonicalize(&*x).unwrap_or(x))
.expect("to_parts returned no dimensions");
let mut raw = BTreeMap::new();
raw.insert(Dim::new(&unit), 1);
NumberParts {
unit: Some(pretty.unit.or(pretty.dimensions)
.map(|x| self.canonicalize(&*x).unwrap_or(x))
.expect("to_parts returned no dimensions")),
unit: Some(unit),
raw_unit: Some(raw),
exact_value: Some(pretty.approx_value.or(pretty.exact_value)
.expect("to_parts returned neither exact nor approx value")),
..Default::default()
@ -791,6 +795,11 @@ impl Context {
months: NumberParts {
exact_value: Some("0".to_owned()),
unit: Some("month".to_owned()),
raw_unit: Some({
let mut raw = BTreeMap::new();
raw.insert(Dim::new("month"), 1);
raw
}),
..Default::default()
},
weeks: list.next().expect("Unexpected end of iterator"),