jeff/dust
1
0
Fork 0
Code Issues

Add type arguments to function calls

Browse Source
This commit is contained in:
Jeff 2024-03-24 10:58:09 -04:00
parent 2b797c19f7
commit a0a9bc2fdf
3 changed files with 55 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dust-lang/src/abstract_tree/function_call.rs
View File

@ -9,16 +9,19 @@ use super::{AbstractNode, Action, Expression, Type, WithPosition};
#[derive(Debug, Clone, Eq, PartialEq, PartialOrd, Ord)]
pub struct FunctionCall {
function: Box<WithPosition<Expression>>,
type_arguments: Vec<WithPosition<Type>>,
arguments: Vec<WithPosition<Expression>>,
}
impl FunctionCall {
pub fn new(
function: WithPosition<Expression>,
type_arguments: Vec<WithPosition<Type>>,
arguments: Vec<WithPosition<Expression>>,
) -> Self {
FunctionCall {
function: Box::new(function),
type_arguments,
arguments,
}
}

43
dust-lang/src/parser.rs
View File

@ -291,6 +291,20 @@ pub fn parser<'src>() -> impl Parser<
.with_position(state.span())
});
let turbofish = r#type
.clone()
.separated_by(just(Token::Control(Control::Comma)))
.at_least(1)
.collect()
.delimited_by(
just(Token::Control(Control::ParenOpen)),
just(Token::Control(Control::ParenClose)),
)
.delimited_by(
just(Token::Control(Control::DoubleColon)),
just(Token::Control(Control::DoubleColon)),
);
let atom = choice((
range.clone(),
structure_instance.clone(),
@ -323,6 +337,7 @@ pub fn parser<'src>() -> impl Parser<
),
postfix(
3,
turbofish.clone().or_not().then(
positioned_expression
.clone()
.separated_by(just(Token::Control(Control::Comma)))
@ -331,8 +346,18 @@ pub fn parser<'src>() -> impl Parser<
just(Token::Control(Control::ParenOpen)),
just(Token::Control(Control::ParenClose)),
),
|function_expression, arguments, span| {
Expression::FunctionCall(FunctionCall::new(function_expression, arguments))
),
|function_expression,
(type_arguments, arguments): (
Option<Vec<WithPosition<Type>>>,
Vec<WithPosition<Expression>>,
),
span| {
Expression::FunctionCall(FunctionCall::new(
function_expression,
type_arguments.unwrap_or_else(|| Vec::with_capacity(0)),
arguments,
))
.with_position(span)
},
),
@ -690,6 +715,7 @@ mod tests {
vec![
Statement::Expression(Expression::FunctionCall(FunctionCall::new(
Expression::Identifier(Identifier::new("output")).with_position((13, 19)),
Vec::with_capacity(0),
vec![Expression::Value(ValueNode::String("hi".to_string()))
.with_position((20, 24))]
)))
@ -793,6 +819,19 @@ mod tests {
)))
.with_position((0, 13)),
Vec::with_capacity(0),
Vec::with_capacity(0),
)))
)
}
#[test]
fn function_call_with_type_arguments() {
assert_eq!(
parse(&lex("foobar::(str)::('hi')").unwrap()).unwrap()[0].node,
Statement::Expression(Expression::FunctionCall(FunctionCall::new(
Expression::Identifier(Identifier::new("foobar")).with_position((0, 6)),
vec![Type::String.with_position((9, 12))],
vec![Expression::Value(ValueNode::String("hi".to_string())).with_position((16, 20))],
)))
)
}

4
dust-lang/src/value.rs
View File

@ -51,8 +51,8 @@ impl Value {
Value(Arc::new(ValueInner::Range(range)))
}
pub fn string(string: String) -> Self {
Value(Arc::new(ValueInner::String(string)))
pub fn string<T: ToString>(to_string: T) -> Self {
Value(Arc::new(ValueInner::String(to_string.to_string())))
}
pub fn function(