Parser - Support for calls with arbitrary expressions as the callee

src/parser.rs

@@ -507,7 +507,7 @@ impl Parser {
     /// ```
     /// unary := "-" unary
     /// unary := "!" unary
-    /// unary := primary
+    /// unary := primary call_arguments*
     /// ```
     fn parse_unary(&mut self) -> ParserResult<ast::ExprNode> {
         if let Some(operator) = self.expect(&[TokenType::Bang, TokenType::Minus]) {
@@ -516,7 +516,11 @@ impl Parser {
                 right: Box::new(self.parse_unary()?),
             })
         } else {
-            self.parse_primary()
+            let mut expr = self.parse_primary()?;
+            while self.expect(&[TokenType::LeftParen]).is_some() {
+                expr = self.parse_call_arguments(expr)?;
+            }
+            Ok(expr)
         }
     }
 
@@ -543,27 +547,23 @@ impl Parser {
                 TokenType::Number(_) | &TokenType::String(_) => Ok(ast::ExprNode::Litteral {
                     value: self.advance().clone(),
                 }),
-                TokenType::Identifier(_) => {
+                TokenType::Identifier(_) => Ok(ast::ExprNode::Variable {
-                    let identifier = self.advance().clone();
+                    name: self.advance().clone(),
-                    if self.expect(&[TokenType::LeftParen]).is_some() {
+                }),
-                        self.parse_call(identifier)
-                    } else {
-                        Ok(ast::ExprNode::Variable { name: identifier })
-                    }
-                }
                 _ => Err(ParserError::new(self.peek(), "expected expression")),
             }
         }
     }
 
-    /// Parse the following rules:
+    /// Help parsing the following rules:
     /// ```
-    /// call      := IDENTIFIER "(" arguments? ")"
+    /// call      := expression "(" arguments? ")"
     /// arguments := expression ( "," expression )*
     /// ```
-    /// The `identifier` has already been read and is provided to the method;
+    fn parse_call_arguments(
-    /// the opening parenthesis has already been skipped.
+        &mut self,
-    fn parse_call(&mut self, name: Token) -> Result<ast::ExprNode, ParserError> {
+        callee: ast::ExprNode,
+    ) -> Result<ast::ExprNode, ParserError> {
         let mut arguments = Vec::new();
         if !self.check(&TokenType::RightParen) {
             loop {
@@ -583,7 +583,7 @@ impl Parser {
             .consume(&TokenType::RightParen, "')' expected after arguments")?
             .clone();
         Ok(ast::ExprNode::Call {
-            name,
+            callee: Box::new(callee),
             right_paren,
             arguments,
         })