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

Refactor change-color to reduce boilerplate

Browse Source
This commit is contained in:
ConnorSkees 2020-02-14 19:21:24 -05:00
parent 7811a3e056
commit 6369282044
1 changed files with 27 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/builtin/color/other.rs
View File

@ -5,6 +5,26 @@ use crate::color::Color;
use crate::units::Unit; use crate::units::Unit;
use crate::value::{Number, Value}; use crate::value::{Number, Value};
macro_rules! opt_arg {
($args:ident, $name:ident, $arg:literal) => {
let $name = match arg!($args, -1, $arg = Value::Null).eval() {
Value::Dimension(n, Unit::None) => Some(n),
Value::Dimension(n, Unit::Percent) => Some(n / Number::from(100)),
Value::Null => None,
_ => todo!(concat!("expected either unitless or % number for $", $arg)),
};
};
(hsl: $args:ident, $name:ident, $arg:literal) => {
let $name = match arg!($args, -1, $arg = Value::Null).eval() {
Value::Dimension(n, Unit::None) | Value::Dimension(n, Unit::Percent) => {
Some(n / Number::from(100))
}
Value::Null => None,
_ => todo!(concat!("expected either unitless or % number for $", $arg)),
};
};
}
pub(crate) fn register(f: &mut BTreeMap<String, Builtin>) { pub(crate) fn register(f: &mut BTreeMap<String, Builtin>) {
decl!(f "change-color", |args, _| { decl!(f "change-color", |args, _| {
let color = match arg!(args, 0, "color").eval() { let color = match arg!(args, 0, "color").eval() {
@ -12,31 +32,10 @@ pub(crate) fn register(f: &mut BTreeMap<String, Builtin>) {
_ => todo!("non-color given to builtin function `change-color()`") _ => todo!("non-color given to builtin function `change-color()`")
}; };
let alpha = match arg!(args, -1, "alpha"=Value::Null).eval() { opt_arg!(args, alpha, "alpha");
Value::Dimension(n, Unit::None) => Some(n), opt_arg!(args, red, "red");
Value::Dimension(n, Unit::Percent) => Some(n / Number::from(100)), opt_arg!(args, green, "green");
Value::Null => None, opt_arg!(args, blue, "blue");
_ => todo!("expected either unitless or % number for $alpha")
};
let red = match arg!(args, -1, "red"=Value::Null).eval() {
Value::Dimension(n, Unit::None) => Some(n),
Value::Dimension(n, Unit::Percent) => Some(n / Number::from(100)),
Value::Null => None,
_ => todo!("expected either unitless or % number for $red")
};
let green = match arg!(args, -1, "green"=Value::Null).eval() {
Value::Dimension(n, Unit::None) => Some(n),
Value::Dimension(n, Unit::Percent) => Some(n / Number::from(100)),
Value::Null => None,
_ => todo!("expected either unitless or % number for $green")
};
let blue = match arg!(args, -1, "blue"=Value::Null).eval() {
Value::Dimension(n, Unit::None) => Some(n),
Value::Dimension(n, Unit::Percent) => Some(n / Number::from(100)),
Value::Null => None,
_ => todo!("expected either unitless or % number for $blue")
};
if red.is_some() || green.is_some() || blue.is_some() { if red.is_some() || green.is_some() || blue.is_some() {
return Some(Value::Color(Color::from_rgba(red.unwrap_or(color.red()), green.unwrap_or(color.green()), blue.unwrap_or(color.blue()), alpha.unwrap_or(color.alpha())))) return Some(Value::Color(Color::from_rgba(red.unwrap_or(color.red()), green.unwrap_or(color.green()), blue.unwrap_or(color.blue()), alpha.unwrap_or(color.alpha()))))
@ -49,18 +48,9 @@ pub(crate) fn register(f: &mut BTreeMap<String, Builtin>) {
Value::Null => None, Value::Null => None,
_ => todo!("expected either unitless or % number for hue"), _ => todo!("expected either unitless or % number for hue"),
}; };
let saturation = match arg!(args, -1, "saturation"=Value::Null).eval() {
Value::Dimension(n, Unit::None) opt_arg!(hsl: args, saturation, "saturation");
| Value::Dimension(n, Unit::Percent) => Some(n / Number::from(100)), opt_arg!(hsl: args, luminance, "lightness");
Value::Null => None,
_ => todo!("expected either unitless or % number for saturation"),
};
let luminance = match arg!(args, -1, "lightness"=Value::Null).eval() {
Value::Dimension(n, Unit::None)
| Value::Dimension(n, Unit::Percent) => Some(n / Number::from(100)),
Value::Null => None,
_ => todo!("expected either unitless or % number for luminance"),
};
if hue.is_some() || saturation.is_some() || luminance.is_some() { if hue.is_some() || saturation.is_some() || luminance.is_some() {
// Color::as_hsla() returns more exact values than Color::hue(), etc. // Color::as_hsla() returns more exact values than Color::hue(), etc.