use chainchomp

Author: zahash

Cargo.lock

@@ -11,6 +11,7 @@ repository = "https://github.com/zahash/csc"
 regex = { version = "1" }
 lazy_static = { version = "1" }
 rustyline = { version = "12" }
+chainchomp = { version = "0.1" }
 
 [dev-dependencies]
 pretty_assertions = { version = "1" }
@@ -29,6 +30,11 @@ ci = ["github"]
 # The installers to generate for each app
 installers = []
 # Target platforms to build apps for (Rust target-triple syntax)
-targets = ["x86_64-unknown-linux-gnu", "aarch64-apple-darwin", "x86_64-apple-darwin", "x86_64-pc-windows-msvc"]
+targets = [
+    "x86_64-unknown-linux-gnu",
+    "aarch64-apple-darwin",
+    "x86_64-apple-darwin",
+    "x86_64-pc-windows-msvc",
+]
 # Publish jobs to run in CI
 pr-run-mode = "plan"

Cargo.toml

@@ -1,5 +1,7 @@
 use std::fmt::{self, Display, Formatter};
 
+use chainchomp::ctx_free::many_delimited;
+
 use crate::lex::Token;
 
 #[derive(Debug)]
@@ -206,12 +208,8 @@ fn parse_postfix_expr<'text>(
 ) -> Result<(PostfixExpr<'text>, usize), ParseError> {
     if let Some(Token::Ident(name)) = tokens.get(pos) {
         if let Some(Token::Symbol("(")) = tokens.get(pos + 1) {
-            let (args, pos) = many(
-                tokens,
-                pos + 2,
-                parse_assignment_expr,
-                Some(Token::Symbol(",")),
-            );
+            let (args, pos) =
+                many_delimited(tokens, pos + 2, parse_assignment_expr, &Token::Symbol(","));
 
             let Some(Token::Symbol(")")) = tokens.get(pos) else {
                 return Err(ParseError::Expected(Token::Symbol(")"), pos));
@@ -253,31 +251,6 @@ fn parse_primary_expr<'text>(
     }
 }
 
-fn many<'text, Ast>(
-    tokens: &[Token<'text>],
-    mut pos: usize,
-    parser: impl Fn(&[Token<'text>], usize) -> Result<(Ast, usize), ParseError>,
-    delimiter: Option<Token>,
-) -> (Vec<Ast>, usize) {
-    let mut list = vec![];
-
-    while let Ok((ast, next_pos)) = parser(tokens, pos) {
-        list.push(ast);
-        pos = next_pos;
-
-        if let Some(delimiter) = &delimiter {
-            match tokens.get(pos) {
-                Some(token) if token == delimiter => {
-                    pos += 1;
-                }
-                _ => break,
-            };
-        }
-    }
-
-    (list, pos)
-}
-
 impl<'text> Display for AssignmentExpr<'text> {
     fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
         match self {