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

handle builtin functions in get-function

Browse Source
This commit is contained in:
ConnorSkees 2020-04-03 23:47:56 -04:00
parent 3f98d1abca
commit 81c85a6f86
14 changed files with 165 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/builtin/color/hsl.rs
View File

@ -11,7 +11,7 @@ use crate::value::{Number, Value};
pub(crate) fn register(f: &mut HashMap<String, Builtin>) { pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
f.insert( f.insert(
"hsl".to_owned(), "hsl".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
if args.is_empty() { if args.is_empty() {
return Err("Missing argument $channels.".into()); return Err("Missing argument $channels.".into());
} }
@ -89,7 +89,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"hsla".to_owned(), "hsla".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
if args.is_empty() { if args.is_empty() {
return Err("Missing argument $channels.".into()); return Err("Missing argument $channels.".into());
} }
@ -167,7 +167,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"hue".to_owned(), "hue".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
max_args!(args, 1); max_args!(args, 1);
match arg!(args, 0, "color") { match arg!(args, 0, "color") {
Value::Color(c) => Ok(Value::Dimension(c.hue(), Unit::Deg)), Value::Color(c) => Ok(Value::Dimension(c.hue(), Unit::Deg)),
@ -177,7 +177,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"saturation".to_owned(), "saturation".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
max_args!(args, 1); max_args!(args, 1);
match arg!(args, 0, "color") { match arg!(args, 0, "color") {
Value::Color(c) => Ok(Value::Dimension(c.saturation(), Unit::Percent)), Value::Color(c) => Ok(Value::Dimension(c.saturation(), Unit::Percent)),
@ -187,7 +187,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"lightness".to_owned(), "lightness".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
max_args!(args, 1); max_args!(args, 1);
match arg!(args, 0, "color") { match arg!(args, 0, "color") {
Value::Color(c) => Ok(Value::Dimension(c.lightness(), Unit::Percent)), Value::Color(c) => Ok(Value::Dimension(c.lightness(), Unit::Percent)),
@ -197,7 +197,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"adjust-hue".to_owned(), "adjust-hue".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
max_args!(args, 2); max_args!(args, 2);
let color = match arg!(args, 0, "color") { let color = match arg!(args, 0, "color") {
Value::Color(c) => c, Value::Color(c) => c,
@ -212,7 +212,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"lighten".to_owned(), "lighten".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
max_args!(args, 2); max_args!(args, 2);
let color = match arg!(args, 0, "color") { let color = match arg!(args, 0, "color") {
Value::Color(c) => c, Value::Color(c) => c,
@ -227,7 +227,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"darken".to_owned(), "darken".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
max_args!(args, 2); max_args!(args, 2);
let color = match arg!(args, 0, "color") { let color = match arg!(args, 0, "color") {
Value::Color(c) => c, Value::Color(c) => c,
@ -242,7 +242,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"saturate".to_owned(), "saturate".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
max_args!(args, 2); max_args!(args, 2);
if args.len() == 1 { if args.len() == 1 {
return Ok(Value::Ident( return Ok(Value::Ident(
@ -270,7 +270,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"desaturate".to_owned(), "desaturate".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
max_args!(args, 2); max_args!(args, 2);
let color = match arg!(args, 0, "color") { let color = match arg!(args, 0, "color") {
Value::Color(c) => c, Value::Color(c) => c,
@ -285,7 +285,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"grayscale".to_owned(), "grayscale".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
max_args!(args, 1); max_args!(args, 1);
let color = match arg!(args, 0, "color") { let color = match arg!(args, 0, "color") {
Value::Color(c) => c, Value::Color(c) => c,
@ -302,7 +302,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"complement".to_owned(), "complement".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
max_args!(args, 1); max_args!(args, 1);
let color = match arg!(args, 0, "color") { let color = match arg!(args, 0, "color") {
Value::Color(c) => c, Value::Color(c) => c,
@ -313,7 +313,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"invert".to_owned(), "invert".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
max_args!(args, 2); max_args!(args, 2);
let weight = match arg!( let weight = match arg!(
args, args,

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

@ -9,7 +9,7 @@ use crate::value::Value;
pub(crate) fn register(f: &mut HashMap<String, Builtin>) { pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
f.insert( f.insert(
"alpha".to_owned(), "alpha".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
max_args!(args, 1); max_args!(args, 1);
match arg!(args, 0, "color") { match arg!(args, 0, "color") {
Value::Color(c) => Ok(Value::Dimension(c.alpha(), Unit::None)), Value::Color(c) => Ok(Value::Dimension(c.alpha(), Unit::None)),
@ -19,7 +19,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"opacity".to_owned(), "opacity".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
max_args!(args, 1); max_args!(args, 1);
match arg!(args, 0, "color") { match arg!(args, 0, "color") {
Value::Color(c) => Ok(Value::Dimension(c.alpha(), Unit::None)), Value::Color(c) => Ok(Value::Dimension(c.alpha(), Unit::None)),
@ -33,7 +33,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"opacify".to_owned(), "opacify".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
max_args!(args, 2); max_args!(args, 2);
let color = match arg!(args, 0, "color") { let color = match arg!(args, 0, "color") {
Value::Color(c) => c, Value::Color(c) => c,
@ -48,7 +48,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"fade-in".to_owned(), "fade-in".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
max_args!(args, 2); max_args!(args, 2);
let color = match arg!(args, 0, "color") { let color = match arg!(args, 0, "color") {
Value::Color(c) => c, Value::Color(c) => c,
@ -63,7 +63,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"transparentize".to_owned(), "transparentize".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
max_args!(args, 2); max_args!(args, 2);
let color = match arg!(args, 0, "color") { let color = match arg!(args, 0, "color") {
Value::Color(c) => c, Value::Color(c) => c,
@ -78,7 +78,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"fade-out".to_owned(), "fade-out".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
max_args!(args, 2); max_args!(args, 2);
let color = match arg!(args, 0, "color") { let color = match arg!(args, 0, "color") {
Value::Color(c) => c, Value::Color(c) => c,

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

@ -31,7 +31,7 @@ macro_rules! opt_hsl {
} }
pub(crate) fn register(f: &mut HashMap<String, Builtin>) { pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
f.insert("change-color".to_owned(), Box::new(|mut args, _| { f.insert("change-color".to_owned(), Builtin::new(|mut args, _| {
if args.get_positional(1).is_some() { if args.get_positional(1).is_some() {
return Err("Only one positional argument is allowed. All other arguments must be passed by name.".into()); return Err("Only one positional argument is allowed. All other arguments must be passed by name.".into());
} }
@ -73,7 +73,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
})); }));
f.insert( f.insert(
"adjust-color".to_owned(), "adjust-color".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
let color = match arg!(args, 0, "color") { let color = match arg!(args, 0, "color") {
Value::Color(c) => c, Value::Color(c) => c,
v => return Err(format!("$color: {} is not a color.", v).into()), v => return Err(format!("$color: {} is not a color.", v).into()),
@ -123,7 +123,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"scale-color".to_owned(), "scale-color".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
let color = match arg!(args, 0, "color") { let color = match arg!(args, 0, "color") {
Value::Color(c) => c, Value::Color(c) => c,
v => return Err(format!("$color: {} is not a color.", v).into()), v => return Err(format!("$color: {} is not a color.", v).into()),
@ -209,7 +209,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"ie-hex-str".to_owned(), "ie-hex-str".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
max_args!(args, 1); max_args!(args, 1);
let color = match arg!(args, 0, "color") { let color = match arg!(args, 0, "color") {
Value::Color(c) => c, Value::Color(c) => c,

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

@ -10,7 +10,7 @@ use crate::value::{Number, Value};
pub(crate) fn register(f: &mut HashMap<String, Builtin>) { pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
f.insert( f.insert(
"rgb".to_owned(), "rgb".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
if args.is_empty() { if args.is_empty() {
return Err("Missing argument $channels.".into()); return Err("Missing argument $channels.".into());
} }
@ -132,7 +132,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"rgba".to_owned(), "rgba".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
if args.is_empty() { if args.is_empty() {
return Err("Missing argument $channels.".into()); return Err("Missing argument $channels.".into());
} }
@ -254,7 +254,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"red".to_owned(), "red".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
max_args!(args, 1); max_args!(args, 1);
match arg!(args, 0, "color") { match arg!(args, 0, "color") {
Value::Color(c) => Ok(Value::Dimension(c.red(), Unit::None)), Value::Color(c) => Ok(Value::Dimension(c.red(), Unit::None)),
@ -264,7 +264,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"green".to_owned(), "green".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
max_args!(args, 1); max_args!(args, 1);
match arg!(args, 0, "color") { match arg!(args, 0, "color") {
Value::Color(c) => Ok(Value::Dimension(c.green(), Unit::None)), Value::Color(c) => Ok(Value::Dimension(c.green(), Unit::None)),
@ -274,7 +274,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"blue".to_owned(), "blue".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
max_args!(args, 1); max_args!(args, 1);
match arg!(args, 0, "color") { match arg!(args, 0, "color") {
Value::Color(c) => Ok(Value::Dimension(c.blue(), Unit::None)), Value::Color(c) => Ok(Value::Dimension(c.blue(), Unit::None)),
@ -284,7 +284,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"mix".to_owned(), "mix".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
max_args!(args, 3); max_args!(args, 3);
let color1 = match arg!(args, 0, "color1") { let color1 = match arg!(args, 0, "color1") {
Value::Color(c) => c, Value::Color(c) => c,

18
src/builtin/list.rs
View File

@ -10,7 +10,7 @@ use crate::value::{Number, Value};
pub(crate) fn register(f: &mut HashMap<String, Builtin>) { pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
f.insert( f.insert(
"length".to_owned(), "length".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
max_args!(args, 1); max_args!(args, 1);
let len = match arg!(args, 0, "list") { let len = match arg!(args, 0, "list") {
Value::List(v, ..) => Number::from(v.len()), Value::List(v, ..) => Number::from(v.len()),
@ -22,7 +22,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"nth".to_owned(), "nth".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
max_args!(args, 2); max_args!(args, 2);
let list = match arg!(args, 0, "list") { let list = match arg!(args, 0, "list") {
Value::List(v, ..) => v, Value::List(v, ..) => v,
@ -60,7 +60,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"list-separator".to_owned(), "list-separator".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
max_args!(args, 1); max_args!(args, 1);
Ok(Value::Ident( Ok(Value::Ident(
match arg!(args, 0, "list") { match arg!(args, 0, "list") {
@ -74,7 +74,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"set-nth".to_owned(), "set-nth".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
max_args!(args, 3); max_args!(args, 3);
let (mut list, sep, brackets) = match arg!(args, 0, "list") { let (mut list, sep, brackets) = match arg!(args, 0, "list") {
Value::List(v, sep, b) => (v, sep, b), Value::List(v, sep, b) => (v, sep, b),
@ -115,7 +115,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"append".to_owned(), "append".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
max_args!(args, 3); max_args!(args, 3);
let (mut list, sep, brackets) = match arg!(args, 0, "list") { let (mut list, sep, brackets) = match arg!(args, 0, "list") {
Value::List(v, sep, b) => (v, sep, b), Value::List(v, sep, b) => (v, sep, b),
@ -145,7 +145,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"join".to_owned(), "join".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
max_args!(args, 4); max_args!(args, 4);
let (mut list1, sep1, brackets) = match arg!(args, 0, "list1") { let (mut list1, sep1, brackets) = match arg!(args, 0, "list1") {
Value::List(v, sep, brackets) => (v, sep, brackets), Value::List(v, sep, brackets) => (v, sep, brackets),
@ -204,7 +204,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"is-bracketed".to_owned(), "is-bracketed".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
max_args!(args, 1); max_args!(args, 1);
Ok(Value::bool(match arg!(args, 0, "list") { Ok(Value::bool(match arg!(args, 0, "list") {
Value::List(.., brackets) => match brackets { Value::List(.., brackets) => match brackets {
@ -217,7 +217,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"index".to_owned(), "index".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
max_args!(args, 2); max_args!(args, 2);
let list = match arg!(args, 0, "list") { let list = match arg!(args, 0, "list") {
Value::List(v, ..) => v, Value::List(v, ..) => v,
@ -242,7 +242,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"zip".to_owned(), "zip".to_owned(),
Box::new(|args, _| { Builtin::new(|args, _| {
let lists = args let lists = args
.get_variadic()? .get_variadic()?
.into_iter() .into_iter()

12
src/builtin/map.rs
View File

@ -7,7 +7,7 @@ use crate::value::{SassMap, Value};
pub(crate) fn register(f: &mut HashMap<String, Builtin>) { pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
f.insert( f.insert(
"map-get".to_owned(), "map-get".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
max_args!(args, 2); max_args!(args, 2);
let key = arg!(args, 1, "key"); let key = arg!(args, 1, "key");
let map = match arg!(args, 0, "map") { let map = match arg!(args, 0, "map") {
@ -20,7 +20,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"map-has-key".to_owned(), "map-has-key".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
max_args!(args, 2); max_args!(args, 2);
let key = arg!(args, 1, "key"); let key = arg!(args, 1, "key");
let map = match arg!(args, 0, "map") { let map = match arg!(args, 0, "map") {
@ -33,7 +33,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"map-keys".to_owned(), "map-keys".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
max_args!(args, 1); max_args!(args, 1);
let map = match arg!(args, 0, "map") { let map = match arg!(args, 0, "map") {
Value::Map(m) => m, Value::Map(m) => m,
@ -49,7 +49,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"map-values".to_owned(), "map-values".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
max_args!(args, 1); max_args!(args, 1);
let map = match arg!(args, 0, "map") { let map = match arg!(args, 0, "map") {
Value::Map(m) => m, Value::Map(m) => m,
@ -65,7 +65,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"map-merge".to_owned(), "map-merge".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
max_args!(args, 2); max_args!(args, 2);
let mut map1 = match arg!(args, 0, "map1") { let mut map1 = match arg!(args, 0, "map1") {
Value::Map(m) => m, Value::Map(m) => m,
@ -83,7 +83,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"map-remove".to_owned(), "map-remove".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
let mut map = match arg!(args, 0, "map") { let mut map = match arg!(args, 0, "map") {
Value::Map(m) => m, Value::Map(m) => m,
Value::List(v, ..) if v.is_empty() => SassMap::new(), Value::List(v, ..) if v.is_empty() => SassMap::new(),

12
src/builtin/math.rs
View File

@ -7,7 +7,7 @@ use crate::value::{Number, Value};
pub(crate) fn register(f: &mut HashMap<String, Builtin>) { pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
f.insert( f.insert(
"percentage".to_owned(), "percentage".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
max_args!(args, 1); max_args!(args, 1);
let num = match arg!(args, 0, "number") { let num = match arg!(args, 0, "number") {
Value::Dimension(n, Unit::None) => n * Number::from(100), Value::Dimension(n, Unit::None) => n * Number::from(100),
@ -21,7 +21,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"round".to_owned(), "round".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
max_args!(args, 1); max_args!(args, 1);
match arg!(args, 0, "number") { match arg!(args, 0, "number") {
Value::Dimension(n, u) => Ok(Value::Dimension(n.round(), u)), Value::Dimension(n, u) => Ok(Value::Dimension(n.round(), u)),
@ -31,7 +31,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"ceil".to_owned(), "ceil".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
max_args!(args, 1); max_args!(args, 1);
match arg!(args, 0, "number") { match arg!(args, 0, "number") {
Value::Dimension(n, u) => Ok(Value::Dimension(n.ceil(), u)), Value::Dimension(n, u) => Ok(Value::Dimension(n.ceil(), u)),
@ -41,7 +41,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"floor".to_owned(), "floor".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
max_args!(args, 1); max_args!(args, 1);
match arg!(args, 0, "number") { match arg!(args, 0, "number") {
Value::Dimension(n, u) => Ok(Value::Dimension(n.floor(), u)), Value::Dimension(n, u) => Ok(Value::Dimension(n.floor(), u)),
@ -51,7 +51,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"abs".to_owned(), "abs".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
max_args!(args, 1); max_args!(args, 1);
match arg!(args, 0, "number") { match arg!(args, 0, "number") {
Value::Dimension(n, u) => Ok(Value::Dimension(n.abs(), u)), Value::Dimension(n, u) => Ok(Value::Dimension(n.abs(), u)),
@ -61,7 +61,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"comparable".to_owned(), "comparable".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
max_args!(args, 2); max_args!(args, 2);
let unit1 = match arg!(args, 0, "number1") { let unit1 = match arg!(args, 0, "number1") {
Value::Dimension(_, u) => u, Value::Dimension(_, u) => u,

37
src/builtin/meta.rs
View File

@ -4,12 +4,12 @@ use super::{Builtin, GLOBAL_FUNCTIONS};
use crate::common::{Brackets, QuoteKind}; use crate::common::{Brackets, QuoteKind};
use crate::scope::global_var_exists; use crate::scope::global_var_exists;
use crate::unit::Unit; use crate::unit::Unit;
use crate::value::Value; use crate::value::{SassFunction, Value};
pub(crate) fn register(f: &mut HashMap<String, Builtin>) { pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
f.insert( f.insert(
"if".to_owned(), "if".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
max_args!(args, 3); max_args!(args, 3);
if arg!(args, 0, "condition").is_true()? { if arg!(args, 0, "condition").is_true()? {
Ok(arg!(args, 1, "if-true")) Ok(arg!(args, 1, "if-true"))
@ -20,7 +20,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"feature-exists".to_owned(), "feature-exists".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
max_args!(args, 1); max_args!(args, 1);
match arg!(args, 0, "feature") { match arg!(args, 0, "feature") {
Value::Ident(s, _) => match s.as_str() { Value::Ident(s, _) => match s.as_str() {
@ -47,7 +47,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"unit".to_owned(), "unit".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
max_args!(args, 1); max_args!(args, 1);
let unit = match arg!(args, 0, "number") { let unit = match arg!(args, 0, "number") {
Value::Dimension(_, u) => u.to_string(), Value::Dimension(_, u) => u.to_string(),
@ -58,7 +58,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"type-of".to_owned(), "type-of".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
max_args!(args, 1); max_args!(args, 1);
let value = arg!(args, 0, "value"); let value = arg!(args, 0, "value");
Ok(Value::Ident(value.kind()?.to_owned(), QuoteKind::None)) Ok(Value::Ident(value.kind()?.to_owned(), QuoteKind::None))
@ -66,7 +66,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"unitless".to_owned(), "unitless".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
max_args!(args, 1); max_args!(args, 1);
match arg!(args, 0, "number") { match arg!(args, 0, "number") {
Value::Dimension(_, Unit::None) => Ok(Value::True), Value::Dimension(_, Unit::None) => Ok(Value::True),
@ -77,7 +77,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"inspect".to_owned(), "inspect".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
max_args!(args, 1); max_args!(args, 1);
Ok(Value::Ident( Ok(Value::Ident(
match arg!(args, 0, "value") { match arg!(args, 0, "value") {
@ -85,6 +85,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
Brackets::None => "()".to_string(), Brackets::None => "()".to_string(),
Brackets::Bracketed => "[]".to_string(), Brackets::Bracketed => "[]".to_string(),
}, },
Value::Function(f) => format!("get-function(\"{}\")", f.name()),
v => v.to_string(), v => v.to_string(),
}, },
QuoteKind::None, QuoteKind::None,
@ -93,7 +94,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"variable-exists".to_owned(), "variable-exists".to_owned(),
Box::new(|mut args, scope| { Builtin::new(|mut args, scope| {
max_args!(args, 1); max_args!(args, 1);
match arg!(args, 0, "name") { match arg!(args, 0, "name") {
Value::Ident(s, _) => Ok(Value::bool(scope.var_exists(&s))), Value::Ident(s, _) => Ok(Value::bool(scope.var_exists(&s))),
@ -103,7 +104,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"global-variable-exists".to_owned(), "global-variable-exists".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
max_args!(args, 1); max_args!(args, 1);
match arg!(args, 0, "name") { match arg!(args, 0, "name") {
Value::Ident(s, _) => Ok(Value::bool(global_var_exists(&s))), Value::Ident(s, _) => Ok(Value::bool(global_var_exists(&s))),
@ -113,7 +114,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"mixin-exists".to_owned(), "mixin-exists".to_owned(),
Box::new(|mut args, scope| { Builtin::new(|mut args, scope| {
max_args!(args, 2); max_args!(args, 2);
match arg!(args, 0, "name") { match arg!(args, 0, "name") {
Value::Ident(s, _) => Ok(Value::bool(scope.mixin_exists(&s))), Value::Ident(s, _) => Ok(Value::bool(scope.mixin_exists(&s))),
@ -123,7 +124,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"function-exists".to_owned(), "function-exists".to_owned(),
Box::new(|mut args, scope| { Builtin::new(|mut args, scope| {
max_args!(args, 2); max_args!(args, 2);
match arg!(args, 0, "name") { match arg!(args, 0, "name") {
Value::Ident(s, _) => Ok(Value::bool( Value::Ident(s, _) => Ok(Value::bool(
@ -135,7 +136,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"get-function".to_owned(), "get-function".to_owned(),
Box::new(|mut args, scope| { Builtin::new(|mut args, scope| {
max_args!(args, 2); max_args!(args, 2);
let name = match arg!(args, 0, "name") { let name = match arg!(args, 0, "name") {
Value::Ident(s, _) => s, Value::Ident(s, _) => s,
@ -143,10 +144,18 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
}; };
let css = arg!(args, 1, "css" = Value::False).is_true()?; let css = arg!(args, 1, "css" = Value::False).is_true()?;
Ok(Value::Function(Box::new(scope.get_fn(&name)?), css)) let func = match scope.get_fn(&name) {
Ok(f) => SassFunction::UserDefined(Box::new(f), name),
Err(e) => match GLOBAL_FUNCTIONS.get(&name) {
Some(f) => SassFunction::Builtin(f.clone(), name),
None => return Err(e),
},
};
Ok(Value::Function(func))
}), }),
); );
f.insert("call".to_owned(), Box::new(|_args, _scope| { f.insert("call".to_owned(), Builtin::new(|_args, _scope| {
todo!("builtin function `call()` is blocked on refactoring how call args are stored and parsed") todo!("builtin function `call()` is blocked on refactoring how call args are stored and parsed")
// let func = arg!(args, 0, "function").to_string(); // let func = arg!(args, 0, "function").to_string();
// let func = match scope.get_fn(&func) { // let func = match scope.get_fn(&func) {

19
src/builtin/mod.rs
View File

@ -1,5 +1,6 @@
use once_cell::sync::Lazy; use once_cell::sync::Lazy;
use std::collections::HashMap; use std::collections::HashMap;
use std::sync::atomic::{AtomicUsize, Ordering};
use crate::args::CallArgs; use crate::args::CallArgs;
use crate::error::SassResult; use crate::error::SassResult;
@ -17,7 +18,23 @@ mod meta;
mod selector; mod selector;
mod string; mod string;
pub(crate) type Builtin = Box<dyn Fn(CallArgs, &Scope) -> SassResult<Value> + Send + Sync>; static FUNCTION_COUNT: AtomicUsize = AtomicUsize::new(0);
// TODO: impl Fn
#[derive(Clone)]
pub(crate) struct Builtin(pub fn(CallArgs, &Scope) -> SassResult<Value>, usize);
impl Builtin {
pub fn new(body: fn(CallArgs, &Scope) -> SassResult<Value>) -> Builtin {
let count = FUNCTION_COUNT.fetch_add(1, Ordering::Relaxed);
Self(body, count)
}
}
impl PartialEq for Builtin {
fn eq(&self, other: &Self) -> bool {
self.1 == other.1
}
}
pub(crate) static GLOBAL_FUNCTIONS: Lazy<HashMap<String, Builtin>> = Lazy::new(|| { pub(crate) static GLOBAL_FUNCTIONS: Lazy<HashMap<String, Builtin>> = Lazy::new(|| {
let mut m = HashMap::new(); let mut m = HashMap::new();

16
src/builtin/string.rs
View File

@ -11,7 +11,7 @@ use crate::value::{Number, Value};
pub(crate) fn register(f: &mut HashMap<String, Builtin>) { pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
f.insert( f.insert(
"to-upper-case".to_owned(), "to-upper-case".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
max_args!(args, 1); max_args!(args, 1);
match arg!(args, 0, "string") { match arg!(args, 0, "string") {
Value::Ident(i, q) => Ok(Value::Ident(i.to_ascii_uppercase(), q)), Value::Ident(i, q) => Ok(Value::Ident(i.to_ascii_uppercase(), q)),
@ -21,7 +21,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"to-lower-case".to_owned(), "to-lower-case".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
max_args!(args, 1); max_args!(args, 1);
match arg!(args, 0, "string") { match arg!(args, 0, "string") {
Value::Ident(i, q) => Ok(Value::Ident(i.to_ascii_lowercase(), q)), Value::Ident(i, q) => Ok(Value::Ident(i.to_ascii_lowercase(), q)),
@ -31,7 +31,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"str-length".to_owned(), "str-length".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
max_args!(args, 1); max_args!(args, 1);
match arg!(args, 0, "string") { match arg!(args, 0, "string") {
Value::Ident(i, _) => Ok(Value::Dimension( Value::Ident(i, _) => Ok(Value::Dimension(
@ -44,7 +44,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"quote".to_owned(), "quote".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
max_args!(args, 1); max_args!(args, 1);
match arg!(args, 0, "string") { match arg!(args, 0, "string") {
Value::Ident(i, _) => Ok(Value::Ident(i, QuoteKind::Double)), Value::Ident(i, _) => Ok(Value::Ident(i, QuoteKind::Double)),
@ -54,7 +54,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"unquote".to_owned(), "unquote".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
max_args!(args, 1); max_args!(args, 1);
match arg!(args, 0, "string") { match arg!(args, 0, "string") {
i @ Value::Ident(..) => Ok(i.unquote()), i @ Value::Ident(..) => Ok(i.unquote()),
@ -64,7 +64,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"str-slice".to_owned(), "str-slice".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
max_args!(args, 3); max_args!(args, 3);
let (string, quotes) = match arg!(args, 0, "string") { let (string, quotes) = match arg!(args, 0, "string") {
Value::Ident(s, q) => (s, q), Value::Ident(s, q) => (s, q),
@ -127,7 +127,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"str-index".to_owned(), "str-index".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
max_args!(args, 2); max_args!(args, 2);
let s1 = match arg!(args, 0, "string") { let s1 = match arg!(args, 0, "string") {
Value::Ident(i, _) => i, Value::Ident(i, _) => i,
@ -147,7 +147,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
); );
f.insert( f.insert(
"str-insert".to_owned(), "str-insert".to_owned(),
Box::new(|mut args, _| { Builtin::new(|mut args, _| {
max_args!(args, 3); max_args!(args, 3);
let (s1, quotes) = match arg!(args, 0, "string") { let (s1, quotes) = match arg!(args, 0, "string") {
Value::Ident(i, q) => (i, q.normalize()), Value::Ident(i, q) => (i, q.normalize()),

42
src/value/function.rs Normal file
View File

@ -0,0 +1,42 @@
use std::fmt;
use crate::atrule::Function;
use crate::builtin::Builtin;
#[derive(Clone)]
pub(crate) enum SassFunction {
Builtin(Builtin, String),
UserDefined(Box<Function>, String),
}
impl SassFunction {
pub fn name(&self) -> &str {
match self {
Self::Builtin(_, name) => name,
Self::UserDefined(_, name) => name,
}
}
}
impl fmt::Debug for SassFunction {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
todo!()
}
}
impl PartialEq for SassFunction {
fn eq(&self, other: &Self) -> bool {
match self {
Self::UserDefined(f, ..) => match other {
Self::UserDefined(f2, ..) => f == f2,
Self::Builtin(..) => false,
},
Self::Builtin(f, ..) => match other {
Self::UserDefined(..) => false,
Self::Builtin(f2, ..) => f == f2,
},
}
}
}
impl Eq for SassFunction {}

5
src/value/mod.rs
View File

@ -2,15 +2,16 @@ use std::cmp::Ordering;
use std::fmt::{self, Display, Write}; use std::fmt::{self, Display, Write};
use std::iter::Iterator; use std::iter::Iterator;
use crate::atrule::Function;
use crate::color::Color; use crate::color::Color;
use crate::common::{Brackets, ListSeparator, Op, QuoteKind}; use crate::common::{Brackets, ListSeparator, Op, QuoteKind};
use crate::error::SassResult; use crate::error::SassResult;
use crate::unit::{Unit, UNIT_CONVERSION_TABLE}; use crate::unit::{Unit, UNIT_CONVERSION_TABLE};
pub(crate) use function::SassFunction;
pub(crate) use map::SassMap; pub(crate) use map::SassMap;
pub(crate) use number::Number; pub(crate) use number::Number;
mod function;
mod map; mod map;
mod number; mod number;
mod ops; mod ops;
@ -32,7 +33,7 @@ pub(crate) enum Value {
Map(SassMap), Map(SassMap),
ArgList(Vec<Value>), ArgList(Vec<Value>),
/// Returned by `get-function()` /// Returned by `get-function()`
Function(Box<Function>, bool), Function(SassFunction),
} }
impl Display for Value { impl Display for Value {

2
src/value/parse.rs
View File

@ -368,7 +368,7 @@ impl Value {
Ok(f) => f, Ok(f) => f,
Err(_) => match GLOBAL_FUNCTIONS.get(&s) { Err(_) => match GLOBAL_FUNCTIONS.get(&s) {
Some(f) => { Some(f) => {
return Ok(IntermediateValue::Value(f( return Ok(IntermediateValue::Value(f.0(
eat_call_args(toks, scope, super_selector)?, eat_call_args(toks, scope, super_selector)?,
scope, scope,
)?)) )?))

20
tests/get-function.rs
View File

@ -32,3 +32,23 @@ test!(
a {b: type-of(get-function(user-defined));}", a {b: type-of(get-function(user-defined));}",
"a {\n b: function;\n}\n" "a {\n b: function;\n}\n"
); );
test!(
type_of_builtin_function,
"a {b: type-of(get-function(lighten));}",
"a {\n b: function;\n}\n"
);
test!(
same_builtin_function_is_equal,
"a {b: get-function(lighten) == get-function(lighten);}",
"a {\n b: true;\n}\n"
);
test!(
different_builtin_function_not_equal,
"a {b: get-function(lighten) == get-function(darken);}",
"a {\n b: false;\n}\n"
);
test!(
inspect_builtin_function,
"a {b: inspect(get-function(lighten));}",
"a {\n b: get-function(\"lighten\");\n}\n"
);