From 8072a9f915626ea5e8e7706c7042e8281d6983b2 Mon Sep 17 00:00:00 2001 From: Rogier Reerink Date: Sun, 15 Nov 2026 11:10:18 +0100 Subject: [PATCH] FnCall parsing. --- src/ast.rs | 4 +++ src/parser.rs | 76 +++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 78 insertions(+), 2 deletions(-) diff --git a/src/ast.rs b/src/ast.rs index 309bb57..ea50e49 100644 --- a/src/ast.rs +++ b/src/ast.rs @@ -44,6 +44,7 @@ pub struct Let { pub struct Assign { pub name: Ident, pub value: Expr, + pub span: Span, } #[derive(Debug, PartialEq)] @@ -51,12 +52,14 @@ pub struct FnDef { pub name: Ident, pub params: Vec, pub body: Vec, + pub span: Span, } #[derive(Debug, PartialEq)] pub struct FnParam { pub name: Ident, pub ty: Type, + pub span: Span, } #[derive(Debug, PartialEq)] @@ -100,6 +103,7 @@ pub struct LitString { pub struct FnCall { pub name: Ident, pub args: Vec, + pub span: Span, } #[derive(Debug, PartialEq)] diff --git a/src/parser.rs b/src/parser.rs index b7a8d2c..2f1cdcb 100644 --- a/src/parser.rs +++ b/src/parser.rs @@ -1,7 +1,7 @@ use std::iter::Peekable; use crate::{ - ast::{Expr, Ident, Let, LitNumber, LitString, Stmt}, + ast::{Expr, FnCall, Ident, Let, LitNumber, LitString, Stmt}, lexer::Token, span::{Span, Spanned}, }; @@ -51,6 +51,14 @@ where } } + fn next_if(&mut self, expected: Token) -> Option> { + if self.peek() == Some(&expected) { + self.next() + } else { + None + } + } + fn slice(&self, span: Span) -> Result<&'a str, ParseError> { self.input .get(span.start()..span.end()) @@ -136,7 +144,24 @@ where name: raw.to_string(), span: *token.span(), }; - Ok(Expr::Variable(ident)) + 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()?); + self.next_if(Token::Comma); + } + let rparen = self.next_expected(Token::ParenR)?; + let fncall = FnCall { + name: ident, + args, + span: token.span_to(&rparen), + }; + Ok(Expr::FnCall(fncall)) + } + _ => Ok(Expr::Variable(ident)), + } } Some(_) => Err(ParseError { span: self.current_span, @@ -291,4 +316,51 @@ mod tests { ); pretty_assertions::assert_eq!(parser.next(), None); } + + #[test] + fn expr_fncall() { + let input = "f(x)"; + let lexer = Lexer::new(input); + let mut parser = Parser::new(input, lexer); + pretty_assertions::assert_eq!( + parser.parse_expr(), + Ok(Expr::FnCall(FnCall { + name: Ident { + name: "f".to_string(), + span: Span::new(0, 1), + }, + args: vec![Expr::Variable(Ident { + name: "x".to_string(), + span: Span::new(2, 3), + })], + span: Span::new(0, 4), + })) + ); + pretty_assertions::assert_eq!(parser.next(), None); + + let input = "f(x, y)"; + let lexer = Lexer::new(input); + let mut parser = Parser::new(input, lexer); + pretty_assertions::assert_eq!( + parser.parse_expr(), + Ok(Expr::FnCall(FnCall { + name: Ident { + name: "f".to_string(), + span: Span::new(0, 1), + }, + args: vec![ + Expr::Variable(Ident { + name: "x".to_string(), + span: Span::new(2, 3), + }), + Expr::Variable(Ident { + name: "y".to_string(), + span: Span::new(5, 6), + }), + ], + span: Span::new(0, 7), + })) + ); + pretty_assertions::assert_eq!(parser.next(), None); + } }