diff options
author | yazevnul <yazevnul@yandex-team.ru> | 2022-02-10 16:46:48 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:46:48 +0300 |
commit | 9abfb1a53b7f7b791444d1378e645d8fad9b06ed (patch) | |
tree | 49e222ea1c5804306084bb3ae065bb702625360f /library/cpp/diff | |
parent | 8cbc307de0221f84c80c42dcbe07d40727537e2c (diff) | |
download | ydb-9abfb1a53b7f7b791444d1378e645d8fad9b06ed.tar.gz |
Restoring authorship annotation for <yazevnul@yandex-team.ru>. Commit 2 of 2.
Diffstat (limited to 'library/cpp/diff')
-rw-r--r-- | library/cpp/diff/diff.cpp | 6 | ||||
-rw-r--r-- | library/cpp/diff/diff.h | 4 | ||||
-rw-r--r-- | library/cpp/diff/diff_ut.cpp | 24 |
3 files changed, 17 insertions, 17 deletions
diff --git a/library/cpp/diff/diff.cpp b/library/cpp/diff/diff.cpp index 776b686546..be57da7f39 100644 --- a/library/cpp/diff/diff.cpp +++ b/library/cpp/diff/diff.cpp @@ -66,8 +66,8 @@ size_t NDiff::InlineDiff(TVector<TChunk<char>>& chunks, const TStringBuf& left, TCollection<char> 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<char>(c1.Remap(it.Left), c2.Remap(it.Right), c1.Remap(it.Common))); + for (const auto& it : diff) { + chunks.push_back(TChunk<char>(c1.Remap(it.Left), c2.Remap(it.Right), c1.Remap(it.Common))); } return dist; } @@ -80,7 +80,7 @@ size_t NDiff::InlineDiff(TVector<TChunk<wchar16>>& chunks, const TWtringBuf& lef 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) { + for (const auto& it : diff) { 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 252564f53a..94fb00cd0b 100644 --- a/library/cpp/diff/diff.h +++ b/library/cpp/diff/diff.h @@ -44,8 +44,8 @@ namespace NDiff { NLCS::MakeLCS<T>(s1, s2, &lcs, &ctx); // Start points of current common and diff parts - const T* c1 = nullptr; - const T* c2 = nullptr; + const T* c1 = nullptr; + const T* c2 = nullptr; const T* d1 = s1.begin(); const T* d2 = s2.begin(); diff --git a/library/cpp/diff/diff_ut.cpp b/library/cpp/diff/diff_ut.cpp index dd75fa6754..b82a7b000e 100644 --- a/library/cpp/diff/diff_ut.cpp +++ b/library/cpp/diff/diff_ut.cpp @@ -36,7 +36,7 @@ struct TDiffTester { } }; -Y_UNIT_TEST_SUITE(DiffTokens) { +Y_UNIT_TEST_SUITE(DiffTokens) { Y_UNIT_TEST(ReturnValue) { TVector<TChunk<char>> res; UNIT_ASSERT_VALUES_EQUAL(InlineDiff(res, "aaa", "aaa"), 0); @@ -49,7 +49,7 @@ Y_UNIT_TEST_SUITE(DiffTokens) { UNIT_ASSERT_VALUES_EQUAL(InlineDiff(res, "abc", "xyz"), 3); } - Y_UNIT_TEST(EqualStringsOneToken) { + Y_UNIT_TEST(EqualStringsOneToken) { TDiffTester tester; tester.Test("aaa", "aaa"); @@ -57,7 +57,7 @@ Y_UNIT_TEST_SUITE(DiffTokens) { UNIT_ASSERT_VALUES_EQUAL(tester.Result(), "aaa"); } - Y_UNIT_TEST(NonCrossingStringsOneToken) { + Y_UNIT_TEST(NonCrossingStringsOneToken) { TDiffTester tester; tester.Test("aaa", "bbb"); @@ -69,7 +69,7 @@ Y_UNIT_TEST_SUITE(DiffTokens) { UNIT_ASSERT_VALUES_EQUAL(tester.Result(), "(aaa|bbbb)"); } - Y_UNIT_TEST(Simple) { + Y_UNIT_TEST(Simple) { TDiffTester tester; tester.Test("aaa", "abb", ""); @@ -89,7 +89,7 @@ Y_UNIT_TEST_SUITE(DiffTokens) { UNIT_ASSERT_VALUES_EQUAL(tester.Result(), "[1, (2|3), 3]"); } - Y_UNIT_TEST(CommonCharOneToken) { + Y_UNIT_TEST(CommonCharOneToken) { TDiffTester tester; tester.Test("abcde", "accfg"); @@ -97,7 +97,7 @@ Y_UNIT_TEST_SUITE(DiffTokens) { UNIT_ASSERT_VALUES_EQUAL(tester.Result(), "(abcde|accfg)"); } - Y_UNIT_TEST(EqualStringsTwoTokens) { + Y_UNIT_TEST(EqualStringsTwoTokens) { TDiffTester tester; TStringBuf str("aaa bbb"); @@ -107,7 +107,7 @@ Y_UNIT_TEST_SUITE(DiffTokens) { UNIT_ASSERT_VALUES_EQUAL(tester.Result(), "aaa bbb"); } - Y_UNIT_TEST(NonCrossingStringsTwoTokens) { + Y_UNIT_TEST(NonCrossingStringsTwoTokens) { TDiffTester tester; tester.Test("aaa bbb", "ccc ddd"); @@ -119,7 +119,7 @@ Y_UNIT_TEST_SUITE(DiffTokens) { UNIT_ASSERT_VALUES_EQUAL(tester.Result(), "(aaa|c) (bbb|d)"); } - Y_UNIT_TEST(SimpleTwoTokens) { + Y_UNIT_TEST(SimpleTwoTokens) { TDiffTester tester; tester.Test("aaa ccd", "abb cce"); @@ -131,7 +131,7 @@ Y_UNIT_TEST_SUITE(DiffTokens) { UNIT_ASSERT_VALUES_EQUAL(tester.Result(), "(aac|aa) (cbb|bb)"); } - Y_UNIT_TEST(MixedTwoTokens) { + Y_UNIT_TEST(MixedTwoTokens) { TDiffTester tester; tester.Test("aaa bbb", "bbb aaa"); @@ -151,7 +151,7 @@ Y_UNIT_TEST_SUITE(DiffTokens) { UNIT_ASSERT_VALUES_EQUAL(tester.Result(), "(aaa|) (bb|bbb aa)"); } - Y_UNIT_TEST(TwoTokensInOneString) { + Y_UNIT_TEST(TwoTokensInOneString) { TDiffTester tester; tester.Test("aaa bbb", "aaa"); @@ -171,7 +171,7 @@ Y_UNIT_TEST_SUITE(DiffTokens) { UNIT_ASSERT_VALUES_EQUAL(tester.Result(), "(aaa |)bbb"); } - Y_UNIT_TEST(Multiline) { + Y_UNIT_TEST(Multiline) { TDiffTester tester; tester.Test("aaa\nabc\nbbb", "aaa\nacc\nbbb"); @@ -183,7 +183,7 @@ Y_UNIT_TEST_SUITE(DiffTokens) { UNIT_ASSERT_VALUES_EQUAL(tester.Result(), "aaa\n(abc|ac)\nbbb"); } - Y_UNIT_TEST(DifferentDelimiters) { + Y_UNIT_TEST(DifferentDelimiters) { TDiffTester tester; tester.Test("aaa bbb", "aaa\tbbb"); |