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

Lookup quantities first in units for + factorize

Browse source
This commit is contained in:
Tiffany Bennett 2016-10-08 13:02:02 -04:00
parent c691608dc7
commit cf0d571d4e
1 changed files with 38 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/eval.rs
View file

@ -702,11 +702,26 @@ impl Context {
which, base)))
},
Query::Factorize(ref expr) => {
let val = try!(self.eval(expr));
let mut val = None;
if let Expr::Unit(ref name) = *expr {
for (u, k) in &self.quantities {
if name == k {
val = Some(Number(Num::one(), u.clone()));
break
}
}
}
let val = match val {
Value::Number(val) => val,
_ => return Err(QueryError::Generic(format!(
"Cannot find derivatives of <{}>", val.show(self))),)
None => {
let val = try!(self.eval(expr));
let val = match val {
Value::Number(val) => val,
_ => return Err(QueryError::Generic(format!(
"Cannot find derivatives of <{}>", val.show(self))),)
};
val
},
Some(val) => val
};
let quantities = self.quantities.iter()
.map(|(a, b)| (a.clone(), Rc::new(b.clone())))
@ -726,11 +741,26 @@ impl Context {
}))
},
Query::UnitsFor(ref expr) => {
let val = try!(self.eval(expr));
let mut val = None;
if let Expr::Unit(ref name) = *expr {
for (u, k) in &self.quantities {
if name == k {
val = Some(Number(Num::one(), u.clone()));
break
}
}
}
let val = match val {
Value::Number(val) => val,
_ => return Err(QueryError::Generic(format!(
"Cannot find units for <{}>", val.show(self)))),
None => {
let val = try!(self.eval(expr));
let val = match val {
Value::Number(val) => val,
_ => return Err(QueryError::Generic(format!(
"Cannot find units for <{}>", val.show(self)))),
};
val
},
Some(val) => val
};
let mut out = vec![];
for (name, unit) in self.units.iter() {