Speed up performance by reducing rule count.

Going to do a sweep of the rules and consolidate them where possible. If a rule is only used by exactly one other rule then I am going to rewrite the grammar without creating that separate rule.
codeschool · Mar 8, 2016 · 8559684 · 8559684
1 parent f7bb184
commit 8559684
Show file tree

Hide file tree

Showing 11 changed files with 2,410 additions and 2,321 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -122,8 +122,8 @@ module.exports = function(grunt) {
           livereload: false
         },
         files: [
-          'index.js', 'test/*.js', 'src/*.js', 'src/*.pegjs',
-          'test/sql/*.sql', 'Gruntfile.js'
+          'index.js', 'test/**/*.js', 'src/*.js', 'src/*.pegjs',
+          'test/sql/**/*.sql', 'test/json/**/*.json', 'Gruntfile.js'
         ],
         tasks: ['build', 'shell:debug']
       },

diff --git a/demo/css/sqlite-parser-demo.css b/demo/css/sqlite-parser-demo.css
diff --git a/demo/js/sqlite-parser-demo.js b/demo/js/sqlite-parser-demo.js
diff --git a/dist/sqlite-parser-min.js b/dist/sqlite-parser-min.js
diff --git a/dist/sqlite-parser.js b/dist/sqlite-parser.js
diff --git a/lib/parser-util.js b/lib/parser-util.js
@@ -56,9 +56,13 @@ function compose(args, glue) {
   }
   res = args.reduce(function (prev, cur) {
     return conc ? (isOkay(cur) ? prev.concat(cur) : prev) :
-                  (prev + (isOkay(cur) ? textNode(cur) + glue : ''));
+                  (prev + (isOkay(cur) ? textCompose(cur) + glue : ''));
   }, start);
-  return conc ? res : res.trim();
+  return conc ? res : textNode(res);
+}
+
+function textCompose(arg) {
+  return nodeToString(isArray(arg) ? arg.join('') : arg);
 }
 
 function stack(arr) {

diff --git a/lib/parser.js b/lib/parser.js
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "sqlite-parser",
   "description": "JavaScript implentation of SQLite 3 query parser",
   "author": "Code School (http://codeschool.com)",
-  "version": "0.12.3",
+  "version": "0.13.0",
   "contributors": [
     "Nick Wronski <nick@javascript.com>"
   ],
@@ -30,25 +30,25 @@
     "test": "grunt test"
   },
   "devDependencies": {
-    "chai": "^3.4.1",
-    "codemirror": "^5.9.0",
+    "chai": "^3.5.0",
+    "codemirror": "^5.12.0",
     "grunt": "^0.4.5",
     "grunt-banner": "^0.6.0",
     "grunt-browserify": "^4.0.1",
-    "grunt-contrib-clean": "^0.7.0",
-    "grunt-contrib-connect": "^0.11.2",
-    "grunt-contrib-copy": "^0.8.2",
-    "grunt-contrib-cssmin": "^0.14.0",
-    "grunt-contrib-uglify": "^0.11.0",
+    "grunt-contrib-clean": "^1.0.0",
+    "grunt-contrib-connect": "^1.0.0",
+    "grunt-contrib-copy": "^1.0.0",
+    "grunt-contrib-cssmin": "^1.0.0",
+    "grunt-contrib-uglify": "^1.0.0",
     "grunt-contrib-watch": "^0.6.1",
     "grunt-replace": "^0.11.0",
-    "grunt-shell": "^1.1.2",
-    "load-grunt-tasks": "^3.3.0",
-    "lodash": "^3.10.1",
-    "mocha": "^2.3.4",
+    "grunt-shell": "^1.2.1",
+    "load-grunt-tasks": "^3.4.1",
+    "lodash": "^4.6.1",
+    "mocha": "^2.4.5",
     "pegjs": "git+https://github.com/dmajda/pegjs.git#master",
     "prettyjson": "^1.1.3",
-    "promise": "^7.0.4"
+    "promise": "^7.1.1"
   },
   "dependencies": {}
 }
diff --git a/src/grammar.pegjs b/src/grammar.pegjs
@@ -7,13 +7,13 @@
 
 /* Start Grammar */
 start
-  = o s:( stmt_list )?
+  = o semi_optional s:( stmt_list )? semi_optional
   {
     return util.extend({}, s);
   }
 
 stmt_list
-  = semi_optional f:( stmt ) o b:( stmt_list_tail )* semi_optional
+  = f:( stmt ) o b:( stmt_list_tail )*
   {
     return {
       'statement': util.listify(f, b)
@@ -2458,12 +2458,8 @@ datatype_real "REAL Datatype Name"
   { return util.key(t); }
 
 datatype_real_double "DOUBLE Datatype Name"
-  = d:( "DOUBLE"i ) p:( real_double_precision )?
-  { return util.compose([d, p]); }
-
-real_double_precision
-  = e p:( "PRECISION"i )
-  { return p; }
+  = d:( "DOUBLE"i ) p:( [\t ]+ "PRECISION"i )?
+  { return util.compose([d, p], ''); }
 
 datatype_numeric "NUMERIC Datatype Name"
   = t:( "NUMERIC"i
@@ -2510,36 +2506,23 @@ name_unquoted
 
 /** @note Non-standard legacy format */
 name_bracketed
-  = sym_bopen n:( name_bracketed_schar )+ o sym_bclose
+  = sym_bopen n:( !( [ \t]* "]" ) [^\]] )+ o sym_bclose
   { return util.textNode(n); }
 
-name_bracketed_schar
-  = !( whitespace_space* "]" ) n:( [^\]] )
-  { return n; }
-
 name_dblquoted
-  = '"' n:( name_dblquoted_schar )+ '"'
+  = '"' n:( '""' / [^\"] )+ '"'
   { return util.unescape(n, '"'); }
 
-name_dblquoted_schar
-  = '""' / [^\"]
-
 /** @note Non-standard format */
 name_sglquoted
-  = "'" n:( name_sglquoted_schar )+ "'"
+  = "'" n:( "''" / [^\'] )+ "'"
   { return util.unescape(n, "'"); }
 
-name_sglquoted_schar
-  = "''" / [^\']
-
 /** @note Non-standard legacy format */
 name_backticked
-  = '`' n:( name_backticked_schar )+ '`'
+  = '`' n:( '``' / [^\`] )+ '`'
   { return util.unescape(n, '`'); }
 
-name_backticked_schar
-  = '``' / [^\`]
-
 /* Symbols */
 
 sym_bopen "Open Bracket"
@@ -2879,10 +2862,7 @@ comment
   { return null; }
 
 comment_line "Line Comment"
-  = comment_line_start ( !whitespace_line match_all )*
-
-comment_line_start
-  = "--"
+  = "--" ( ![\n\v\f\r] . )*
 
 comment_block "Block Comment"
   = comment_block_start comment_block_feed comment_block_end
@@ -2894,43 +2874,19 @@ comment_block_end
   = "*/"
 
 comment_block_body
-  = ( !( comment_block_end / comment_block_start ) match_all )+
+  = ( !( comment_block_end / comment_block_start ) . )+
 
 block_body_nodes
   = comment_block_body / comment_block
 
 comment_block_feed
-  = block_body_nodes ( whitespace / block_body_nodes )*
-
-match_all
-  = .
-  /*= [\s\S]*/
+  = block_body_nodes ( [\n\v\f\r\t ] / block_body_nodes )*
 
 /* Optional Whitespace */
-o
-  = n:( whitespace_nodes )*
-  { return n; }
-
-/* Enforced Whitespace */
-e
-  = n:( whitespace_nodes )+
+o "Whitespace"
+  = n:( [\n\v\f\r\t ] / comment )*
   { return n; }
 
-whitespace_nodes
-  = whitespace
-  / comment
-
-/* Whitespace */
-whitespace
-  = whitespace_space
-  / whitespace_line
-
-whitespace_space "Whitespace"
-  = [ \t]
-
-whitespace_line "New Line"
-  = [\n\v\f\r]
-
 /* TODO: Everything with this symbol */
 _TODO_
   = "__TODO__"
diff --git a/src/parser-util.js b/src/parser-util.js
@@ -56,9 +56,13 @@ function compose(args, glue) {
   }
   res = args.reduce(function (prev, cur) {
     return conc ? (isOkay(cur) ? prev.concat(cur) : prev) :
-                  (prev + (isOkay(cur) ? textNode(cur) + glue : ''));
+                  (prev + (isOkay(cur) ? textCompose(cur) + glue : ''));
   }, start);
-  return conc ? res : res.trim();
+  return conc ? res : textNode(res);
+}
+
+function textCompose(arg) {
+  return nodeToString(isArray(arg) ? arg.join('') : arg);
 }
 
 function stack(arr) {

diff --git a/test/core/parse-errors-spec.js b/test/core/parse-errors-spec.js
@@ -2,7 +2,7 @@ describe('parse errors', function() {
 
   it('parse error 1', function(done) {
     tree.error({
-      'message': 'Expected Block Comment, Line Comment, New Line, Semicolon, Whitespace or end of input.'
+      'message': 'Expected Semicolon or end of input.'
     }, this, done);
   });