xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More refactoring of the diff code in order to make it cleaner

Browse Source
This commit is contained in:
Maxime Coste 2017-07-18 16:11:24 +02:00
parent 50fec86749
commit 9197dd393c
2 changed files with 35 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/diff.hh
View File

@ -18,8 +18,7 @@ struct Snake{ int x, y, u, v; bool add; };
template<typename Iterator, typename Equal>
Snake find_end_snake_of_further_reaching_dpath(Iterator a, int N, Iterator b, int M,
const int* V,
const int D, const int k, Equal eq)
const int* V, const int D, const int k, Equal eq)
{
const bool add = k == -D or (k != D and V[k-1] < V[k+1]);
@ -40,8 +39,9 @@ Snake find_end_snake_of_further_reaching_dpath(Iterator a, int N, Iterator b, in
struct SnakeLen : Snake
{
SnakeLen(Snake s, int d) : Snake(s), d(d) {}
int d;
SnakeLen(Snake s, bool reverse, int d) : Snake(s), reverse(reverse), d(d) {}
const bool reverse;
const int d;
};
template<typename Iterator, typename Equal>
@ -65,7 +65,7 @@ SnakeLen find_middle_snake(Iterator a, int N, Iterator b, int M,
if ((delta % 2 != 0) and -(D-1) <= k2 and k2 <= (D-1))
{
if (V1[k1] + V2[k2] >= N)
return { p, 2 * D - 1 };// return last snake on forward path
return { p, false, 2 * D - 1 };// return last snake on forward path
}
}
@ -78,13 +78,13 @@ SnakeLen find_middle_snake(Iterator a, int N, Iterator b, int M,
if ((delta % 2 == 0) and -D <= k1 and k1 <= D)
{
if (V1[k1] + V2[k2] >= N)
return { { N - p.u, M - p.v, N - p.x , M - p.y, p.add } , 2 * D };// return last snake on reverse path
return { { N - p.u, M - p.v, N - p.x , M - p.y, p.add } , true, 2 * D };// return last snake on reverse path
}
}
}
kak_assert(false);
return { {}, 0 };
return { {}, false, 0 };
}
struct Diff
@ -131,33 +131,28 @@ void find_diff_rec(Iterator a, int begA, int endA,
else
{
auto snake = find_middle_snake(a + begA, lenA, b + begB, lenB, V1, V2, eq);
kak_assert(snake.u <= lenA and snake.v <= lenB);
if (snake.d > 1)
{
find_diff_rec(a, begA, begA + snake.x,
b, begB, begB + snake.y,
kak_assert(snake.d > 0 and snake.u <= lenA and snake.v <= lenB);
const bool recurse = snake.d > 1;
if (recurse)
find_diff_rec(a, begA, begA + snake.x - (snake.reverse ? 0 : (snake.add ? 0 : 1)),
b, begB, begB + snake.y - (snake.reverse ? 0 : (snake.add ? 1 : 0)),
V1, V2, eq, diffs);
append_diff(diffs, {Diff::Keep, snake.u - snake.x, 0});
if (not snake.reverse)
append_diff(diffs, snake.add ? Diff{Diff::Add, 1, begB + snake.y - 1}
: Diff{Diff::Remove, 1, 0});
find_diff_rec(a, begA + snake.u, endA,
b, begB + snake.v, endB,
append_diff(diffs, {Diff::Keep, snake.u - snake.x, 0});
if (snake.reverse)
append_diff(diffs, snake.add ? Diff{Diff::Add, 1, begB + snake.v}
: Diff{Diff::Remove, 1, 0});
if (recurse)
find_diff_rec(a, begA + snake.u + (snake.reverse ? (snake.add ? 0 : 1) : 0), endA,
b, begB + snake.v + (snake.reverse ? (snake.add ? 1 : 0) : 0), endB,
V1, V2, eq, diffs);
}
else
{
if (snake.d == 1)
{
const int diag = snake.x - (snake.add ? 0 : 1);
append_diff(diffs, {Diff::Keep, diag, 0});
if (snake.add)
append_diff(diffs, {Diff::Add, 1, begB + diag});
else
append_diff(diffs, {Diff::Remove, 1, 0});
}
append_diff(diffs, {Diff::Keep, snake.u - snake.x, 0});
}
}
append_diff(diffs, {Diff::Keep, suffix_len, 0});

20
src/unit_tests.cc
View File

@ -21,14 +21,6 @@ UnitTest test_diff{[]()
return lhs.mode == rhs.mode and lhs.len == rhs.len and lhs.posB == rhs.posB;
};
{
StringView s1 = "mais que fais la police";
StringView s2 = "mais ou va la police";
auto diff = find_diff(s1.begin(), (int)s1.length(), s2.begin(), (int)s2.length());
kak_assert(diff.size() == 11);
}
{
auto diff = find_diff("a?", 2, "!", 1);
kak_assert(diff.size() == 3 and
@ -38,10 +30,10 @@ UnitTest test_diff{[]()
}
{
auto diff = find_diff("abcd", 4, "c", 1);
auto diff = find_diff("abcde", 5, "cd", 2);
kak_assert(diff.size() == 3 and
eq(diff[0], {Diff::Remove, 2, 0}) and
eq(diff[1], {Diff::Keep, 1, 0}) and
eq(diff[1], {Diff::Keep, 2, 0}) and
eq(diff[2], {Diff::Remove, 1, 0}));
}
@ -52,6 +44,14 @@ UnitTest test_diff{[]()
eq(diff[1], {Diff::Keep, 2, 0}) and
eq(diff[2], {Diff::Add, 2, 2}));
}
{
StringView s1 = "mais que fais la police";
StringView s2 = "mais ou va la police";
auto diff = find_diff(s1.begin(), (int)s1.length(), s2.begin(), (int)s2.length());
kak_assert(diff.size() == 11);
}
}};
UnitTest* UnitTest::list = nullptr;