parser, smart pipes: Add support for yield in pipeline bodies

Fixes #9178.
This commit is contained in:
J. S. Choi 2018-12-20 00:21:27 -05:00 committed by Nicolò Ribaudo
parent 60ffe1d103
commit c586d4e8ca
4 changed files with 199 additions and 2 deletions

View File

@ -13,7 +13,12 @@
// expressions and divisions. It is set on all token types that can // expressions and divisions. It is set on all token types that can
// be followed by an expression (thus, a slash after them would be a // be followed by an expression (thus, a slash after them would be a
// regular expression). // regular expression).
//
// The `startsExpr` property is used to determine whether an expression
// may be the “argument” subexpression of a `yield` expression or
// `yield` statement. It is set on all token types that may be at the
// start of a subexpression.
// `isLoop` marks a keyword as starting a loop, which is important // `isLoop` marks a keyword as starting a loop, which is important
// to know when parsing a label, in order to allow or disallow // to know when parsing a label, in order to allow or disallow
// continue jumps to that label. // continue jumps to that label.
@ -104,7 +109,7 @@ export const types: { [name: string]: TokenType } = {
backQuote: new TokenType("`", { startsExpr }), backQuote: new TokenType("`", { startsExpr }),
dollarBraceL: new TokenType("${", { beforeExpr, startsExpr }), dollarBraceL: new TokenType("${", { beforeExpr, startsExpr }),
at: new TokenType("@"), at: new TokenType("@"),
hash: new TokenType("#"), hash: new TokenType("#", { startsExpr }),
// Special hashbang token. // Special hashbang token.
interpreterDirective: new TokenType("#!..."), interpreterDirective: new TokenType("#!..."),

View File

@ -0,0 +1,3 @@
function * f () {
return x |> (yield #);
}

View File

@ -0,0 +1,3 @@
{
"plugins": [["pipelineOperator", { "proposal": "smart" }]]
}

View File

@ -0,0 +1,186 @@
{
"type": "File",
"start": 0,
"end": 44,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 3,
"column": 1
}
},
"program": {
"type": "Program",
"start": 0,
"end": 44,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 3,
"column": 1
}
},
"sourceType": "script",
"interpreter": null,
"body": [
{
"type": "FunctionDeclaration",
"start": 0,
"end": 44,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 3,
"column": 1
}
},
"id": {
"type": "Identifier",
"start": 11,
"end": 12,
"loc": {
"start": {
"line": 1,
"column": 11
},
"end": {
"line": 1,
"column": 12
},
"identifierName": "f"
},
"name": "f"
},
"generator": true,
"async": false,
"params": [],
"body": {
"type": "BlockStatement",
"start": 16,
"end": 44,
"loc": {
"start": {
"line": 1,
"column": 16
},
"end": {
"line": 3,
"column": 1
}
},
"body": [
{
"type": "ReturnStatement",
"start": 20,
"end": 42,
"loc": {
"start": {
"line": 2,
"column": 2
},
"end": {
"line": 2,
"column": 24
}
},
"argument": {
"type": "BinaryExpression",
"start": 27,
"end": 41,
"loc": {
"start": {
"line": 2,
"column": 9
},
"end": {
"line": 2,
"column": 23
}
},
"left": {
"type": "Identifier",
"start": 27,
"end": 28,
"loc": {
"start": {
"line": 2,
"column": 9
},
"end": {
"line": 2,
"column": 10
},
"identifierName": "x"
},
"name": "x"
},
"operator": "|>",
"right": {
"type": "PipelineTopicExpression",
"start": 32,
"end": 41,
"loc": {
"start": {
"line": 2,
"column": 14
},
"end": {
"line": 2,
"column": 23
}
},
"expression": {
"type": "YieldExpression",
"start": 33,
"end": 40,
"loc": {
"start": {
"line": 2,
"column": 15
},
"end": {
"line": 2,
"column": 22
}
},
"delegate": false,
"argument": {
"type": "PipelinePrimaryTopicReference",
"start": 39,
"end": 40,
"loc": {
"start": {
"line": 2,
"column": 21
},
"end": {
"line": 2,
"column": 22
}
}
},
"extra": {
"parenthesized": true,
"parenStart": 32
}
}
}
}
}
],
"directives": []
}
}
],
"directives": []
}
}