diff --git a/src/parser.rs b/src/parser.rs index 6945213..ce46804 100644 --- a/src/parser.rs +++ b/src/parser.rs @@ -123,13 +123,7 @@ where } 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; - } - } + let args = self.parse_fn_args()?; self.next_expected(Token::ParenR)?; let semi = self.next_expected(Token::Semicolon)?; Ok(FnCall { @@ -229,13 +223,7 @@ where match self.peek() { 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; - } - } + let args = self.parse_fn_args()?; let rparen = self.next_expected(Token::ParenR)?; let fncall = FnCall { name: ident, @@ -266,6 +254,17 @@ where }) } + fn parse_fn_args(&mut self) -> Result, 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 { let lbrace = self.next_expected(Token::CurlyBracketL)?; let mut stmts = Vec::new();