forked pegjs repository as nwronski/pegjs to get the changes into pegjs core into version control so they are not accidentally overwritten. refs #2

Author: nwronski

CHANGELOG.md

@@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased][unreleased]
 
+## [v0.8.1] - 2015-07-04
+### Changed
+- forked `pegjs` repository as `nwronski/pegjs` to get the changes into `pegjs` core into version control so they are not accidentally overwritten
+
 ## [v0.8.0] - 2015-07-04
 ### Added
 - added several array methods (e.g.: `findLast()`, `takeRight()`, `pluck()`) so that I could remove `lodash` as a dependency of the "smart error" `Tracer` class

demo/sqlite-parser-demo.js

@@ -20,7 +20,7 @@
     });
   }
   sqliteParser['NAME'] = 'sqlite-parser';
-  sqliteParser['VERSION'] = '0.8.0';
+  sqliteParser['VERSION'] = '0.8.1';
 
   module.exports = root.sqliteParser = sqliteParser;
 })(typeof self === 'object' ? self : global);

dist/sqlite-parser.js

@@ -217,6 +217,18 @@ function rest(arr) {
   return 2 <= arr.length ? slice.call(arr, 1) : [];
 }
 
+function uniq(arr) {
+  var u = {}, a = [];
+  for(var i = 0, l = arr.length; i < l; ++i){
+     if(Object.prototype.hasOwnProperty.call(u, arr[i])) {
+        continue;
+     }
+     a.push(arr[i]);
+     u[arr[i]] = 1;
+  }
+  return a;
+}
+
 module.exports = {
   // Array methods
   'stack':                stack,
@@ -232,6 +244,7 @@ module.exports = {
   'first':                first,
   'last':                 last,
   'rest':                 rest,
+  'uniq':                 uniq,
   // String methods
   'nodeToString':         nodeToString,
   'textNode':             textNode,

index.js

@@ -47,7 +47,7 @@ module.exports = (function (util) {
 
     chain = this.events.filter(function (e) {
       // Only use nodes with a set description
-      return e.description !== '' && !/whitespace|(semi$)|(^[oe]$)/i.test(e.rule);
+      return e.description != null && !/whitespace|(semi$)|(^[oe]$)/i.test(e.rule);
     })
     .reverse()
     .filter(function (e) {
@@ -65,13 +65,13 @@ module.exports = (function (util) {
       // Get best location data
       location = util.first(chain).location;
       // Collect descriptions
-      chain = util.takeWhile(util.pluck(chain, 'description'), function (d) {
+      chain = util.uniq(util.takeWhile(util.pluck(chain, 'description'), function (d) {
         if (!bestDescriptor && /(Statement|Clause)$/i.test(d)) {
           bestDescriptor = true;
           return true;
         }
         return !bestDescriptor;
-      })
+      }))
       .reverse();
       // Don't accidentally repeat the first description in the output
       chainDetail = util.takeRight(util.rest(chain), 2);

lib/parser-util.js

@@ -2,7 +2,7 @@
   "name": "sqlite-parser",
   "description": "JavaScript implentation of SQLite 3 query parser",
   "author": "Code School (http://codeschool.com)",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "contributors": [
     "Nick Wronski <nick@javascript.com>"
   ],
@@ -42,7 +42,7 @@
     "grunt-shell": "^1.1.2",
     "lodash": "^3.10.0",
     "mocha": "^2.2.5",
-    "pegjs": "git+https://github.com/pegjs/pegjs.git#master",
+    "pegjs": "git+https://github.com/nwronski/pegjs.git#master",
     "prettyjson": "^1.1.2"
   },
   "dependencies": {

lib/parser.js

@@ -217,6 +217,18 @@ function rest(arr) {
   return 2 <= arr.length ? slice.call(arr, 1) : [];
 }
 
+function uniq(arr) {
+  var u = {}, a = [];
+  for(var i = 0, l = arr.length; i < l; ++i){
+     if(Object.prototype.hasOwnProperty.call(u, arr[i])) {
+        continue;
+     }
+     a.push(arr[i]);
+     u[arr[i]] = 1;
+  }
+  return a;
+}
+
 module.exports = {
   // Array methods
   'stack':                stack,
@@ -232,6 +244,7 @@ module.exports = {
   'first':                first,
   'last':                 last,
   'rest':                 rest,
+  'uniq':                 uniq,
   // String methods
   'nodeToString':         nodeToString,
   'textNode':             textNode,

lib/tracer.js

@@ -47,7 +47,7 @@ module.exports = (function (util) {
 
     chain = this.events.filter(function (e) {
       // Only use nodes with a set description
-      return e.description !== '' && !/whitespace|(semi$)|(^[oe]$)/i.test(e.rule);
+      return e.description != null && !/whitespace|(semi$)|(^[oe]$)/i.test(e.rule);
     })
     .reverse()
     .filter(function (e) {
@@ -65,13 +65,13 @@ module.exports = (function (util) {
       // Get best location data
       location = util.first(chain).location;
       // Collect descriptions
-      chain = util.takeWhile(util.pluck(chain, 'description'), function (d) {
+      chain = util.uniq(util.takeWhile(util.pluck(chain, 'description'), function (d) {
         if (!bestDescriptor && /(Statement|Clause)$/i.test(d)) {
           bestDescriptor = true;
           return true;
         }
         return !bestDescriptor;
-      })
+      }))
       .reverse();
       // Don't accidentally repeat the first description in the output
       chainDetail = util.takeRight(util.rest(chain), 2);