mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-08-30 06:06:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

LibJS: Use AK's number parsing over stroul in JS::Token
Some checks are pending
CI / macOS, arm64, Sanitizer, Clang (push) Waiting to run
Details
CI / Linux, x86_64, Fuzzers, Clang (push) Waiting to run
Details
CI / Linux, x86_64, Sanitizer, GNU (push) Waiting to run
Details
CI / Linux, x86_64, Sanitizer, Clang (push) Waiting to run
Details
Package the js repl as a binary artifact / Linux, arm64 (push) Waiting to run
Details
Package the js repl as a binary artifact / macOS, arm64 (push) Waiting to run
Details
Package the js repl as a binary artifact / Linux, x86_64 (push) Waiting to run
Details
Run test262 and test-wasm / run_and_update_results (push) Waiting to run
Details
Lint Code / lint (push) Waiting to run
Details
Label PRs with merge conflicts / auto-labeler (push) Waiting to run
Details
Push notes / build (push) Waiting to run
Details

Browse source 
This gives us a drop-in replacement for UTF-16 strings.
This commit is contained in:
Timothy Flynn 2025-08-06 07:34:01 -04:00 • committed by Jelle Raaijmakers
commit cd15b1a2c9
Notes: github-actions[bot] 2025-08-07 00:06:56 +00:00
1 changed files with 31 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

64
Libraries/LibJS/Token.cpp
View file

@ -54,42 +54,36 @@ double Token::double_value() const
{ {
VERIFY(type() == TokenType::NumericLiteral); VERIFY(type() == TokenType::NumericLiteral);
Vector<char, 32> buffer; auto value = this->value();
ByteString buffer;
for (auto ch : value()) { if (value.contains('_')) {
if (ch == '_') buffer = value.replace("_"sv, {}, ReplaceMode::All);
continue; value = buffer;
buffer.append(ch);
} }
buffer.append('\0');
auto value_string = StringView { buffer.data(), buffer.size() - 1 }; if (value.length() >= 2 && value.starts_with('0')) {
if (value_string[0] == '0' && value_string.length() >= 2) { auto next = value[1];
if (value_string[1] == 'x' || value_string[1] == 'X') {
// hexadecimal // hexadecimal
return static_cast<double>(strtoul(value_string.characters_without_null_termination() + 2, nullptr, 16)); if (next == 'x' || next == 'X')
} else if (value_string[1] == 'o' || value_string[1] == 'O') { return static_cast<double>(value.substring_view(2).to_number<u64>(TrimWhitespace::No, 16).value());
// octal
return static_cast<double>(strtoul(value_string.characters_without_null_termination() + 2, nullptr, 8)); // octal
} else if (value_string[1] == 'b' || value_string[1] == 'B') { if (next == 'o' || next == 'O')
// binary return static_cast<double>(value.substring_view(2).to_number<u64>(TrimWhitespace::No, 8).value());
return static_cast<double>(strtoul(value_string.characters_without_null_termination() + 2, nullptr, 2));
} else if (is_ascii_digit(value_string[1])) { // binary
// also octal, but syntax error in strict mode if (next == 'b' || next == 'B')
if (!value().contains('8') && !value().contains('9')) return static_cast<double>(value.substring_view(2).to_number<u64>(TrimWhitespace::No, 2).value());
return static_cast<double>(strtoul(value_string.characters_without_null_termination() + 1, nullptr, 8));
} // also octal, but syntax error in strict mode
if (is_ascii_digit(next) && (!value.contains('8') && !value.contains('9')))
return static_cast<double>(value.substring_view(1).to_number<u64>(TrimWhitespace::No, 8).value());
} }
// This should always be a valid double // This should always be a valid double
return value_string.to_number<double>().release_value(); return value.to_number<double>(TrimWhitespace::No).value();
}
static u32 hex2int(char x)
{
VERIFY(is_ascii_hex_digit(x));
if (x >= '0' && x <= '9')
return x - '0';
return 10u + (to_ascii_lowercase(x) - 'a');
} }
ByteString Token::string_value(StringValueStatus& status) const ByteString Token::string_value(StringValueStatus& status) const
@ -165,8 +159,10 @@ ByteString Token::string_value(StringValueStatus& status) const
lexer.ignore(); lexer.ignore();
if (!is_ascii_hex_digit(lexer.peek()) || !is_ascii_hex_digit(lexer.peek(1))) if (!is_ascii_hex_digit(lexer.peek()) || !is_ascii_hex_digit(lexer.peek(1)))
return encoding_failure(StringValueStatus::MalformedHexEscape); return encoding_failure(StringValueStatus::MalformedHexEscape);
auto code_point = hex2int(lexer.consume()) * 16 + hex2int(lexer.consume());
auto code_point = lexer.consume(2).to_number<u32>(TrimWhitespace::No, 16).value();
VERIFY(code_point <= 255); VERIFY(code_point <= 255);
builder.append_code_point(code_point); builder.append_code_point(code_point);
continue; continue;
} }
@ -194,8 +190,10 @@ ByteString Token::string_value(StringValueStatus& status) const
if (octal_str.has_value()) { if (octal_str.has_value()) {
status = StringValueStatus::LegacyOctalEscapeSequence; status = StringValueStatus::LegacyOctalEscapeSequence;
auto code_point = strtoul(octal_str->characters(), nullptr, 8);
auto code_point = octal_str->to_number<u32>(TrimWhitespace::No, 8).value();
VERIFY(code_point <= 255); VERIFY(code_point <= 255);
builder.append_code_point(code_point); builder.append_code_point(code_point);
continue; continue;
} }