summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAndreas Rumpf <rumpf_a@web.de>2017-12-14 10:54:49 +0100
committerAndreas Rumpf <rumpf_a@web.de>2017-12-28 09:21:22 +0100
commit3593a4bdd1899194ed7cd3d21160bccfa6abb2e1 (patch)
tree36fe600b14211dc99f3a647fe3bc64b69e68d612
parent1c2dee18d09c383bce51e9821f0f18656e71bb76 (diff)
downloadNim-3593a4bdd1899194ed7cd3d21160bccfa6abb2e1.tar.gz
made the logic correct
-rw-r--r--lib/pure/asyncfutures.nim11
1 files changed, 5 insertions, 6 deletions
diff --git a/lib/pure/asyncfutures.nim b/lib/pure/asyncfutures.nim
index f3b4234cc..6e64981fe 100644
--- a/lib/pure/asyncfutures.nim
+++ b/lib/pure/asyncfutures.nim
@@ -239,10 +239,10 @@ proc mergeEntries(entries: seq[StackTraceEntry]): seq[StackTraceEntry] =
       # completely. 'diff' is the wrong idea here.
       var last = result.len-1
       var e = reRaiseEnd-1
-      var newBlock = true
+      var newBlock = false
       while last >= 0 and e >= i+1:
         if result[last] != entries[e]:
-          newBlock = false
+          newBlock = true
           break
         dec e
         dec last
@@ -251,10 +251,9 @@ proc mergeEntries(entries: seq[StackTraceEntry]): seq[StackTraceEntry] =
         for j in i+1 ..< reRaiseEnd: result.add entries[j]
 
       i = reRaiseEnd+1
-      continue
-
-    result.add(entry)
-    i.inc
+    else:
+      result.add(entry)
+      i.inc
 
 proc getHint(entry: StackTraceEntry): string =
   ## We try to provide some hints about stack trace entries that the user