feat(fsm): update not()

thi-ng · Jan 4, 2019 · a933607 · a933607
1 parent 980d488
commit a933607
Showing 1 changed file with 19 additions and 15 deletions.
diff --git a/packages/fsm/src/not.ts b/packages/fsm/src/not.ts
@@ -1,17 +1,21 @@
-import { Match, RES_FAIL, RES_PARTIAL, Matcher } from "./api";
+import { Match, RES_FAIL, RES_PARTIAL, Matcher, SeqCallback } from "./api";
 import { success } from "./success";
 
-export const not =
-    <T, C, R>(match: Matcher<T, C, R>, callback?): Matcher<T, C, R> =>
-        () => {
-            let m = match();
-            return (ctx, x) => {
-                const { type } = m(ctx, x);
-                return type === Match.FAIL ?
-                    success(callback && callback(ctx)) :
-                    type !== Match.PARTIAL ?
-                        // TODO Match.FULL_NC handling?
-                        RES_FAIL :
-                        RES_PARTIAL;
-            }
-        };
+export const not = <T, C, R>(
+    match: Matcher<T, C, R>,
+    callback?: SeqCallback<T, C, R>
+): Matcher<T, C, R> =>
+    () => {
+        let m = match();
+        const buf: T[] = [];
+        return (ctx, x) => {
+            buf.push(x);
+            const { type } = m(ctx, x);
+            return type === Match.FAIL ?
+                success(callback && callback(ctx, buf)) :
+                type !== Match.PARTIAL ?
+                    // TODO Match.FULL_NC handling?
+                    RES_FAIL :
+                    RES_PARTIAL;
+        }
+    };