Skip to content

Minor refactorings for numeric parsing in tokenizer #2472

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

Merged
merged 5 commits into from
Aug 26, 2022
Merged

Minor refactorings for numeric parsing in tokenizer #2472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f79d727
init
MaxGraey Aug 26, 2022
a5640f1
fix
MaxGraey Aug 26, 2022
a12fe7c
same for octal
MaxGraey Aug 26, 2022
0841adb
renmae isHexPart to isHex
MaxGraey Aug 26, 2022
e332f0d
rename isHex to isHexBase
MaxGraey Aug 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 22 additions & 30 deletions src/tokenizer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import {
isIdentifierPart,
isDecimal,
isOctal,
isHexBase,
isHighSurrogate,
isLowSurrogate
} from "./util";
Expand Down Expand Up @@ -1313,30 +1314,24 @@ export class Tokenizer extends DiagnosticEmitter {
var end = this.end;
var start = pos;
var sepEnd = start;
var value = i64_new(0);
var value = i64_zero;
var i64_4 = i64_new(4);
var nextValue = value;
var overflowOccurred = false;

while (pos < end) {
let c = text.charCodeAt(pos);
if (c >= CharCode._0 && c <= CharCode._9) {
// value = (value << 4) + c - CharCode._0;
if (isDecimal(c)) {
// (value << 4) + c - CharCode._0
nextValue = i64_add(
i64_shl(value, i64_4),
i64_new(c - CharCode._0)
);
} else if (c >= CharCode.A && c <= CharCode.F) {
// value = (value << 4) + 10 + c - CharCode.A;
} else if (isHexBase(c)) {
// (value << 4) + (c | 32) + (10 - CharCode.a)
nextValue = i64_add(
i64_shl(value, i64_4),
i64_new(10 + c - CharCode.A)
);
} else if (c >= CharCode.a && c <= CharCode.f) {
// value = (value << 4) + 10 + c - CharCode.a;
nextValue = i64_add(
i64_shl(value, i64_4),
i64_new(10 + c - CharCode.a)
i64_new((c | 32) + (10 - CharCode.a))
);
} else if (c == CharCode._) {
if (sepEnd == pos) {
Expand Down Expand Up @@ -1386,14 +1381,14 @@ export class Tokenizer extends DiagnosticEmitter {
var end = this.end;
var start = pos;
var sepEnd = start;
var value = i64_new(0);
var value = i64_zero;
var i64_10 = i64_new(10);
var nextValue = value;
var overflowOccurred = false;

while (pos < end) {
let c = text.charCodeAt(pos);
if (c >= CharCode._0 && c <= CharCode._9) {
if (isDecimal(c)) {
// value = value * 10 + c - CharCode._0;
nextValue = i64_add(
i64_mul(value, i64_10),
Expand Down Expand Up @@ -1451,15 +1446,15 @@ export class Tokenizer extends DiagnosticEmitter {
var end = this.end;
var start = pos;
var sepEnd = start;
var value = i64_new(0);
var value = i64_zero;
var i64_3 = i64_new(3);
var nextValue = value;
var overflowOccurred = false;

while (pos < end) {
let c = text.charCodeAt(pos);
if (c >= CharCode._0 && c <= CharCode._7) {
// value = (value << 3) + c - CharCode._0;
if (isOctal(c)) {
// (value << 3) + c - CharCode._0
nextValue = i64_add(
i64_shl(value, i64_3),
i64_new(c - CharCode._0)
Expand Down Expand Up @@ -1511,21 +1506,20 @@ export class Tokenizer extends DiagnosticEmitter {
var end = this.end;
var start = pos;
var sepEnd = start;
var value = i64_new(0);
var i64_1 = i64_new(1);
var value = i64_zero;
var nextValue = value;
var overflowOccurred = false;

while (pos < end) {
let c = text.charCodeAt(pos);
if (c == CharCode._0) {
// value = (value << 1);
nextValue = i64_shl(value, i64_1);
// value << 1 | 0
nextValue = i64_shl(value, i64_one);
} else if (c == CharCode._1) {
// value = (value << 1) + 1;
nextValue = i64_add(
i64_shl(value, i64_1),
i64_1
// value << 1 | 1
nextValue = i64_or(
i64_shl(value, i64_one),
i64_one
);
} else if (c == CharCode._) {
if (sepEnd == pos) {
Expand Down Expand Up @@ -1665,12 +1659,10 @@ export class Tokenizer extends DiagnosticEmitter {
var end = this.end;
while (pos < end) {
let c = text.charCodeAt(pos++);
if (c >= CharCode._0 && c <= CharCode._9) {
if (isDecimal(c)) {
value = (value << 4) + c - CharCode._0;
} else if (c >= CharCode.A && c <= CharCode.F) {
value = (value << 4) + c + (10 - CharCode.A);
} else if (c >= CharCode.a && c <= CharCode.f) {
value = (value << 4) + c + (10 - CharCode.a);
} else if (isHexBase(c)) {
value = (value << 4) + (c | 32) + (10 - CharCode.a);
} else if (~startIfTaggedTemplate) {
this.pos = --pos;
return text.substring(startIfTaggedTemplate, pos);
Expand Down
11 changes: 8 additions & 3 deletions src/util/text.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,10 +234,15 @@ export function isOctal(c: i32): bool {
return c >= CharCode._0 && c <= CharCode._7;
}

/** Tests if the specified character code is a valid hexadecimal digit. */
export function isHex(c: i32): bool {
/** Tests if the specified character code is a valid hexadecimal symbol [a-f]. */
export function isHexBase(c: i32): bool {
let c0 = c | 32; // unify uppercases and lowercases a|A - f|F
return isDecimal(c) || (c0 >= CharCode.a && c0 <= CharCode.f);
return c0 >= CharCode.a && c0 <= CharCode.f;
}

/** Tests if the specified character code is a valid hexadecimal digit. */
export function isHexOrDecimal(c: i32): bool {
return isDecimal(c) || isHexBase(c);
}

/** Tests if the specified character code is trivially alphanumeric. */
Expand Down