Convert benchmark files to modules

benchmark/benchmarks.js

@@ -1,4 +1,12 @@
-benchmarks = [
+(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 +43,6 @@ benchmarks = [
         { file: "960.gs/min/960_24_col.css",    title: "960.gs - 960_24_col.css (minified)"  }
       ]
     }
-];
+  ];
+
+}));

benchmark/run

@@ -4,12 +4,8 @@ var util = require("util");
 var fs   = require("fs");
 var PEG  = require("../lib/peg");
 
-[
+var benchmarks = require("./benchmarks.js");
-  "benchmarks.js",
+var Runner = require("./runner.js")(PEG);
-  "runner.js",
-].forEach(function(file) {
-  eval(fs.readFileSync(__dirname + "/" + file, "utf8"));
-});
 
 /* Results Table Manipulation */
 

benchmark/runner.js

@@ -1,4 +1,12 @@
-Runner = {
+(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 +124,6 @@ Runner = {
 
       Q.run();
     }
-};
+  };
+
+}));