From 8c25cb0d80f63b931a53a9f3b607922bf587ae29 Mon Sep 17 00:00:00 2001 From: Sebastian McKenzie Date: Tue, 6 Jan 2015 10:42:57 +1100 Subject: [PATCH] add higher priority to exponent operator, better async contextual functions --- acorn.js | 10 +++------- package.json | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/acorn.js b/acorn.js index f93cb72511..225b588c3f 100644 --- a/acorn.js +++ b/acorn.js @@ -469,7 +469,7 @@ // '*' may be multiply or have special meaning in ES6 var _star = {binop: 10, beforeExpr: true}; - var _exponent = {binop: 10, beforeExpr: true}; + var _exponent = {binop: 11, beforeExpr: true}; // '<', '>' may be relational or have special meaning in JSX var _lt = {binop: 7, beforeExpr: true}, _gt = {binop: 7, beforeExpr: true}; @@ -2618,12 +2618,8 @@ // normal functions if (tokType === _function) { - if (isStatement) { - // no line terminator after `async` contextual keyword - if (tokType === _semi || canInsertSemicolon()) { - return id; - } - } + // no line terminator after `async` contextual keyword + if (canInsertSemicolon()) return id; next(); return parseFunction(node, isStatement, true); diff --git a/package.json b/package.json index cd22d22b71..2309ef12b9 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "acorn-6to5", "description": "Acorn fork used by 6to5", "main": "acorn.js", - "version": "0.11.1-10", + "version": "0.11.1-11", "maintainers": [ { "name": "Marijn Haverbeke",