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

LibWeb/CSS: Expand single-none-parsing helper to parse any keyword

Browse source 
Multiple font properties are either the `normal` keyword or some
non-keyword value, so this lets us avoid some boilerplate for those, at
the cost of the existing `none` users having marginally more verbose
code.
This commit is contained in:
Sam Atkins 2024-09-30 15:17:01 +01:00 • committed by Sam Atkins
commit 1a127c9d37
Notes: github-actions[bot] 2024-10-02 15:37:50 +00:00
2 changed files with 32 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

75
Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp
View file

@ -3868,18 +3868,18 @@ RefPtr<CSSStyleValue> Parser::parse_simple_comma_separated_value_list(PropertyID
}); });
} }
RefPtr<CSSStyleValue> Parser::parse_all_as_single_none_value(TokenStream<ComponentValue>& tokens) RefPtr<CSSStyleValue> Parser::parse_all_as_single_keyword_value(TokenStream<ComponentValue>& tokens, Keyword keyword)
{ {
auto transaction = tokens.begin_transaction(); auto transaction = tokens.begin_transaction();
tokens.skip_whitespace(); tokens.skip_whitespace();
auto maybe_none = tokens.next_token(); auto keyword_value = parse_keyword_value(tokens);
tokens.skip_whitespace(); tokens.skip_whitespace();
if (tokens.has_next_token() || !maybe_none.is_ident("none"sv)) if (tokens.has_next_token() || !keyword_value || keyword_value->to_keyword() != keyword)
return {}; return {};
transaction.commit(); transaction.commit();
return CSSKeywordValue::create(Keyword::None); return keyword_value;
} }
static void remove_property(Vector<PropertyID>& properties, PropertyID property_to_remove) static void remove_property(Vector<PropertyID>& properties, PropertyID property_to_remove)
@ -4593,7 +4593,7 @@ RefPtr<CSSStyleValue> Parser::parse_columns_value(TokenStream<ComponentValue>& t
RefPtr<CSSStyleValue> Parser::parse_shadow_value(TokenStream<ComponentValue>& tokens, AllowInsetKeyword allow_inset_keyword) RefPtr<CSSStyleValue> Parser::parse_shadow_value(TokenStream<ComponentValue>& tokens, AllowInsetKeyword allow_inset_keyword)
{ {
// "none" // "none"
if (auto none = parse_all_as_single_none_value(tokens)) if (auto none = parse_all_as_single_keyword_value(tokens, Keyword::None))
return none; return none;
return parse_comma_separated_value_list(tokens, [this, allow_inset_keyword](auto& tokens) { return parse_comma_separated_value_list(tokens, [this, allow_inset_keyword](auto& tokens) {
@ -4774,7 +4774,7 @@ RefPtr<CSSStyleValue> Parser::parse_content_value(TokenStream<ComponentValue>& t
RefPtr<CSSStyleValue> Parser::parse_counter_increment_value(TokenStream<ComponentValue>& tokens) RefPtr<CSSStyleValue> Parser::parse_counter_increment_value(TokenStream<ComponentValue>& tokens)
{ {
// [ <counter-name> <integer>? ]+ | none // [ <counter-name> <integer>? ]+ | none
if (auto none = parse_all_as_single_none_value(tokens)) if (auto none = parse_all_as_single_keyword_value(tokens, Keyword::None))
return none; return none;
return parse_counter_definitions_value(tokens, AllowReversed::No, 1); return parse_counter_definitions_value(tokens, AllowReversed::No, 1);
@ -4784,7 +4784,7 @@ RefPtr<CSSStyleValue> Parser::parse_counter_increment_value(TokenStream<Componen
RefPtr<CSSStyleValue> Parser::parse_counter_reset_value(TokenStream<ComponentValue>& tokens) RefPtr<CSSStyleValue> Parser::parse_counter_reset_value(TokenStream<ComponentValue>& tokens)
{ {
// [ <counter-name> <integer>? | <reversed-counter-name> <integer>? ]+ | none // [ <counter-name> <integer>? | <reversed-counter-name> <integer>? ]+ | none
if (auto none = parse_all_as_single_none_value(tokens)) if (auto none = parse_all_as_single_keyword_value(tokens, Keyword::None))
return none; return none;
return parse_counter_definitions_value(tokens, AllowReversed::Yes, 0); return parse_counter_definitions_value(tokens, AllowReversed::Yes, 0);
@ -4794,7 +4794,7 @@ RefPtr<CSSStyleValue> Parser::parse_counter_reset_value(TokenStream<ComponentVal
RefPtr<CSSStyleValue> Parser::parse_counter_set_value(TokenStream<ComponentValue>& tokens) RefPtr<CSSStyleValue> Parser::parse_counter_set_value(TokenStream<ComponentValue>& tokens)
{ {
// [ <counter-name> <integer>? ]+ | none // [ <counter-name> <integer>? ]+ | none
if (auto none = parse_all_as_single_none_value(tokens)) if (auto none = parse_all_as_single_keyword_value(tokens, Keyword::None))
return none; return none;
return parse_counter_definitions_value(tokens, AllowReversed::No, 0); return parse_counter_definitions_value(tokens, AllowReversed::No, 0);
@ -4933,7 +4933,7 @@ RefPtr<CSSStyleValue> Parser::parse_display_value(TokenStream<ComponentValue>& t
RefPtr<CSSStyleValue> Parser::parse_filter_value_list_value(TokenStream<ComponentValue>& tokens) RefPtr<CSSStyleValue> Parser::parse_filter_value_list_value(TokenStream<ComponentValue>& tokens)
{ {
if (auto none = parse_all_as_single_none_value(tokens)) if (auto none = parse_all_as_single_keyword_value(tokens, Keyword::None))
return none; return none;
auto transaction = tokens.begin_transaction(); auto transaction = tokens.begin_transaction();
@ -5453,40 +5453,27 @@ RefPtr<CSSStyleValue> Parser::parse_font_language_override_value(TokenStream<Com
// This is `normal | <string>` but with the constraint that the string has to be 4 characters long: // This is `normal | <string>` but with the constraint that the string has to be 4 characters long:
// Shorter strings are right-padded with spaces, and longer strings are invalid. // Shorter strings are right-padded with spaces, and longer strings are invalid.
{ if (auto normal = parse_all_as_single_keyword_value(tokens, Keyword::Normal))
auto transaction = tokens.begin_transaction(); return normal;
tokens.skip_whitespace();
if (auto keyword = parse_keyword_value(tokens); keyword->to_keyword() == Keyword::Normal) {
tokens.skip_whitespace();
if (tokens.has_next_token()) {
dbgln_if(CSS_PARSER_DEBUG, "CSSParser: Failed to parse font-language-override: unexpected trailing tokens");
return nullptr;
}
transaction.commit();
return keyword;
}
}
{ auto transaction = tokens.begin_transaction();
auto transaction = tokens.begin_transaction(); tokens.skip_whitespace();
if (auto string = parse_string_value(tokens)) {
auto string_value = string->string_value();
tokens.skip_whitespace(); tokens.skip_whitespace();
if (auto string = parse_string_value(tokens)) { if (tokens.has_next_token()) {
auto string_value = string->string_value(); dbgln_if(CSS_PARSER_DEBUG, "CSSParser: Failed to parse font-language-override: unexpected trailing tokens");
tokens.skip_whitespace(); return nullptr;
if (tokens.has_next_token()) {
dbgln_if(CSS_PARSER_DEBUG, "CSSParser: Failed to parse font-language-override: unexpected trailing tokens");
return nullptr;
}
auto length = string_value.code_points().length();
if (length > 4) {
dbgln_if(CSS_PARSER_DEBUG, "CSSParser: Failed to parse font-language-override: <string> value \"{}\" is too long", string_value);
return nullptr;
}
transaction.commit();
if (length < 4)
return StringStyleValue::create(MUST(String::formatted("{<4}", string_value)));
return string;
} }
auto length = string_value.code_points().length();
if (length > 4) {
dbgln_if(CSS_PARSER_DEBUG, "CSSParser: Failed to parse font-language-override: <string> value \"{}\" is too long", string_value);
return nullptr;
}
transaction.commit();
if (length < 4)
return StringStyleValue::create(MUST(String::formatted("{<4}", string_value)));
return string;
} }
return nullptr; return nullptr;
@ -6343,7 +6330,7 @@ RefPtr<CSSStyleValue> Parser::parse_transform_value(TokenStream<ComponentValue>&
// <transform> = none | <transform-list> // <transform> = none | <transform-list>
// <transform-list> = <transform-function>+ // <transform-list> = <transform-function>+
if (auto none = parse_all_as_single_none_value(tokens)) if (auto none = parse_all_as_single_keyword_value(tokens, Keyword::None))
return none; return none;
StyleValueVector transformations; StyleValueVector transformations;
@ -6595,7 +6582,7 @@ RefPtr<CSSStyleValue> Parser::parse_transform_origin_value(TokenStream<Component
RefPtr<CSSStyleValue> Parser::parse_transition_value(TokenStream<ComponentValue>& tokens) RefPtr<CSSStyleValue> Parser::parse_transition_value(TokenStream<ComponentValue>& tokens)
{ {
if (auto none = parse_all_as_single_none_value(tokens)) if (auto none = parse_all_as_single_keyword_value(tokens, Keyword::None))
return none; return none;
Vector<TransitionStyleValue::Transition> transitions; Vector<TransitionStyleValue::Transition> transitions;
@ -6901,7 +6888,7 @@ Optional<CSS::ExplicitGridTrack> Parser::parse_track_sizing_function(ComponentVa
RefPtr<CSSStyleValue> Parser::parse_grid_track_size_list(TokenStream<ComponentValue>& tokens, bool allow_separate_line_name_blocks) RefPtr<CSSStyleValue> Parser::parse_grid_track_size_list(TokenStream<ComponentValue>& tokens, bool allow_separate_line_name_blocks)
{ {
if (auto none = parse_all_as_single_none_value(tokens)) if (auto none = parse_all_as_single_keyword_value(tokens, Keyword::None))
return GridTrackSizeListStyleValue::make_none(); return GridTrackSizeListStyleValue::make_none();
auto transaction = tokens.begin_transaction(); auto transaction = tokens.begin_transaction();
@ -7397,7 +7384,7 @@ RefPtr<CSSStyleValue> Parser::parse_grid_template_areas_value(TokenStream<Compon
// none | <string>+ // none | <string>+
Vector<Vector<String>> grid_area_rows; Vector<Vector<String>> grid_area_rows;
if (auto none = parse_all_as_single_none_value(tokens)) if (auto none = parse_all_as_single_keyword_value(tokens, Keyword::None))
return GridTemplateAreaStyleValue::create(move(grid_area_rows)); return GridTemplateAreaStyleValue::create(move(grid_area_rows));
auto transaction = tokens.begin_transaction(); auto transaction = tokens.begin_transaction();

2
Userland/Libraries/LibWeb/CSS/Parser/Parser.h
View file

@ -286,7 +286,7 @@ private:
template<typename ParseFunction> template<typename ParseFunction>
RefPtr<CSSStyleValue> parse_comma_separated_value_list(TokenStream<ComponentValue>&, ParseFunction); RefPtr<CSSStyleValue> parse_comma_separated_value_list(TokenStream<ComponentValue>&, ParseFunction);
RefPtr<CSSStyleValue> parse_simple_comma_separated_value_list(PropertyID, TokenStream<ComponentValue>&); RefPtr<CSSStyleValue> parse_simple_comma_separated_value_list(PropertyID, TokenStream<ComponentValue>&);
RefPtr<CSSStyleValue> parse_all_as_single_none_value(TokenStream<ComponentValue>&); RefPtr<CSSStyleValue> parse_all_as_single_keyword_value(TokenStream<ComponentValue>&, Keyword);
RefPtr<CSSStyleValue> parse_aspect_ratio_value(TokenStream<ComponentValue>&); RefPtr<CSSStyleValue> parse_aspect_ratio_value(TokenStream<ComponentValue>&);
RefPtr<CSSStyleValue> parse_background_value(TokenStream<ComponentValue>&); RefPtr<CSSStyleValue> parse_background_value(TokenStream<ComponentValue>&);