diff options
| author | Maxime Coste <mawww@kakoune.org> | 2020-03-20 20:26:05 +1100 |
|---|---|---|
| committer | Maxime Coste <mawww@kakoune.org> | 2020-03-20 20:27:50 +1100 |
| commit | 3c265acd6c9640676c9e976c1795c72daabe71e2 (patch) | |
| tree | bf5e4f7f473d7d8f94a1d33e9eb2a67324d6dc31 /src/unit_tests.cc | |
| parent | 401ef84a4bbba69a1ccf787712369a43253aa5bd (diff) | |
Remove posB from information given by the diff algorithm
posB is always the sum of previous add len and previous keep len,
so very easy to keep track of.
Diffstat (limited to 'src/unit_tests.cc')
| -rw-r--r-- | src/unit_tests.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/unit_tests.cc b/src/unit_tests.cc index 5b693026..7c77d508 100644 --- a/src/unit_tests.cc +++ b/src/unit_tests.cc @@ -17,29 +17,29 @@ UnitTest test_utf8{[]() UnitTest test_diff{[]() { - struct Diff{DiffOp op; int len; int posB = 0;}; + struct Diff{DiffOp op; int len;}; auto check_diff = [](StringView a, StringView b, std::initializer_list<Diff> diffs) { size_t count = 0; for_each_diff(a.begin(), (int)a.length(), b.begin(), (int)b.length(), - [&](DiffOp op, int len, int posB) { + [&](DiffOp op, int len) { kak_assert(count < diffs.size()); auto& d = diffs.begin()[count++]; - kak_assert(d.op == op and d.len == len and d.posB == posB); + kak_assert(d.op == op and d.len == len); }); kak_assert(count == diffs.size()); }; check_diff("a?", "!", {{DiffOp::Remove, 1}, {DiffOp::Add, 1}, {DiffOp::Remove, 1}}); check_diff("abcde", "cd", {{DiffOp::Remove, 2}, {DiffOp::Keep, 2}, {DiffOp::Remove, 1}}); - check_diff("abcd", "cdef", {{DiffOp::Remove, 2}, {DiffOp::Keep, 2}, {DiffOp::Add, 2, 2}}); + check_diff("abcd", "cdef", {{DiffOp::Remove, 2}, {DiffOp::Keep, 2}, {DiffOp::Add, 2}}); check_diff("mais que fais la police", "mais ou va la police", - {{DiffOp::Keep, 5}, {DiffOp::Remove, 1}, {DiffOp::Add, 1, 5}, {DiffOp::Keep, 1}, - {DiffOp::Remove, 1}, {DiffOp::Keep, 1}, {DiffOp::Add, 1, 8}, {DiffOp::Remove, 1}, + {{DiffOp::Keep, 5}, {DiffOp::Remove, 1}, {DiffOp::Add, 1}, {DiffOp::Keep, 1}, + {DiffOp::Remove, 1}, {DiffOp::Keep, 1}, {DiffOp::Add, 1}, {DiffOp::Remove, 1}, {DiffOp::Keep, 1}, {DiffOp::Remove, 2}, {DiffOp::Keep, 10}} ); check_diff("abcdefghijk", "1cdef2hij34", - {{DiffOp::Remove, 2}, {DiffOp::Add, 1, 0}, {DiffOp::Keep, 4}, {DiffOp::Remove, 1}, - {DiffOp::Add, 1, 5}, {DiffOp::Keep, 3}, {DiffOp::Add, 2, 9}, {DiffOp::Remove, 1}}); + {{DiffOp::Remove, 2}, {DiffOp::Add, 1}, {DiffOp::Keep, 4}, {DiffOp::Remove, 1}, + {DiffOp::Add, 1}, {DiffOp::Keep, 3}, {DiffOp::Add, 2}, {DiffOp::Remove, 1}}); }}; |
