Factored out fn param parsing.

This commit is contained in:
2026-11-15 13:31:25 +01:00
parent 6168950fb8
commit 86587d726c
+13 -14
View File
@@ -123,13 +123,7 @@ where
} }
Some(Token::ParenL) => { Some(Token::ParenL) => {
self.next().unwrap(); self.next().unwrap();
let mut args = Vec::new(); let args = self.parse_fn_args()?;
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)?; self.next_expected(Token::ParenR)?;
let semi = self.next_expected(Token::Semicolon)?; let semi = self.next_expected(Token::Semicolon)?;
Ok(FnCall { Ok(FnCall {
@@ -229,13 +223,7 @@ where
match self.peek() { match self.peek() {
Some(Token::ParenL) => { Some(Token::ParenL) => {
self.next().unwrap(); self.next().unwrap();
let mut args = Vec::new(); let args = self.parse_fn_args()?;
while self.peek() != Some(&Token::ParenR) {
args.push(self.parse_expr()?);
if self.next_if(Token::Comma).is_none() {
break;
}
}
let rparen = self.next_expected(Token::ParenR)?; let rparen = self.next_expected(Token::ParenR)?;
let fncall = FnCall { let fncall = FnCall {
name: ident, name: ident,
@@ -266,6 +254,17 @@ where
}) })
} }
fn parse_fn_args(&mut self) -> Result<Vec<Expr>, ParseError> {
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;
}
}
Ok(args)
}
fn parse_block(&mut self) -> Result<Block, ParseError> { fn parse_block(&mut self) -> Result<Block, ParseError> {
let lbrace = self.next_expected(Token::CurlyBracketL)?; let lbrace = self.next_expected(Token::CurlyBracketL)?;
let mut stmts = Vec::new(); let mut stmts = Vec::new();