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

Workaround negative numbers in macro

Browse Source
This commit is contained in:
ConnorSkees 2020-03-16 16:44:52 -04:00
parent 849f3d8479
commit 7a5b5c7369
2 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,8 +8,9 @@ use crate::value::{Number, Value};
macro_rules! opt_rgba { macro_rules! opt_rgba {
($args:ident, $name:ident, $arg:literal, $low:literal, $high:literal) => { ($args:ident, $name:ident, $arg:literal, $low:literal, $high:literal) => {
let x = $low;
let $name = match arg!($args, -1, $arg = Value::Null) { let $name = match arg!($args, -1, $arg = Value::Null) {
Value::Dimension(n, u) => Some(bound!($arg, n, u, $low, $high)), Value::Dimension(n, u) => Some(bound!($arg, n, u, x, $high)),
Value::Null => None, Value::Null => None,
v => return Err(format!("${}: {} is not a number.", $arg, v).into()), v => return Err(format!("${}: {} is not a number.", $arg, v).into()),
}; };
@ -18,8 +19,9 @@ macro_rules! opt_rgba {
macro_rules! opt_hsl { macro_rules! opt_hsl {
($args:ident, $name:ident, $arg:literal, $low:literal, $high:literal) => { ($args:ident, $name:ident, $arg:literal, $low:literal, $high:literal) => {
let x = $low;
let $name = match arg!($args, -1, $arg = Value::Null) { let $name = match arg!($args, -1, $arg = Value::Null) {
Value::Dimension(n, u) => Some(bound!($arg, n, u, $low, $high) / Number::from(100)), Value::Dimension(n, u) => Some(bound!($arg, n, u, x, $high) / Number::from(100)),
Value::Null => None, Value::Null => None,
v => return Err(format!("${}: {} is not a number.", $arg, v).into()), v => return Err(format!("${}: {} is not a number.", $arg, v).into()),
}; };
@ -129,12 +131,15 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
macro_rules! opt_scale_arg { macro_rules! opt_scale_arg {
($args:ident, $name:ident, $arg:literal, $low:literal, $high:literal) => { ($args:ident, $name:ident, $arg:literal, $low:literal, $high:literal) => {
let x = $low;
let $name = match arg!($args, -1, $arg = Value::Null) { let $name = match arg!($args, -1, $arg = Value::Null) {
Value::Dimension(n, Unit::Percent) => { Value::Dimension(n, Unit::Percent) => {
Some(bound!($arg, n, Unit::Percent, $low, $high) / Number::from(100)) Some(bound!($arg, n, Unit::Percent, x, $high) / Number::from(100))
} }
v @ Value::Dimension(..) => { v @ Value::Dimension(..) => {
return Err(format!("${}: Expected {} to have unit \"%\".", $arg, v).into()) return Err(
format!("${}: Expected {} to have unit \"%\".", $arg, v).into()
)
} }
Value::Null => None, Value::Null => None,
v => return Err(format!("${}: {} is not a number.", $arg, v).into()), v => return Err(format!("${}: {} is not a number.", $arg, v).into()),

28
src/builtin/macros.rs
View File

@ -53,6 +53,20 @@ macro_rules! bound {
$arg $arg
} }
}; };
// HACK: we accept `$low` as an ident here in order to work around
// a bug in the nightly compiler.
// https://github.com/rust-lang/rust/issues/70050
($name:literal, $arg:ident, $unit:ident, $low:ident, $high:literal) => {
if $arg > Number::from($high) || $arg < Number::from($low) {
return Err(format!(
"${}: Expected {}{} to be within {}{} and {}{}.",
$name, $arg, $unit, $low, $unit, $high, $unit,
)
.into());
} else {
$arg
}
};
($name:literal, $arg:ident, $unit:path, $low:literal, $high:literal) => { ($name:literal, $arg:ident, $unit:path, $low:literal, $high:literal) => {
if $arg > Number::from($high) || $arg < Number::from($low) { if $arg > Number::from($high) || $arg < Number::from($low) {
return Err(format!( return Err(format!(
@ -64,4 +78,18 @@ macro_rules! bound {
$arg $arg
} }
}; };
// HACK: we accept `$low` as an ident here in order to work around
// a bug in the nightly compiler.
// https://github.com/rust-lang/rust/issues/70050
($name:literal, $arg:ident, $unit:path, $low:ident, $high:literal) => {
if $arg > Number::from($high) || $arg < Number::from($low) {
return Err(format!(
"${}: Expected {}{} to be within {}{} and {}{}.",
$name, $arg, $unit, $low, $unit, $high, $unit,
)
.into());
} else {
$arg
}
};
} }