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

make async tests green again

Browse source
This commit is contained in:
Andreas Rumpf 2019-07-11 11:09:10 +02:00
commit ac458448d8
3 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/pure/asyncfutures.nim
View file

@ -31,6 +31,10 @@ when not defined(release):
var currentID = 0 var currentID = 0
const isFutureLoggingEnabled* = defined(futureLogging) const isFutureLoggingEnabled* = defined(futureLogging)
const
NimAsyncContinueSuffix* = "NimAsyncContinue" ## For internal usage. Do not use.
when isFutureLoggingEnabled: when isFutureLoggingEnabled:
import hashes import hashes
type type
@ -294,7 +298,7 @@ proc getHint(entry: StackTraceEntry): string =
if cmpIgnoreStyle(entry.filename, "asyncdispatch.nim") == 0: if cmpIgnoreStyle(entry.filename, "asyncdispatch.nim") == 0:
return "Processes asynchronous completion events" return "Processes asynchronous completion events"
if entry.procname.endsWith("_continue"): if entry.procname.endsWith(NimAsyncContinueSuffix):
if cmpIgnoreStyle(entry.filename, "asyncmacro.nim") == 0: if cmpIgnoreStyle(entry.filename, "asyncmacro.nim") == 0:
return "Resumes an async procedure" return "Resumes an async procedure"

4
lib/pure/asyncmacro.nim
View file

@ -308,9 +308,9 @@ proc asyncSingleProc(prc: NimNode): NimNode {.compileTime.} =
outerProcBody.add(closureIterator) outerProcBody.add(closureIterator)
# -> createCb(retFuture) # -> createCb(retFuture)
# NOTE: The "_continue" suffix is checked for in asyncfutures.nim to produce # NOTE: The NimAsyncContinueSuffix is checked for in asyncfutures.nim to produce
# friendlier stack traces: # friendlier stack traces:
var cbName = genSym(nskProc, prcName & "Continue") var cbName = genSym(nskProc, prcName & NimAsyncContinueSuffix)
var procCb = getAst createCb(retFutureSym, iteratorNameSym, var procCb = getAst createCb(retFutureSym, iteratorNameSym,
newStrLitNode(prcName), newStrLitNode(prcName),
cbName, cbName,

10
tests/async/tasync_traceback.nim
View file

@ -70,17 +70,17 @@ b failure
Async traceback: Async traceback:
tasync_traceback\.nim\(\d+?\)\s+?tasync_traceback tasync_traceback\.nim\(\d+?\)\s+?tasync_traceback
asyncmacro\.nim\(\d+?\)\s+?a asyncmacro\.nim\(\d+?\)\s+?a
asyncmacro\.nim\(\d+?\)\s+?aContinue asyncmacro\.nim\(\d+?\)\s+?aNimAsyncContinue
## Resumes an async procedure ## Resumes an async procedure
tasync_traceback\.nim\(\d+?\)\s+?aIter tasync_traceback\.nim\(\d+?\)\s+?aIter
asyncmacro\.nim\(\d+?\)\s+?b asyncmacro\.nim\(\d+?\)\s+?b
asyncmacro\.nim\(\d+?\)\s+?bContinue asyncmacro\.nim\(\d+?\)\s+?bNimAsyncContinue
## Resumes an async procedure ## Resumes an async procedure
tasync_traceback\.nim\(\d+?\)\s+?bIter tasync_traceback\.nim\(\d+?\)\s+?bIter
#\[ #\[
tasync_traceback\.nim\(\d+?\)\s+?tasync_traceback tasync_traceback\.nim\(\d+?\)\s+?tasync_traceback
asyncmacro\.nim\(\d+?\)\s+?a asyncmacro\.nim\(\d+?\)\s+?a
asyncmacro\.nim\(\d+?\)\s+?aContinue asyncmacro\.nim\(\d+?\)\s+?aNimAsyncContinue
## Resumes an async procedure ## Resumes an async procedure
tasync_traceback\.nim\(\d+?\)\s+?aIter tasync_traceback\.nim\(\d+?\)\s+?aIter
asyncfutures\.nim\(\d+?\)\s+?read asyncfutures\.nim\(\d+?\)\s+?read
@ -97,7 +97,7 @@ Async traceback:
asyncdispatch\.nim\(\d+?\)\s+?runOnce asyncdispatch\.nim\(\d+?\)\s+?runOnce
asyncdispatch\.nim\(\d+?\)\s+?processPendingCallbacks asyncdispatch\.nim\(\d+?\)\s+?processPendingCallbacks
## Executes pending callbacks ## Executes pending callbacks
asyncmacro\.nim\(\d+?\)\s+?barContinue asyncmacro\.nim\(\d+?\)\s+?barNimAsyncContinue
## Resumes an async procedure ## Resumes an async procedure
tasync_traceback\.nim\(\d+?\)\s+?barIter tasync_traceback\.nim\(\d+?\)\s+?barIter
#\[ #\[
@ -108,7 +108,7 @@ Async traceback:
asyncdispatch\.nim\(\d+?\)\s+?runOnce asyncdispatch\.nim\(\d+?\)\s+?runOnce
asyncdispatch\.nim\(\d+?\)\s+?processPendingCallbacks asyncdispatch\.nim\(\d+?\)\s+?processPendingCallbacks
## Executes pending callbacks ## Executes pending callbacks
asyncmacro\.nim\(\d+?\)\s+?fooContinue asyncmacro\.nim\(\d+?\)\s+?fooNimAsyncContinue
## Resumes an async procedure ## Resumes an async procedure
tasync_traceback\.nim\(\d+?\)\s+?fooIter tasync_traceback\.nim\(\d+?\)\s+?fooIter
asyncfutures\.nim\(\d+?\)\s+?read asyncfutures\.nim\(\d+?\)\s+?read