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

Another bug fix in diff implementation

Browse Source
This commit is contained in:
Maxime Coste 2015-05-15 13:55:39 +01:00
parent 802d6e106c
commit 73ddf18dc3
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/diff.hh
View File

@ -97,7 +97,7 @@ SnakeLen find_middle_snake(Iterator a, int N, Iterator b, int M,
if ((delta % 2 == 0) and -D <= k1 and k1 <= D) if ((delta % 2 == 0) and -D <= k1 and k1 <= D)
{ {
if (V1[k1] + V2[k2] >= N) if (V1[k1] + V2[k2] >= N)
return { { N - p.u, M - p.v, N - p.x , M - p.y } , 2 * D };// return last snake on reverse path return { { N - p.u, M - p.v, N - p.x , M - p.y, p.add } , 2 * D };// return last snake on reverse path
} }
} }
} }
@ -138,11 +138,7 @@ void find_diff_rec(Iterator a, int offA, int lenA,
} }
else if (middle_snake.d == 1) else if (middle_snake.d == 1)
{ {
int diag = 0; if (int diag = middle_snake.x - (middle_snake.add ? 0 : 1))
while (eq(a[offA + diag], b[offB + diag]))
++diag;
if (diag != 0)
diffs.push_back({Diff::Keep, diag, 0}); diffs.push_back({Diff::Keep, diag, 0});
if (middle_snake.add) if (middle_snake.add)