simplify declaration of rgb fns

This commit is contained in:
ConnorSkees 2020-04-30 19:04:32 -04:00
parent 4cfa29c971
commit 170759239a

View File

@ -3,15 +3,17 @@ use super::GlobalFunctionMap;
use num_traits::One; use num_traits::One;
use super::Builtin; use super::Builtin;
use crate::args::CallArgs;
use crate::color::Color; use crate::color::Color;
use crate::common::QuoteKind; use crate::common::QuoteKind;
use crate::error::SassResult;
use crate::scope::Scope;
use crate::selector::Selector;
use crate::unit::Unit; use crate::unit::Unit;
use crate::value::{Number, Value}; use crate::value::{Number, Value};
pub(crate) fn register(f: &mut GlobalFunctionMap) { pub(crate) fn register(f: &mut GlobalFunctionMap) {
f.insert( fn rgb(mut args: CallArgs, scope: &Scope, super_selector: &Selector) -> SassResult<Value> {
"rgb",
Builtin::new(|mut args, scope, super_selector| {
if args.is_empty() { if args.is_empty() {
return Err(("Missing argument $channels.", args.span()).into()); return Err(("Missing argument $channels.", args.span()).into());
} }
@ -176,9 +178,7 @@ pub(crate) fn register(f: &mut GlobalFunctionMap) {
} else { } else {
let red = match arg!(args, scope, super_selector, 0, "red") { let red = match arg!(args, scope, super_selector, 0, "red") {
Value::Dimension(n, Unit::None) => n, Value::Dimension(n, Unit::None) => n,
Value::Dimension(n, Unit::Percent) => { Value::Dimension(n, Unit::Percent) => (n / Number::from(100)) * Number::from(255),
(n / Number::from(100)) * Number::from(255)
}
v @ Value::Dimension(..) => { v @ Value::Dimension(..) => {
return Err(( return Err((
format!( format!(
@ -218,9 +218,7 @@ pub(crate) fn register(f: &mut GlobalFunctionMap) {
}; };
let green = match arg!(args, scope, super_selector, 1, "green") { let green = match arg!(args, scope, super_selector, 1, "green") {
Value::Dimension(n, Unit::None) => n, Value::Dimension(n, Unit::None) => n,
Value::Dimension(n, Unit::Percent) => { Value::Dimension(n, Unit::Percent) => (n / Number::from(100)) * Number::from(255),
(n / Number::from(100)) * Number::from(255)
}
v @ Value::Dimension(..) => { v @ Value::Dimension(..) => {
return Err(( return Err((
format!( format!(
@ -259,9 +257,7 @@ pub(crate) fn register(f: &mut GlobalFunctionMap) {
}; };
let blue = match arg!(args, scope, super_selector, 2, "blue") { let blue = match arg!(args, scope, super_selector, 2, "blue") {
Value::Dimension(n, Unit::None) => n, Value::Dimension(n, Unit::None) => n,
Value::Dimension(n, Unit::Percent) => { Value::Dimension(n, Unit::Percent) => (n / Number::from(100)) * Number::from(255),
(n / Number::from(100)) * Number::from(255)
}
v @ Value::Dimension(..) => { v @ Value::Dimension(..) => {
return Err(( return Err((
format!( format!(
@ -334,11 +330,9 @@ pub(crate) fn register(f: &mut GlobalFunctionMap) {
red, green, blue, alpha, red, green, blue, alpha,
)))) ))))
} }
}), }
);
f.insert( fn rgba(mut args: CallArgs, scope: &Scope, super_selector: &Selector) -> SassResult<Value> {
"rgba",
Builtin::new(|mut args, scope, super_selector| {
if args.is_empty() { if args.is_empty() {
return Err(("Missing argument $channels.", args.span()).into()); return Err(("Missing argument $channels.", args.span()).into());
} }
@ -503,9 +497,7 @@ pub(crate) fn register(f: &mut GlobalFunctionMap) {
} else { } else {
let red = match arg!(args, scope, super_selector, 0, "red") { let red = match arg!(args, scope, super_selector, 0, "red") {
Value::Dimension(n, Unit::None) => n, Value::Dimension(n, Unit::None) => n,
Value::Dimension(n, Unit::Percent) => { Value::Dimension(n, Unit::Percent) => (n / Number::from(100)) * Number::from(255),
(n / Number::from(100)) * Number::from(255)
}
v @ Value::Dimension(..) => { v @ Value::Dimension(..) => {
return Err(( return Err((
format!( format!(
@ -545,9 +537,7 @@ pub(crate) fn register(f: &mut GlobalFunctionMap) {
}; };
let green = match arg!(args, scope, super_selector, 1, "green") { let green = match arg!(args, scope, super_selector, 1, "green") {
Value::Dimension(n, Unit::None) => n, Value::Dimension(n, Unit::None) => n,
Value::Dimension(n, Unit::Percent) => { Value::Dimension(n, Unit::Percent) => (n / Number::from(100)) * Number::from(255),
(n / Number::from(100)) * Number::from(255)
}
v @ Value::Dimension(..) => { v @ Value::Dimension(..) => {
return Err(( return Err((
format!( format!(
@ -586,9 +576,7 @@ pub(crate) fn register(f: &mut GlobalFunctionMap) {
}; };
let blue = match arg!(args, scope, super_selector, 2, "blue") { let blue = match arg!(args, scope, super_selector, 2, "blue") {
Value::Dimension(n, Unit::None) => n, Value::Dimension(n, Unit::None) => n,
Value::Dimension(n, Unit::Percent) => { Value::Dimension(n, Unit::Percent) => (n / Number::from(100)) * Number::from(255),
(n / Number::from(100)) * Number::from(255)
}
v @ Value::Dimension(..) => { v @ Value::Dimension(..) => {
return Err(( return Err((
format!( format!(
@ -661,11 +649,9 @@ pub(crate) fn register(f: &mut GlobalFunctionMap) {
red, green, blue, alpha, red, green, blue, alpha,
)))) ))))
} }
}), }
);
f.insert( fn red(mut args: CallArgs, scope: &Scope, super_selector: &Selector) -> SassResult<Value> {
"red",
Builtin::new(|mut args, scope, super_selector| {
args.max_args(1)?; args.max_args(1)?;
match arg!(args, scope, super_selector, 0, "color") { match arg!(args, scope, super_selector, 0, "color") {
Value::Color(c) => Ok(Value::Dimension(c.red(), Unit::None)), Value::Color(c) => Ok(Value::Dimension(c.red(), Unit::None)),
@ -675,11 +661,9 @@ pub(crate) fn register(f: &mut GlobalFunctionMap) {
) )
.into()), .into()),
} }
}), }
);
f.insert( fn green(mut args: CallArgs, scope: &Scope, super_selector: &Selector) -> SassResult<Value> {
"green",
Builtin::new(|mut args, scope, super_selector| {
args.max_args(1)?; args.max_args(1)?;
match arg!(args, scope, super_selector, 0, "color") { match arg!(args, scope, super_selector, 0, "color") {
Value::Color(c) => Ok(Value::Dimension(c.green(), Unit::None)), Value::Color(c) => Ok(Value::Dimension(c.green(), Unit::None)),
@ -689,11 +673,9 @@ pub(crate) fn register(f: &mut GlobalFunctionMap) {
) )
.into()), .into()),
} }
}), }
);
f.insert( fn blue(mut args: CallArgs, scope: &Scope, super_selector: &Selector) -> SassResult<Value> {
"blue",
Builtin::new(|mut args, scope, super_selector| {
args.max_args(1)?; args.max_args(1)?;
match arg!(args, scope, super_selector, 0, "color") { match arg!(args, scope, super_selector, 0, "color") {
Value::Color(c) => Ok(Value::Dimension(c.blue(), Unit::None)), Value::Color(c) => Ok(Value::Dimension(c.blue(), Unit::None)),
@ -703,11 +685,9 @@ pub(crate) fn register(f: &mut GlobalFunctionMap) {
) )
.into()), .into()),
} }
}), }
);
f.insert( fn mix(mut args: CallArgs, scope: &Scope, super_selector: &Selector) -> SassResult<Value> {
"mix",
Builtin::new(|mut args, scope, super_selector| {
args.max_args(3)?; args.max_args(3)?;
let color1 = match arg!(args, scope, super_selector, 0, "color1") { let color1 = match arg!(args, scope, super_selector, 0, "color1") {
Value::Color(c) => c, Value::Color(c) => c,
@ -751,6 +731,12 @@ pub(crate) fn register(f: &mut GlobalFunctionMap) {
} }
}; };
Ok(Value::Color(Box::new(color1.mix(&color2, weight)))) Ok(Value::Color(Box::new(color1.mix(&color2, weight))))
}), }
);
f.insert("rgb", Builtin::new(rgb));
f.insert("rgba", Builtin::new(rgba));
f.insert("red", Builtin::new(red));
f.insert("green", Builtin::new(green));
f.insert("blue", Builtin::new(blue));
f.insert("mix", Builtin::new(mix));
} }