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

fix: allow 09.1_1 and 09e1_1 in sloppy mode (#11854)

Browse Source 
* fix: allow 09.1_1 and 09e1_1 in sloppy mode

* polish: avoid extra input source scanning

* chore: move comment [skip ci]
This commit is contained in:
Huáng Jùnliàng 2020-07-21 09:44:28 -04:00 committed by GitHub
parent 48be93b46c
commit 3680f019d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 70 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
packages/babel-parser/src/tokenizer/index.js
View File

@ -1116,26 +1116,31 @@ export default class Tokenizer extends ParserErrors {
const start = this.state.pos;
let isFloat = false;
let isBigInt = false;
let isNonOctalDecimalInt = false;
let isOctal = false;
if (!startsWithDot && this.readInt(10) === null) {
this.raise(start, Errors.InvalidNumber);
}
let octal =
const hasLeadingZero =
this.state.pos - start >= 2 &&
this.input.charCodeAt(start) === charCodes.digit0;
if (octal) {
if (hasLeadingZero) {
const integer = this.input.slice(start, this.state.pos);
if (this.state.strict) {
this.raise(start, Errors.StrictOctalLiteral);
} else if (this.hasPlugin("numericSeparator")) {
// disallow numeric separators in non octal decimals and legacy octal likes
const underscorePos = integer.indexOf("_");
if (underscorePos > 0) {
this.raise(underscorePos + start, Errors.ZeroDigitNumericSeparator);
}
if (/[89]/.test(this.input.slice(start, this.state.pos))) {
octal = false;
isNonOctalDecimalInt = true;
}
isOctal = hasLeadingZero && !/[89]/.test(integer);
}
let next = this.input.charCodeAt(this.state.pos);
if (next === charCodes.dot && !octal) {
if (next === charCodes.dot && !isOctal) {
++this.state.pos;
this.readInt(10);
isFloat = true;
@ -1144,7 +1149,7 @@ export default class Tokenizer extends ParserErrors {
if (
(next === charCodes.uppercaseE || next === charCodes.lowercaseE) &&
!octal
!isOctal
) {
next = this.input.charCodeAt(++this.state.pos);
if (next === charCodes.plusSign || next === charCodes.dash) {
@ -1155,16 +1160,6 @@ export default class Tokenizer extends ParserErrors {
next = this.input.charCodeAt(this.state.pos);
}
// disallow numeric separators in non octal decimals and legacy octal likes
if (this.hasPlugin("numericSeparator") && (octal || isNonOctalDecimalInt)) {
const underscorePos = this.input
.slice(start, this.state.pos)
.indexOf("_");
if (underscorePos > 0) {
this.raise(underscorePos + start, Errors.ZeroDigitNumericSeparator);
}
}
if (next === charCodes.underscore) {
this.expectPlugin("numericSeparator", this.state.pos);
}
@ -1172,7 +1167,7 @@ export default class Tokenizer extends ParserErrors {
if (next === charCodes.lowercaseN) {
// disallow floats, legacy octal syntax and non octal decimals
// new style octal ("0o") is handled in this.readRadixNumber
if (isFloat || octal || isNonOctalDecimalInt) {
if (isFloat || hasLeadingZero) {
this.raise(start, Errors.InvalidBigIntLiteral);
}
++this.state.pos;
@ -1191,7 +1186,7 @@ export default class Tokenizer extends ParserErrors {
return;
}
const val = octal ? parseInt(str, 8) : parseFloat(str);
const val = isOctal ? parseInt(str, 8) : parseFloat(str);
this.finishToken(tt.num, val);
}

1
packages/babel-parser/test/fixtures/experimental/numeric-separator/valid-non-octal-exponents/input.js vendored Normal file
View File

@ -0,0 +1 @@
09e1_1

26
packages/babel-parser/test/fixtures/experimental/numeric-separator/valid-non-octal-exponents/output.json vendored Normal file
View File

@ -0,0 +1,26 @@
{
"type": "File",
"start":0,"end":6,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":6}},
"program": {
"type": "Program",
"start":0,"end":6,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":6}},
"sourceType": "script",
"interpreter": null,
"body": [
{
"type": "ExpressionStatement",
"start":0,"end":6,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":6}},
"expression": {
"type": "NumericLiteral",
"start":0,"end":6,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":6}},
"extra": {
"rawValue": 900000000000,
"raw": "09e1_1"
},
"value": 900000000000
}
}
],
"directives": []
}
}

1
packages/babel-parser/test/fixtures/experimental/numeric-separator/valid-non-octal-fragments/input.js vendored Normal file
View File

@ -0,0 +1 @@
09.1_1

26
packages/babel-parser/test/fixtures/experimental/numeric-separator/valid-non-octal-fragments/output.json vendored Normal file
View File

@ -0,0 +1,26 @@
{
"type": "File",
"start":0,"end":6,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":6}},
"program": {
"type": "Program",
"start":0,"end":6,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":6}},
"sourceType": "script",
"interpreter": null,
"body": [
{
"type": "ExpressionStatement",
"start":0,"end":6,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":6}},
"expression": {
"type": "NumericLiteral",
"start":0,"end":6,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":6}},
"extra": {
"rawValue": 9.11,
"raw": "09.1_1"
},
"value": 9.11
}
}
],
"directives": []
}
}