1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
use std::ptr::NonNull;
use crate::intern::Token;
use crate::myers::middle_snake::{MiddleSnakeSearch, SearchResult};
use crate::myers::preprocess::PreprocessedFile;
use crate::myers::slice::FileSlice;
use crate::util::sqrt;
use crate::Sink;
mod middle_snake;
mod preprocess;
mod slice;
pub struct Myers {
kvec: NonNull<[i32]>,
kforward: NonNull<i32>,
kbackward: NonNull<i32>,
max_cost: u32,
}
pub fn diff<S: Sink>(
before: &[Token],
after: &[Token],
_num_tokens: u32,
mut sink: S,
minimal: bool,
) -> S::Out {
let (mut before, mut after) = preprocess::preprocess(before, after);
Myers::new(before.tokens.len(), after.tokens.len()).run(
FileSlice::new(&mut before),
FileSlice::new(&mut after),
minimal,
);
process_changes_with_sink(&before, &after, &mut sink);
sink.finish()
}
const HEUR_MIN_COST: u32 = 256;
const MAX_COST_MIN: u32 = 256;
impl Drop for Myers {
fn drop(&mut self) {
unsafe { drop(Box::from_raw(self.kvec.as_ptr())) }
}
}
impl Myers {
fn new(len1: usize, len2: usize) -> Self {
let ndiags = len1 + len2 as usize + 3;
let kvec = Box::leak(vec![0; 2 * ndiags + 2].into_boxed_slice());
let kforward = NonNull::from(&mut kvec[len2 + 1]);
let kbackward = NonNull::from(&mut kvec[ndiags + len2 + 1]);
Self { kvec: kvec.into(), kforward, kbackward, max_cost: sqrt(ndiags).max(MAX_COST_MIN) }
}
fn run<'f>(&mut self, mut file1: FileSlice<'f>, mut file2: FileSlice<'f>, mut need_min: bool) {
loop {
file1.strip_common(&mut file2);
if file1.is_empty() {
file2.mark_changed();
return;
} else if file2.is_empty() {
file1.mark_changed();
return;
}
let split = self.split(&file1, &file2, need_min);
self.run(
file1.borrow().slice(..split.token_idx1 as u32),
file2.borrow().slice(..split.token_idx2 as u32),
split.minimized_lo,
);
file1 = file1.slice(split.token_idx1 as u32..);
file2 = file2.slice(split.token_idx2 as u32..);
need_min = split.minimized_hi
}
}
fn split(&mut self, file1: &FileSlice, file2: &FileSlice, need_min: bool) -> Split {
let mut forward_search =
unsafe { MiddleSnakeSearch::<false>::new(self.kforward, file1, file2) };
let mut backwards_search =
unsafe { MiddleSnakeSearch::<true>::new(self.kbackward, file1, file2) };
let is_odd = (file2.len() - file2.len()) & 1 != 0;
let mut ec = 0;
while ec <= self.max_cost {
let mut found_snake = false;
forward_search.next_d();
if is_odd {
if let Some(res) = forward_search.run(file1, file2, |k, token_idx1| {
backwards_search.contains(k)
&& backwards_search.x_pos_at_diagonal(k) <= token_idx1
}) {
match res {
SearchResult::Snake => found_snake = true,
SearchResult::Found { token_idx1, token_idx2 } => {
return Split {
token_idx1,
token_idx2,
minimized_lo: true,
minimized_hi: true,
};
}
}
}
} else {
found_snake |= forward_search.run(file1, file2, |_, _| false).is_some()
};
backwards_search.next_d();
if !is_odd {
if let Some(res) = backwards_search.run(file1, file2, |k, token_idx1| {
forward_search.contains(k) && token_idx1 <= forward_search.x_pos_at_diagonal(k)
}) {
match res {
SearchResult::Snake => found_snake = true,
SearchResult::Found { token_idx1, token_idx2 } => {
return Split {
token_idx1,
token_idx2,
minimized_lo: true,
minimized_hi: true,
};
}
}
}
} else {
found_snake |= backwards_search.run(file1, file2, |_, _| false).is_some()
};
if need_min {
continue;
}
if found_snake && ec > HEUR_MIN_COST {
if let Some((token_idx1, token_idx2)) = forward_search.found_snake(ec, file1, file2)
{
return Split {
token_idx1,
token_idx2,
minimized_lo: true,
minimized_hi: false,
};
}
if let Some((token_idx1, token_idx2)) =
backwards_search.found_snake(ec, file1, file2)
{
return Split {
token_idx1,
token_idx2,
minimized_lo: false,
minimized_hi: true,
};
}
}
ec += 1;
}
let (distance_forward, token_idx1_forward) = forward_search.best_position(file1, file2);
let (distance_backwards, token_idx1_backwards) =
backwards_search.best_position(file1, file2);
if distance_forward > file1.len() as isize + file2.len() as isize - distance_backwards {
Split {
token_idx1: token_idx1_forward,
token_idx2: (distance_forward - token_idx1_forward as isize) as i32,
minimized_lo: true,
minimized_hi: false,
}
} else {
Split {
token_idx1: token_idx1_backwards,
token_idx2: (distance_backwards - token_idx1_backwards as isize) as i32,
minimized_lo: false,
minimized_hi: true,
}
}
}
}
#[derive(Debug)]
struct Split {
token_idx1: i32,
token_idx2: i32,
minimized_lo: bool,
minimized_hi: bool,
}
fn process_changes_with_sink(
before: &PreprocessedFile,
after: &PreprocessedFile,
sink: &mut impl Sink,
) {
let before_end = before.is_changed.len() as u32 + before.offset;
let after_end = after.is_changed.len() as u32 + after.offset;
let mut before = before
.is_changed
.iter()
.enumerate()
.map(|(i, removed)| (i as u32 + before.offset, *removed));
let mut after = after
.is_changed
.iter()
.enumerate()
.map(|(i, inserted)| (i as u32 + after.offset, *inserted));
let mut next1 = before.next();
let mut next2 = after.next();
while let (Some((before_pos, removed)), Some((after_pos, inserted))) = (next1, next2) {
if !(removed | inserted) {
next1 = before.next();
next2 = after.next();
continue;
}
let mut hunk_before = before_pos..before_pos;
let mut hunk_after = after_pos..after_pos;
if removed {
let end = before.find(|(_, changed)| !changed);
next1 = end.map(|(end, _)| (end, false));
hunk_before.end = end.map_or(before_end, |(end, _)| end);
};
if inserted {
let end = after.find(|(_, changed)| !changed);
next2 = end.map(|(end, _)| (end, false));
hunk_after.end = end.map_or(after_end, |(end, _)| end);
}
sink.process_change(hunk_before, hunk_after);
}
if let Some((before_pos, _)) = next1 {
sink.process_change(before_pos..before_end, after_end..after_end);
} else if let Some((after_pos, _)) = next2 {
sink.process_change(before_end..before_end, after_pos..after_end);
}
}