yuqei/difflib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2 from mitsuhiko/bugfix/saturating-add

Browse Source 
Fixed a bug with subtraction in the opcode code
This commit is contained in:
Dima Kudosh
2017-07-16 14:17:52 +03:00
committed by GitHub
parent e0726b8cb6 76384c2568
commit 428ab41a85
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sequencematcher.rs
+4 -4
View File
@@ -337,8 +337,8 @@ Opcode::new(String::from("equal"), m.first_start, i, m.second_start, j)
if codes.first().unwrap().tag == "equal" {
let mut opcode = codes.first_mut().unwrap();
opcode.first_start = max(opcode.first_start, opcode.first_end - n);
opcode.second_start = max(opcode.second_start, opcode.second_end - n);
opcode.first_start = max(opcode.first_start, opcode.first_end.saturating_sub(n));
opcode.second_start = max(opcode.second_start, opcode.second_end.saturating_sub(n));
}
if codes.last().unwrap().tag == "equal" {
let mut opcode = codes.last_mut().unwrap();
@@ -357,8 +357,8 @@ Opcode::new(String::from("equal"), m.first_start, i, m.second_start, j)
min(code.second_end, code.second_start + n)));
res.push(group.clone());
group.clear();
first_start = max(first_start, code.first_end - n);
second_start = max(second_start, code.second_end - n);
first_start = max(first_start, code.first_end.saturating_sub(n));
second_start = max(second_start, code.second_end.saturating_sub(n));
}
group.push(Opcode::new(code.tag.clone(),
first_start,