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

Bounds check for fade_(in|out)

Browse Source
This commit is contained in:
ConnorSkees 2020-02-16 16:03:22 -05:00
parent 048ab562b2
commit 96d29f45b8
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/builtin/color/opacity.rs
View File

@ -2,6 +2,7 @@ use std::collections::BTreeMap;
use super::Builtin; use super::Builtin;
use crate::common::QuoteKind; use crate::common::QuoteKind;
use crate::value::Number;
use crate::units::Unit; use crate::units::Unit;
use crate::value::Value; use crate::value::Value;
@ -28,7 +29,7 @@ pub(crate) fn register(f: &mut BTreeMap<String, Builtin>) {
v => return Err(format!("$color: {} is not a color.", v).into()), v => return Err(format!("$color: {} is not a color.", v).into()),
}; };
let amount = match arg!(args, 1, "amount").eval() { let amount = match arg!(args, 1, "amount").eval() {
Value::Dimension(n, _) => n, Value::Dimension(n, u) => bound!("amount", n, u, 0, 1),
v => return Err(format!("$amount: {} is not a number.", v).into()), v => return Err(format!("$amount: {} is not a number.", v).into()),
}; };
Ok(Value::Color(color.fade_in(amount))) Ok(Value::Color(color.fade_in(amount)))
@ -40,7 +41,7 @@ pub(crate) fn register(f: &mut BTreeMap<String, Builtin>) {
v => return Err(format!("$color: {} is not a color.", v).into()), v => return Err(format!("$color: {} is not a color.", v).into()),
}; };
let amount = match arg!(args, 1, "amount").eval() { let amount = match arg!(args, 1, "amount").eval() {
Value::Dimension(n, _) => n, Value::Dimension(n, u) => bound!("amount", n, u, 0, 1),
v => return Err(format!("$amount: {} is not a number.", v).into()), v => return Err(format!("$amount: {} is not a number.", v).into()),
}; };
Ok(Value::Color(color.fade_in(amount))) Ok(Value::Color(color.fade_in(amount)))
@ -52,7 +53,7 @@ pub(crate) fn register(f: &mut BTreeMap<String, Builtin>) {
v => return Err(format!("$color: {} is not a color.", v).into()), v => return Err(format!("$color: {} is not a color.", v).into()),
}; };
let amount = match arg!(args, 1, "amount").eval() { let amount = match arg!(args, 1, "amount").eval() {
Value::Dimension(n, _) => n, Value::Dimension(n, u) => bound!("amount", n, u, 0, 1),
v => return Err(format!("$amount: {} is not a number.", v).into()), v => return Err(format!("$amount: {} is not a number.", v).into()),
}; };
Ok(Value::Color(color.fade_out(amount))) Ok(Value::Color(color.fade_out(amount)))
@ -64,7 +65,7 @@ pub(crate) fn register(f: &mut BTreeMap<String, Builtin>) {
v => return Err(format!("$color: {} is not a color.", v).into()), v => return Err(format!("$color: {} is not a color.", v).into()),
}; };
let amount = match arg!(args, 1, "amount").eval() { let amount = match arg!(args, 1, "amount").eval() {
Value::Dimension(n, _) => n, Value::Dimension(n, u) => bound!("amount", n, u, 0, 1),
v => return Err(format!("$amount: {} is not a number.", v).into()), v => return Err(format!("$amount: {} is not a number.", v).into()),
}; };
Ok(Value::Color(color.fade_out(amount))) Ok(Value::Color(color.fade_out(amount)))