RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 15:07:45 +00:00
Code Issues Activity Actions

LibWeb: Use an enum class for the "top-level flag"

Browse source
This commit is contained in:
Sam Atkins 2022-03-29 13:46:16 +01:00 • committed by Andreas Kling
parent 87b125dcb9
commit fc3d51c59e
2 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -180,7 +180,7 @@ NonnullRefPtr<CSSStyleSheet> Parser::parse_a_stylesheet(TokenStream<T>& tokens,
// NOTE: We create the stylesheet at the end. // NOTE: We create the stylesheet at the end.
// 4. Consume a list of rules from input, with the top-level flag set, and set the stylesheet’s value to the result. // 4. Consume a list of rules from input, with the top-level flag set, and set the stylesheet’s value to the result.
auto parser_rules = consume_a_list_of_rules(tokens, true); auto parser_rules = consume_a_list_of_rules(tokens, TopLevel::Yes);
NonnullRefPtrVector<CSSRule> rules; NonnullRefPtrVector<CSSRule> rules;
for (auto& raw_rule : parser_rules) { for (auto& raw_rule : parser_rules) {
@ -1510,7 +1510,7 @@ Optional<GeneralEnclosed> Parser::parse_general_enclosed(TokenStream<StyleCompon
} }
template<typename T> template<typename T>
NonnullRefPtrVector<StyleRule> Parser::consume_a_list_of_rules(TokenStream<T>& tokens, bool top_level) NonnullRefPtrVector<StyleRule> Parser::consume_a_list_of_rules(TokenStream<T>& tokens, TopLevel top_level)
{ {
NonnullRefPtrVector<StyleRule> rules; NonnullRefPtrVector<StyleRule> rules;
@ -1526,7 +1526,7 @@ NonnullRefPtrVector<StyleRule> Parser::consume_a_list_of_rules(TokenStream<T>& t
} }
if (token.is(Token::Type::CDO) || token.is(Token::Type::CDC)) { if (token.is(Token::Type::CDO) || token.is(Token::Type::CDC)) {
if (top_level) { if (top_level == TopLevel::Yes) {
continue; continue;
} }
@ -1904,7 +1904,7 @@ NonnullRefPtrVector<CSSRule> Parser::parse_as_list_of_rules()
template<typename T> template<typename T>
NonnullRefPtrVector<CSSRule> Parser::parse_a_list_of_rules(TokenStream<T>& tokens) NonnullRefPtrVector<CSSRule> Parser::parse_a_list_of_rules(TokenStream<T>& tokens)
{ {
auto parsed_rules = consume_a_list_of_rules(tokens, false); auto parsed_rules = consume_a_list_of_rules(tokens, TopLevel::No);
NonnullRefPtrVector<CSSRule> rules; NonnullRefPtrVector<CSSRule> rules;
for (auto& rule : parsed_rules) { for (auto& rule : parsed_rules) {
@ -2130,7 +2130,7 @@ RefPtr<CSSRule> Parser::convert_to_rule(NonnullRefPtr<StyleRule> rule)
return {}; return {};
auto child_tokens = TokenStream { rule->block()->values() }; auto child_tokens = TokenStream { rule->block()->values() };
auto parser_rules = consume_a_list_of_rules(child_tokens, false); auto parser_rules = consume_a_list_of_rules(child_tokens, TopLevel::No);
NonnullRefPtrVector<CSSRule> child_rules; NonnullRefPtrVector<CSSRule> child_rules;
for (auto& raw_rule : parser_rules) { for (auto& raw_rule : parser_rules) {
if (auto child_rule = convert_to_rule(raw_rule)) if (auto child_rule = convert_to_rule(raw_rule))
@ -2154,7 +2154,7 @@ RefPtr<CSSRule> Parser::convert_to_rule(NonnullRefPtr<StyleRule> rule)
if (!rule->block()) if (!rule->block())
return {}; return {};
auto child_tokens = TokenStream { rule->block()->values() }; auto child_tokens = TokenStream { rule->block()->values() };
auto parser_rules = consume_a_list_of_rules(child_tokens, false); auto parser_rules = consume_a_list_of_rules(child_tokens, TopLevel::No);
NonnullRefPtrVector<CSSRule> child_rules; NonnullRefPtrVector<CSSRule> child_rules;
for (auto& raw_rule : parser_rules) { for (auto& raw_rule : parser_rules) {
if (auto child_rule = convert_to_rule(raw_rule)) if (auto child_rule = convert_to_rule(raw_rule))

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

@ -169,8 +169,12 @@ private:
}; };
Optional<Selector::SimpleSelector::ANPlusBPattern> parse_a_n_plus_b_pattern(TokenStream<StyleComponentValueRule>&, AllowTrailingTokens = AllowTrailingTokens::No); Optional<Selector::SimpleSelector::ANPlusBPattern> parse_a_n_plus_b_pattern(TokenStream<StyleComponentValueRule>&, AllowTrailingTokens = AllowTrailingTokens::No);
enum class TopLevel {
No,
Yes
};
template<typename T> template<typename T>
[[nodiscard]] NonnullRefPtrVector<StyleRule> consume_a_list_of_rules(TokenStream<T>&, bool top_level); [[nodiscard]] NonnullRefPtrVector<StyleRule> consume_a_list_of_rules(TokenStream<T>&, TopLevel);
template<typename T> template<typename T>
[[nodiscard]] NonnullRefPtr<StyleRule> consume_an_at_rule(TokenStream<T>&); [[nodiscard]] NonnullRefPtr<StyleRule> consume_an_at_rule(TokenStream<T>&);
template<typename T> template<typename T>