Merge branch 'master' of https://github.com/marijnh/acorn

Conflicts: README.md acorn.js package.json
2014-12-27 20:02:15 +11:00
parent 29a33f5ae9 5512e26ac0
commit ff4228c09d
8 changed files with 325 additions and 89 deletions
--- a/test/tests-6to5.js
+++ b/test/tests-6to5.js
@@ -482,8 +482,6 @@ test('({x, ...y, a, ...b, c})', {

 testFail("function foo(promise) { await promise; }", "Unexpected token (1:30)", {ecmaVersion: 7});

-testFail("async function* foo(promise) { await promise; }", "Unexpected token (1:14)", {ecmaVersion: 7});
-
 test('async function foo(promise) { await promise; }', {
  type: "Program",
  body: [{