Merge 4227348 into d501b66

alongubkin · Dec 7, 2014 · 5e20aa5 · 5e20aa5
2 parents d501b66 + 4227348
commit 5e20aa5
Show file tree

Hide file tree

Showing 77 changed files with 183 additions and 135 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -1,97 +1,76 @@
 "use strict";
-(function () {
-    module.exports = function (grunt) {
-        require("traceur");
-        require("time-grunt")(grunt);
-        require("load-grunt-tasks")(grunt);
-        grunt.initConfig({
-            nodeunit: { files: ["test/**/*_test.js"] },
-            eslint: {
-                lib: [
-                    "lib/**/*.js",
-                    "!lib/parser.js"
-                ],
-                test: ["test/**/*.js"]
-            },
-            mochacli: {
-                options: {
-                    reporter: "spec",
-                    bail: true,
-                    timeout: 15000
-                },
-                all: ["test/*.js"]
-            },
-            watch: {
-                gruntfile: {
-                    files: "<%= jshint.gruntfile.src %>",
-                    tasks: ["jshint:gruntfile"]
-                },
-                lib: {
-                    files: "<%= jshint.lib.src %>",
-                    tasks: [
-                        "jshint:lib",
-                        "mochacli"
-                    ]
-                },
-                test: {
-                    files: "<%= jshint.test.src %>",
-                    tasks: [
-                        "jshint:test",
-                        "mochacli"
-                    ]
-                }
-            },
-            peg: {
-                spider: {
-                    src: "src/spider.pegjs",
-                    dest: "lib/parser.js"
-                }
-            },
-            mocha_istanbul: {
-                coverage: {
-                    src: "test",
-                    options: {
-                        mask: "*.js",
-                        excludes: ["lib/parser.js"]
-                    }
-                }
-            },
-            clean: { build: ["lib/"] },
-            spider_script: {
-                options: {},
-                build: {
-                    files: [{
-                            expand: true,
-                            cwd: "src",
-                            src: ["**/*.spider"],
-                            dest: "lib/",
-                            ext: ".js"
-                        }]
-                }
-            },
-            copy: {
-                build: {
-                    files: [{
-                            expand: true,
-                            cwd: "src",
-                            src: ["**/*.js"],
-                            dest: "lib/"
-                        }]
-                }
-            }
-        });
-        grunt.registerTask("default", [
-            "build",
-            "mochacli"
-        ]);
-        grunt.registerTask("build", [
-            "clean:build",
-            "peg",
-            "spider_script:build",
-            "copy:build"
-        ]);
-        grunt.registerTask("coverage", ["mocha_istanbul:coverage"]);
-    };
-}());
 
-//# sourceMappingURL=Gruntfile.map
+module.exports = function (grunt) {
+  require("time-grunt")(grunt);
+  require("load-grunt-tasks")(grunt);
+  grunt.initConfig({
+    nodeunit: { files: ["test/**/*_test.js"] },
+    eslint: {
+      lib: ["lib/**/*.js", "!lib/parser.js"],
+      test: ["test/**/*.js"]
+    },
+    mochacli: {
+      options: {
+        reporter: "spec",
+        bail: true,
+        timeout: 15000
+      },
+      all: ["test/*.js"]
+    },
+    watch: {
+      gruntfile: {
+        files: "<%= jshint.gruntfile.src %>",
+        tasks: ["jshint:gruntfile"]
+      },
+      lib: {
+        files: "<%= jshint.lib.src %>",
+        tasks: ["jshint:lib", "mochacli"]
+      },
+      test: {
+        files: "<%= jshint.test.src %>",
+        tasks: ["jshint:test", "mochacli"]
+      }
+    },
+    peg: {
+      spider: {
+        src: "src/spider.pegjs",
+        dest: "lib/parser.js"
+      }
+    },
+    mocha_istanbul: {
+      coverage: {
+        src: "test",
+        options: {
+          mask: "*.js",
+          excludes: ["lib/parser.js"]
+        }
+      }
+    },
+    clean: { build: ["lib/"] },
+    spider_script: {
+      options: {},
+      build: {
+        files: [{
+          expand: true,
+          cwd: "src",
+          src: ["**/*.spider"],
+          dest: "lib/",
+          ext: ".js"
+        }]
+      }
+    },
+    copy: {
+      build: {
+        files: [{
+          expand: true,
+          cwd: "src",
+          src: ["**/*.js"],
+          dest: "lib/"
+        }]
+      }
+    }
+  });
+  grunt.registerTask("default", ["build", "mochacli"]);
+  grunt.registerTask("build", ["clean:build", "peg", "spider_script:build", "copy:build"]);
+  grunt.registerTask("coverage", ["mocha_istanbul:coverage"]);
+};
diff --git a/Gruntfile.spider b/Gruntfile.spider
@@ -1,8 +1,6 @@
 use :node;
 
 module.exports = fn (grunt) {
-  require('traceur');
-
   // Show elapsed time at the end
   require('time-grunt')(grunt);
   // Load all grunt tasks

diff --git a/cli.js b/cli.js
@@ -2,13 +2,15 @@
 
 "use strict";
 
-var fs = require("fs"),
-    path = require("path"),
-    vm = require("vm"),
-    traceur = require("traceur"),
-    nomnom = require("nomnom"),
-    chalk = require("chalk"),
-    spider = require("./lib/spider");
+var fs = require("fs");
+var path = require("path");
+var vm = require("vm");
+var nomnom = require("nomnom");
+var chalk = require("chalk");
+var spider = require("./lib/spider");
+
+//This can be removed when grunt-spider-script updates or is replaced.
+require('traceur');
 
 var opts = nomnom
   .option("files", {

diff --git a/lib/ast.js b/lib/ast.js
diff --git a/lib/ast/CaseClause.js b/lib/ast/CaseClause.js
diff --git a/lib/ast/CatchClause.js b/lib/ast/CatchClause.js
diff --git a/lib/ast/ExportBatchSpecifier.js b/lib/ast/ExportBatchSpecifier.js
diff --git a/lib/ast/ExportSpecifier.js b/lib/ast/ExportSpecifier.js
diff --git a/lib/ast/ImportDefaultSpecifier.js b/lib/ast/ImportDefaultSpecifier.js
diff --git a/lib/ast/ImportNamespaceSpecifier.js b/lib/ast/ImportNamespaceSpecifier.js
diff --git a/lib/ast/ImportSpecifier.js b/lib/ast/ImportSpecifier.js
diff --git a/lib/ast/Node.js b/lib/ast/Node.js
diff --git a/lib/ast/Parameter.js b/lib/ast/Parameter.js
diff --git a/lib/ast/Program.js b/lib/ast/Program.js
diff --git a/lib/ast/Property.js b/lib/ast/Property.js
diff --git a/lib/ast/Range.js b/lib/ast/Range.js
diff --git a/lib/ast/VariableDeclarator.js b/lib/ast/VariableDeclarator.js
diff --git a/lib/ast/expressions/ArrayExpression.js b/lib/ast/expressions/ArrayExpression.js
diff --git a/lib/ast/expressions/ArrayPattern.js b/lib/ast/expressions/ArrayPattern.js
diff --git a/lib/ast/expressions/AssignmentExpression.js b/lib/ast/expressions/AssignmentExpression.js
diff --git a/lib/ast/expressions/BinaryExpression.js b/lib/ast/expressions/BinaryExpression.js
diff --git a/lib/ast/expressions/CallExpression.js b/lib/ast/expressions/CallExpression.js
diff --git a/lib/ast/expressions/ConditionalExpression.js b/lib/ast/expressions/ConditionalExpression.js
diff --git a/lib/ast/expressions/CurryCallExpression.js b/lib/ast/expressions/CurryCallExpression.js
diff --git a/lib/ast/expressions/ExistentialExpression.js b/lib/ast/expressions/ExistentialExpression.js
diff --git a/lib/ast/expressions/ForInExpression.js b/lib/ast/expressions/ForInExpression.js
diff --git a/lib/ast/expressions/FunctionExpression.js b/lib/ast/expressions/FunctionExpression.js
diff --git a/lib/ast/expressions/InExpression.js b/lib/ast/expressions/InExpression.js
diff --git a/lib/ast/expressions/LogicalExpression.js b/lib/ast/expressions/LogicalExpression.js
diff --git a/lib/ast/expressions/MemberExpression.js b/lib/ast/expressions/MemberExpression.js
diff --git a/lib/ast/expressions/NewExpression.js b/lib/ast/expressions/NewExpression.js
diff --git a/lib/ast/expressions/NullCheckCallExpression.js b/lib/ast/expressions/NullCheckCallExpression.js
diff --git a/lib/ast/expressions/NullCoalescingExpression.js b/lib/ast/expressions/NullCoalescingExpression.js
diff --git a/lib/ast/expressions/NullPropagatingExpression.js b/lib/ast/expressions/NullPropagatingExpression.js
diff --git a/lib/ast/expressions/ObjectExpression.js b/lib/ast/expressions/ObjectExpression.js