From 7a8c2d7f564f7c38faa40fd88ce3d92b848cfaa0 Mon Sep 17 00:00:00 2001 From: Maxime Coste Date: Wed, 13 May 2015 20:51:10 +0100 Subject: [PATCH] Fix diff implementation and change the Diff struct format --- src/diff.hh | 98 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 56 insertions(+), 42 deletions(-) diff --git a/src/diff.hh b/src/diff.hh index aa482acf..bc971708 100644 --- a/src/diff.hh +++ b/src/diff.hh @@ -1,6 +1,9 @@ #include "array_view.hh" #include "vector.hh" +#include +#include + namespace Kakoune { @@ -21,10 +24,10 @@ private: struct Snake{ int x, y, u, v; bool add; }; -template +template Snake find_end_snake_of_further_reaching_dpath(Iterator a, int N, Iterator b, int M, const MirroredArray& V, - const int D, const int k) + const int D, const int k, Equal eq) { int x; // our position along a @@ -43,7 +46,7 @@ Snake find_end_snake_of_further_reaching_dpath(Iterator a, int N, Iterator b, in int u = x, v = y; // follow end snake along diagonal k - while (u < N and v < M and a[u] == b[v]) + while (u < N and v < M and eq(a[u], b[v])) ++u, ++v; return { x, y, u, v, add }; @@ -55,9 +58,10 @@ struct SnakeLen : Snake int d; }; -template +template SnakeLen find_middle_snake(Iterator a, int N, Iterator b, int M, - ArrayView data1, ArrayView data2) + ArrayView data1, ArrayView data2, + Equal eq) { const int delta = N - M; MirroredArray V1{data1, N + M}; @@ -69,7 +73,7 @@ SnakeLen find_middle_snake(Iterator a, int N, Iterator b, int M, { for (int k1 = -D; k1 <= D; k1 += 2) { - auto p = find_end_snake_of_further_reaching_dpath(a, N, b, M, V1, D, k1); + auto p = find_end_snake_of_further_reaching_dpath(a, N, b, M, V1, D, k1, eq); V1[k1] = p.u; const int k2 = -(k1 - delta); @@ -82,7 +86,7 @@ SnakeLen find_middle_snake(Iterator a, int N, Iterator b, int M, for (int k2 = -D; k2 <= D; k2 += 2) { - auto p = find_end_snake_of_further_reaching_dpath(ra, N, rb, M, V2, D, k2); + auto p = find_end_snake_of_further_reaching_dpath(ra, N, rb, M, V2, D, k2, eq); V2[k2] = p.u; const int k1 = -(k2 - delta); @@ -95,53 +99,60 @@ SnakeLen find_middle_snake(Iterator a, int N, Iterator b, int M, } kak_assert(false); + return { {}, 0 }; } -template struct Diff { - bool add; - Iterator begin; - Iterator end; + enum { Keep, Add, Remove } mode; + int len; + int posB; }; -template -void find_diff_rec(Iterator a, size_t N, Iterator b, size_t M, +template +void find_diff_rec(Iterator a, int offA, int lenA, + Iterator b, int offB, int lenB, ArrayView data1, ArrayView data2, - Vector>& diffs) + Equal eq, Vector& diffs) { - if (N > 0 and M > 0) + if (lenA > 0 and lenB > 0) { - auto middle_snake = find_middle_snake(a, N, b, M, data1, data2); + auto middle_snake = find_middle_snake(a + offA, lenA, b + offB, lenB, data1, data2, eq); if (middle_snake.d > 1) { - find_diff_rec(a, middle_snake.x, b, middle_snake.y, - data1, data2, diffs); + find_diff_rec(a, offA, middle_snake.x, + b, offB, middle_snake.y, + data1, data2, eq, diffs); - find_diff_rec(a + middle_snake.u, N - middle_snake.u, - b + middle_snake.v, M - middle_snake.v, - data1, data2, diffs); + if (int len = middle_snake.u - middle_snake.x) + diffs.push_back({Diff::Keep, len, 0}); + + find_diff_rec(a, offA + middle_snake.u, lenA - middle_snake.u, + b, offB + middle_snake.v, lenB - middle_snake.v, + data1, data2, eq, diffs); } else if (middle_snake.d == 1) { int diag = 0; - while (a[diag] == b[diag]) + while (eq(a[offA + diag], b[offB + diag])) ++diag; + if (diag != 0) + diffs.push_back({Diff::Keep, diag, 0}); + if (middle_snake.add) - diffs.push_back({true, b + middle_snake.y, b + middle_snake.y + 1}); + diffs.push_back({Diff::Add, 1, offB + middle_snake.y-1}); else - diffs.push_back({false, a + middle_snake.x-1, a + middle_snake.x}); + diffs.push_back({Diff::Remove, 1, 0}); } } - else if (M > 0) - diffs.push_back({true, b, b + M}); - else if (N > 0) - diffs.push_back({false, a, a + N}); + else if (lenB > 0) + diffs.push_back({Diff::Add, lenB, offB}); + else if (lenA > 0) + diffs.push_back({Diff::Remove, lenA, 0}); } -template -void compact_diffs(Vector>& diffs) +inline void compact_diffs(Vector& diffs) { if (diffs.size() < 2) return; @@ -149,25 +160,28 @@ void compact_diffs(Vector>& diffs) auto out_it = diffs.begin(); for (auto it = out_it + 1; it != diffs.end(); ++it) { - if (it->add == out_it->add and it->begin == out_it->end) - out_it->end = it->end; + if (it->mode == out_it->mode and + (it->mode != Diff::Add or + it->posB == out_it->posB + out_it->len)) + out_it->len += it->len; else if (++out_it != it) *out_it = *it; } + diffs.erase(out_it+1, diffs.end()); } -template -Vector> find_diff(Iterator a, size_t N, Iterator b, size_t M) +template::value_type>> +Vector find_diff(Iterator a, int N, Iterator b, int M, + Equal eq = Equal{}) { - Vector data(4 * (N+M)); - Vector> diffs; - const size_t max_D_size = 2 * (N + M) + 1; - find_diff_rec(a, N, b, M, - {data.data(), max_D_size}, - {data.data() + max_D_size, max_D_size}, - diffs); + const int max = 2 * (N + M) + 1; + Vector data(2*max); + Vector diffs; + find_diff_rec(a, 0, N, b, 0, M, + {data.data(), (size_t)max}, {data.data() + max, (size_t)max}, + eq, diffs); - // compact_diffs(diffs); + compact_diffs(diffs); return diffs; }