From 49116032d905455a7b1c994e4a696afc885c1e71 Mon Sep 17 00:00:00 2001 From: thegeorg Date: Thu, 10 Feb 2022 16:45:12 +0300 Subject: Restoring authorship annotation for . Commit 2 of 2. --- library/cpp/diff/diff.cpp | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'library/cpp/diff/diff.cpp') diff --git a/library/cpp/diff/diff.cpp b/library/cpp/diff/diff.cpp index 8690ead6a63..be57da7f396 100644 --- a/library/cpp/diff/diff.cpp +++ b/library/cpp/diff/diff.cpp @@ -3,8 +3,8 @@ #include #include -#include - +#include + template struct TCollectionImpl { TVector> Words; @@ -18,21 +18,21 @@ struct TCollectionImpl { return true; } - TConstArrayRef Remap(const TConstArrayRef& keys) const { + TConstArrayRef Remap(const TConstArrayRef& keys) const { if (keys.empty()) { return TConstArrayRef(); } - 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(lastWordPos) < Words.size()); - - return TConstArrayRef(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(lastWordPos) < Words.size()); + + return TConstArrayRef(Words[firstWordPos].begin(), Words[lastWordPos].end()); } TConstArrayRef GetKeys() const { - return TConstArrayRef(Keys); + return TConstArrayRef(Keys); } }; @@ -50,10 +50,10 @@ struct TCollection: public TCollectionImpl { }; template <> -struct TCollection: public TCollectionImpl { +struct TCollection: public TCollectionImpl { TCollection(const TWtringBuf& str, const TUtf16String& delims) { - TSetDelimiter set(delims.data()); - TKeepDelimiters> c(this); + TSetDelimiter set(delims.data()); + TKeepDelimiters> c(this); SplitString(str.begin(), str.end(), set, c); } }; @@ -72,16 +72,16 @@ size_t NDiff::InlineDiff(TVector>& chunks, const TStringBuf& left, return dist; } -size_t NDiff::InlineDiff(TVector>& chunks, const TWtringBuf& left, const TWtringBuf& right, const TUtf16String& delims) { +size_t NDiff::InlineDiff(TVector>& chunks, const TWtringBuf& left, const TWtringBuf& right, const TUtf16String& delims) { if (delims.empty()) { - return InlineDiff(chunks, TConstArrayRef(left.data(), left.size()), TConstArrayRef(right.data(), right.size())); + return InlineDiff(chunks, TConstArrayRef(left.data(), left.size()), TConstArrayRef(right.data(), right.size())); } - TCollection c1(left, delims); - TCollection c2(right, delims); + TCollection c1(left, delims); + TCollection c2(right, delims); TVector> diff; const size_t dist = InlineDiff(diff, c1.GetKeys(), c2.GetKeys()); for (const auto& it : diff) { - chunks.push_back(TChunk(c1.Remap(it.Left), c2.Remap(it.Right), c1.Remap(it.Common))); + chunks.push_back(TChunk(c1.Remap(it.Left), c2.Remap(it.Right), c1.Remap(it.Common))); } return dist; } -- cgit v1.3