made the logic correct

This commit is contained in:
Andreas Rumpf 2017-12-14 10:54:49 +01:00
commit 3593a4bdd1

View file

@ -239,10 +239,10 @@ proc mergeEntries(entries: seq[StackTraceEntry]): seq[StackTraceEntry] =
# completely. 'diff' is the wrong idea here. # completely. 'diff' is the wrong idea here.
var last = result.len-1 var last = result.len-1
var e = reRaiseEnd-1 var e = reRaiseEnd-1
var newBlock = true var newBlock = false
while last >= 0 and e >= i+1: while last >= 0 and e >= i+1:
if result[last] != entries[e]: if result[last] != entries[e]:
newBlock = false newBlock = true
break break
dec e dec e
dec last dec last
@ -251,10 +251,9 @@ proc mergeEntries(entries: seq[StackTraceEntry]): seq[StackTraceEntry] =
for j in i+1 ..< reRaiseEnd: result.add entries[j] for j in i+1 ..< reRaiseEnd: result.add entries[j]
i = reRaiseEnd+1 i = reRaiseEnd+1
continue else:
result.add(entry)
result.add(entry) i.inc
i.inc
proc getHint(entry: StackTraceEntry): string = proc getHint(entry: StackTraceEntry): string =
## We try to provide some hints about stack trace entries that the user ## We try to provide some hints about stack trace entries that the user