feat(parse): update repeat grammar

- support specifying min repeat count only (max: infinity), e.g. `{3,}`
thi-ng · Jul 19, 2020 · 7aae9ac · 7aae9ac
1 parent 22188a4
commit 7aae9ac
Showing 1 changed file with 3 additions and 8 deletions.
diff --git a/packages/parse/src/grammar.ts b/packages/parse/src/grammar.ts
@@ -57,12 +57,7 @@ const REPEAT = maybe(
         oneOf("?*+", "repeat"),
         collect(
             seq(
-                [
-                    litD("{"),
-                    UINT,
-                    maybe(hoistResult(seq([litD(","), UINT]))),
-                    litD("}"),
-                ],
+                [litD("{"), UINT, maybe(lit(",")), maybe(UINT), litD("}")],
                 "repeatN"
             )
         ),
@@ -320,8 +315,8 @@ const compileRepeat = (
                 return parser;
         }
     } else if (rspec.id === "repeatN") {
-        const [n, m] = rspec.result;
-        return repeat(parser, n, m || n);
+        const [n, sep, m] = rspec.result;
+        return repeat(parser, n, sep ? m || Infinity : m || n);
     }
     return parser;
 };