jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

No need to recurse now that mergeEntries doesn't do any pattern matching.

Browse source
This commit is contained in:
Dominik Picheta 2017-11-26 15:16:54 +00:00 • committed by Andreas Rumpf
commit 383c80971c
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/pure/asyncfutures.nim
View file

@ -248,9 +248,10 @@ proc mergeEntries(entries: seq[StackTraceEntry]): seq[StackTraceEntry] =
reRaiseEnd.inc() reRaiseEnd.inc()
assert entries[reRaiseEnd].procName.isNil assert entries[reRaiseEnd].procName.isNil
assert entries[reRaiseEnd].line == -100 # Signifies end of re-raise block. assert entries[reRaiseEnd].line == -100 # Signifies end of re-raise block.
let reRaisedEntries = mergeEntries(entries[i+1 .. reRaiseEnd-1]) let reRaisedEntries = entries[i+1 .. reRaiseEnd-1]
let (lastIndex, remainder) = diff(result, reRaisedEntries) let (lastIndex, remainder) = diff(result, reRaisedEntries)
# Insert all the entries after lastIndex.
for i in 0..<remainder.len: for i in 0..<remainder.len:
result.insert(remainder[i], lastIndex+i) result.insert(remainder[i], lastIndex+i)
i = reRaiseEnd+1 i = reRaiseEnd+1

4
tests/async/tasync_traceback.nim
View file

@ -14,7 +14,7 @@ Async traceback:
asyncmacro.nim(34) a_continue asyncmacro.nim(34) a_continue
└─Resumes an async procedure └─Resumes an async procedure
asyncmacro.nim(0) aIter asyncmacro.nim(0) aIter
asyncfutures.nim(340) read asyncfutures.nim(341) read
asyncmacro.nim(34) a_continue asyncmacro.nim(34) a_continue
└─Resumes an async procedure └─Resumes an async procedure
tasync_traceback.nim(81) aIter tasync_traceback.nim(81) aIter
@ -36,7 +36,7 @@ Async traceback:
asyncmacro.nim(34) foo_continue asyncmacro.nim(34) foo_continue
└─Resumes an async procedure └─Resumes an async procedure
asyncmacro.nim(0) fooIter asyncmacro.nim(0) fooIter
asyncfutures.nim(340) read asyncfutures.nim(341) read
asyncmacro.nim(34) bar_continue asyncmacro.nim(34) bar_continue
└─Resumes an async procedure └─Resumes an async procedure
tasync_traceback.nim(94) barIter tasync_traceback.nim(94) barIter