cerxes/babel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #10 from danez/fix-flow-arrow-spread

Browse Source 
Fix flow plugin when flow+arrow+spread used together
This commit is contained in:
Sebastian McKenzie
2016-06-22 12:36:52 +01:00
committed by GitHub
parent f11a82c96c d15a2310cd
commit 4d2e1dddfb
13 changed files with 793 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/parser/expression.js
View File

@@ -531,12 +531,12 @@ pp.parseParenExpression = function () {
return val;
};
pp.parseParenAndDistinguishExpression = function (startPos, startLoc, canBeArrow, isAsync, allowOptionalCommaStart) {
pp.parseParenAndDistinguishExpression = function (startPos, startLoc, canBeArrow, isAsync) {
startPos = startPos || this.state.start;
startLoc = startLoc || this.state.startLoc;
let val;
this.next();
this.expect(tt.parenL);
let innerStartPos = this.state.start, innerStartLoc = this.state.startLoc;
let exprList = [], first = true;
@@ -566,12 +566,13 @@ pp.parseParenAndDistinguishExpression = function (startPos, startLoc, canBeArrow
let innerEndLoc = this.state.startLoc;
this.expect(tt.parenR);
if (canBeArrow && !this.canInsertSemicolon() && this.eat(tt.arrow)) {
let arrowNode = this.startNodeAt(startPos, startLoc);
if (canBeArrow && !this.canInsertSemicolon() && (arrowNode = this.parseArrow(arrowNode))) {
for (let param of exprList) {
if (param.extra && param.extra.parenthesized) this.unexpected(param.extra.parenStart);
}
return this.parseArrowExpression(this.startNodeAt(startPos, startLoc), exprList, isAsync);
return this.parseArrowExpression(arrowNode, exprList, isAsync);
}
if (!exprList.length) {
@@ -581,7 +582,7 @@ pp.parseParenAndDistinguishExpression = function (startPos, startLoc, canBeArrow
this.unexpected(this.state.lastTokStart);
}
}
if (optionalCommaStart && !allowOptionalCommaStart) this.unexpected(optionalCommaStart);
if (optionalCommaStart) this.unexpected(optionalCommaStart);
if (spreadStart) this.unexpected(spreadStart);
if (refShorthandDefaultPos.start) this.unexpected(refShorthandDefaultPos.start);
@@ -601,6 +602,12 @@ pp.parseParenAndDistinguishExpression = function (startPos, startLoc, canBeArrow
return val;
};
pp.parseArrow = function (node) {
if (this.eat(tt.arrow)) {
return node;
}
};
pp.parseParenItem = function (node) {
return node;
};