mirror of
https://github.com/LadybirdBrowser/ladybird
synced 2026-04-26 17:55:07 +02:00
AK+Everywhere: Replace custom number parsers with fast_float
Our floating point number parser was based on the fast_float library: https://github.com/fastfloat/fast_float However, our implementation only supports 8-bit characters. To support UTF-16, we will need to be able to convert char16_t-based strings to numbers as well. This works out-of-the-box with fast_float. We can also use fast_float for integer parsing.
This commit is contained in:
Notes:
github-actions[bot]
2025-07-03 13:53:10 +00:00
Author: https://github.com/trflynn89 Commit: https://github.com/LadybirdBrowser/ladybird/commit/62d9a84b8d7 Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/5228 Reviewed-by: https://github.com/ADKaster ✅ Reviewed-by: https://github.com/shannonbooth
@@ -6,8 +6,8 @@
|
||||
*/
|
||||
|
||||
#include <AK/Debug.h>
|
||||
#include <AK/FloatingPointStringConversions.h>
|
||||
#include <AK/SourceLocation.h>
|
||||
#include <AK/StringConversions.h>
|
||||
#include <AK/Vector.h>
|
||||
#include <LibTextCodec/Decoder.h>
|
||||
#include <LibWeb/CSS/CharacterTypes.h>
|
||||
@@ -377,7 +377,7 @@ u32 Tokenizer::consume_escaped_code_point()
|
||||
}
|
||||
|
||||
// Interpret the hex digits as a hexadecimal number.
|
||||
auto unhexed = AK::StringUtils::convert_to_uint_from_hex<u32>(builder.string_view()).value_or(0);
|
||||
auto unhexed = AK::parse_hexadecimal_number<u32>(builder.string_view()).value_or(0);
|
||||
// If this number is zero, or is for a surrogate, or is greater than the maximum allowed
|
||||
// code point, return U+FFFD REPLACEMENT CHARACTER (<28>).
|
||||
if (unhexed == 0 || is_unicode_surrogate(unhexed) || is_greater_than_maximum_allowed_code_point(unhexed)) {
|
||||
|
||||
@@ -16,6 +16,7 @@
|
||||
#include <AK/Debug.h>
|
||||
#include <AK/GenericLexer.h>
|
||||
#include <AK/QuickSort.h>
|
||||
#include <AK/StringConversions.h>
|
||||
#include <AK/TemporaryChange.h>
|
||||
#include <LibWeb/CSS/FontFace.h>
|
||||
#include <LibWeb/CSS/Parser/Parser.h>
|
||||
@@ -564,7 +565,7 @@ Optional<Gfx::UnicodeRange> Parser::parse_unicode_range(StringView text)
|
||||
// with the U+003F QUESTION MARK (?) code points replaced by U+0030 DIGIT ZERO (0) code points.
|
||||
// This is the start value.
|
||||
auto start_value_string = start_value_code_points.replace("?"sv, "0"sv, ReplaceMode::All);
|
||||
auto maybe_start_value = AK::StringUtils::convert_to_uint_from_hex<u32>(start_value_string);
|
||||
auto maybe_start_value = AK::parse_hexadecimal_number<u32>(start_value_string);
|
||||
if (!maybe_start_value.has_value()) {
|
||||
dbgln_if(CSS_PARSER_DEBUG, "CSSParser: <urange> ?-converted start value did not parse as hex number.");
|
||||
return {};
|
||||
@@ -575,7 +576,7 @@ Optional<Gfx::UnicodeRange> Parser::parse_unicode_range(StringView text)
|
||||
// with the U+003F QUESTION MARK (?) code points replaced by U+0046 LATIN CAPITAL LETTER F (F) code points.
|
||||
// This is the end value.
|
||||
auto end_value_string = start_value_code_points.replace("?"sv, "F"sv, ReplaceMode::All);
|
||||
auto maybe_end_value = AK::StringUtils::convert_to_uint_from_hex<u32>(end_value_string);
|
||||
auto maybe_end_value = AK::parse_hexadecimal_number<u32>(end_value_string);
|
||||
if (!maybe_end_value.has_value()) {
|
||||
dbgln_if(CSS_PARSER_DEBUG, "CSSParser: <urange> ?-converted end value did not parse as hex number.");
|
||||
return {};
|
||||
@@ -586,7 +587,7 @@ Optional<Gfx::UnicodeRange> Parser::parse_unicode_range(StringView text)
|
||||
return make_valid_unicode_range(start_value, end_value);
|
||||
}
|
||||
// Otherwise, interpret the consumed code points as a hexadecimal number. This is the start value.
|
||||
auto maybe_start_value = AK::StringUtils::convert_to_uint_from_hex<u32>(start_value_code_points);
|
||||
auto maybe_start_value = AK::parse_hexadecimal_number<u32>(start_value_code_points);
|
||||
if (!maybe_start_value.has_value()) {
|
||||
dbgln_if(CSS_PARSER_DEBUG, "CSSParser: <urange> start value did not parse as hex number.");
|
||||
return {};
|
||||
@@ -625,7 +626,7 @@ Optional<Gfx::UnicodeRange> Parser::parse_unicode_range(StringView text)
|
||||
}
|
||||
|
||||
// 7. Interpret the consumed code points as a hexadecimal number. This is the end value.
|
||||
auto maybe_end_value = AK::StringUtils::convert_to_uint_from_hex<u32>(end_hex_digits);
|
||||
auto maybe_end_value = AK::parse_hexadecimal_number<u32>(end_hex_digits);
|
||||
if (!maybe_end_value.has_value()) {
|
||||
dbgln_if(CSS_PARSER_DEBUG, "CSSParser: <urange> end value did not parse as hex number.");
|
||||
return {};
|
||||
|
||||
Reference in New Issue
Block a user