Parse function calls in statements.

This commit is contained in:
2026-11-15 13:23:00 +01:00
parent 527b97463f
commit 6168950fb8
2 changed files with 59 additions and 8 deletions
+6
View File
@@ -27,6 +27,12 @@ impl From<Expr> for Stmt {
} }
} }
impl From<FnCall> for Stmt {
fn from(fn_call: FnCall) -> Self {
Expr::FnCall(fn_call).into()
}
}
impl From<Block> for Stmt { impl From<Block> for Stmt {
fn from(block: Block) -> Self { fn from(block: Block) -> Self {
Stmt::Block(block) Stmt::Block(block)
+46 -1
View File
@@ -109,7 +109,9 @@ where
name: self.slice(*ident.span())?.to_string(), name: self.slice(*ident.span())?.to_string(),
span: *ident.span(), span: *ident.span(),
}; };
self.next_expected(Token::Equals)?; match self.peek() {
Some(Token::Equals) => {
self.next().unwrap();
let expr = self.parse_expr()?; let expr = self.parse_expr()?;
let semi = self.next_expected(Token::Semicolon)?; let semi = self.next_expected(Token::Semicolon)?;
Ok(Assign { Ok(Assign {
@@ -119,6 +121,30 @@ where
} }
.into()) .into())
} }
Some(Token::ParenL) => {
self.next().unwrap();
let mut args = Vec::new();
while self.peek() != Some(&Token::ParenR) {
args.push(self.parse_expr()?);
if self.next_if(Token::Comma).is_none() {
break;
}
}
self.next_expected(Token::ParenR)?;
let semi = self.next_expected(Token::Semicolon)?;
Ok(FnCall {
span: ident.span.to(semi.span()),
name: ident,
args,
}
.into())
}
_ => Err(ParseError {
span: ident.span,
message: "Unexpected token after identifier".to_string(),
}),
}
}
Some(Token::CurlyBracketL) => Ok(Stmt::Block(self.parse_block()?).into()), Some(Token::CurlyBracketL) => Ok(Stmt::Block(self.parse_block()?).into()),
Some(Token::Fn) => { Some(Token::Fn) => {
let r#fn = self.next().unwrap(); let r#fn = self.next().unwrap();
@@ -509,6 +535,25 @@ mod tests {
})) }))
); );
pretty_assertions::assert_eq!(parser.next(), None); pretty_assertions::assert_eq!(parser.next(), None);
let input = "{ foo(); }";
let lexer = Lexer::new(input);
let mut parser = Parser::new(input, lexer);
pretty_assertions::assert_eq!(
parser.parse_stmt(),
Ok(Stmt::Block(Block {
stmts: vec![Stmt::Expr(Expr::FnCall(FnCall {
name: Ident {
name: "foo".to_string(),
span: Span::new(2, 5),
},
args: vec![],
span: Span::new(2, 8),
})),],
span: Span::new(0, 10),
}))
);
pretty_assertions::assert_eq!(parser.next(), None);
} }
#[test] #[test]