Skip to content

Commit

Permalink
Merge branch 'master' of github.com:jashkenas/coffeescript into issue…
Browse files Browse the repository at this point in the history
…3921

# Conflicts:
#	test/control_flow.coffee
  • Loading branch information
GeoffreyBooth committed Jan 16, 2018
2 parents ea6f46a + 0217ed5 commit a3e57b8
Show file tree
Hide file tree
Showing 12 changed files with 533 additions and 373 deletions.
7 changes: 7 additions & 0 deletions bin/cake
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
#!/usr/bin/env node

try {
new Function('var {a} = {a: 1}')();
} catch (error) {
console.error('Your JavaScript runtime does not support some features used by the cake command. Please use Node 6 or later.');
process.exit(1);
}

var path = require('path');
var fs = require('fs');

Expand Down
7 changes: 7 additions & 0 deletions bin/coffee
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
#!/usr/bin/env node

try {
new Function('var {a} = {a: 1}')();
} catch (error) {
console.error('Your JavaScript runtime does not support some features used by the coffee command. Please use Node 6 or later.');
process.exit(1);
}

var path = require('path');
var fs = require('fs');

Expand Down
49 changes: 24 additions & 25 deletions lib/coffeescript/browser.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 7 additions & 8 deletions lib/coffeescript/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 12 additions & 11 deletions lib/coffeescript/lexer.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit a3e57b8

Please sign in to comment.