Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix %== parsing in hack pipes #13536

Merged
merged 4 commits into from
Jul 20, 2021
Merged

Fix %== parsing in hack pipes #13536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4a9fcf5
Fix `%==` parsing in hack pipes
nicolo-ribaudo Jul 7, 2021
e8feae8
Use custom token type
nicolo-ribaudo Jul 8, 2021
1da535f
Update packages/babel-parser/src/parser/expression.js
nicolo-ribaudo Jul 8, 2021
d668a78
Apply suggestions from code review
nicolo-ribaudo Jul 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 20 additions & 0 deletions packages/babel-parser/src/parser/expression.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1214,6 +1214,26 @@ export default class ExpressionParser extends LValParser {
return node;
}

case tt.moduloAssign:
if (
this.getPluginOption("pipelineOperator", "proposal") === "hack" &&
this.getPluginOption("pipelineOperator", "topicToken") === "%"
) {
// If we find %= in an expression position, and the Hack-pipes proposal is active,
// then the % could be the topic token (e.g., in x |> %==y or x |> %===y), and so we
// reparse it as %.
// The next readToken() call will start parsing from =.

this.state.value = "%";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could skip this step since this.state.value is not used.

this.state.type = tt.modulo;
this.state.pos--;

This comment was marked as resolved.

Sign in to view

this.state.end--;
this.state.endLoc.column--;
nicolo-ribaudo marked this conversation as resolved.
Show resolved Hide resolved
} else {
throw this.unexpected();
}

// falls through
case tt.modulo:
case tt.hash: {
const pipeProposal = this.getPluginOption(
Expand Down
2 changes: 1 addition & 1 deletion packages/babel-parser/src/tokenizer/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,7 @@ export default class Tokenizer extends ParserErrors {

if (next === charCodes.equalsTo && !this.state.inType) {
width++;
type = tt.assign;
type = code === charCodes.percentSign ? tt.moduloAssign : tt.assign;
}

this.finishOp(type, width);
Expand Down
3 changes: 3 additions & 0 deletions packages/babel-parser/src/tokenizer/types.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,9 @@ export const types: { [name: string]: TokenType } = {
eq: new TokenType("=", { beforeExpr, isAssign }),
assign: new TokenType("_=", { beforeExpr, isAssign }),
slashAssign: new TokenType("_=", { beforeExpr, isAssign }),
// This is only needed to support % as a Hack-pipe topic token. If the proposal
// ends up choosing a different token, it can be merged with tt.assign.
moduloAssign: new TokenType("_=", { beforeExpr, isAssign }),
incDec: new TokenType("++/--", { prefix, postfix, startsExpr }),
bang: new TokenType("!", { beforeExpr, prefix, startsExpr }),
tilde: new TokenType("~", { beforeExpr, prefix, startsExpr }),
Expand Down