From a0d7640e034a5ce0dc6efabceac48d28780bc86d Mon Sep 17 00:00:00 2001 From: Lenny Maiorani Date: Sun, 25 Jul 2021 14:21:27 -0600 Subject: [PATCH] Userland: Make use of container version of any_of Problem: - New `any_of` implementation takes the entire container so the user does not need to pass explicit begin/end iterators. This is unused except is in tests. Solution: - Make use of the new and more user-friendly version where possible. --- Userland/Libraries/LibJS/Parser.cpp | 8 ++++---- Userland/Libraries/LibVT/Line.h | 2 +- Userland/Libraries/LibWeb/DOM/Element.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Userland/Libraries/LibJS/Parser.cpp b/Userland/Libraries/LibJS/Parser.cpp index b5d9a67c56..393ce96e43 100644 --- a/Userland/Libraries/LibJS/Parser.cpp +++ b/Userland/Libraries/LibJS/Parser.cpp @@ -411,7 +411,7 @@ static constexpr AK::Array strict_reserved_words = { "implements" static bool is_strict_reserved_word(StringView str) { - return any_of(strict_reserved_words.begin(), strict_reserved_words.end(), [&str](StringView const& word) { + return any_of(strict_reserved_words, [&str](StringView const& word) { return word == str; }); } @@ -474,7 +474,7 @@ RefPtr Parser::try_parse_arrow_function_expression(bool expe if (match(TokenType::CurlyOpen)) { // Parse a function body with statements ScopePusher scope(*this, ScopePusher::Var, Scope::Function); - bool has_binding = any_of(parameters.begin(), parameters.end(), [&](FunctionNode::Parameter const& parameter) { + bool has_binding = any_of(parameters, [](FunctionNode::Parameter const& parameter) { return parameter.binding.has>(); }); @@ -1705,7 +1705,7 @@ NonnullRefPtr Parser::parse_function_node(u8 parse_options) m_state.function_parameters.append(parameters); - bool has_binding = any_of(parameters.begin(), parameters.end(), [&](FunctionNode::Parameter const& parameter) { + bool has_binding = any_of(parameters, [](FunctionNode::Parameter const& parameter) { return parameter.binding.has>(); }); @@ -2794,7 +2794,7 @@ void Parser::discard_saved_state() void Parser::check_identifier_name_for_assignment_validity(StringView name, bool force_strict) { // FIXME: this is now called from multiple places maybe the error message should be dynamic? - if (any_of(s_reserved_words.begin(), s_reserved_words.end(), [&](auto& value) { return name == value; })) { + if (any_of(s_reserved_words, [&](auto& value) { return name == value; })) { syntax_error("Binding pattern target may not be a reserved word"); } else if (m_state.strict_mode || force_strict) { if (name.is_one_of("arguments"sv, "eval"sv)) diff --git a/Userland/Libraries/LibVT/Line.h b/Userland/Libraries/LibVT/Line.h index 0ec69c2932..5035b7f20f 100644 --- a/Userland/Libraries/LibVT/Line.h +++ b/Userland/Libraries/LibVT/Line.h @@ -46,7 +46,7 @@ public: bool is_empty() const { - return !any_of(m_cells.begin(), m_cells.end(), [](auto& cell) { return cell != Cell(); }); + return !any_of(m_cells, [](auto& cell) { return cell != Cell(); }); } size_t length() const diff --git a/Userland/Libraries/LibWeb/DOM/Element.cpp b/Userland/Libraries/LibWeb/DOM/Element.cpp index a71d30bdb6..3bdd6d9aef 100644 --- a/Userland/Libraries/LibWeb/DOM/Element.cpp +++ b/Userland/Libraries/LibWeb/DOM/Element.cpp @@ -91,7 +91,7 @@ void Element::remove_attribute(const FlyString& name) bool Element::has_class(const FlyString& class_name, CaseSensitivity case_sensitivity) const { - return any_of(m_classes.begin(), m_classes.end(), [&](auto& it) { + return any_of(m_classes, [&](auto& it) { return case_sensitivity == CaseSensitivity::CaseSensitive ? it == class_name : it.to_lowercase() == class_name.to_lowercase();