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] Invalid NonOctal Decimal #10467

Merged
merged 12 commits into from Sep 23, 2019
Merged

[parser] Invalid NonOctal Decimal #10467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a4bcbaf
Add test
zant Sep 19, 2019
2ac7281
Add nonOctalDecimal verification
zant Sep 19, 2019
36b23ff
Update regex and code style
zant Sep 19, 2019
6bf61b6
Refactor non octal detection
zant Sep 20, 2019
63288b3
Add numeric separator test
zant Sep 20, 2019
ad99d8d
Disallow numeric separators in non octals
zant Sep 20, 2019
9c26846
Update whitelist
zant Sep 20, 2019
dbaf284
Better test naming
zant Sep 20, 2019
a4c9bcf
Disallow numeric separators in non oct for all numbers
zant Sep 21, 2019
ae6025e
Specific error above the general error
zant Sep 21, 2019
4b8e265
Add test for invalid leading zero in num separator
zant Sep 22, 2019
5283e6c
Add start position to error
zant Sep 23, 2019
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
22 changes: 20 additions & 2 deletions packages/babel-parser/src/tokenizer/index.js
View file
Open in desktop
Expand Up @@ -993,6 +993,7 @@ export default class Tokenizer extends LocationParser {
const start = this.state.pos;
let isFloat = false;
let isBigInt = false;
let isNonOctalDecimalInt = false;

if (!startsWithDot && this.readInt(10) === null) {
this.raise(start, "Invalid number");
Expand All @@ -1009,6 +1010,7 @@ export default class Tokenizer extends LocationParser {
}
if (/[89]/.test(this.input.slice(start, this.state.pos))) {
octal = false;
isNonOctalDecimalInt = true;
}
}

Expand All @@ -1033,10 +1035,26 @@ export default class Tokenizer extends LocationParser {
next = this.input.charCodeAt(this.state.pos);
}

// disallow numeric separators in non octal decimals
if (this.hasPlugin("numericSeparator") && isNonOctalDecimalInt) {
const underscorePos = this.input
.slice(start, this.state.pos)
.indexOf("_");
if (underscorePos > 0) {
this.raise(
underscorePos + start,
"Numeric separator can not be used after leading 0",
);
}
}

if (this.hasPlugin("bigInt")) {
if (next === charCodes.lowercaseN) {
// disallow floats and legacy octal syntax, new style octal ("0o") is handled in this.readRadixNumber
if (isFloat || octal) this.raise(start, "Invalid BigIntLiteral");
// disallow floats, legacy octal syntax and non octal decimals
// new style octal ("0o") is handled in this.readRadixNumber
if (isFloat || octal || isNonOctalDecimalInt) {
this.raise(start, "Invalid BigIntLiteral");
}
++this.state.pos;
isBigInt = true;
}
Expand Down
1 change: 1 addition & 0 deletions ...ges/babel-parser/test/fixtures/experimental/bigint/invalid-non-octal-decimal-int/input.js
View file
Open in desktop
@@ -0,0 +1 @@
089n
1 change: 1 addition & 0 deletions ...babel-parser/test/fixtures/experimental/bigint/invalid-non-octal-decimal-int/options.json
View file
Open in desktop
@@ -0,0 +1 @@
{ "throws": "Invalid BigIntLiteral (1:0)" }
1 change: 1 addition & 0 deletions ...s/babel-parser/test/fixtures/experimental/numeric-separator/invalid-leading-zero/input.js
View file
Open in desktop
@@ -0,0 +1 @@
0_8
1 change: 1 addition & 0 deletions ...bel-parser/test/fixtures/experimental/numeric-separator/invalid-leading-zero/options.json
View file
Open in desktop
@@ -0,0 +1 @@
{ "throws": "Numeric separator can not be used after leading 0 (1:1)" }
1 change: 1 addition & 0 deletions ...arser/test/fixtures/experimental/numeric-separator/invalid-non-octal-decimal-int/input.js
View file
Open in desktop
@@ -0,0 +1 @@
08_0n
1 change: 1 addition & 0 deletions ...r/test/fixtures/experimental/numeric-separator/invalid-non-octal-decimal-int/options.json
View file
Open in desktop
@@ -0,0 +1 @@
{ "throws": "Numeric separator can not be used after leading 0 (1:2)" }
2 changes: 1 addition & 1 deletion packages/babel-parser/test/fixtures/experimental/numeric-separator/options.json
View file
Open in desktop
@@ -1,3 +1,3 @@
{
"plugins": ["numericSeparator"]
"plugins": ["bigInt", "numericSeparator"]
}
14 changes: 0 additions & 14 deletions scripts/tests/test262/test262_whitelist.txt
View file
Open in desktop
Expand Up @@ -104,26 +104,12 @@ language/expressions/object/method-definition/private-name-early-error-gen-insid
language/expressions/object/method-definition/private-name-early-error-gen-inside-class.js(strict mode)
language/expressions/object/method-definition/private-name-early-error-method-inside-class.js(default)
language/expressions/object/method-definition/private-name-early-error-method-inside-class.js(strict mode)
language/literals/bigint/non-octal-like-invalid-0008n.js(default)
language/literals/bigint/non-octal-like-invalid-012348n.js(default)
language/literals/bigint/non-octal-like-invalid-08n.js(default)
language/literals/bigint/non-octal-like-invalid-09n.js(default)
language/literals/bigint/numeric-separators/numeric-separator-literal-nonoctal-08-err.js(default)
language/literals/bigint/numeric-separators/numeric-separator-literal-nonoctal-09-err.js(default)
language/literals/bigint/numeric-separators/numeric-separator-literal-nonoctal-0_8-err.js(default)
language/literals/bigint/numeric-separators/numeric-separator-literal-nonoctal-0_9-err.js(default)
language/literals/bigint/numeric-separators/numeric-separator-literal-nzd-nsl-dds-leading-zero-err.js(default)
language/literals/numeric/numeric-separators/numeric-separator-literal-lol-00-err.js(default)
language/literals/numeric/numeric-separators/numeric-separator-literal-lol-01-err.js(default)
language/literals/numeric/numeric-separators/numeric-separator-literal-lol-07-err.js(default)
language/literals/numeric/numeric-separators/numeric-separator-literal-lol-0_0-err.js(default)
language/literals/numeric/numeric-separators/numeric-separator-literal-lol-0_1-err.js(default)
language/literals/numeric/numeric-separators/numeric-separator-literal-lol-0_7-err.js(default)
Copy link
Member

Choose a reason for hiding this comment

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

If you want to open another PR to fix these tests, you are welcome to do so!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Great, i would like to do so! Should i make an issue or just as a follow up of this PR?

Copy link
Member

Choose a reason for hiding this comment

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

Naa, just a PR

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Goodd 👌

language/literals/numeric/numeric-separators/numeric-separator-literal-nonoctal-08-err.js(default)
language/literals/numeric/numeric-separators/numeric-separator-literal-nonoctal-09-err.js(default)
language/literals/numeric/numeric-separators/numeric-separator-literal-nonoctal-0_8-err.js(default)
language/literals/numeric/numeric-separators/numeric-separator-literal-nonoctal-0_9-err.js(default)
language/literals/numeric/numeric-separators/numeric-separator-literal-nzd-nsl-dds-leading-zero-err.js(default)
language/module-code/privatename-not-valid-earlyerr-module-1.js(default)
language/module-code/privatename-not-valid-earlyerr-module-1.js(strict mode)
language/module-code/privatename-not-valid-earlyerr-module-2.js(default)
Expand Down