shadowfacts/grass
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve color ops error messages

Browse Source
This commit is contained in:
ConnorSkees 2020-02-29 20:14:51 -05:00
parent 7d39b0c86a
commit 547ac7415a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/value/ops.rs
View File

@ -109,8 +109,8 @@ impl Sub for Value {
Value::Ident(format!("{}-{}{}{}", c, quotes, s, quotes), QuoteKind::None) Value::Ident(format!("{}-{}{}{}", c, quotes, s, quotes), QuoteKind::None)
} }
Self::Null => Value::Ident(format!("{}-", c), QuoteKind::None), Self::Null => Value::Ident(format!("{}-", c), QuoteKind::None),
v @ Self::Dimension(..) => { Self::Dimension(..) | Self::Color(..) => {
return Err(format!("Undefined operation \"{} - {}\".", c, v).into()) return Err(format!("Undefined operation \"{} - {}\".", c, other).into())
} }
_ => Value::Ident(format!("{}-{}", c, other), QuoteKind::None), _ => Value::Ident(format!("{}-{}", c, other), QuoteKind::None),
}, },
@ -186,7 +186,7 @@ impl Mul for Value {
} }
}, },
Self::BinaryOp(..) | Self::Paren(..) => self.eval()?, Self::BinaryOp(..) | Self::Paren(..) => self.eval()?,
_ => todo!("incompatible mul types"), _ => return Err(format!("Undefined operation \"{} * {}\".", self, other).into()),
}) })
} }
} }
@ -229,7 +229,7 @@ impl Div for Value {
Value::Ident(format!("{}/{}{}{}", c, quotes, s, quotes), QuoteKind::None) Value::Ident(format!("{}/{}{}{}", c, quotes, s, quotes), QuoteKind::None)
} }
Self::Null => Value::Ident(format!("{}/", c), QuoteKind::None), Self::Null => Value::Ident(format!("{}/", c), QuoteKind::None),
Self::Dimension(..) => { Self::Dimension(..) | Self::Color(..) => {
return Err(format!("Undefined operation \"{} / {}\".", c, other).into()) return Err(format!("Undefined operation \"{} / {}\".", c, other).into())
} }
_ => Value::Ident(format!("{}/{}", c, other), QuoteKind::None), _ => Value::Ident(format!("{}/{}", c, other), QuoteKind::None),