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

Update to git head of tiffany352/rust-gmp

Browse source
This commit is contained in:
Tiffany Bennett 2016-08-07 14:55:32 -04:00
parent 4a182741e0
commit ec09c3a48c
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/eval.rs
View file

@ -442,7 +442,7 @@ impl Context {
Expr::Pow(ref base, ref exp) => {
let base = try!(self.eval(&**base));
let exp = try!(self.eval(&**exp));
let fexp: f64 = exp.0.to_f64();
let fexp: f64 = exp.0.into();
if exp.1.len() != 0 {
Err(format!("Exponent not dimensionless"))
} else if fexp.trunc() == fexp {
@ -494,9 +494,10 @@ impl Context {
if res.1.len() > 0 {
return Err(format!("Exponents must be dimensionless"))
}
let res: f64 = res.0.into();
Ok(try!(self.eval_unit_name(left)).into_iter()
.filter_map(|(k, v)| {
let v = v + res.0.to_f64() as isize;
let v = v + res as isize;
if v != 0 {
Some((k, v))
} else {