bennu - npm Package Compare versions

Comparing version 17.2.1 to 17.2.2

dist_node/parse.js

@@ -243,7 +243,9 @@ /*
 (label = (function(name, p) {
-    return (p.run.hasOwnProperty("displayName") ? label(name, new(Parser)(unparser.bind(null, p))) : new(Parser)
-        (Object.defineProperty(p.run, "displayName", ({
-            value: name,
-            writable: false
-        }))));
+    return (p.run.hasOwnProperty("displayName") ? label(name, new(Parser)((function(state, m, cok, cerr, eok,
+        eerr) {
+        return new(Tail)(p.run, state, m, cok, cerr, eok, eerr);
+    }))) : new(Parser)(Object.defineProperty(p.run, "displayName", ({
+        value: name,
+        writable: false
+    }))));
 }));
@@ -254,3 +256,4 @@ (late = (function(def) {
         (value = (value || def()));
-        return unparser(value, state, m, cok, cerr, eok, eerr);
+        var p = value;
+        return new(Tail)(p.run, state, m, cok, cerr, eok, eerr);
     }));
@@ -279,7 +282,11 @@ }));
     return new(Parser)((function(state, m, cok, cerr, eok, eerr) {
-        return unparser(p, state, m, (function(x, state0, m0) {
-            return unparser(f(x), state0, m0, cok, cerr, cok, cerr);
-        }), cerr, (function(x, state0, m0) {
-            return unparser(f(x), state0, m0, cok, cerr, eok, eerr);
-        }), eerr);
+        var cok0 = (function(x, state0, m0) {
+            var p0 = f(x);
+            return new(Tail)(p0.run, state0, m0, cok, cerr, cok, cerr);
+        }),
+            eok0 = (function(x, state0, m0) {
+                var p0 = f(x);
+                return new(Tail)(p0.run, state0, m0, cok, cerr, eok, eerr);
+            });
+        return new(Tail)(p.run, state, m, cok0, cerr, eok0, eerr);
     }));
@@ -294,6 +301,6 @@ }));
 (Parser.prototype.map = (function(f) {
-    var y, self = this;
-    return bind(self, ((y = always), (function(z) {
-        return y(f(z));
-    })));
+    var self = this;
+    return chain(self, (function(z) {
+        return of(f(z));
+    }));
 }));
@@ -305,3 +312,3 @@ (Parser.map = (function(f, p) {
 (Parser.ap = (function(f, m) {
-    return bind(f, (function(f0) {
+    return chain(f, (function(f0) {
         return m.map(f0);
@@ -331,6 +338,5 @@ }));
 })))));
-var x = modifyParserState;
 (setParserState = (function(z) {
-    return x((function() {
-        return z;
+    return new(Parser)((function(state, m, _, _0, eok, _1) {
+        return eok(z, z, m);
     }));
@@ -344,4 +350,5 @@ }));
 (modifyState = (function(f) {
-    return modifyParserState((function(s) {
-        return s.setUserState(f(s.userState));
+    return new(Parser)((function(state, m, _, _0, eok, _1) {
+        var newState = state.setUserState(f(state.userState));
+        return eok(newState, newState, m);
     }));
@@ -359,6 +366,6 @@ }));
 })))));
-var x0 = modifyState;
 (setState = (function(z) {
-    return x0((function() {
-        return z;
+    return new(Parser)((function(state, m, _, _0, eok, _1) {
+        var newState = state.setUserState(z);
+        return eok(newState, newState, m);
     }));
@@ -377,4 +384,5 @@ }));
 (setPosition = (function(position) {
-    return modifyParserState((function(s) {
-        return s.setPosition(position);
+    return new(Parser)((function(state, m, _, _0, eok, _1) {
+        var newState = state.setPosition(position);
+        return eok(newState, newState, m);
     }));
@@ -393,25 +401,14 @@ }));
 (setInput = (function(input) {
-    return modifyParserState((function(s) {
-        return s.setInput(input);
+    return new(Parser)((function(state, m, _, _0, eok, _1) {
+        var newState = state.setInput(input);
+        return eok(newState, newState, m);
     }));
 }));
-var _binary = (function(p10, p20, f) {
-    return bind(p10, (function(v1) {
-        return bind(p20, (function(v2) {
-            return f(v1, v2);
-        }));
-    }));
-}),
-    _fail = (function(e) {
-        return bind(getPosition, (function(z) {
-            var x1 = e(z);
-            return new(Parser)((function(state, m, _, _0, _1, eerr) {
-                return eerr(x1, state, m);
-            }));
-        }));
-    });
 (fail = (function(msg) {
     var e = (msg ? ParseError : UnknownError);
-    return _fail((function(pos) {
-        return new(e)(pos, msg);
+    return chain(getPosition, (function(z) {
+        var x = new(e)(z, msg);
+        return new(Parser)((function(state, m, _, _0, _1, eerr) {
+            return eerr(x, state, m);
+        }));
     }));
@@ -421,21 +418,31 @@ }));
     return new(Parser)((function(state, m, cok, cerr, eok, eerr) {
-        var peerr = (function(x1, s, m0) {
-            return eerr(x1, s, Memoer.popWindow(m0));
-        });
-        return unparser(p3, state, Memoer.pushWindow(m, state.position), (function(x1, s, m0) {
-            return cok(x1, s, Memoer.popWindow(m0));
-        }), peerr, (function(x1, s, m0) {
-            return eok(x1, s, Memoer.popWindow(m0));
-        }), peerr);
+        var peerr = (function(x, s, m0) {
+            return eerr(x, s, Memoer.popWindow(m0));
+        }),
+            m0 = Memoer.pushWindow(m, state.position),
+            cok0 = (function(x, s, m1) {
+                return cok(x, s, Memoer.popWindow(m1));
+            }),
+            eok0 = (function(x, s, m1) {
+                return eok(x, s, Memoer.popWindow(m1));
+            });
+        return new(Tail)(p3.run, state, m0, cok0, peerr, eok0, peerr);
     }));
 }));
 (look = (function(p3) {
-    return _binary(getParserState, p3, (function(state, x1) {
-        return next(setParserState(state), always(x1));
+    return chain(getParserState, (function(v1) {
+        return chain(p3, (function(v2) {
+            return next(setParserState(v1), of(v2));
+        }));
     }));
 }));
 (lookahead = (function(p3) {
-    return _binary(getInput, getPosition, (function(input, pos) {
-        return bind(p3, (function(x1) {
-            return sequence(setPosition(pos), setInput(input), always(x1));
+    return chain(getInput, (function(v1) {
+        return chain(getPosition, (function(v2) {
+            return chain(p3, (function(x) {
+                return sequence(new(Parser)((function(state, m, _, _0, eok, _1) {
+                    var newState = state.setPosition(v2);
+                    return eok(newState, newState, m);
+                })), setInput(v1), of(x));
+            }));
         }));
@@ -445,25 +452,24 @@ }));
 (next = (function(p3, q) {
-    return bind(p3, (function() {
+    return chain(p3, (function() {
         return q;
     }));
 }));
-var f;
-(sequences = reduceRight.bind(null, ((f = next), (function(x1, y) {
-    return f(y, x1);
-}))));
-var x1 = stream.from,
-    y = sequences;
+(sequences = reduceRight.bind(null, (function(x, y) {
+    return chain(y, (function() {
+        return x;
+    }));
+})));
+var x = stream.from;
 (sequencea = (function(z) {
-    return y(x1(z));
+    return sequences(x(z));
 }));
-var y0 = sequencea;
 (sequence = (function() {
     var args0 = arguments;
-    return y0(args.apply(null, args0));
+    return sequencea(args.apply(null, args0));
 }));
 var e = (undefined ? ParseError : UnknownError);
-(Parser.prototype.empty = bind(getPosition, (function(z) {
-    var x2 = new(e)(z, undefined);
+(Parser.prototype.empty = chain(getPosition, (function(z) {
+    var x0 = new(e)(z, undefined);
     return new(Parser)((function(state, m, _, _0, _1, eerr) {
-        return eerr(x2, state, m);
+        return eerr(x0, state, m);
     }));
@@ -481,5 +487,5 @@ })));
                 });
-                return unparser(q, state, mFromP, cok, cerr, eok, qeerr);
+                return new(Tail)(q.run, state, mFromP, cok, cerr, eok, qeerr);
             });
-        return unparser(p3, state, m, cok, cerr, eok, peerr);
+        return new(Tail)(p3.run, state, m, cok, cerr, eok, peerr);
     }));
@@ -493,4 +499,4 @@ }));
 }));
-var x2;
-(choices = foldr.bind(null, (function(x2, y1) {
+var x0;
+(choices = foldr.bind(null, (function(x0, y) {
     return new(Parser)((function(state, m, cok, cerr, eok, eerr) {
@@ -503,71 +509,95 @@ var position = state["position"],
                 });
-                return unparser(x2, state, mFromP, cok, cerr, eok, qeerr);
+                return new(Tail)(x0.run, state, mFromP, cok, cerr, eok, qeerr);
             });
-        return unparser(y1, state, m, cok, cerr, eok, peerr);
+        return new(Tail)(y.run, state, m, cok, cerr, eok, peerr);
     }));
-}), ((x2 = new(MultipleError)(null, [])), new(Parser)((function(state, m, _, _0, _1, eerr) {
-    return eerr(x2, state, m);
+}), ((x0 = new(MultipleError)(null, [])), new(Parser)((function(state, m, _, _0, _1, eerr) {
+    return eerr(x0, state, m);
 })))));
-var x3 = stream.from,
-    y1 = choices;
+var x1 = stream.from;
 (choicea = (function(z) {
-    return y1(x3(z));
+    return choices(x1(z));
 }));
-var y2 = choicea;
 (choice = (function() {
     var args0 = arguments;
-    return y2(args.apply(null, args0));
+    return choicea(args.apply(null, args0));
 }));
-(optional = (function(x4, p3) {
-    return (p3 ? either(p3, always(x4)) : either(x4, always(null)));
+(optional = (function(x2, p3) {
+    return (p3 ? concat(p3, of(x2)) : concat(x2, of(null)));
 }));
 (expected = (function(expect, p3) {
     return new(Parser)((function(state, m, cok, cerr, eok, eerr) {
-        return unparser(p3, state, m, cok, cerr, eok, (function(x4, state0, m0) {
+        var eerr0 = (function(x2, state0, m0) {
             return eerr(new(ExpectError)(state0.position, expect), state0, m0);
-        }));
+        });
+        return new(Tail)(p3.run, state, m, cok, cerr, eok, eerr0);
     }));
 }));
 (not = (function(p3, msg) {
-    return attempt(either(bind(attempt(p3), (function(x4) {
-        return _fail((function(pos) {
-            return new(UnexpectError)(pos, x4);
+    var p4 = concat(chain(new(Parser)((function(state, m, cok, cerr, eok, eerr) {
+        var peerr = (function(x2, s, m0) {
+            return eerr(x2, s, Memoer.popWindow(m0));
+        }),
+            m0 = Memoer.pushWindow(m, state.position),
+            cok0 = (function(x2, s, m1) {
+                return cok(x2, s, Memoer.popWindow(m1));
+            }),
+            eok0 = (function(x2, s, m1) {
+                return eok(x2, s, Memoer.popWindow(m1));
+            });
+        return new(Tail)(p3.run, state, m0, cok0, peerr, eok0, peerr);
+    })), (function(x2) {
+        return chain(getPosition, (function(z) {
+            var x3 = new(UnexpectError)(z, x2);
+            return new(Parser)((function(state, m, _, _0, _1, eerr) {
+                return eerr(x3, state, m);
+            }));
         }));
-    })), always(null)));
+    })), of(null));
+    return new(Parser)((function(state, m, cok, cerr, eok, eerr) {
+        var peerr = (function(x2, s, m0) {
+            return eerr(x2, s, Memoer.popWindow(m0));
+        }),
+            m0 = Memoer.pushWindow(m, state.position),
+            cok0 = (function(x2, s, m1) {
+                return cok(x2, s, Memoer.popWindow(m1));
+            }),
+            eok0 = (function(x2, s, m1) {
+                return eok(x2, s, Memoer.popWindow(m1));
+            });
+        return new(Tail)(p4.run, state, m0, cok0, peerr, eok0, peerr);
+    }));
 }));
 (eager = map.bind(null, stream.toArray));
-(binds = (function(p3, f0) {
-    return bind(eager(p3), (function(x4) {
-        return f0.apply(undefined, x4);
+(binds = (function(p3, f) {
+    return chain(eager(p3), (function(x2) {
+        return f.apply(undefined, x2);
     }));
 }));
-var f0 = stream.cons;
+var f = stream.cons;
 (cons = (function(p10, p20) {
-    return bind(p10, (function(x4) {
-        return p20.map((function(y3) {
-            return f0(x4, y3);
-        }));
+    return chain(p10, (function(x2) {
+        return map((function(y) {
+            return f(x2, y);
+        }), p20);
     }));
 }));
-var f1 = stream.append;
+var f0 = stream.append;
 (append = (function(p10, p20) {
-    return bind(p10, (function(x4) {
-        return p20.map((function(y3) {
-            return f1(x4, y3);
-        }));
+    return chain(p10, (function(x2) {
+        return map((function(y) {
+            return f0(x2, y);
+        }), p20);
     }));
 }));
-var f2;
-(enumerations = foldr.bind(null, ((f2 = cons), (function(x4, y3) {
-    return f2(y3, x4);
-})), always(NIL)));
-var x4 = stream.from,
-    y3 = enumerations;
+(enumerations = foldr.bind(null, (function(x2, y) {
+    return cons(y, x2);
+}), of(NIL)));
+var x2 = stream.from;
 (enumerationa = (function(z) {
-    return y3(x4(z));
+    return enumerations(x2(z));
 }));
-var y4 = enumerationa;
 (enumeration = (function() {
     var args0 = arguments;
-    return y4(args.apply(null, args0));
+    return enumerationa(args.apply(null, args0));
 }));
@@ -580,7 +610,7 @@ var err = new(ParserError)("Many parser applied to parser that accepts an empty string"),
     var safeP = new(Parser)((function(state, m, cok, cerr, eok, eerr) {
-        return unparser(p3, state, m, cok, cerr, manyError, eerr);
+        return new(Tail)(p3.run, state, m, cok, cerr, manyError, eerr);
     }));
     return rec((function(self) {
         var p4 = cons(safeP, self);
-        return (p4 ? either(p4, always(NIL)) : either(NIL, always(null)));
+        return (p4 ? concat(p4, of(NIL)) : concat(NIL, of(null)));
     }));
@@ -601,24 +631,28 @@ }));
             var type = entry[0],
-                x5 = entry[1],
+                x3 = entry[1],
                 s = entry[2];
             switch (type) {
                 case "cok":
-                    return cok(x5, s, m);
+                    return cok(x3, s, m);
                 case "ceerr":
-                    return cerr(x5, s, m);
+                    return cerr(x3, s, m);
                 case "eok":
-                    return eok(x5, s, m);
+                    return eok(x3, s, m);
                 case "eerr":
-                    return eerr(x5, s, m);
+                    return eerr(x3, s, m);
             }
         }
-        return unparser(p3, state, m, (function(x6, pstate, pm) {
-            return cok(x6, pstate, Memoer.update(pm, position, key, ["cok", x6, pstate]));
-        }), (function(x6, pstate, pm) {
-            return cerr(x6, pstate, Memoer.update(pm, position, key, ["cerr", x6, pstate]));
-        }), (function(x6, pstate, pm) {
-            return eok(x6, pstate, Memoer.update(pm, position, key, ["eok", x6, pstate]));
-        }), (function(x6, pstate, pm) {
-            return eerr(x6, pstate, Memoer.update(pm, position, key, ["eerr", x6, pstate]));
-        }));
+        var cok0 = (function(x4, pstate, pm) {
+            return cok(x4, pstate, Memoer.update(pm, position, key, ["cok", x4, pstate]));
+        }),
+            cerr0 = (function(x4, pstate, pm) {
+                return cerr(x4, pstate, Memoer.update(pm, position, key, ["cerr", x4, pstate]));
+            }),
+            eok0 = (function(x4, pstate, pm) {
+                return eok(x4, pstate, Memoer.update(pm, position, key, ["eok", x4, pstate]));
+            }),
+            eerr0 = (function(x4, pstate, pm) {
+                return eerr(x4, pstate, Memoer.update(pm, position, key, ["eerr", x4, pstate]));
+            });
+        return new(Tail)(p3.run, state, m, cok0, cerr0, eok0, eerr0);
     }));
@@ -632,8 +666,8 @@ }));
     return new(Parser)((function(s, m, cok, cerr, eok, eerr) {
-        var tok, pcok;
+        var tok, pcok, p3;
         return (s.isEmpty() ? eerr(errorHandler(s.position, null), s, m) : ((tok = s.first()), (consume(
-            tok) ? ((pcok = (function(x5, s0, m0) {
-            return cok(x5, s0, Memoer.prune(m0, s0.position));
-        })), unparser(s.next(tok), s, m, pcok, cerr, pcok, cerr)) : eerr(errorHandler(s.position,
-            tok), s, m))));
+            tok) ? ((pcok = (function(x3, s0, m0) {
+            return cok(x3, s0, Memoer.prune(m0, s0.position));
+        })), (p3 = s.next(tok)), new(Tail)(p3.run, s, m, pcok, cerr, pcok, cerr)) : eerr(
+            errorHandler(s.position, tok), s, m))));
     }));
@@ -651,25 +685,34 @@ }));
 })))));
-var p4 = either(bind(new(Parser)((function(state, m, cok, cerr, eok, eerr) {
-    var peerr = (function(x5, s, m0) {
-        return eerr(x5, s, Memoer.popWindow(m0));
-    });
-    return unparser(anyToken, state, Memoer.pushWindow(m, state.position), (function(x5, s, m0) {
-        return cok(x5, s, Memoer.popWindow(m0));
-    }), peerr, (function(x5, s, m0) {
-        return eok(x5, s, Memoer.popWindow(m0));
-    }), peerr);
-})), (function(x5) {
-    return _fail((function(pos) {
-        return new(UnexpectError)(pos, x5);
+var p4 = concat(chain(new(Parser)((function(state, m, cok, cerr, eok, eerr) {
+    var peerr = (function(x3, s, m0) {
+        return eerr(x3, s, Memoer.popWindow(m0));
+    }),
+        m0 = Memoer.pushWindow(m, state.position),
+        cok0 = (function(x3, s, m1) {
+            return cok(x3, s, Memoer.popWindow(m1));
+        }),
+        eok0 = (function(x3, s, m1) {
+            return eok(x3, s, Memoer.popWindow(m1));
+        });
+    return new(Tail)(anyToken.run, state, m0, cok0, peerr, eok0, peerr);
+})), (function(x3) {
+    return chain(getPosition, (function(z) {
+        var x4 = new(UnexpectError)(z, x3);
+        return new(Parser)((function(state, m, _, _0, _1, eerr) {
+            return eerr(x4, state, m);
+        }));
     }));
-})), always(null)),
+})), of(null)),
     p5 = new(Parser)((function(state, m, cok, cerr, eok, eerr) {
-        var peerr = (function(x5, s, m0) {
-            return eerr(x5, s, Memoer.popWindow(m0));
-        });
-        return unparser(p4, state, Memoer.pushWindow(m, state.position), (function(x5, s, m0) {
-            return cok(x5, s, Memoer.popWindow(m0));
-        }), peerr, (function(x5, s, m0) {
-            return eok(x5, s, Memoer.popWindow(m0));
-        }), peerr);
+        var peerr = (function(x3, s, m0) {
+            return eerr(x3, s, Memoer.popWindow(m0));
+        }),
+            m0 = Memoer.pushWindow(m, state.position),
+            cok0 = (function(x3, s, m1) {
+                return cok(x3, s, Memoer.popWindow(m1));
+            }),
+            eok0 = (function(x3, s, m1) {
+                return eok(x3, s, Memoer.popWindow(m1));
+            });
+        return new(Tail)(p4.run, state, m0, cok0, peerr, eok0, peerr);
     }));
@@ -682,6 +725,5 @@ (eof = (p5.run.hasOwnProperty("displayName") ? label("EOF", new(Parser)((function(state, m, cok, cerr, eok, eerr) {
 })))));
-var x5 = unparser;
 (exec = (function() {
     var args0 = arguments;
-    return trampoline(x5.apply(null, args0));
+    return trampoline(unparser.apply(null, args0));
 }));
@@ -692,12 +734,15 @@ (parseState = (function(p6, state, ok, err0) {
 (parseStream = (function(p6, s, ud, ok, err0) {
-    return parseState(p6, new(ParserState)(s, Position.initial, ud), ok, err0);
+    var state = new(ParserState)(s, Position.initial, ud);
+    return exec(p6, state, Memoer.empty, ok, err0, ok, err0);
 }));
 (parse = (function(p6, input, ud, ok, err0) {
-    return parseStream(p6, stream.from(input), ud, ok, err0);
+    var s = stream.from(input),
+        state = new(ParserState)(s, Position.initial, ud);
+    return exec(p6, state, Memoer.empty, ok, err0, ok, err0);
 }));
-var err0 = (function(x6) {
-    throw x6;
+var err0 = (function(x3) {
+    throw x3;
 });
 (runState = (function(p6, state) {
-    return parseState(p6, state, identity, err0);
+    return exec(p6, state, Memoer.empty, identity, err0, identity, err0);
 }));
@@ -708,3 +753,4 @@ (runStream = (function(p6, s, ud) {
 (run = (function(p6, input, ud) {
-    return runStream(p6, stream.from(input), ud);
+    var s = stream.from(input);
+    return runState(p6, new(ParserState)(s, Position.initial, ud));
 }));
@@ -718,3 +764,3 @@ var ok = (function() {
 (testState = (function(p6, state) {
-    return parseState(p6, state, ok, err1);
+    return exec(p6, state, Memoer.empty, ok, err1, ok, err1);
 }));
@@ -725,3 +771,4 @@ (testStream = (function(p6, s, ud) {
 (test = (function(p6, input, ud) {
-    return testStream(p6, stream.from(input), ud);
+    var s = stream.from(input);
+    return testState(p6, new(ParserState)(s, Position.initial, ud));
 }));
@@ -728,0 +775,0 @@ (exports["Tail"] = Tail);

package.json

 {
     "name": "bennu",
-    "version": "17.2.1",
+    "version": "17.2.2",
     "description": "Parser Combinator Library",
     "author": "Matt Bierner",
+    "homepage": "http://bennu-js.com",
     "license": "MIT",
@@ -7,0 +8,0 @@ "repository": {

README.md

@@ -1,2 +0,6 @@
-# Bennu - Javascript Parser Combinator Library
+<div align="center" >
+    <a href="http://bennu-js.com">
+        <img src="http://bennu-js.com/resources/bennu.svg" width="300px" alt="Bennu" />
+    </a>
+</div>
 
@@ -10,3 +14,3 @@ ## About
 
-```
+```javascript
 // Very simple Brainfuck Bennuu parser in Khepri
@@ -13,0 +17,0 @@

tests/not.js

@@ -45,3 +45,2 @@ var parse = require('../index').parse;
     
-    
     test.equal(
@@ -48,0 +47,0 @@ parse.run(p, 'ba'),

Fixed alerts

No website

Quality

Package does not have a website.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

131575

increased by2.05%

Lines of code

2398

increased by2%

Number of low quality alerts

0

decreased by-100%

Number of lines in readme file

145

increased by2.84%

No dependency changes