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

test_runner: refactor tap_lexer to use more primordials #45744

Merged
merged 3 commits into from Dec 12, 2022
Merged

test_runner: refactor tap_lexer to use more primordials #45744

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
10544ef
test_runner: refactor `tap_lexer` to use more primordials
aduh95 Dec 5, 2022
9e1e56f
fixup! test_runner: refactor `tap_lexer` to use more primordials
aduh95 Dec 5, 2022
350ce5f
Update lib/internal/test_runner/tap_lexer.js
aduh95 Dec 6, 2022
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
37 changes: 22 additions & 15 deletions lib/internal/test_runner/tap_lexer.js
View file
Open in desktop
@@ -1,6 +1,14 @@
'use strict';

const { SafeSet, MathMax, StringPrototypeIncludes } = primordials;
const {
ArrayPrototypePop,
ArrayPrototypePush,
ArrayPrototypePushApply,
aduh95 marked this conversation as resolved.
Show resolved Hide resolved
MathMax,
SafeSet,
StringPrototypeIncludes,
StringPrototypeTrim,
} = primordials;
const {
codes: { ERR_TAP_LEXER_ERROR },
} = require('internal/errors');
Expand Down Expand Up @@ -136,21 +144,21 @@ class TapLexer {
this.#lastScannedToken = token;
}

ArrayPrototypePush(chunk, token);
if (token.kind === TokenKind.NEWLINE) {
// Store the current chunk + NEWLINE token
tokens.push([...chunk, token]);
ArrayPrototypePush(tokens, chunk);
chunk = [];
} else {
chunk.push(token);
}
}

if (chunk.length > 0) {
tokens.push([...chunk, this.#scanEOL()]);
ArrayPrototypePush(chunk, this.#scanEOL());
ArrayPrototypePush(tokens, chunk);
}

// send EOF as a separate chunk
tokens.push([this.#scanEOF()]);
ArrayPrototypePush(tokens, [this.#scanEOF()]);

return tokens;
}
Expand Down Expand Up @@ -238,7 +246,7 @@ class TapLexer {
this.#hasTheCurrentCharacterBeenEscaped() ||
this.#source.peek(1) === TokenKind.WHITESPACE
) {
this.#escapeStack.pop();
ArrayPrototypePop(this.#escapeStack);
return new Token({
kind: TokenKind.LITERAL,
value: char,
Expand All @@ -249,7 +257,7 @@ class TapLexer {
// Otherwise, consume the escape symbol as an escape symbol that should be ignored by the parser
// we also need to push the escape symbol to the escape stack
// and consume the next character as a literal (done in the next turn)
this.#escapeStack.push(char);
ArrayPrototypePush(this.#escapeStack, char);
return new Token({
kind: TokenKind.ESCAPE,
value: char,
Expand Down Expand Up @@ -326,7 +334,7 @@ class TapLexer {
const charHasBeenEscaped = this.#hasTheCurrentCharacterBeenEscaped();
if (this.#isComment || charHasBeenEscaped) {
if (charHasBeenEscaped) {
this.#escapeStack.pop();
ArrayPrototypePop(this.#escapeStack);
}

return new Token({
Expand Down Expand Up @@ -355,7 +363,7 @@ class TapLexer {
}
}

word = word.trim();
word = StringPrototypeTrim(word);

if (TapLexer.Keywords.has(word)) {
const token = this.#scanTAPKeyword(word);
Expand All @@ -380,10 +388,9 @@ class TapLexer {
}

#scanTAPKeyword(word) {
const isLastScannedTokenEOLorNewLine = StringPrototypeIncludes(
[TokenKind.EOL, TokenKind.NEWLINE],
this.#lastScannedToken.kind
);
const isLastScannedTokenEOLorNewLine =
TokenKind.EOL === this.#lastScannedToken.kind ||
TokenKind.NEWLINE === this.#lastScannedToken.kind;

if (word === 'TAP' && isLastScannedTokenEOLorNewLine) {
return new Token({
Expand Down Expand Up @@ -479,7 +486,7 @@ class TapLexer {
// We deliberately do not include "# \ + -"" in this list
// these are used for comments/reasons explanations, pragma and escape characters
// whitespace is not included because it is handled separately
return '!"$%&\'()*,./:;<=>?@[]^_`{|}~'.indexOf(char) > -1;
return StringPrototypeIncludes('!"$%&\'()*,./:;<=>?@[]^_`{|}~', char);
}

#isWhitespaceSymbol(char) {
Expand Down