Merge pull request #51 from davidchambers/harmony

switch to esprima-fb for Harmony support

.travis.yml

@@ -1,7 +1,7 @@
 language: node_js
 node_js:
   - "0.10"
-  - "0.11"
+  - "0.12"
 install:
   - make setup
 script:

Makefile

@@ -43,11 +43,11 @@ test: \
 		test/public/shared/index.coffee \
 		test/public/shared/index.js \
 		test/public/style.css
-	$(COFFEE) test/index.coffee
+	$(COFFEE) --nodejs --harmony -- test/index.coffee
 
 test/public/bundle.js: \
 		bower_components/coffee-script/extras/coffee-script.js \
-		bower_components/esprima/esprima.js \
+		node_modules/esprima-fb/esprima.js \
 		bower_components/jquery/dist/jquery.js \
 		bower_components/qunit/qunit/qunit.js \
 		bower_components/ramda/dist/ramda.js \

README.md

@@ -33,7 +33,7 @@ function toFahrenheit(degreesCelsius) {
 
 2.  Add script tags:
 
-        <script src="path/to/bower_components/esprima/esprima.js"></script>
+        <script src="path/to/node_modules/esprima-fb/esprima.js"></script>
         <script src="path/to/bower_components/jquery/dist/jquery.js"></script>
         <script src="path/to/bower_components/qunit/qunit/qunit.js"></script>
         <script src="path/to/bower_components/ramda/dist/ramda.js"></script>

bin/doctest

@@ -1,3 +1,15 @@
 #!/usr/bin/env node
 
-require('../lib/command');
+// Based on:
+// https://github.com/jashkenas/coffeescript/blob/1.9.1/src/command.coffee#L431-L441
+var args = process.argv.slice(1);
+var idx = args.indexOf('--nodejs');
+if (idx < 0 || idx === args.length - 1) {
+  require('../lib/command');
+} else {
+  require('child_process').spawn(
+    process.execPath,
+    args[idx + 1].split(/\s+/).concat(args.slice(0, idx), args.slice(idx + 2)),
+    {cwd: process.cwd(), env: process.env, stdio: [0, 1, 2]}
+  ).on('exit', process.exit);
+}

bower.json

@@ -11,7 +11,6 @@
   ],
   "dependencies": {
     "coffee-script": "1.8.x",
-    "esprima": "1.2.x",
     "jquery": "2.1.x",
     "ramda": "0.10.x"
   },

package.json

@@ -26,11 +26,12 @@
   "dependencies": {
     "coffee-script": "1.8.x",
     "commander": "2.5.x",
-    "esprima": "1.2.x",
+    "esprima-fb": "13001.1001.0-dev-harmony-fb",
     "ramda": "0.10.x"
   },
   "devDependencies": {
     "bower": "1.3.x",
+    "semver": "4.3.x",
     "xyz": "0.5.x"
   }
 }

src/command.coffee

@@ -8,6 +8,7 @@ program
 .version doctest.version
 .usage '[options] path/to/js/or/coffee/module'
 .option '-m, --module <type>', 'specify module system ("amd" or "commonjs")'
+.option '    --nodejs', 'pass options directly to the "node" binary'
 .option '-p, --print', 'output the rewritten source without running tests'
 .option '-s, --silent', 'suppress output'
 .option '-t, --type <type>', 'specify file type ("coffee" or "js")'

src/doctest.coffee

@@ -50,7 +50,7 @@ else
   fs = require 'fs'
   pathlib = require 'path'
   CoffeeScript = require 'coffee-script'
-  esprima = require 'esprima'
+  esprima = require 'esprima-fb'
   R = require 'ramda'
   module.exports = doctest
 

test/harmony/index.js

@@ -0,0 +1,22 @@
+function* fibonacci() {
+  var prev = 0;
+  var curr = 1;
+  while (true) {
+    yield curr;
+    var next = prev + curr;
+    prev = curr;
+    curr = next;
+  }
+}
+
+// > seq.next().value
+// 1
+// > seq.next().value
+// 1
+// > seq.next().value
+// 2
+// > seq.next().value
+// 3
+// > seq.next().value
+// 5
+var seq = fibonacci();

test/harmony/results.js

@@ -0,0 +1,7 @@
+module.exports = [
+  ['seq.next().value', [true, 1, 1, 13]],
+  ['seq.next().value', [true, 1, 1, 15]],
+  ['seq.next().value', [true, 2, 2, 17]],
+  ['seq.next().value', [true, 3, 3, 19]],
+  ['seq.next().value', [true, 5, 5, 21]],
+];

test/index.coffee

@@ -2,6 +2,7 @@
 pathlib = require 'path'
 
 R       = require 'ramda'
+semver  = require 'semver'
 
 doctest = require '../lib/doctest'
 
@@ -57,6 +58,7 @@ testModule 'test/commonjs/exports/index.js', module: 'commonjs'
 testModule 'test/commonjs/module.exports/index.js', module: 'commonjs'
 testModule 'test/commonjs/strict/index.js', module: 'commonjs'
 testModule 'test/bin/executable', type: 'js'
+testModule 'test/harmony/index.js' if semver.gte process.version, '0.12.0'
 
 testCommand 'bin/doctest --xxx',
   code: 1