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

Don't treat e, b, E, B as forbidden siblings for hex literals. (#549)

Browse Source
This commit is contained in:
Rick Waldron 2017-05-30 19:14:31 -04:00 committed by Brian Ng
parent 3ca75dc9ec
commit 2f5d146d54
3 changed files with 93 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/tokenizer/index.js
View File

@ -17,18 +17,24 @@ import State from "./state";
// The following character codes are forbidden from being
// an immediate sibling of NumericLiteralSeparator _
const forbiddenNumericLiteralSeparatorSiblings = [
46, // .
66, // B
69, // E
79, // O
88, // X
95, // _ (multiple separators are not allowed)
98, // b
101, // e
111, // o
120, // x
];
const forbiddenNumericSeparatorSiblings = {
decBinOct: [
46, // .
66, // B
69, // E
79, // O
95, // _ (multiple separators are not allowed)
98, // b
101, // e
111, // o
],
hex: [
46, // .
88, // X
95, // _ (multiple separators are not allowed)
120, // x
],
};
// Object type used to represent tokens. Note that normally, tokens
// simply exist as properties on the parser object. This is only
@ -567,6 +573,9 @@ export default class Tokenizer extends LocationParser {
readInt(radix: number, len?: number): number | null {
const start = this.state.pos;
const forbiddenSiblings = radix === 16 ?
forbiddenNumericSeparatorSiblings.hex :
forbiddenNumericSeparatorSiblings.decBinOct;
let total = 0;
for (let i = 0, e = len == null ? Infinity : len; i < e; ++i) {
@ -577,8 +586,8 @@ export default class Tokenizer extends LocationParser {
const prev = this.input.charCodeAt(this.state.pos - 1);
const next = this.input.charCodeAt(this.state.pos + 1);
if (code === 95) {
if ((forbiddenNumericLiteralSeparatorSiblings.indexOf(prev) > -1) ||
(forbiddenNumericLiteralSeparatorSiblings.indexOf(next) > -1) ||
if ((forbiddenSiblings.indexOf(prev) > -1) ||
(forbiddenSiblings.indexOf(next) > -1) ||
Number.isNaN(next)) {
this.raise(this.state.pos, "Invalid NumericLiteralSeparator");
}

1
test/fixtures/experimental/numeric-literal-separator/valid-12/actual.js vendored Normal file
View File

@ -0,0 +1 @@
0xBE_be_EB_eb;

69
test/fixtures/experimental/numeric-literal-separator/valid-12/expected.json vendored Normal file
View File

@ -0,0 +1,69 @@
{
"type": "File",
"start": 0,
"end": 14,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 14
}
},
"program": {
"type": "Program",
"start": 0,
"end": 14,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 14
}
},
"sourceType": "script",
"body": [
{
"type": "ExpressionStatement",
"start": 0,
"end": 14,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 14
}
},
"expression": {
"type": "NumericLiteral",
"start": 0,
"end": 13,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 13
}
},
"extra": {
"rawValue": 3200183275,
"raw": "0xBE_be_EB_eb"
},
"value": 3200183275
}
}
],
"directives": []
}
}