Merge pull request #4 from Masynchin/master

Simplify call expression parse
orsinium-labs · Jun 22, 2023 · ddd910a · ddd910a
2 parents 3256622 + d23716b
commit ddd910a
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/src/parser.rs b/src/parser.rs
@@ -111,16 +111,13 @@ fn parse_expression(root: Pair<Rule>) -> Expr {
             }
         }
         Rule::call => {
-            let mut subpairs = root.into_inner();
-            let p1 = subpairs.next().unwrap();
-            let mut target = parse_expression(p1);
-            for p in subpairs {
-                target = Expr::Call {
+            root.into_inner()
+                .map(parse_expression)
+                .reduce(|target, arg| Expr::Call {
                     target: Box::new(target),
-                    arg: Box::new(parse_expression(p)),
-                }
-            }
-            target
+                    arg: Box::new(arg)
+                })
+                .unwrap()
         }
         Rule::identifier => Expr::Id {
             name: root.as_str().parse().unwrap(),