aboutsummaryrefslogtreecommitdiffstats
path: root/library/cpp/diff
diff options
context:
space:
mode:
authorthegeorg <thegeorg@yandex-team.ru>2022-02-10 16:45:12 +0300
committerDaniil Cherednik <dcherednik@yandex-team.ru>2022-02-10 16:45:12 +0300
commit49116032d905455a7b1c994e4a696afc885c1e71 (patch)
treebe835aa92c6248212e705f25388ebafcf84bc7a1 /library/cpp/diff
parent4e839db24a3bbc9f1c610c43d6faaaa99824dcca (diff)
downloadydb-49116032d905455a7b1c994e4a696afc885c1e71.tar.gz
Restoring authorship annotation for <thegeorg@yandex-team.ru>. Commit 2 of 2.
Diffstat (limited to 'library/cpp/diff')
-rw-r--r--library/cpp/diff/diff.cpp38
-rw-r--r--library/cpp/diff/diff.h2
2 files changed, 20 insertions, 20 deletions
diff --git a/library/cpp/diff/diff.cpp b/library/cpp/diff/diff.cpp
index 8690ead6a6..be57da7f39 100644
--- a/library/cpp/diff/diff.cpp
+++ b/library/cpp/diff/diff.cpp
@@ -3,8 +3,8 @@
#include <util/generic/hash.h>
#include <util/digest/fnv.h>
-#include <iterator>
-
+#include <iterator>
+
template <typename T>
struct TCollectionImpl {
TVector<TConstArrayRef<T>> Words;
@@ -18,21 +18,21 @@ struct TCollectionImpl {
return true;
}
- TConstArrayRef<T> Remap(const TConstArrayRef<ui64>& keys) const {
+ TConstArrayRef<T> Remap(const TConstArrayRef<ui64>& keys) const {
if (keys.empty()) {
return TConstArrayRef<T>();
}
- auto firstWordPos = std::distance(Keys.data(), keys.begin());
- auto lastWordPos = std::distance(Keys.data(), keys.end()) - 1;
- Y_ASSERT(firstWordPos >= 0);
- Y_ASSERT(lastWordPos >= firstWordPos);
- Y_ASSERT(static_cast<size_t>(lastWordPos) < Words.size());
-
- return TConstArrayRef<T>(Words[firstWordPos].begin(), Words[lastWordPos].end());
+ auto firstWordPos = std::distance(Keys.data(), keys.begin());
+ auto lastWordPos = std::distance(Keys.data(), keys.end()) - 1;
+ Y_ASSERT(firstWordPos >= 0);
+ Y_ASSERT(lastWordPos >= firstWordPos);
+ Y_ASSERT(static_cast<size_t>(lastWordPos) < Words.size());
+
+ return TConstArrayRef<T>(Words[firstWordPos].begin(), Words[lastWordPos].end());
}
TConstArrayRef<ui64> GetKeys() const {
- return TConstArrayRef<ui64>(Keys);
+ return TConstArrayRef<ui64>(Keys);
}
};
@@ -50,10 +50,10 @@ struct TCollection<char>: public TCollectionImpl<char> {
};
template <>
-struct TCollection<wchar16>: public TCollectionImpl<wchar16> {
+struct TCollection<wchar16>: public TCollectionImpl<wchar16> {
TCollection(const TWtringBuf& str, const TUtf16String& delims) {
- TSetDelimiter<const wchar16> set(delims.data());
- TKeepDelimiters<TCollection<wchar16>> c(this);
+ TSetDelimiter<const wchar16> set(delims.data());
+ TKeepDelimiters<TCollection<wchar16>> c(this);
SplitString(str.begin(), str.end(), set, c);
}
};
@@ -72,16 +72,16 @@ size_t NDiff::InlineDiff(TVector<TChunk<char>>& chunks, const TStringBuf& left,
return dist;
}
-size_t NDiff::InlineDiff(TVector<TChunk<wchar16>>& chunks, const TWtringBuf& left, const TWtringBuf& right, const TUtf16String& delims) {
+size_t NDiff::InlineDiff(TVector<TChunk<wchar16>>& chunks, const TWtringBuf& left, const TWtringBuf& right, const TUtf16String& delims) {
if (delims.empty()) {
- return InlineDiff<wchar16>(chunks, TConstArrayRef<wchar16>(left.data(), left.size()), TConstArrayRef<wchar16>(right.data(), right.size()));
+ return InlineDiff<wchar16>(chunks, TConstArrayRef<wchar16>(left.data(), left.size()), TConstArrayRef<wchar16>(right.data(), right.size()));
}
- TCollection<wchar16> c1(left, delims);
- TCollection<wchar16> c2(right, delims);
+ TCollection<wchar16> c1(left, delims);
+ TCollection<wchar16> c2(right, delims);
TVector<TChunk<ui64>> diff;
const size_t dist = InlineDiff<ui64>(diff, c1.GetKeys(), c2.GetKeys());
for (const auto& it : diff) {
- chunks.push_back(TChunk<wchar16>(c1.Remap(it.Left), c2.Remap(it.Right), c1.Remap(it.Common)));
+ chunks.push_back(TChunk<wchar16>(c1.Remap(it.Left), c2.Remap(it.Right), c1.Remap(it.Common)));
}
return dist;
}
diff --git a/library/cpp/diff/diff.h b/library/cpp/diff/diff.h
index b2d66c9188..94fb00cd0b 100644
--- a/library/cpp/diff/diff.h
+++ b/library/cpp/diff/diff.h
@@ -107,6 +107,6 @@ namespace NDiff {
// Without delimiters calculates character-wise diff
// With delimiters calculates token-wise diff
size_t InlineDiff(TVector<TChunk<char>>& chunks, const TStringBuf& left, const TStringBuf& right, const TString& delims = TString());
- size_t InlineDiff(TVector<TChunk<wchar16>>& chunks, const TWtringBuf& left, const TWtringBuf& right, const TUtf16String& delims = TUtf16String());
+ size_t InlineDiff(TVector<TChunk<wchar16>>& chunks, const TWtringBuf& left, const TWtringBuf& right, const TUtf16String& delims = TUtf16String());
}