Merge pull request #345 from arlolra/split4

Even more split outs from #339

.jshintrc

@@ -10,8 +10,10 @@
   "loopfunc":  true,
   "newcap":    false,
   "noarg":     true,
+  "node":      true,
   "noempty":   true,
   "nonew":     true,
+  "strict":    true,
   "trailing":  true,
   "validthis": true,
   "-W082":     false

Makefile

@@ -79,6 +79,8 @@ browser:
 	echo ' * Licensed under the MIT license.'                                          >> $(BROWSER_FILE_DEV)
 	echo ' */'                                                                         >> $(BROWSER_FILE_DEV)
 	echo 'var PEG = (function(undefined) {'                                            >> $(BROWSER_FILE_DEV)
+	echo '  "use strict";'                                                             >> $(BROWSER_FILE_DEV)
+	echo ''                                                                            >> $(BROWSER_FILE_DEV)
 	echo '  var modules = {'                                                           >> $(BROWSER_FILE_DEV)
 	echo '    define: function(name, factory) {'                                       >> $(BROWSER_FILE_DEV)
 	echo '      var dir    = name.replace(/(^|\/)[^/]+$$/, "$$1"),'                    >> $(BROWSER_FILE_DEV)

benchmark/benchmarks.js

@@ -1,4 +1,14 @@
-benchmarks = [
+"use strict";
+
+(function(root, factory) {
+  if (typeof module !== 'undefined' && module.exports) {
+    module.exports = factory();
+  } else {
+    root.benchmarks = factory();
+  }
+}(this, function() {
+
+  return [
     {
       id:          "json",
       title:       "JSON",
@@ -35,4 +45,6 @@ benchmarks = [
         { file: "960.gs/min/960_24_col.css",    title: "960.gs - 960_24_col.css (minified)"  }
       ]
     }
-];
+  ];
+
+}));

benchmark/index.js

@@ -1,4 +1,8 @@
+/* jshint node:false */
+/* global $, alert, benchmarks, document, Runner */
+
 $("#run").click(function() {
+  "use strict";
 
   /* Results Table Manipulation */
 
@@ -130,5 +134,7 @@ $("#run").click(function() {
 });
 
 $(document).ready(function() {
+  "use strict";
+
   $("#run").focus();
 });

benchmark/run

@@ -1,15 +1,13 @@
 #!/usr/bin/env node
 
+"use strict";
+
 var util = require("util");
 var fs   = require("fs");
 var PEG  = require("../lib/peg");
 
-[
-  "benchmarks.js",
-  "runner.js",
-].forEach(function(file) {
-  eval(fs.readFileSync(__dirname + "/" + file, "utf8"));
-});
+var benchmarks = require("./benchmarks.js");
+var Runner = require("./runner.js")(PEG);
 
 /* Results Table Manipulation */
 

benchmark/runner.js

@@ -1,4 +1,14 @@
-Runner = {
+"use strict";
+
+(function(root, factory) {
+  if (typeof module !== 'undefined' && module.exports) {
+    module.exports = factory;
+  } else {
+    root.Runner = factory(root.PEG);
+  }
+}(this, function(PEG) {
+
+  return {
     run: function(benchmarks, runCount, options, callbacks) {
 
       /* Queue */
@@ -116,4 +126,6 @@ Runner = {
 
       Q.run();
     }
-};
+  };
+
+}));

bin/pegjs

@@ -1,5 +1,7 @@
 #!/usr/bin/env node
 
+"use strict";
+
 var util = require("util");
 var fs   = require("fs");
 var path = require("path");

lib/compiler.js

@@ -1,3 +1,5 @@
+"use strict";
+
 var arrays  = require("./utils/arrays"),
     objects = require("./utils/objects");
 

lib/compiler/asts.js

@@ -1,3 +1,5 @@
+"use strict";
+
 var arrays  = require("../utils/arrays"),
     visitor = require("./visitor");
 

lib/compiler/javascript.js

@@ -1,3 +1,5 @@
+"use strict";
+
 function hex(ch) { return ch.charCodeAt(0).toString(16).toUpperCase(); }
 
 /* JavaScript code generation helpers. */

lib/compiler/opcodes.js

@@ -1,3 +1,5 @@
+"use strict";
+
 /* Bytecode instruction opcodes. */
 var opcodes = {
   /* Stack Manipulation */

lib/compiler/passes/generate-bytecode.js

@@ -1,3 +1,5 @@
+"use strict";
+
 var arrays  = require("../../utils/arrays"),
     objects = require("../../utils/objects"),
     asts    = require("../asts"),

lib/compiler/passes/generate-javascript.js

@@ -1,3 +1,5 @@
+"use strict";
+
 var arrays = require("../../utils/arrays"),
     asts   = require("../asts"),
     op     = require("../opcodes"),

lib/compiler/passes/remove-proxy-rules.js

@@ -1,3 +1,5 @@
+"use strict";
+
 var arrays  = require("../../utils/arrays"),
     visitor = require("../visitor");
 

lib/compiler/passes/report-infinite-loops.js

@@ -1,3 +1,5 @@
+"use strict";
+
 var GrammarError = require("../../grammar-error"),
     asts         = require("../asts"),
     visitor      = require("../visitor");

lib/compiler/passes/report-left-recursion.js

@@ -1,3 +1,5 @@
+"use strict";
+
 var arrays       = require("../../utils/arrays"),
     GrammarError = require("../../grammar-error"),
     asts         = require("../asts"),

lib/compiler/passes/report-missing-rules.js

@@ -1,3 +1,5 @@
+"use strict";
+
 var GrammarError = require("../../grammar-error"),
     asts         = require("../asts"),
     visitor      = require("../visitor");

lib/compiler/visitor.js

@@ -1,3 +1,5 @@
+"use strict";
+
 var objects = require("../utils/objects"),
     arrays  = require("../utils/arrays");
 

lib/grammar-error.js

@@ -1,3 +1,5 @@
+"use strict";
+
 var classes = require("./utils/classes");
 
 /* Thrown when the grammar contains an error. */

lib/peg.js

@@ -1,3 +1,5 @@
+"use strict";
+
 var arrays  = require("./utils/arrays"),
     objects = require("./utils/objects");
 

lib/utils/arrays.js

@@ -1,3 +1,5 @@
+"use strict";
+
 /* Array utilities. */
 var arrays = {
   range: function(start, stop) {

lib/utils/classes.js

@@ -1,3 +1,5 @@
+"use strict";
+
 /* Class utilities */
 var classes = {
   subclass: function(child, parent) {

lib/utils/objects.js

@@ -1,3 +1,5 @@
+"use strict";
+
 /* Object utilities. */
 var objects = {
   keys: function(object) {

spec/api/generated-parser-api.spec.js

@@ -1,3 +1,7 @@
+/* global describe, expect, it, PEG, spyOn */
+
+"use strict";
+
 describe("generated parser API", function() {
   describe("parse", function() {
     it("parses input", function() {

spec/api/pegjs-api.spec.js

@@ -1,3 +1,7 @@
+/* global describe, expect, it, PEG, spyOn */
+
+"use strict";
+
 describe("PEG.js API", function() {
   describe("buildParser", function() {
     it("builds a parser", function() {

spec/api/plugin-api.spec.js

@@ -1,3 +1,7 @@
+/* global beforeEach, describe, expect, it, jasmine, PEG */
+
+"use strict";
+
 describe("plugin API", function() {
   beforeEach(function() {
     this.addMatchers({

spec/behavior/generated-parser-behavior.spec.js

@@ -1,3 +1,7 @@
+/* global beforeEach, describe, expect, it, jasmine, PEG */
+
+"use strict";
+
 describe("generated parser behavior", function() {
   function varyOptimizationOptions(block) {
     function clone(object) {

spec/helpers.js

@@ -1,3 +1,7 @@
-if (typeof module !== "undefined") {
-  PEG = require("../lib/peg.js");
-}
+"use strict";
+
+(function(root) {
+  if (typeof module !== 'undefined') {
+    root.PEG = require("../lib/peg.js");
+  }
+}(this));

spec/unit/compiler/passes/generate-bytecode.spec.js

@@ -1,3 +1,7 @@
+/* global describe, expect, it, PEG */
+
+"use strict";
+
 describe("compiler pass |generateBytecode|", function() {
   var pass = PEG.compiler.passes.generate.generateBytecode;
 

spec/unit/compiler/passes/helpers.js

@@ -1,3 +1,7 @@
+/* global beforeEach, jasmine, PEG */
+
+"use strict";
+
 beforeEach(function() {
   this.addMatchers({
     toChangeAST: function(grammar) {

spec/unit/compiler/passes/remove-proxy-rules.spec.js

@@ -1,3 +1,7 @@
+/* global describe, expect, it, PEG */
+
+"use strict";
+
 describe("compiler pass |removeProxyRules|", function() {
   var pass = PEG.compiler.passes.transform.removeProxyRules;
 

spec/unit/compiler/passes/report-infinite-loops.spec.js

@@ -1,3 +1,7 @@
+/* global describe, expect, it, PEG */
+
+"use strict";
+
 describe("compiler pass |reportLeftRecursion|", function() {
   var pass = PEG.compiler.passes.check.reportInfiniteLoops;
 

spec/unit/compiler/passes/report-left-recursion.spec.js

@@ -1,3 +1,7 @@
+/* global describe, expect, it, PEG */
+
+"use strict";
+
 describe("compiler pass |reportLeftRecursion|", function() {
   var pass = PEG.compiler.passes.check.reportLeftRecursion;
 

spec/unit/compiler/passes/report-missing-rules.spec.js

@@ -1,3 +1,7 @@
+/* global describe, expect, it, PEG */
+
+"use strict";
+
 describe("compiler pass |reportMissingRules|", function() {
   var pass = PEG.compiler.passes.check.reportMissingRules;
 

spec/unit/parser.spec.js

@@ -1,3 +1,7 @@
+/* global beforeEach, describe, expect, it, jasmine, PEG */
+
+"use strict";
+
 describe("PEG.js grammar parser", function() {
   var literalAbcd       = { type: "literal",      value: "abcd", ignoreCase: false },
       literalEfgh       = { type: "literal",      value: "efgh", ignoreCase: false },