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

rgb error messages

Browse Source
This commit is contained in:
ConnorSkees 2020-02-16 11:33:13 -05:00
parent bbf0cd7e51
commit 4114bb0a78
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/builtin/color/rgb.rs
View File

@ -43,35 +43,39 @@ pub(crate) fn register(f: &mut BTreeMap<String, Builtin>) {
} else if args.len() == 2 { } else if args.len() == 2 {
let color = match arg!(args, 0, "color").eval() { let color = match arg!(args, 0, "color").eval() {
Value::Color(c) => c, Value::Color(c) => c,
_ => todo!("expected color") v => return Err(format!("$color: {} is not a color.", v).into()),
}; };
let alpha = match arg!(args, 1, "alpha").eval() { let alpha = match arg!(args, 1, "alpha").eval() {
Value::Dimension(n, Unit::None) => n, Value::Dimension(n, Unit::None) => n,
Value::Dimension(n, Unit::Percent) => n / Number::from(100), Value::Dimension(n, Unit::Percent) => n / Number::from(100),
_ => todo!("expected either unitless or % number for alpha"), v @ Value::Dimension(..) => return Err(format!("$alpha: Expected {} to have no units or \"%\".", v).into()),
v => return Err(format!("$alpha: {} is not a number.", v).into()),
}; };
Ok(Value::Color(color.with_alpha(alpha))) Ok(Value::Color(color.with_alpha(alpha)))
} else { } else {
let red = match arg!(args, 0, "red").eval() { let red = match arg!(args, 0, "red").eval() {
Value::Dimension(n, Unit::None) => n, Value::Dimension(n, Unit::None) => n,
Value::Dimension(n, Unit::Percent) => (n / Number::from(100)) * Number::from(255), Value::Dimension(n, Unit::Percent) => (n / Number::from(100)) * Number::from(255),
v @ Value::Dimension(..) => return Err(format!("Expected {} to have no units or \"%\".", v).into()), v @ Value::Dimension(..) => return Err(format!("$red: Expected {} to have no units or \"%\".", v).into()),
v => return Err(format!("$red: {} is not a number.", v).into()), v => return Err(format!("$red: {} is not a number.", v).into()),
}; };
let green = match arg!(args, 1, "green").eval() { let green = match arg!(args, 1, "green").eval() {
Value::Dimension(n, Unit::None) => n, Value::Dimension(n, Unit::None) => n,
Value::Dimension(n, Unit::Percent) => (n / Number::from(100)) * Number::from(255), Value::Dimension(n, Unit::Percent) => (n / Number::from(100)) * Number::from(255),
_ => todo!("expected either unitless or % number for alpha"), v @ Value::Dimension(..) => return Err(format!("$green: Expected {} to have no units or \"%\".", v).into()),
v => return Err(format!("$green: {} is not a number.", v).into()),
}; };
let blue = match arg!(args, 2, "blue").eval() { let blue = match arg!(args, 2, "blue").eval() {
Value::Dimension(n, Unit::None) => n, Value::Dimension(n, Unit::None) => n,
Value::Dimension(n, Unit::Percent) => (n / Number::from(100)) * Number::from(255), Value::Dimension(n, Unit::Percent) => (n / Number::from(100)) * Number::from(255),
_ => todo!("expected either unitless or % number for alpha"), v @ Value::Dimension(..) => return Err(format!("$blue: Expected {} to have no units or \"%\".", v).into()),
v => return Err(format!("$blue: {} is not a number.", v).into()),
}; };
let alpha = match arg!(args, 3, "alpha"=Value::Dimension(Number::from(1), Unit::None)).eval() { let alpha = match arg!(args, 3, "alpha"=Value::Dimension(Number::from(1), Unit::None)).eval() {
Value::Dimension(n, Unit::None) => n, Value::Dimension(n, Unit::None) => n,
Value::Dimension(n, Unit::Percent) => n / Number::from(100), Value::Dimension(n, Unit::Percent) => n / Number::from(100),
_ => todo!("expected either unitless or % number for alpha") v @ Value::Dimension(..) => return Err(format!("$alpha: Expected {} to have no units or \"%\".", v).into()),
v => return Err(format!("$alpha: {} is not a number.", v).into()),
}; };
Ok(Value::Color(Color::from_rgba(red, green, blue, alpha))) Ok(Value::Color(Color::from_rgba(red, green, blue, alpha)))
} }
@ -122,17 +126,20 @@ pub(crate) fn register(f: &mut BTreeMap<String, Builtin>) {
let red = match arg!(args, 0, "red").eval() { let red = match arg!(args, 0, "red").eval() {
Value::Dimension(n, Unit::None) => n, Value::Dimension(n, Unit::None) => n,
Value::Dimension(n, Unit::Percent) => (n / Number::from(100)) * Number::from(255), Value::Dimension(n, Unit::Percent) => (n / Number::from(100)) * Number::from(255),
_ => todo!("expected either unitless or % number for alpha"), v @ Value::Dimension(..) => return Err(format!("$red: Expected {} to have no units or \"%\".", v).into()),
v => return Err(format!("$red: {} is not a number.", v).into()),
}; };
let green = match arg!(args, 1, "green").eval() { let green = match arg!(args, 1, "green").eval() {
Value::Dimension(n, Unit::None) => n, Value::Dimension(n, Unit::None) => n,
Value::Dimension(n, Unit::Percent) => (n / Number::from(100)) * Number::from(255), Value::Dimension(n, Unit::Percent) => (n / Number::from(100)) * Number::from(255),
_ => todo!("expected either unitless or % number for alpha"), v @ Value::Dimension(..) => return Err(format!("$green: Expected {} to have no units or \"%\".", v).into()),
v => return Err(format!("$green: {} is not a number.", v).into()),
}; };
let blue = match arg!(args, 2, "blue").eval() { let blue = match arg!(args, 2, "blue").eval() {
Value::Dimension(n, Unit::None) => n, Value::Dimension(n, Unit::None) => n,
Value::Dimension(n, Unit::Percent) => (n / Number::from(100)) * Number::from(255), Value::Dimension(n, Unit::Percent) => (n / Number::from(100)) * Number::from(255),
_ => todo!("expected either unitless or % number for alpha"), v @ Value::Dimension(..) => return Err(format!("$blue: Expected {} to have no units or \"%\".", v).into()),
v => return Err(format!("$blue: {} is not a number.", v).into()),
}; };
let alpha = match arg!(args, 3, "alpha"=Value::Dimension(Number::from(1), Unit::None)).eval() { let alpha = match arg!(args, 3, "alpha"=Value::Dimension(Number::from(1), Unit::None)).eval() {
Value::Dimension(n, Unit::None) => n, Value::Dimension(n, Unit::None) => n,