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

[parser] Report escapes in kws only if they won't be used as identifiers #10455

Merged
merged 1 commit into from Sep 17, 2019
Merged

[parser] Report escapes in kws only if they won't be used as identifiers #10455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions packages/babel-parser/src/parser/expression.js
View file
Open in desktop
Expand Up @@ -2066,6 +2066,11 @@ export default class ExpressionParser extends LValParser {

if (this.match(tt.name)) {
name = this.state.value;

// An escaped identifier whose value is the same as a keyword
if (!liberal && this.state.containsEsc && isKeyword(name)) {
this.raise(this.state.pos, `Escape sequence in keyword ${name}`);
}
} else if (this.state.type.keyword) {
name = this.state.type.keyword;

Expand Down
6 changes: 1 addition & 5 deletions packages/babel-parser/src/tokenizer/index.js
View file
Open in desktop
Expand Up @@ -1326,11 +1326,7 @@ export default class Tokenizer extends LocationParser {

readWord(): void {
const word = this.readWord1();
const type = keywordTypes.get(word) || tt.name;

if (type.keyword && this.state.containsEsc) {
this.raise(this.state.pos, `Escape sequence in keyword ${word}`);
}
const type = (!this.state.containsEsc && keywordTypes.get(word)) || tt.name;

// Allow @@iterator and @@asyncIterator as a identifier only inside type
if (
Expand Down
0 ...fixtures/core/valid-escape/async/input.js → ...xtures/core/escape-keyword/async/input.js
View file
Open in desktop
File renamed without changes.
0 ...tures/core/valid-escape/async/output.json → ...res/core/escape-keyword/async/output.json
View file
Open in desktop
File renamed without changes.
3 changes: 3 additions & 0 deletions packages/babel-parser/test/fixtures/core/escape-keyword/invalid/input.js
View file
Open in desktop
@@ -0,0 +1,3 @@
var a = {
br\u{65}ak
};
3 changes: 3 additions & 0 deletions packages/babel-parser/test/fixtures/core/escape-keyword/invalid/options.json
View file
Open in desktop
@@ -0,0 +1,3 @@
{
"throws": "Unexpected keyword 'break' (2:2)"
JLHwung marked this conversation as resolved.
Show resolved Hide resolved
}
3 changes: 3 additions & 0 deletions packages/babel-parser/test/fixtures/core/escape-keyword/used-as-property/input.js
View file
Open in desktop
@@ -0,0 +1,3 @@
var a = {
br\u{65}ak: 2
};
157 changes: 157 additions & 0 deletions packages/babel-parser/test/fixtures/core/escape-keyword/used-as-property/output.json
View file
Open in desktop
@@ -0,0 +1,157 @@
{
"type": "File",
"start": 0,
"end": 28,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 3,
"column": 2
}
},
"program": {
"type": "Program",
"start": 0,
"end": 28,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 3,
"column": 2
}
},
"sourceType": "script",
"interpreter": null,
"body": [
{
"type": "VariableDeclaration",
"start": 0,
"end": 28,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 3,
"column": 2
}
},
"declarations": [
{
"type": "VariableDeclarator",
"start": 4,
"end": 27,
"loc": {
"start": {
"line": 1,
"column": 4
},
"end": {
"line": 3,
"column": 1
}
},
"id": {
"type": "Identifier",
"start": 4,
"end": 5,
"loc": {
"start": {
"line": 1,
"column": 4
},
"end": {
"line": 1,
"column": 5
},
"identifierName": "a"
},
"name": "a"
},
"init": {
"type": "ObjectExpression",
"start": 8,
"end": 27,
"loc": {
"start": {
"line": 1,
"column": 8
},
"end": {
"line": 3,
"column": 1
}
},
"properties": [
{
"type": "ObjectProperty",
"start": 12,
"end": 25,
"loc": {
"start": {
"line": 2,
"column": 2
},
"end": {
"line": 2,
"column": 15
}
},
"method": false,
"key": {
"type": "Identifier",
"start": 12,
"end": 22,
"loc": {
"start": {
"line": 2,
"column": 2
},
"end": {
"line": 2,
"column": 12
},
"identifierName": "break"
},
"name": "break"
},
"computed": false,
"shorthand": false,
"value": {
"type": "NumericLiteral",
"start": 24,
"end": 25,
"loc": {
"start": {
"line": 2,
"column": 14
},
"end": {
"line": 2,
"column": 15
}
},
"extra": {
"rawValue": 2,
"raw": "2"
},
"value": 2
}
}
]
}
}
],
"kind": "var"
}
],
"directives": []
}
}