From e23eb7c073f4bc7ca4624d96d31cce53e2f6731e Mon Sep 17 00:00:00 2001 From: Zeb Burke-Conte Date: Tue, 11 Feb 2025 11:10:39 -0800 Subject: [PATCH] Use quotes rather than brackets on internal includes --- bench/bench-fuzz.cpp | 4 ++-- bench/bench-jarowinkler.cpp | 4 ++-- bench/bench-lcs.cpp | 6 +++--- bench/bench-levenshtein.cpp | 4 ++-- fuzzing/fuzz_damerau_levenshtein_distance.cpp | 4 ++-- fuzzing/fuzz_indel_distance.cpp | 2 +- fuzzing/fuzz_indel_editops.cpp | 2 +- fuzzing/fuzz_jaro_similarity.cpp | 4 ++-- fuzzing/fuzz_lcs_similarity.cpp | 4 ++-- fuzzing/fuzz_levenshtein_distance.cpp | 4 ++-- fuzzing/fuzz_levenshtein_editops.cpp | 2 +- fuzzing/fuzz_osa_distance.cpp | 4 ++-- fuzzing/fuzz_partial_ratio.cpp | 2 +- fuzzing/fuzzing.hpp | 2 +- rapidfuzz/details/PatternMatchVector.hpp | 8 ++++---- rapidfuzz/details/Range.hpp | 2 +- rapidfuzz/details/SplittedSentenceView.hpp | 4 ++-- rapidfuzz/details/common.hpp | 12 +++++------ rapidfuzz/details/distance.hpp | 6 +++--- rapidfuzz/details/intrinsics.hpp | 2 +- rapidfuzz/details/simd.hpp | 4 ++-- rapidfuzz/details/simd_avx2.hpp | 2 +- rapidfuzz/details/simd_sse2.hpp | 2 +- rapidfuzz/details/type_traits.hpp | 2 +- rapidfuzz/details/types.hpp | 2 +- rapidfuzz/distance.hpp | 20 +++++++++---------- rapidfuzz/distance/DamerauLevenshtein.hpp | 2 +- .../distance/DamerauLevenshtein_impl.hpp | 10 +++++----- rapidfuzz/distance/Hamming.hpp | 4 ++-- rapidfuzz/distance/Hamming_impl.hpp | 4 ++-- rapidfuzz/distance/Indel.hpp | 4 ++-- rapidfuzz/distance/Indel_impl.hpp | 12 +++++------ rapidfuzz/distance/Jaro.hpp | 4 ++-- rapidfuzz/distance/JaroWinkler.hpp | 4 ++-- rapidfuzz/distance/JaroWinkler_impl.hpp | 2 +- rapidfuzz/distance/Jaro_impl.hpp | 8 ++++---- rapidfuzz/distance/LCSseq.hpp | 2 +- rapidfuzz/distance/LCSseq_impl.hpp | 14 ++++++------- rapidfuzz/distance/Levenshtein.hpp | 4 ++-- rapidfuzz/distance/Levenshtein_impl.hpp | 16 +++++++-------- rapidfuzz/distance/OSA.hpp | 4 ++-- rapidfuzz/distance/OSA_impl.hpp | 10 +++++----- rapidfuzz/distance/Postfix.hpp | 4 ++-- rapidfuzz/distance/Postfix_impl.hpp | 6 +++--- rapidfuzz/distance/Prefix.hpp | 4 ++-- rapidfuzz/distance/Prefix_impl.hpp | 6 +++--- rapidfuzz/fuzz.hpp | 10 +++++----- rapidfuzz/fuzz_impl.hpp | 2 +- rapidfuzz/rapidfuzz_all.hpp | 4 ++-- 49 files changed, 127 insertions(+), 127 deletions(-) diff --git a/bench/bench-fuzz.cpp b/bench/bench-fuzz.cpp index 7d66f623..8cfa4f0d 100644 --- a/bench/bench-fuzz.cpp +++ b/bench/bench-fuzz.cpp @@ -1,5 +1,5 @@ -#include -#include +#include "benchmark/benchmark.h" +#include "rapidfuzz/fuzz.hpp" #include #include diff --git a/bench/bench-jarowinkler.cpp b/bench/bench-jarowinkler.cpp index b8d5c41e..3fce58c4 100644 --- a/bench/bench-jarowinkler.cpp +++ b/bench/bench-jarowinkler.cpp @@ -1,6 +1,6 @@ -#include +#include "benchmark/benchmark.h" #include -#include +#include "rapidfuzz/distance/Jaro.hpp" #include #include diff --git a/bench/bench-lcs.cpp b/bench/bench-lcs.cpp index 5ac63d02..082840e2 100644 --- a/bench/bench-lcs.cpp +++ b/bench/bench-lcs.cpp @@ -1,7 +1,7 @@ -#include +#include "benchmark/benchmark.h" #include -#include -#include +#include "rapidfuzz/details/intrinsics.hpp" +#include "rapidfuzz/distance/LCSseq.hpp" #include #include diff --git a/bench/bench-levenshtein.cpp b/bench/bench-levenshtein.cpp index 0bc29773..4439109e 100644 --- a/bench/bench-levenshtein.cpp +++ b/bench/bench-levenshtein.cpp @@ -1,6 +1,6 @@ -#include +#include "benchmark/benchmark.h" #include -#include +#include "rapidfuzz/distance/Levenshtein.hpp" #include #include diff --git a/fuzzing/fuzz_damerau_levenshtein_distance.cpp b/fuzzing/fuzz_damerau_levenshtein_distance.cpp index 743cf74a..36d9af66 100644 --- a/fuzzing/fuzz_damerau_levenshtein_distance.cpp +++ b/fuzzing/fuzz_damerau_levenshtein_distance.cpp @@ -3,8 +3,8 @@ #include "../rapidfuzz_reference/DamerauLevenshtein.hpp" #include "fuzzing.hpp" -#include -#include +#include "rapidfuzz/details/Range.hpp" +#include "rapidfuzz/distance/DamerauLevenshtein.hpp" #include #include diff --git a/fuzzing/fuzz_indel_distance.cpp b/fuzzing/fuzz_indel_distance.cpp index 546bcd14..18c0d8fa 100644 --- a/fuzzing/fuzz_indel_distance.cpp +++ b/fuzzing/fuzz_indel_distance.cpp @@ -4,7 +4,7 @@ #include "../rapidfuzz_reference/Indel.hpp" #include "fuzzing.hpp" #include -#include +#include "rapidfuzz/distance/Indel.hpp" #include #include diff --git a/fuzzing/fuzz_indel_editops.cpp b/fuzzing/fuzz_indel_editops.cpp index 4d99c300..92a3650b 100644 --- a/fuzzing/fuzz_indel_editops.cpp +++ b/fuzzing/fuzz_indel_editops.cpp @@ -3,7 +3,7 @@ #include "../rapidfuzz_reference/Indel.hpp" #include "fuzzing.hpp" -#include +#include "rapidfuzz/distance.hpp" #include #include diff --git a/fuzzing/fuzz_jaro_similarity.cpp b/fuzzing/fuzz_jaro_similarity.cpp index 6ba5a046..843b6ee4 100644 --- a/fuzzing/fuzz_jaro_similarity.cpp +++ b/fuzzing/fuzz_jaro_similarity.cpp @@ -3,8 +3,8 @@ #include "../rapidfuzz_reference/Jaro.hpp" #include "fuzzing.hpp" -#include -#include +#include "rapidfuzz/details/Range.hpp" +#include "rapidfuzz/distance/Jaro.hpp" #include #include diff --git a/fuzzing/fuzz_lcs_similarity.cpp b/fuzzing/fuzz_lcs_similarity.cpp index 7f833c51..c6b4b3a9 100644 --- a/fuzzing/fuzz_lcs_similarity.cpp +++ b/fuzzing/fuzz_lcs_similarity.cpp @@ -3,8 +3,8 @@ #include "../rapidfuzz_reference/LCSseq.hpp" #include "fuzzing.hpp" -#include -#include +#include "rapidfuzz/details/Range.hpp" +#include "rapidfuzz/distance/LCSseq.hpp" #include #include diff --git a/fuzzing/fuzz_levenshtein_distance.cpp b/fuzzing/fuzz_levenshtein_distance.cpp index a577c608..e9079e21 100644 --- a/fuzzing/fuzz_levenshtein_distance.cpp +++ b/fuzzing/fuzz_levenshtein_distance.cpp @@ -3,8 +3,8 @@ #include "../rapidfuzz_reference/Levenshtein.hpp" #include "fuzzing.hpp" -#include -#include +#include "rapidfuzz/details/Range.hpp" +#include "rapidfuzz/distance/Levenshtein.hpp" #include #include diff --git a/fuzzing/fuzz_levenshtein_editops.cpp b/fuzzing/fuzz_levenshtein_editops.cpp index 7a540eae..1a759fd5 100644 --- a/fuzzing/fuzz_levenshtein_editops.cpp +++ b/fuzzing/fuzz_levenshtein_editops.cpp @@ -3,7 +3,7 @@ #include "../rapidfuzz_reference/Levenshtein.hpp" #include "fuzzing.hpp" -#include +#include "rapidfuzz/distance.hpp" #include #include diff --git a/fuzzing/fuzz_osa_distance.cpp b/fuzzing/fuzz_osa_distance.cpp index 5cd75020..9a7ae4c2 100644 --- a/fuzzing/fuzz_osa_distance.cpp +++ b/fuzzing/fuzz_osa_distance.cpp @@ -3,8 +3,8 @@ #include "../rapidfuzz_reference/OSA.hpp" #include "fuzzing.hpp" -#include -#include +#include "rapidfuzz/details/Range.hpp" +#include "rapidfuzz/distance/OSA.hpp" #include #include diff --git a/fuzzing/fuzz_partial_ratio.cpp b/fuzzing/fuzz_partial_ratio.cpp index c250ea2e..6de161a3 100644 --- a/fuzzing/fuzz_partial_ratio.cpp +++ b/fuzzing/fuzz_partial_ratio.cpp @@ -4,7 +4,7 @@ #include "../rapidfuzz_reference/fuzz.hpp" #include "fuzzing.hpp" #include -#include +#include "rapidfuzz/fuzz.hpp" #include #include diff --git a/fuzzing/fuzzing.hpp b/fuzzing/fuzzing.hpp index 282baf98..cc829cd9 100644 --- a/fuzzing/fuzzing.hpp +++ b/fuzzing/fuzzing.hpp @@ -1,6 +1,6 @@ #pragma once #include -#include +#include "rapidfuzz/distance/Levenshtein.hpp" #include static inline bool extract_strings(const uint8_t* data, size_t size, std::vector& s1, diff --git a/rapidfuzz/details/PatternMatchVector.hpp b/rapidfuzz/details/PatternMatchVector.hpp index f60f2fa4..dd67e983 100644 --- a/rapidfuzz/details/PatternMatchVector.hpp +++ b/rapidfuzz/details/PatternMatchVector.hpp @@ -6,10 +6,10 @@ #include #include -#include -#include -#include -#include +#include "rapidfuzz/details/GrowingHashmap.hpp" +#include "rapidfuzz/details/Matrix.hpp" +#include "rapidfuzz/details/Range.hpp" +#include "rapidfuzz/details/intrinsics.hpp" namespace rapidfuzz { namespace detail { diff --git a/rapidfuzz/details/Range.hpp b/rapidfuzz/details/Range.hpp index f0c3b10c..87346a91 100644 --- a/rapidfuzz/details/Range.hpp +++ b/rapidfuzz/details/Range.hpp @@ -13,7 +13,7 @@ #include #include -#include +#include "rapidfuzz/details/type_traits.hpp" namespace rapidfuzz { namespace detail { diff --git a/rapidfuzz/details/SplittedSentenceView.hpp b/rapidfuzz/details/SplittedSentenceView.hpp index 52653a37..411d8082 100644 --- a/rapidfuzz/details/SplittedSentenceView.hpp +++ b/rapidfuzz/details/SplittedSentenceView.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include -#include +#include "rapidfuzz/details/Range.hpp" +#include "rapidfuzz/details/type_traits.hpp" namespace rapidfuzz { namespace detail { diff --git a/rapidfuzz/details/common.hpp b/rapidfuzz/details/common.hpp index 61733d8e..0a01867c 100644 --- a/rapidfuzz/details/common.hpp +++ b/rapidfuzz/details/common.hpp @@ -3,11 +3,11 @@ #pragma once #include -#include -#include -#include -#include -#include +#include "rapidfuzz/details/Range.hpp" +#include "rapidfuzz/details/SplittedSentenceView.hpp" +#include "rapidfuzz/details/intrinsics.hpp" +#include "rapidfuzz/details/type_traits.hpp" +#include "rapidfuzz/details/types.hpp" #if defined(__APPLE__) && !defined(_LIBCPP_HAS_C11_FEATURES) # include @@ -98,4 +98,4 @@ static inline void rf_aligned_free(void* ptr) } // namespace detail } // namespace rapidfuzz -#include +#include "rapidfuzz/details/common_impl.hpp" diff --git a/rapidfuzz/details/distance.hpp b/rapidfuzz/details/distance.hpp index fb87057d..796acea4 100644 --- a/rapidfuzz/details/distance.hpp +++ b/rapidfuzz/details/distance.hpp @@ -4,9 +4,9 @@ #pragma once #include -#include -#include -#include +#include "rapidfuzz/details/Range.hpp" +#include "rapidfuzz/details/common.hpp" +#include "rapidfuzz/details/simd.hpp" #include namespace rapidfuzz { diff --git a/rapidfuzz/details/intrinsics.hpp b/rapidfuzz/details/intrinsics.hpp index 7952759e..22f87356 100644 --- a/rapidfuzz/details/intrinsics.hpp +++ b/rapidfuzz/details/intrinsics.hpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include "rapidfuzz/details/config.hpp" #include #include diff --git a/rapidfuzz/details/simd.hpp b/rapidfuzz/details/simd.hpp index 358ebec6..594af338 100644 --- a/rapidfuzz/details/simd.hpp +++ b/rapidfuzz/details/simd.hpp @@ -10,12 +10,12 @@ # define RAPIDFUZZ_SIMD # define RAPIDFUZZ_AVX2 # define RAPIDFUZZ_LTO_HACK 0 -# include +# include "rapidfuzz/details/simd_avx2.hpp" # elif (defined(_M_AMD64) || defined(_M_X64)) || defined(__SSE2__) # define RAPIDFUZZ_SIMD # define RAPIDFUZZ_SSE2 # define RAPIDFUZZ_LTO_HACK 1 -# include +# include "rapidfuzz/details/simd_sse2.hpp" # endif #endif \ No newline at end of file diff --git a/rapidfuzz/details/simd_avx2.hpp b/rapidfuzz/details/simd_avx2.hpp index 65a446cd..e511724b 100644 --- a/rapidfuzz/details/simd_avx2.hpp +++ b/rapidfuzz/details/simd_avx2.hpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include "rapidfuzz/details/intrinsics.hpp" #include namespace rapidfuzz { diff --git a/rapidfuzz/details/simd_sse2.hpp b/rapidfuzz/details/simd_sse2.hpp index da0a5378..30eb89b3 100644 --- a/rapidfuzz/details/simd_sse2.hpp +++ b/rapidfuzz/details/simd_sse2.hpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include "rapidfuzz/details/intrinsics.hpp" #include namespace rapidfuzz { diff --git a/rapidfuzz/details/type_traits.hpp b/rapidfuzz/details/type_traits.hpp index 2f05d2b4..9477f601 100644 --- a/rapidfuzz/details/type_traits.hpp +++ b/rapidfuzz/details/type_traits.hpp @@ -2,7 +2,7 @@ /* Copyright © 2020 Max Bachmann */ #pragma once -#include +#include "rapidfuzz/details/types.hpp" #include #include diff --git a/rapidfuzz/details/types.hpp b/rapidfuzz/details/types.hpp index b8ec393c..e7c09854 100644 --- a/rapidfuzz/details/types.hpp +++ b/rapidfuzz/details/types.hpp @@ -4,7 +4,7 @@ #pragma once #include -#include +#include "rapidfuzz/details/config.hpp" #include #include #include diff --git a/rapidfuzz/distance.hpp b/rapidfuzz/distance.hpp index da686f7b..52d35667 100644 --- a/rapidfuzz/distance.hpp +++ b/rapidfuzz/distance.hpp @@ -2,16 +2,16 @@ /* Copyright © 2022-present Max Bachmann */ #pragma once -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "rapidfuzz/distance/DamerauLevenshtein.hpp" +#include "rapidfuzz/distance/Hamming.hpp" +#include "rapidfuzz/distance/Indel.hpp" +#include "rapidfuzz/distance/Jaro.hpp" +#include "rapidfuzz/distance/JaroWinkler.hpp" +#include "rapidfuzz/distance/LCSseq.hpp" +#include "rapidfuzz/distance/Levenshtein.hpp" +#include "rapidfuzz/distance/OSA.hpp" +#include "rapidfuzz/distance/Postfix.hpp" +#include "rapidfuzz/distance/Prefix.hpp" namespace rapidfuzz { diff --git a/rapidfuzz/distance/DamerauLevenshtein.hpp b/rapidfuzz/distance/DamerauLevenshtein.hpp index 98f3f2f1..1a7d5c74 100644 --- a/rapidfuzz/distance/DamerauLevenshtein.hpp +++ b/rapidfuzz/distance/DamerauLevenshtein.hpp @@ -2,7 +2,7 @@ /* Copyright © 2022-present Max Bachmann */ #include -#include +#include "rapidfuzz/distance/DamerauLevenshtein_impl.hpp" namespace rapidfuzz { /* the API will require a change when adding custom weights */ diff --git a/rapidfuzz/distance/DamerauLevenshtein_impl.hpp b/rapidfuzz/distance/DamerauLevenshtein_impl.hpp index 5e34556d..713afd01 100644 --- a/rapidfuzz/distance/DamerauLevenshtein_impl.hpp +++ b/rapidfuzz/distance/DamerauLevenshtein_impl.hpp @@ -5,11 +5,11 @@ #include #include #include -#include -#include -#include -#include -#include +#include "rapidfuzz/details/GrowingHashmap.hpp" +#include "rapidfuzz/details/Matrix.hpp" +#include "rapidfuzz/details/Range.hpp" +#include "rapidfuzz/details/common.hpp" +#include "rapidfuzz/details/distance.hpp" namespace rapidfuzz { namespace detail { diff --git a/rapidfuzz/distance/Hamming.hpp b/rapidfuzz/distance/Hamming.hpp index 3ce33b91..14ee23b6 100644 --- a/rapidfuzz/distance/Hamming.hpp +++ b/rapidfuzz/distance/Hamming.hpp @@ -3,8 +3,8 @@ #pragma once #include -#include -#include +#include "rapidfuzz/details/common.hpp" +#include "rapidfuzz/distance/Hamming_impl.hpp" namespace rapidfuzz { diff --git a/rapidfuzz/distance/Hamming_impl.hpp b/rapidfuzz/distance/Hamming_impl.hpp index 34d286cd..0edbe303 100644 --- a/rapidfuzz/distance/Hamming_impl.hpp +++ b/rapidfuzz/distance/Hamming_impl.hpp @@ -2,8 +2,8 @@ /* Copyright © 2021 Max Bachmann */ #pragma once -#include -#include +#include "rapidfuzz/details/Range.hpp" +#include "rapidfuzz/details/distance.hpp" #include namespace rapidfuzz { diff --git a/rapidfuzz/distance/Indel.hpp b/rapidfuzz/distance/Indel.hpp index 16410075..5a192cdf 100644 --- a/rapidfuzz/distance/Indel.hpp +++ b/rapidfuzz/distance/Indel.hpp @@ -4,8 +4,8 @@ #pragma once #include -#include -#include +#include "rapidfuzz/distance/Indel_impl.hpp" +#include "rapidfuzz/distance/LCSseq.hpp" namespace rapidfuzz { diff --git a/rapidfuzz/distance/Indel_impl.hpp b/rapidfuzz/distance/Indel_impl.hpp index b3139fab..15219840 100644 --- a/rapidfuzz/distance/Indel_impl.hpp +++ b/rapidfuzz/distance/Indel_impl.hpp @@ -1,12 +1,12 @@ /* SPDX-License-Identifier: MIT */ /* Copyright © 2022-present Max Bachmann */ -#include -#include -#include -#include -#include -#include +#include "rapidfuzz/details/PatternMatchVector.hpp" +#include "rapidfuzz/details/Range.hpp" +#include "rapidfuzz/details/common.hpp" +#include "rapidfuzz/details/distance.hpp" +#include "rapidfuzz/details/intrinsics.hpp" +#include "rapidfuzz/distance/LCSseq.hpp" namespace rapidfuzz { namespace detail { diff --git a/rapidfuzz/distance/Jaro.hpp b/rapidfuzz/distance/Jaro.hpp index 2948c784..a8a0b539 100644 --- a/rapidfuzz/distance/Jaro.hpp +++ b/rapidfuzz/distance/Jaro.hpp @@ -3,8 +3,8 @@ #pragma once -#include -#include +#include "rapidfuzz/details/Range.hpp" +#include "rapidfuzz/distance/Jaro_impl.hpp" #include namespace rapidfuzz { diff --git a/rapidfuzz/distance/JaroWinkler.hpp b/rapidfuzz/distance/JaroWinkler.hpp index 1bd2f082..b5f1008d 100644 --- a/rapidfuzz/distance/JaroWinkler.hpp +++ b/rapidfuzz/distance/JaroWinkler.hpp @@ -3,8 +3,8 @@ #pragma once -#include -#include +#include "rapidfuzz/details/Range.hpp" +#include "rapidfuzz/distance/JaroWinkler_impl.hpp" namespace rapidfuzz { diff --git a/rapidfuzz/distance/JaroWinkler_impl.hpp b/rapidfuzz/distance/JaroWinkler_impl.hpp index a40f8af8..691a8b37 100644 --- a/rapidfuzz/distance/JaroWinkler_impl.hpp +++ b/rapidfuzz/distance/JaroWinkler_impl.hpp @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: MIT */ /* Copyright © 2022-present Max Bachmann */ -#include +#include "rapidfuzz/distance/Jaro.hpp" namespace rapidfuzz { namespace detail { diff --git a/rapidfuzz/distance/Jaro_impl.hpp b/rapidfuzz/distance/Jaro_impl.hpp index 81bdf2f7..a794125a 100644 --- a/rapidfuzz/distance/Jaro_impl.hpp +++ b/rapidfuzz/distance/Jaro_impl.hpp @@ -3,10 +3,10 @@ #include #include -#include -#include -#include -#include +#include "rapidfuzz/details/PatternMatchVector.hpp" +#include "rapidfuzz/details/common.hpp" +#include "rapidfuzz/details/distance.hpp" +#include "rapidfuzz/details/intrinsics.hpp" #include namespace rapidfuzz { diff --git a/rapidfuzz/distance/LCSseq.hpp b/rapidfuzz/distance/LCSseq.hpp index 8891cf2c..3cdfbeba 100644 --- a/rapidfuzz/distance/LCSseq.hpp +++ b/rapidfuzz/distance/LCSseq.hpp @@ -2,7 +2,7 @@ /* Copyright © 2022-present Max Bachmann */ #pragma once -#include +#include "rapidfuzz/distance/LCSseq_impl.hpp" #include #include diff --git a/rapidfuzz/distance/LCSseq_impl.hpp b/rapidfuzz/distance/LCSseq_impl.hpp index 87242db6..0b4362df 100644 --- a/rapidfuzz/distance/LCSseq_impl.hpp +++ b/rapidfuzz/distance/LCSseq_impl.hpp @@ -2,16 +2,16 @@ /* Copyright © 2022-present Max Bachmann */ #include -#include -#include -#include -#include -#include -#include +#include "rapidfuzz/details/Matrix.hpp" +#include "rapidfuzz/details/PatternMatchVector.hpp" +#include "rapidfuzz/details/common.hpp" +#include "rapidfuzz/details/distance.hpp" +#include "rapidfuzz/details/intrinsics.hpp" +#include "rapidfuzz/details/simd.hpp" #include #include -#include +#include "rapidfuzz/details/types.hpp" namespace rapidfuzz { namespace detail { diff --git a/rapidfuzz/distance/Levenshtein.hpp b/rapidfuzz/distance/Levenshtein.hpp index 45245fea..f248db7c 100644 --- a/rapidfuzz/distance/Levenshtein.hpp +++ b/rapidfuzz/distance/Levenshtein.hpp @@ -3,8 +3,8 @@ #pragma once #include -#include -#include +#include "rapidfuzz/details/Range.hpp" +#include "rapidfuzz/distance/Levenshtein_impl.hpp" namespace rapidfuzz { diff --git a/rapidfuzz/distance/Levenshtein_impl.hpp b/rapidfuzz/distance/Levenshtein_impl.hpp index 991f10c9..2dc6790c 100644 --- a/rapidfuzz/distance/Levenshtein_impl.hpp +++ b/rapidfuzz/distance/Levenshtein_impl.hpp @@ -4,14 +4,14 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include "rapidfuzz/details/GrowingHashmap.hpp" +#include "rapidfuzz/details/Matrix.hpp" +#include "rapidfuzz/details/PatternMatchVector.hpp" +#include "rapidfuzz/details/common.hpp" +#include "rapidfuzz/details/distance.hpp" +#include "rapidfuzz/details/intrinsics.hpp" +#include "rapidfuzz/details/type_traits.hpp" +#include "rapidfuzz/distance/Indel.hpp" #include namespace rapidfuzz { diff --git a/rapidfuzz/distance/OSA.hpp b/rapidfuzz/distance/OSA.hpp index ed9d16d0..cb54ffc7 100644 --- a/rapidfuzz/distance/OSA.hpp +++ b/rapidfuzz/distance/OSA.hpp @@ -4,8 +4,8 @@ #pragma once #include -#include -#include +#include "rapidfuzz/details/common.hpp" +#include "rapidfuzz/distance/OSA_impl.hpp" namespace rapidfuzz { diff --git a/rapidfuzz/distance/OSA_impl.hpp b/rapidfuzz/distance/OSA_impl.hpp index 8fa73289..67ca0cfe 100644 --- a/rapidfuzz/distance/OSA_impl.hpp +++ b/rapidfuzz/distance/OSA_impl.hpp @@ -4,11 +4,11 @@ #pragma once #include -#include -#include -#include -#include -#include +#include "rapidfuzz/details/PatternMatchVector.hpp" +#include "rapidfuzz/details/Range.hpp" +#include "rapidfuzz/details/common.hpp" +#include "rapidfuzz/details/distance.hpp" +#include "rapidfuzz/details/simd.hpp" namespace rapidfuzz { namespace detail { diff --git a/rapidfuzz/distance/Postfix.hpp b/rapidfuzz/distance/Postfix.hpp index 57320a5f..f09d4621 100644 --- a/rapidfuzz/distance/Postfix.hpp +++ b/rapidfuzz/distance/Postfix.hpp @@ -4,8 +4,8 @@ #pragma once #include -#include -#include +#include "rapidfuzz/details/common.hpp" +#include "rapidfuzz/distance/Postfix_impl.hpp" namespace rapidfuzz { diff --git a/rapidfuzz/distance/Postfix_impl.hpp b/rapidfuzz/distance/Postfix_impl.hpp index 87eb6ad2..f18758d9 100644 --- a/rapidfuzz/distance/Postfix_impl.hpp +++ b/rapidfuzz/distance/Postfix_impl.hpp @@ -2,9 +2,9 @@ /* Copyright © 2021 Max Bachmann */ #pragma once -#include -#include -#include +#include "rapidfuzz/details/Range.hpp" +#include "rapidfuzz/details/common.hpp" +#include "rapidfuzz/details/distance.hpp" namespace rapidfuzz { namespace detail { diff --git a/rapidfuzz/distance/Prefix.hpp b/rapidfuzz/distance/Prefix.hpp index d3123950..ad1b2990 100644 --- a/rapidfuzz/distance/Prefix.hpp +++ b/rapidfuzz/distance/Prefix.hpp @@ -4,8 +4,8 @@ #pragma once #include -#include -#include +#include "rapidfuzz/details/common.hpp" +#include "rapidfuzz/distance/Prefix_impl.hpp" namespace rapidfuzz { diff --git a/rapidfuzz/distance/Prefix_impl.hpp b/rapidfuzz/distance/Prefix_impl.hpp index fac93c49..503a5b5e 100644 --- a/rapidfuzz/distance/Prefix_impl.hpp +++ b/rapidfuzz/distance/Prefix_impl.hpp @@ -2,9 +2,9 @@ /* Copyright © 2021 Max Bachmann */ #pragma once -#include -#include -#include +#include "rapidfuzz/details/Range.hpp" +#include "rapidfuzz/details/common.hpp" +#include "rapidfuzz/details/distance.hpp" namespace rapidfuzz { namespace detail { diff --git a/rapidfuzz/fuzz.hpp b/rapidfuzz/fuzz.hpp index de49be9f..c26cb2ce 100644 --- a/rapidfuzz/fuzz.hpp +++ b/rapidfuzz/fuzz.hpp @@ -3,10 +3,10 @@ /* Copyright © 2011 Adam Cohen */ #pragma once -#include -#include -#include -#include +#include "rapidfuzz/details/CharSet.hpp" +#include "rapidfuzz/details/PatternMatchVector.hpp" +#include "rapidfuzz/details/common.hpp" +#include "rapidfuzz/distance/Indel.hpp" namespace rapidfuzz { namespace fuzz { @@ -808,4 +808,4 @@ CachedQRatio(InputIt1 first1, InputIt1 last1) -> CachedQRatio +#include "rapidfuzz/fuzz_impl.hpp" diff --git a/rapidfuzz/fuzz_impl.hpp b/rapidfuzz/fuzz_impl.hpp index 84be44bf..05333d57 100644 --- a/rapidfuzz/fuzz_impl.hpp +++ b/rapidfuzz/fuzz_impl.hpp @@ -4,7 +4,7 @@ #include "rapidfuzz/details/Range.hpp" #include -#include +#include "rapidfuzz/details/CharSet.hpp" #include #include diff --git a/rapidfuzz/rapidfuzz_all.hpp b/rapidfuzz/rapidfuzz_all.hpp index 3992ebb0..a5b255df 100644 --- a/rapidfuzz/rapidfuzz_all.hpp +++ b/rapidfuzz/rapidfuzz_all.hpp @@ -2,5 +2,5 @@ /* Copyright © 2022-present Max Bachmann */ #pragma once -#include -#include \ No newline at end of file +#include "rapidfuzz/distance.hpp" +#include "rapidfuzz/fuzz.hpp" \ No newline at end of file