From 4135115229d27c54b70cd945e2211e652ab58d2f Mon Sep 17 00:00:00 2001
From: Bruce Hill <bruce@bruce-hill.com>
Date: Sun, 13 Sep 2020 23:31:38 -0700
Subject: Spruced up a bunch of stuff, tweaked the grammar, added docs

---
 vm.c | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

(limited to 'vm.c')

diff --git a/vm.c b/vm.c
index b69b3cb..2a44dd7 100644
--- a/vm.c
+++ b/vm.c
@@ -16,7 +16,6 @@ static match_t *get_capture_named(match_t *m, const char *name);
 static const char *opcode_names[] = {
     [VM_EMPTY] = "EMPTY",
     [VM_ANYCHAR] = "ANYCHAR",
-    [VM_ANYTHING_BUT] = "ANYTHING_BUT",
     [VM_STRING] = "STRING",
     [VM_RANGE] = "RANGE",
     [VM_NOT] = "NOT",
@@ -114,10 +113,7 @@ static match_t *_match(grammar_t *g, const char *str, vm_op_t *op, recursive_ref
             m->end = str + 1;
             return m;
         }
-        case VM_NOT: case VM_ANYTHING_BUT: {
-            if (op->op == VM_ANYTHING_BUT)
-                if (!*str || (!op->multiline && *str == '\n'))
-                    return NULL;
+        case VM_NOT: {
             match_t *m = _match(g, str, op->args.pat, rec);
             if (m != NULL) {
                 destroy_match(&m);
@@ -126,7 +122,6 @@ static match_t *_match(grammar_t *g, const char *str, vm_op_t *op, recursive_ref
             m = calloc(sizeof(match_t), 1);
             m->op = op;
             m->start = str;
-            if (op->op == VM_ANYTHING_BUT) ++str;
             m->end = str;
             return m;
         }
@@ -160,13 +155,11 @@ static match_t *_match(grammar_t *g, const char *str, vm_op_t *op, recursive_ref
             m->start = str;
             m->end = str;
             m->op = op;
-            if (op->args.repetitions.max == 0) return m;
 
             match_t **dest = &m->child;
-
             const char *prev = str;
-            size_t reps;
-            for (reps = 0; reps < (size_t)op->args.repetitions.max; ++reps) {
+            size_t reps = 0;
+            for (;;) {
                 // Separator
                 match_t *sep = NULL;
                 if (op->args.repetitions.sep != NULL && reps > 0) {
@@ -188,6 +181,12 @@ static match_t *_match(grammar_t *g, const char *str, vm_op_t *op, recursive_ref
                 dest = &p->nextsibling;
                 str = p->end;
                 prev = str;
+
+                ++reps;
+                if (op->args.repetitions.max != -1 && reps > (size_t)op->args.repetitions.max) {
+                    destroy_match(&m);
+                    return NULL;
+                }
             }
 
             if ((ssize_t)reps < op->args.repetitions.min) {
@@ -386,12 +385,6 @@ void print_pattern(vm_op_t *op)
             fprintf(stderr, ")");
             break;
         }
-        case VM_ANYTHING_BUT: {
-            fprintf(stderr, "anything but (");
-            print_pattern(op->args.pat);
-            fprintf(stderr, ")");
-            break;
-        }
         case VM_AFTER: {
             fprintf(stderr, "after (");
             print_pattern(op->args.pat);
-- 
cgit v1.2.3