From f69d38a346100e9f670d86ed28c0dd21a8c98a90 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Tue, 21 Nov 2023 12:08:39 +0000 Subject: [PATCH] LibWeb: Use ComponentValue::is_ident("..."sv) helper --- .../LibWeb/CSS/Parser/GradientParsing.cpp | 2 +- .../LibWeb/CSS/Parser/MediaParsing.cpp | 6 ++--- .../Libraries/LibWeb/CSS/Parser/Parser.cpp | 19 ++++++++-------- .../LibWeb/CSS/Parser/SelectorParsing.cpp | 22 +++++-------------- 4 files changed, 18 insertions(+), 31 deletions(-) diff --git a/Userland/Libraries/LibWeb/CSS/Parser/GradientParsing.cpp b/Userland/Libraries/LibWeb/CSS/Parser/GradientParsing.cpp index 7974a86781..5e92741856 100644 --- a/Userland/Libraries/LibWeb/CSS/Parser/GradientParsing.cpp +++ b/Userland/Libraries/LibWeb/CSS/Parser/GradientParsing.cpp @@ -497,7 +497,7 @@ RefPtr Parser::parse_radial_gradient_function(ComponentValue const& return nullptr; auto& token = tokens.peek_token(); - if (token.is(Token::Type::Ident) && token.token().ident().equals_ignoring_ascii_case("at"sv)) { + if (token.is_ident("at"sv)) { (void)tokens.next_token(); auto position = parse_position_value(tokens); if (!position) diff --git a/Userland/Libraries/LibWeb/CSS/Parser/MediaParsing.cpp b/Userland/Libraries/LibWeb/CSS/Parser/MediaParsing.cpp index 16373fdc3f..ccaf40fab9 100644 --- a/Userland/Libraries/LibWeb/CSS/Parser/MediaParsing.cpp +++ b/Userland/Libraries/LibWeb/CSS/Parser/MediaParsing.cpp @@ -114,7 +114,7 @@ NonnullRefPtr Parser::parse_media_query(TokenStream& return media_query; // `[ and ]?` - if (auto maybe_and = tokens.next_token(); maybe_and.is(Token::Type::Ident) && maybe_and.token().ident().equals_ignoring_ascii_case("and"sv)) { + if (auto maybe_and = tokens.next_token(); maybe_and.is_ident("and"sv)) { if (auto media_condition = parse_media_condition(tokens, MediaCondition::AllowOr::No)) { tokens.skip_whitespace(); if (tokens.has_next_token()) @@ -143,7 +143,7 @@ OwnPtr Parser::parse_media_condition(TokenStream tokens.skip_whitespace(); auto& first_token = tokens.next_token(); - if (first_token.is(Token::Type::Ident) && first_token.token().ident().equals_ignoring_ascii_case("not"sv)) { + if (first_token.is_ident("not"sv)) { if (auto child_condition = parse_media_condition(tokens, MediaCondition::AllowOr::Yes)) { local_transaction.commit(); return MediaCondition::from_not(child_condition.release_nonnull()); @@ -158,7 +158,7 @@ OwnPtr Parser::parse_media_condition(TokenStream tokens.skip_whitespace(); auto& first = tokens.next_token(); - if (first.is(Token::Type::Ident) && first.token().ident().equals_ignoring_ascii_case(combinator)) { + if (first.is_ident(combinator)) { tokens.skip_whitespace(); if (auto media_in_parens = parse_media_in_parens(tokens)) { local_transaction.commit(); diff --git a/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp b/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp index 64484671db..80715887d4 100644 --- a/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp +++ b/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp @@ -176,7 +176,7 @@ OwnPtr Parser::parse_supports_condition(TokenStream` - if (peeked_token.is(Token::Type::Ident) && peeked_token.token().ident().equals_ignoring_ascii_case("not"sv)) { + if (peeked_token.is_ident("not"sv)) { tokens.next_token(); tokens.skip_whitespace(); auto child = parse_supports_in_parens(tokens); @@ -788,7 +788,7 @@ Optional Parser::consume_a_declaration(TokenStream& tokens) Optional important_index; for (size_t i = declaration_values.size() - 1; i > 0; i--) { auto value = declaration_values[i]; - if (value.is(Token::Type::Ident) && Infra::is_ascii_case_insensitive_match(value.token().ident(), "important"sv)) { + if (value.is_ident("important"sv)) { important_index = i; break; } @@ -1578,7 +1578,7 @@ Optional Parser::parse_dimension(ComponentValue const& component_valu Optional Parser::parse_source_size_value(ComponentValue const& component_value) { - if (component_value.is(Token::Type::Ident) && component_value.token().ident().equals_ignoring_ascii_case("auto"sv)) { + if (component_value.is_ident("auto"sv)) { return LengthOrCalculated { Length::make_auto() }; } @@ -1689,7 +1689,7 @@ Optional Parser::parse_unicode_range(TokenStream& // All options start with 'u'/'U'. auto const& u = tokens.next_token(); - if (!(u.is(Token::Type::Ident) && u.token().ident().equals_ignoring_ascii_case("u"sv))) { + if (!u.is_ident("u"sv)) { dbgln_if(CSS_PARSER_DEBUG, "CSSParser: does not start with 'u'"); return {}; } @@ -3371,8 +3371,7 @@ RefPtr Parser::parse_single_shadow_value(TokenStream continue; } - if (allow_inset_keyword == AllowInsetKeyword::Yes - && token.is(Token::Type::Ident) && token.token().ident().equals_ignoring_ascii_case("inset"sv)) { + if (allow_inset_keyword == AllowInsetKeyword::Yes && token.is_ident("inset"sv)) { if (placement.has_value()) return nullptr; placement = ShadowPlacement::Inner; @@ -3946,7 +3945,7 @@ RefPtr Parser::parse_font_value(Vector const& compon while (tokens.has_next_token()) { auto& peek_token = tokens.peek_token(); - if (peek_token.is(Token::Type::Ident) && value_id_from_string(peek_token.token().ident()) == ValueID::Normal) { + if (peek_token.is_ident("normal"sv)) { normal_count++; (void)tokens.next_token(); continue; @@ -4337,7 +4336,7 @@ RefPtr Parser::parse_list_style_value(Vector const& auto tokens = TokenStream { component_values }; while (tokens.has_next_token()) { - if (auto peek = tokens.peek_token(); peek.is(Token::Type::Ident) && peek.token().ident().equals_ignoring_ascii_case("none"sv)) { + if (auto peek = tokens.peek_token(); peek.is_ident("none"sv)) { (void)tokens.next_token(); found_nones++; continue; @@ -4779,7 +4778,7 @@ RefPtr Parser::parse_transform_value(Vector const& c tokens.skip_whitespace(); auto const& part = tokens.next_token(); - if (part.is(Token::Type::Ident) && part.token().ident().equals_ignoring_ascii_case("none"sv)) { + if (part.is_ident("none"sv)) { if (!transformations.is_empty()) return nullptr; tokens.skip_whitespace(); @@ -5206,7 +5205,7 @@ Optional Parser::parse_track_sizing_function(ComponentVa return CSS::ExplicitGridTrack(GridSize(LengthPercentage(maybe_calculated.release_nonnull()))); } return {}; - } else if (token.is(Token::Type::Ident) && token.token().ident().equals_ignoring_ascii_case("auto"sv)) { + } else if (token.is_ident("auto"sv)) { return CSS::ExplicitGridTrack(GridSize(Length::make_auto())); } else if (token.is_block()) { return {}; diff --git a/Userland/Libraries/LibWeb/CSS/Parser/SelectorParsing.cpp b/Userland/Libraries/LibWeb/CSS/Parser/SelectorParsing.cpp index 8255798b48..f6f1155f25 100644 --- a/Userland/Libraries/LibWeb/CSS/Parser/SelectorParsing.cpp +++ b/Userland/Libraries/LibWeb/CSS/Parser/SelectorParsing.cpp @@ -439,7 +439,7 @@ Parser::ParseErrorOr Parser::parse_pseudo_simple_selec // Parse the `of ` syntax auto const& maybe_of = tokens.next_token(); - if (!(maybe_of.is(Token::Type::Ident) && maybe_of.token().ident().equals_ignoring_ascii_case("of"sv))) + if (!maybe_of.is_ident("of"sv)) return ParseError::SyntaxError; tokens.skip_whitespace(); @@ -678,18 +678,6 @@ Optional Parser::parse_a_n_plus_b_patt return {}; }; - auto is_n = [](ComponentValue const& value) -> bool { - return value.is(Token::Type::Ident) && value.token().ident().equals_ignoring_ascii_case("n"sv); - }; - auto is_ndash = [](ComponentValue const& value) -> bool { - return value.is(Token::Type::Ident) && value.token().ident().equals_ignoring_ascii_case("n-"sv); - }; - auto is_dashn = [](ComponentValue const& value) -> bool { - return value.is(Token::Type::Ident) && value.token().ident().equals_ignoring_ascii_case("-n"sv); - }; - auto is_dashndash = [](ComponentValue const& value) -> bool { - return value.is(Token::Type::Ident) && value.token().ident().equals_ignoring_ascii_case("-n-"sv); - }; auto is_sign = [](ComponentValue const& value) -> bool { return value.is(Token::Type::Delim) && (value.token().delim() == '+' || value.token().delim() == '-'); }; @@ -855,7 +843,7 @@ Optional Parser::parse_a_n_plus_b_patt // -n // -n // -n ['+' | '-'] - if (is_dashn(first_value)) { + if (first_value.is_ident("-n"sv)) { values.skip_whitespace(); // -n @@ -884,7 +872,7 @@ Optional Parser::parse_a_n_plus_b_patt return Selector::SimpleSelector::ANPlusBPattern { -1, 0 }; } // -n- - if (is_dashndash(first_value)) { + if (first_value.is_ident("-n-"sv)) { values.skip_whitespace(); auto const& second_value = values.next_token(); if (is_signless_integer(second_value)) { @@ -913,7 +901,7 @@ Optional Parser::parse_a_n_plus_b_patt // '+'?† n // '+'?† n // '+'?† n ['+' | '-'] - if (is_n(first_after_plus)) { + if (first_after_plus.is_ident("n"sv)) { values.skip_whitespace(); // '+'?† n @@ -943,7 +931,7 @@ Optional Parser::parse_a_n_plus_b_patt } // '+'?† n- - if (is_ndash(first_after_plus)) { + if (first_after_plus.is_ident("n-"sv)) { values.skip_whitespace(); auto const& second_value = values.next_token(); if (is_signless_integer(second_value)) {