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

reorder macro params

Browse Source
This commit is contained in:
ConnorSkees 2020-03-10 21:53:21 -04:00
parent 0665e67158
commit d8db937470
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,17 +7,17 @@ use crate::units::Unit;
use crate::value::{Number, Value};
macro_rules! opt_arg {
($args:ident, $name:ident, $arg:literal, $high:literal, $low:literal) => {
($args:ident, $name:ident, $arg:literal, $low:literal, $high:literal) => {
let $name = match arg!($args, -1, $arg = Value::Null) {
Value::Dimension(n, u) => Some(bound!($arg, n, u, $high, $low)),
Value::Dimension(n, u) => Some(bound!($arg, n, u, $low, $high)),
Value::Null => None,
v => return Err(format!("${}: {} is not a number.", $arg, v).into()),
};
};
(scale: $args:ident, $name:ident, $arg:literal, $high:literal, $low:literal) => {
(scale: $args:ident, $name:ident, $arg:literal, $low:literal, $high:literal) => {
let $name = match arg!($args, -1, $arg = Value::Null) {
Value::Dimension(n, Unit::Percent) => {
Some(bound!($arg, n, Unit::Percent, $high, $low) / Number::from(100))
Some(bound!($arg, n, Unit::Percent, $low, $high) / Number::from(100))
}
v @ Value::Dimension(..) => {
return Err(format!("${}: Expected {} to have unit \"%\".", $arg, v).into())
@ -26,9 +26,9 @@ macro_rules! opt_arg {
v => return Err(format!("${}: {} is not a number.", $arg, v).into()),
};
};
(hsl: $args:ident, $name:ident, $arg:literal, $high:literal, $low:literal) => {
(hsl: $args:ident, $name:ident, $arg:literal, $low:literal, $high:literal) => {
let $name = match arg!($args, -1, $arg = Value::Null) {
Value::Dimension(n, u) => Some(bound!($arg, n, u, $high, $low) / Number::from(100)),
Value::Dimension(n, u) => Some(bound!($arg, n, u, $low, $high) / Number::from(100)),
Value::Null => None,
v => return Err(format!("${}: {} is not a number.", $arg, v).into()),
};