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

Canonicalize to longer version of prefix

Browse source
This commit is contained in:
Tiffany Bennett 2016-08-25 21:57:53 -04:00
parent 4049a8c922
commit eb185656dd
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/eval.rs
View file

@ -212,9 +212,15 @@ impl Context {
return Some(v)
}
}
for &(ref pre, _) in &self.prefixes {
for &(ref pre, ref val) in &self.prefixes {
if name.starts_with(pre) {
if let Some(v) = self.canonicalize(&name[pre.len()..]) {
let mut pre = pre;
for &(ref other, ref otherval) in &self.prefixes {
if other.len() > pre.len() && val == otherval {
pre = other;
}
}
return Some(format!("{}{}", pre, v))
}
}

2
src/number.rs
View file

@ -18,7 +18,7 @@ pub type Dim = Rc<String>;
pub type Unit = BTreeMap<Dim, i64>;
/// The basic representation of a number with a unit.
#[derive(Clone)]
#[derive(Clone, PartialEq, Eq)]
pub struct Number(pub Num, pub Unit);
fn one() -> Mpq {