add a new (sep) PEG special

src/core/peg.c

@@ -39,7 +39,7 @@
 typedef struct {
     const uint8_t *text_start;
     const uint8_t *text_end;
-    /* text_end will be restricted in a (sub) rule, but
+    /* text_end can be restricted by some rules, but
        outer_text_end will always contain the real end of
        input, which we need to generate a line mapping */
     const uint8_t *outer_text_end;
@@ -522,6 +522,49 @@ static const uint8_t *peg_rule(
             return window_end;
         }
 
+        case RULE_SEP: {
+            const uint8_t *saved_end = s->text_end;
+            const uint32_t *rule_separator = s->bytecode + rule[1];
+            const uint32_t *rule_subpattern = s->bytecode + rule[2];
+            const uint8_t *advance_to = text;
+
+            while (true) {
+                const uint8_t *text_start = text;
+
+                const uint8_t *separator_end = NULL;
+                CapState cs = cap_save(s);
+                down1(s);
+                while (text <= s->text_end) {
+                    separator_end = peg_rule(s, rule_separator, text);
+                    cap_load(s, cs);
+                    if (separator_end) {
+                        break;
+                    }
+                    text++;
+                }
+                up1(s);
+
+                const uint8_t *separator_start = separator_end ? text : s->text_end;
+
+                s->text_end = separator_start;
+                down1(s);
+                const uint8_t *subpattern_end = peg_rule(s, rule_subpattern, text_start);
+                up1(s);
+                s->text_end = saved_end;
+
+                if (!subpattern_end) {
+                    break;
+                }
+                advance_to = separator_start;
+                if (!separator_end) {
+                    break;
+                }
+                text = separator_end;
+            }
+
+            return advance_to;
+        }
+
         case RULE_REPLACE:
         case RULE_MATCHTIME: {
             uint32_t tag = rule[3];
@@ -1157,6 +1200,14 @@ static void spec_sub(Builder *b, int32_t argc, const Janet *argv) {
     emit_2(r, RULE_SUB, subrule1, subrule2);
 }
 
+static void spec_sep(Builder *b, int32_t argc, const Janet *argv) {
+    peg_fixarity(b, argc, 2);
+    Reserve r = reserve(b, 3);
+    uint32_t subrule1 = peg_compile1(b, argv[0]);
+    uint32_t subrule2 = peg_compile1(b, argv[1]);
+    emit_2(r, RULE_SEP, subrule1, subrule2);
+}
+
 #ifdef JANET_INT_TYPES
 #define JANET_MAX_READINT_WIDTH 8
 #else
@@ -1237,6 +1288,7 @@ static const SpecialPair peg_specials[] = {
     {"range", spec_range},
     {"repeat", spec_repeat},
     {"replace", spec_replace},
+    {"sep", spec_sep},
     {"sequence", spec_sequence},
     {"set", spec_set},
     {"some", spec_some},
@@ -1579,6 +1631,7 @@ static void *peg_unmarshal(JanetMarshalContext *ctx) {
                 i += 4;
                 break;
             case RULE_SUB:
+            case RULE_SEP:
                 /* [rule, rule] */
                 if (rule[1] >= blen) goto bad;
                 if (rule[2] >= blen) goto bad;

src/include/janet.h

@@ -2139,7 +2139,8 @@ typedef enum {
     RULE_READINT,      /* [(signedness << 4) | (endianess << 5) | bytewidth, tag] */
     RULE_UNREF,        /* [rule, tag] */
     RULE_CAPTURE_NUM,  /* [rule, tag] */
-    RULE_SUB           /* [rule, rule] */
+    RULE_SUB,          /* [rule, rule] */
+    RULE_SEP           /* [rule, rule] */
 } JanetPegOpcod;
 
 typedef struct {

test/suite-peg.janet

@@ -265,6 +265,7 @@
 (marshpeg ~(cmt "abcdf" ,identity))
 (marshpeg '(group "abc"))
 (marshpeg '(sub "abcdf" "abc"))
+(marshpeg '(sep "," (+ "a" "b" "c")))
 
 # Peg swallowing errors
 # 159651117
@@ -710,5 +711,40 @@
   "abcdef"
   @[])
 
+(test "sep: basic functionality"
+  ~(sep "," '1)
+  "a,b,c"
+  @["a" "b" "c"])
+
+(test "sep: does not consume separator if subpattern doesn't match afterwards"
+  ~(* (sep "," "a") '(to -1))
+  "a,a,b,c"
+  @[",b,c"])
+
+(test "sep: drops captures from separator pattern"
+  ~(sep '"," '1)
+  "a,b,c"
+  @["a" "b" "c"])
+
+(test "sep: can match zero times"
+  ~(* (sep "," "a") '(to -1))
+  "x,y,z"
+  @["x,y,z"])
+
+(test "sep: does not consume trailing separator"
+  ~(* (sep "," '1) '(to -1))
+  "a,b,c,"
+  @["a" "b" "c" ","])
+
+(test "sep: can match empty subpatterns"
+  ~(sep "," ':w*)
+  ",a,,bar,,,c,,"
+  @["" "a" "" "bar" "" "" "c" "" ""])
+
+(test "sep: subpattern is limited to only text before the separator"
+  ~(sep "," '(to -1))
+  "a,,bar,c"
+  @["a" "" "bar" "c"])
+
 (end-suite)