wikipeg 4.0.2 → 6.0.0

package/lib/peg.js

@@ -1,11 +1,10 @@
 "use strict";
 
-var arrays  = require("./utils/arrays"),
-    objects = require("./utils/objects");
+var objects = require("./utils/objects");
 
 var PEG = {
   /* WikiPEG version (uses semantic versioning). */
-  VERSION: "4.0.2",
+  VERSION: "6.0.0",
 
   GrammarError: require("./grammar-error"),
   parser:       require("./parser"),
@@ -24,13 +23,11 @@ var PEG = {
    */
   buildParser: function(grammar) {
     function convertPasses(passes) {
-      var converted = {}, stage;
+      let converted = {};
 
-      for (stage in passes) {
-        if (passes.hasOwnProperty(stage)) {
-          converted[stage] = objects.values(passes[stage]);
-        }
-      }
+      Object.getOwnPropertyNames(passes).forEach((stage) => {
+        converted[stage] = Object.values(passes[stage]);
+      });
 
       return converted;
     }
@@ -43,18 +40,13 @@ var PEG = {
       generate: this.compiler.passes.generate
     };
 
-    if (options.allowLoops) {
-      defaultPasses.check = objects.clone(defaultPasses.check);
-      delete defaultPasses.check.reportInfiniteLoops;
-    }
-
     var plugins = "plugins" in options ? options.plugins : [],
         config  = {
           parser: this.parser,
           passes: convertPasses(defaultPasses)
         };
 
-    arrays.each(plugins, function(p) { p.use(config, options); });
+    plugins.forEach( (p) => { p.use(config, options); });
 
     return this.compiler.compile(
       config.parser.parse(grammar),

package/lib/runtime/template.js

@@ -229,7 +229,15 @@ function peg$parse(input, options = {}) {
       var i = 1;
 
       expected.sort(function(a, b) {
-        if (a.description < b.description) {
+        if (a.type < b.type) {
+          return -1;
+        } else if (a.type > b.type) {
+          return 1;
+        } else if (a.value < b.value) {
+          return -1;
+        } else if (a.value > b.value) {
+          return 1;
+        } else if (a.description < b.description) {
           return -1;
         } else if (a.description > b.description) {
           return 1;