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

flow: allow leading pipes in all positions (#256)

Browse Source
This commit is contained in:
Vladimir Kurchatkin
2017-01-02 13:13:53 +04:00
committed by Daniel Tschinder
parent b875ed755b
commit 3dc403974c
12 changed files with 1304 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/flow.js
View File

@@ -7,15 +7,11 @@ import Parser from "../parser";
let pp = Parser.prototype;
pp.flowParseTypeInitialiser = function (tok, allowLeadingPipeOrAnd) {
pp.flowParseTypeInitialiser = function (tok) {
let oldInType = this.state.inType;
this.state.inType = true;
this.expect(tok || tt.colon);
if (allowLeadingPipeOrAnd) {
if (this.match(tt.bitwiseAND) || this.match(tt.bitwiseOR)) {
this.next();
}
}
let type = this.flowParseType();
this.state.inType = oldInType;
return type;
@@ -193,10 +189,7 @@ pp.flowParseTypeAlias = function (node) {
node.typeParameters = null;
}
node.right = this.flowParseTypeInitialiser(
tt.eq,
/*allowLeadingPipeOrAnd*/ true
);
node.right = this.flowParseTypeInitialiser(tt.eq);
this.semicolon();
return this.finishNode(node, "TypeAlias");
@@ -729,6 +722,7 @@ pp.flowParseAnonFunctionWithoutParens = function () {
pp.flowParseIntersectionType = function () {
let node = this.startNode();
this.eat(tt.bitwiseAND);
let type = this.flowParseAnonFunctionWithoutParens();
node.types = [type];
while (this.eat(tt.bitwiseAND)) {
@@ -739,6 +733,7 @@ pp.flowParseIntersectionType = function () {
pp.flowParseUnionType = function () {
let node = this.startNode();
this.eat(tt.bitwiseOR);
let type = this.flowParseIntersectionType();
node.types = [type];
while (this.eat(tt.bitwiseOR)) {