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

Use the provided equal functor for prefix/suffix detection in diff

Browse Source 
We were wrongly using the `==` operator.
This commit is contained in:
Maxime Coste 2017-07-18 17:53:30 +02:00
parent bed8d9c48e
commit 7b96d56996
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/diff.hh
View File

@ -113,11 +113,11 @@ void find_diff_rec(Iterator a, int begA, int endA,
int* V1, int* V2, Equal eq, Vector<Diff>& diffs)
{
int prefix_len = 0;
while (begA != endA and begB != endB and a[begA] == b[begB])
while (begA != endA and begB != endB and eq(a[begA], b[begB]))
++begA, ++begB, ++prefix_len;
int suffix_len = 0;
while (begA != endA and begB != endB and a[endA-1] == b[endB-1])
while (begA != endA and begB != endB and eq(a[endA-1], b[endB-1]))
--endA, --endB, ++suffix_len;
append_diff(diffs, {Diff::Keep, prefix_len, 0});