mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-07-29 20:29:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

LibWeb/CSS: Remove custom <integer> parsing from math-depth

Browse source
This commit is contained in:
Sam Atkins 2025-01-27 11:50:44 +00:00 • committed by Andreas Kling
commit b947ae60db
Notes: github-actions[bot] 2025-01-30 18:33:21 +00:00
1 changed files with 12 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

35
Libraries/LibWeb/CSS/Parser/Parser.cpp
View file

@ -6881,36 +6881,25 @@ RefPtr<CSSStyleValue> Parser::parse_math_depth_value(TokenStream<ComponentValue>
// auto-add | add(<integer>) | <integer> // auto-add | add(<integer>) | <integer>
auto transaction = tokens.begin_transaction(); auto transaction = tokens.begin_transaction();
auto const& token = tokens.consume_a_token();
if (tokens.has_next_token())
return nullptr;
// auto-add // auto-add
if (token.is_ident("auto-add"sv)) { if (tokens.next_token().is_ident("auto-add"sv)) {
tokens.discard_a_token(); // auto-add
transaction.commit(); transaction.commit();
return MathDepthStyleValue::create_auto_add(); return MathDepthStyleValue::create_auto_add();
} }
// FIXME: Make it easier to parse "thing that might be <bar> or literally anything that resolves to it" and get rid of this
auto parse_something_that_resolves_to_integer = [this](ComponentValue const& token) -> RefPtr<CSSStyleValue> {
if (token.is(Token::Type::Number) && token.token().number().is_integer())
return IntegerStyleValue::create(token.token().to_integer());
if (auto value = parse_calculated_value(token); value && value->resolves_to_number())
return value;
return nullptr;
};
// add(<integer>) // add(<integer>)
if (token.is_function("add"sv)) { if (tokens.next_token().is_function("add"sv)) {
auto context_guard = push_temporary_value_parsing_context(FunctionContext { token.function().name }); auto const& function = tokens.next_token().function();
auto context_guard = push_temporary_value_parsing_context(FunctionContext { function.name });
auto add_tokens = TokenStream { token.function().value }; auto add_tokens = TokenStream { function.value };
add_tokens.discard_whitespace(); add_tokens.discard_whitespace();
auto const& integer_token = add_tokens.consume_a_token(); if (auto integer_value = parse_integer_value(add_tokens)) {
add_tokens.discard_whitespace(); add_tokens.discard_whitespace();
if (add_tokens.has_next_token()) if (add_tokens.has_next_token())
return nullptr; return nullptr;
if (auto integer_value = parse_something_that_resolves_to_integer(integer_token)) { tokens.discard_a_token(); // add()
transaction.commit(); transaction.commit();
return MathDepthStyleValue::create_add(integer_value.release_nonnull()); return MathDepthStyleValue::create_add(integer_value.release_nonnull());
} }
@ -6918,7 +6907,7 @@ RefPtr<CSSStyleValue> Parser::parse_math_depth_value(TokenStream<ComponentValue>
} }
// <integer> // <integer>
if (auto integer_value = parse_something_that_resolves_to_integer(token)) { if (auto integer_value = parse_integer_value(tokens)) {
transaction.commit(); transaction.commit();
return MathDepthStyleValue::create_integer(integer_value.release_nonnull()); return MathDepthStyleValue::create_integer(integer_value.release_nonnull());
} }