Skip to content

Commit 98017ce

Browse files
authored
Merge pull request #1662 from janmroczkowski/janmroczkowski/unified_difft-iterator-check-fix-more
Extra fix to unified_difft::lcss to not error on iterator check
2 parents ec89991 + 479e6cf commit 98017ce

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

src/goto-diff/unified_diff.cpp

+8-4
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,8 @@ unified_difft::differencest unified_difft::lcss(
260260
{
261261
differences.push_back(differencet::NEW);
262262
--j;
263-
--new_rit;
263+
if(new_goto_program.instructions.begin()!=new_rit)
264+
--new_rit;
264265
}
265266
else if(j == 0)
266267
{
@@ -273,15 +274,18 @@ unified_difft::differencest unified_difft::lcss(
273274
{
274275
differences.push_back(differencet::SAME);
275276
--i;
276-
--old_rit;
277+
if(old_goto_program.instructions.begin()!=old_rit)
278+
--old_rit;
277279
--j;
278-
--new_rit;
280+
if(new_goto_program.instructions.begin()!=new_rit)
281+
--new_rit;
279282
}
280283
else if(lcss_matrix[i][j - 1] < lcss_matrix[i][j])
281284
{
282285
differences.push_back(differencet::DELETED);
283286
--i;
284-
--old_rit;
287+
if(old_goto_program.instructions.begin()!=old_rit)
288+
--old_rit;
285289
}
286290
else
287291
{

0 commit comments

Comments
 (0)