Skip to content

Commit

Permalink
Disable experimental boyer_moore_horspool_searcher. (#1375)
Browse files Browse the repository at this point in the history 
This should have the effect of disabling this on macOS which hopefully fixes the Python2 hang.

Related: #1255
  • Loading branch information
@BillyONeal
BillyONeal authored Mar 28, 2024
1 parent af2d85b commit 8285230
Show file tree
Hide file tree
Showing 4 changed files with 61 additions and 49 deletions.
42 changes: 33 additions & 9 deletions include/vcpkg/base/strings.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@
#include <algorithm>
#include <vector>

#ifndef __cpp_lib_boyer_moore_searcher
#include <experimental/functional>
#endif

namespace vcpkg::Strings::details
{
void append_internal(std::string& into, char c);
Expand Down Expand Up @@ -48,9 +44,37 @@ namespace vcpkg::Strings::details
namespace vcpkg::Strings
{
#ifdef __cpp_lib_boyer_moore_searcher
using boyer_moore_horspool_searcher = std::boyer_moore_horspool_searcher<std::string::const_iterator>;
struct vcpkg_searcher
{
vcpkg_searcher(std::string::const_iterator first, std::string::const_iterator last) : impl(first, last) { }

template<class SearchIt>
SearchIt search(SearchIt first, SearchIt last) const noexcept
{
return std::search(first, last, impl);
}

private:
std::boyer_moore_horspool_searcher<std::string::const_iterator> impl;
};
#else
using boyer_moore_horspool_searcher = std::experimental::boyer_moore_horspool_searcher<std::string::const_iterator>;
struct vcpkg_searcher
{
vcpkg_searcher(std::string::const_iterator first, std::string::const_iterator last)
: first_pattern(first), last_pattern(last)
{
}

template<class SearchIt>
SearchIt search(SearchIt first, SearchIt last) const noexcept
{
return std::search(first, last, first_pattern, last_pattern);
}

private:
std::string::const_iterator first_pattern;
std::string::const_iterator last_pattern;
};
#endif

template<class... Args>
Expand Down Expand Up @@ -183,11 +207,11 @@ namespace vcpkg::Strings
StringView left_tag,
StringView right_tag);

bool contains_any_ignoring_c_comments(const std::string& source, View<boyer_moore_horspool_searcher> to_find);
bool contains_any_ignoring_c_comments(const std::string& source, View<vcpkg_searcher> to_find);

bool contains_any_ignoring_hash_comments(StringView source, View<boyer_moore_horspool_searcher> to_find);
bool contains_any_ignoring_hash_comments(StringView source, View<vcpkg_searcher> to_find);

bool long_string_contains_any(StringView source, View<boyer_moore_horspool_searcher> to_find);
bool long_string_contains_any(StringView source, View<vcpkg_searcher> to_find);

[[nodiscard]] bool equals(StringView a, StringView b);

Expand Down
43 changes: 19 additions & 24 deletions src/vcpkg-test/strings.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
#include <utility>
#include <vector>

using namespace vcpkg;

TEST_CASE ("b32 encoding", "[strings]")
{
using u64 = uint64_t;
Expand All @@ -30,25 +32,25 @@ TEST_CASE ("b32 encoding", "[strings]")

for (const auto& pr : map)
{
REQUIRE(vcpkg::Strings::b32_encode(pr.first) == pr.second);
REQUIRE(Strings::b32_encode(pr.first) == pr.second);
}
}

TEST_CASE ("percent encoding", "[strings]")
{
std::string ascii(127, 0);
std::iota(ascii.begin(), ascii.end(), static_cast<char>(1));
REQUIRE(vcpkg::Strings::percent_encode(ascii) ==
REQUIRE(Strings::percent_encode(ascii) ==
"%01%02%03%04%05%06%07%08%09%0A%0B%0C%0D%0E%0F%10%11%12%13%14%15%16%17%18%19%1A%1B%1C%1D%1E%1F%20%21%22%23%"
"24%25%26%27%28%29%2A%2B%2C-.%2F0123456789%3A%3B%3C%3D%3E%3F%40ABCDEFGHIJKLMNOPQRSTUVWXYZ%5B%5C%5D%5E_%"
"60abcdefghijklmnopqrstuvwxyz%7B%7C%7D~%7F");
// U+1F44D THUMBS UP SIGN and U+1F30F EARTH GLOBE ASIA-AUSTRALIA
REQUIRE(vcpkg::Strings::percent_encode("\xF0\x9F\x91\x8d\xf0\x9f\x8c\x8f") == "%F0%9F%91%8D%F0%9F%8C%8F");
REQUIRE(Strings::percent_encode("\xF0\x9F\x91\x8d\xf0\x9f\x8c\x8f") == "%F0%9F%91%8D%F0%9F%8C%8F");
}

TEST_CASE ("split by char", "[strings]")
{
using vcpkg::Strings::split;
using Strings::split;
using result_t = std::vector<std::string>;
REQUIRE(split(",,,,,,", ',').empty());
REQUIRE(split(",,a,,b,,", ',') == result_t{"a", "b"});
Expand All @@ -59,7 +61,7 @@ TEST_CASE ("split by char", "[strings]")

TEST_CASE ("find_first_of", "[strings]")
{
using vcpkg::Strings::find_first_of;
using Strings::find_first_of;
REQUIRE(find_first_of("abcdefg", "hij") == std::string());
REQUIRE(find_first_of("abcdefg", "a") == std::string("abcdefg"));
REQUIRE(find_first_of("abcdefg", "g") == std::string("g"));
Expand All @@ -69,13 +71,12 @@ TEST_CASE ("find_first_of", "[strings]")

TEST_CASE ("contains_any_ignoring_c_comments", "[strings]")
{
using vcpkg::Strings::contains_any_ignoring_c_comments;
using Strings::contains_any_ignoring_c_comments;
std::string a = "abc";
std::string b = "wer";

vcpkg::Strings::boyer_moore_horspool_searcher to_find[] = {
vcpkg::Strings::boyer_moore_horspool_searcher(a.begin(), a.end()),
vcpkg::Strings::boyer_moore_horspool_searcher(b.begin(), b.end())};
Strings::vcpkg_searcher to_find[] = {Strings::vcpkg_searcher(a.begin(), a.end()),
Strings::vcpkg_searcher(b.begin(), b.end())};
REQUIRE(contains_any_ignoring_c_comments(R"(abc)", to_find));
REQUIRE(contains_any_ignoring_c_comments(R"("abc")", to_find));
REQUIRE_FALSE(contains_any_ignoring_c_comments(R"("" //abc)", to_find));
Expand Down Expand Up @@ -129,13 +130,12 @@ TEST_CASE ("contains_any_ignoring_c_comments", "[strings]")

TEST_CASE ("contains_any_ignoring_hash_comments", "[strings]")
{
using vcpkg::Strings::contains_any_ignoring_hash_comments;
using Strings::contains_any_ignoring_hash_comments;
std::string a = "abc";
std::string b = "wer";

vcpkg::Strings::boyer_moore_horspool_searcher to_find[] = {
vcpkg::Strings::boyer_moore_horspool_searcher(a.begin(), a.end()),
vcpkg::Strings::boyer_moore_horspool_searcher(b.begin(), b.end())};
Strings::vcpkg_searcher to_find[] = {Strings::vcpkg_searcher(a.begin(), a.end()),
Strings::vcpkg_searcher(b.begin(), b.end())};
REQUIRE(contains_any_ignoring_hash_comments("abc", to_find));
REQUIRE(contains_any_ignoring_hash_comments("wer", to_find));
REQUIRE(contains_any_ignoring_hash_comments("wer # test", to_find));
Expand All @@ -148,7 +148,7 @@ TEST_CASE ("contains_any_ignoring_hash_comments", "[strings]")

TEST_CASE ("edit distance", "[strings]")
{
using vcpkg::Strings::byte_edit_distance;
using Strings::byte_edit_distance;
REQUIRE(byte_edit_distance("", "") == 0);
REQUIRE(byte_edit_distance("a", "a") == 0);
REQUIRE(byte_edit_distance("abcd", "abcd") == 0);
Expand All @@ -163,12 +163,12 @@ TEST_CASE ("edit distance", "[strings]")

TEST_CASE ("replace_all", "[strings]")
{
REQUIRE(vcpkg::Strings::replace_all(vcpkg::StringView("literal"), "ter", "x") == "lixal");
REQUIRE(Strings::replace_all(StringView("literal"), "ter", "x") == "lixal");
}

TEST_CASE ("inplace_replace_all", "[strings]")
{
using vcpkg::Strings::inplace_replace_all;
using Strings::inplace_replace_all;
std::string target;
inplace_replace_all(target, "", "content");
REQUIRE(target.empty());
Expand All @@ -187,7 +187,7 @@ TEST_CASE ("inplace_replace_all", "[strings]")

TEST_CASE ("inplace_replace_all(char)", "[strings]")
{
using vcpkg::Strings::inplace_replace_all;
using Strings::inplace_replace_all;
static_assert(noexcept(inplace_replace_all(std::declval<std::string&>(), 'a', 'a')));

std::string target;
Expand All @@ -204,11 +204,6 @@ TEST_CASE ("inplace_replace_all(char)", "[strings]")

TEST_CASE ("api_stable_format(sv,append_f)", "[strings]")
{
namespace Strings = vcpkg::Strings;
using vcpkg::api_stable_format;
using vcpkg::nullopt;
using vcpkg::StringView;

std::string target;
auto res = api_stable_format("{", [](std::string&, StringView) { CHECK(false); });
REQUIRE(!res.has_value());
Expand Down Expand Up @@ -246,13 +241,13 @@ TEST_CASE ("ascii to utf16", "[utf16]")
{
SECTION ("ASCII to utf16")
{
auto str = vcpkg::Strings::to_utf16("abc");
auto str = Strings::to_utf16("abc");
REQUIRE(str == L"abc");
}

SECTION ("ASCII to utf16 with whitespace")
{
auto str = vcpkg::Strings::to_utf16("abc -x86-windows");
auto str = Strings::to_utf16("abc -x86-windows");
REQUIRE(str == L"abc -x86-windows");
}
}
Expand Down
19 changes: 6 additions & 13 deletions src/vcpkg/base/strings.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -379,8 +379,7 @@ Optional<StringView> Strings::find_at_most_one_enclosed(StringView input, String
return result.front();
}

bool vcpkg::Strings::contains_any_ignoring_c_comments(const std::string& source,
View<boyer_moore_horspool_searcher> to_find)
bool vcpkg::Strings::contains_any_ignoring_c_comments(const std::string& source, View<vcpkg_searcher> to_find)
{
std::string::size_type offset = 0;
std::string::size_type no_comment_offset = 0;
Expand Down Expand Up @@ -444,7 +443,7 @@ bool vcpkg::Strings::contains_any_ignoring_c_comments(const std::string& source,
return false;
}

bool Strings::contains_any_ignoring_hash_comments(StringView source, View<boyer_moore_horspool_searcher> to_find)
bool Strings::contains_any_ignoring_hash_comments(StringView source, View<vcpkg_searcher> to_find)
{
auto first = source.data();
auto block_start = first;
Expand All @@ -471,17 +470,11 @@ bool Strings::contains_any_ignoring_hash_comments(StringView source, View<boyer_
return Strings::long_string_contains_any(StringView{block_start, last}, to_find);
}

bool Strings::long_string_contains_any(StringView source, View<boyer_moore_horspool_searcher> to_find)
bool Strings::long_string_contains_any(StringView source, View<vcpkg_searcher> to_find)
{
for (const auto& subject : to_find)
{
auto found = std::search(source.begin(), source.end(), subject);
if (found != source.end())
{
return true;
}
}
return false;
return std::any_of(to_find.begin(), to_find.end(), [&](const vcpkg_searcher& searcher) {
return searcher.search(source.begin(), source.end()) != source.end();
});
}

bool Strings::equals(StringView a, StringView b)
Expand Down
6 changes: 3 additions & 3 deletions src/vcpkg/postbuildlint.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1217,7 +1217,7 @@ namespace vcpkg

static bool file_contains_absolute_paths(const ReadOnlyFilesystem& fs,
const Path& file,
View<Strings::boyer_moore_horspool_searcher> searcher_paths)
View<Strings::vcpkg_searcher> searcher_paths)
{
const auto extension = file.extension();
if (extension == ".h" || extension == ".hpp" || extension == ".hxx")
Expand Down Expand Up @@ -1269,8 +1269,8 @@ namespace vcpkg

Util::sort_unique_erase(string_paths);

const auto searcher_paths = Util::fmap(
string_paths, [](std::string& s) { return Strings::boyer_moore_horspool_searcher(s.begin(), s.end()); });
const auto searcher_paths =
Util::fmap(string_paths, [](std::string& s) { return Strings::vcpkg_searcher(s.begin(), s.end()); });

std::vector<Path> failing_files;
{
Expand Down

0 comments on commit 8285230

Please sign in to comment.