Add decimal parsing support (#11640)

* docs: add DecimalLiteral to AST spec

* add decimal support

* fix: throw invalid decimal on start

* add DecimalLiteral type definitions

* update parser typings

* add generator support

* add syntax-decimal plugin

* Add syntax-decimal to babel-standalone

* add syntax-decimal to missing plugin helpers

* fix incorrect test macro
This commit is contained in:
Huáng Jùnliàng
2020-07-29 16:43:15 -04:00
committed by GitHub
parent 9daa50e005
commit 059e9124ff
56 changed files with 655 additions and 4 deletions

View File

@@ -61,6 +61,7 @@ export const ErrorMessages = Object.freeze({
ImportOutsideModule: `'import' and 'export' may appear only with 'sourceType: "module"'`,
InvalidBigIntLiteral: "Invalid BigIntLiteral",
InvalidCodePoint: "Code point out of bounds",
InvalidDecimal: "Invalid decimal",
InvalidDigit: "Expected number in radix %0",
InvalidEscapeSequence: "Bad character escape sequence",
InvalidEscapeSequenceTemplate: "Invalid escape sequence in template",

View File

@@ -1032,6 +1032,9 @@ export default class ExpressionParser extends LValParser {
case tt.bigint:
return this.parseLiteral(this.state.value, "BigIntLiteral");
case tt.decimal:
return this.parseLiteral(this.state.value, "DecimalLiteral");
case tt.string:
return this.parseLiteral(this.state.value, "StringLiteral");
@@ -1859,7 +1862,10 @@ export default class ExpressionParser extends LValParser {
this.state.inPropertyName = true;
// We check if it's valid for it to be a private name when we push it.
(prop: $FlowFixMe).key =
this.match(tt.num) || this.match(tt.string) || this.match(tt.bigint)
this.match(tt.num) ||
this.match(tt.string) ||
this.match(tt.bigint) ||
this.match(tt.decimal)
? this.parseExprAtom()
: this.parseMaybePrivateName(isPrivateNameAllowed);

View File

@@ -273,7 +273,8 @@ export default class UtilParser extends Tokenizer {
!!this.state.type.keyword ||
this.match(tt.string) ||
this.match(tt.num) ||
this.match(tt.bigint)
this.match(tt.bigint) ||
this.match(tt.decimal)
);
}
}

View File

@@ -43,6 +43,17 @@ export default (superClass: Class<Parser>): Class<Parser> =>
return node;
}
estreeParseDecimalLiteral(value: any): N.Node {
// https://github.com/estree/estree/blob/master/experimental/decimal.md
// $FlowIgnore
// todo: use BigDecimal when node supports it.
const decimal = null;
const node = this.estreeParseLiteral(decimal);
node.decimal = String(node.value || value);
return node;
}
estreeParseLiteral(value: any): N.Node {
return this.parseLiteral(value, "Literal");
}
@@ -229,6 +240,9 @@ export default (superClass: Class<Parser>): Class<Parser> =>
case tt.bigint:
return this.estreeParseBigIntLiteral(this.state.value);
case tt.decimal:
return this.estreeParseDecimalLiteral(this.state.value);
case tt._null:
return this.estreeParseLiteral(null);

View File

@@ -1095,6 +1095,8 @@ export default class Tokenizer extends ParserErrors {
if (next === charCodes.lowercaseN) {
++this.state.pos;
isBigInt = true;
} else if (next === charCodes.lowercaseM) {
throw this.raise(start, Errors.InvalidDecimal);
}
if (isIdentifierStart(this.input.codePointAt(this.state.pos))) {
@@ -1116,6 +1118,8 @@ export default class Tokenizer extends ParserErrors {
const start = this.state.pos;
let isFloat = false;
let isBigInt = false;
let isDecimal = false;
let hasExponent = false;
let isOctal = false;
if (!startsWithDot && this.readInt(10) === null) {
@@ -1157,6 +1161,7 @@ export default class Tokenizer extends ParserErrors {
}
if (this.readInt(10) === null) this.raise(start, Errors.InvalidNumber);
isFloat = true;
hasExponent = true;
next = this.input.charCodeAt(this.state.pos);
}
@@ -1174,18 +1179,32 @@ export default class Tokenizer extends ParserErrors {
isBigInt = true;
}
if (next === charCodes.lowercaseM) {
this.expectPlugin("decimal", this.state.pos);
if (hasExponent || hasLeadingZero) {
this.raise(start, Errors.InvalidDecimal);
}
++this.state.pos;
isDecimal = true;
}
if (isIdentifierStart(this.input.codePointAt(this.state.pos))) {
throw this.raise(this.state.pos, Errors.NumberIdentifier);
}
// remove "_" for numeric literal separator, and "n" for BigInts
const str = this.input.slice(start, this.state.pos).replace(/[_n]/g, "");
// remove "_" for numeric literal separator, and trailing `m` or `n`
const str = this.input.slice(start, this.state.pos).replace(/[_mn]/g, "");
if (isBigInt) {
this.finishToken(tt.bigint, str);
return;
}
if (isDecimal) {
this.finishToken(tt.decimal, str);
return;
}
const val = isOctal ? parseInt(str, 8) : parseFloat(str);
this.finishToken(tt.num, val);
}

View File

@@ -86,6 +86,7 @@ function createBinop(name: string, binop: number) {
export const types: { [name: string]: TokenType } = {
num: new TokenType("num", { startsExpr }),
bigint: new TokenType("bigint", { startsExpr }),
decimal: new TokenType("decimal", { startsExpr }),
regexp: new TokenType("regexp", { startsExpr }),
string: new TokenType("string", { startsExpr }),
name: new TokenType("name", { startsExpr }),