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

Better error on undefined value-conversion

Browse source
This commit is contained in:
Tiffany Bennett 2016-09-28 15:45:20 -04:00
parent cd832100af
commit 661f30a998
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/eval.rs
View file

@ -536,13 +536,8 @@ impl Context {
Query::Convert(ref top, Conversion::Expr(ref bottom), base) => match
(self.eval(top), self.eval(bottom), self.eval_unit_name(bottom))
{
(Ok(top), Ok(bottom), Ok((bottom_name, bottom_const))) => {
let (top, bottom) = match (top, bottom) {
(Value::Number(top), Value::Number(bottom)) =>
(top, bottom),
_ => return Err(QueryError::Generic(format!(
"Conversion of non-numbers is not defined")))
};
(Ok(Value::Number(top)), Ok(Value::Number(bottom)),
Ok((bottom_name, bottom_const))) => {
if top.1 == bottom.1 {
let raw = match &top / &bottom {
Some(raw) => raw,
@ -559,6 +554,11 @@ impl Context {
&top, &bottom)))
}
},
(Ok(x), Ok(y), Ok(_)) => Err(QueryError::Generic(format!(
"Operation is not defined: <{}> -> <{}>",
x.show(self),
y.show(self)
))),
(Err(e), _, _) => Err(QueryError::Generic(e)),
(_, Err(e), _) => Err(QueryError::Generic(e)),
(_, _, Err(e)) => Err(QueryError::Generic(e)),