diff options
| author | Andreas Rumpf <rumpf_a@web.de> | 2019-07-11 11:09:10 +0200 |
|---|---|---|
| committer | Andreas Rumpf <rumpf_a@web.de> | 2019-07-11 11:09:10 +0200 |
| commit | ac458448d85e3c8295d976ffc95a6df44b5bec6a (patch) | |
| tree | a4c7c75e318747a49a538c6903be3142be6ad51d | |
| parent | cb3c3c306c6507a09c15da26828a39fbbd4dbc66 (diff) | |
| download | Nim-ac458448d85e3c8295d976ffc95a6df44b5bec6a.tar.gz | |
make async tests green again
| -rw-r--r-- | lib/pure/asyncfutures.nim | 6 | ||||
| -rw-r--r-- | lib/pure/asyncmacro.nim | 4 | ||||
| -rw-r--r-- | tests/async/tasync_traceback.nim | 10 |
3 files changed, 12 insertions, 8 deletions
diff --git a/lib/pure/asyncfutures.nim b/lib/pure/asyncfutures.nim index 3f2c45564..00660e56e 100644 --- a/lib/pure/asyncfutures.nim +++ b/lib/pure/asyncfutures.nim @@ -31,6 +31,10 @@ when not defined(release): var currentID = 0 const isFutureLoggingEnabled* = defined(futureLogging) + +const + NimAsyncContinueSuffix* = "NimAsyncContinue" ## For internal usage. Do not use. + when isFutureLoggingEnabled: import hashes type @@ -294,7 +298,7 @@ proc getHint(entry: StackTraceEntry): string = if cmpIgnoreStyle(entry.filename, "asyncdispatch.nim") == 0: return "Processes asynchronous completion events" - if entry.procname.endsWith("_continue"): + if entry.procname.endsWith(NimAsyncContinueSuffix): if cmpIgnoreStyle(entry.filename, "asyncmacro.nim") == 0: return "Resumes an async procedure" diff --git a/lib/pure/asyncmacro.nim b/lib/pure/asyncmacro.nim index 7ecc7506a..fde7fe59a 100644 --- a/lib/pure/asyncmacro.nim +++ b/lib/pure/asyncmacro.nim @@ -308,9 +308,9 @@ proc asyncSingleProc(prc: NimNode): NimNode {.compileTime.} = outerProcBody.add(closureIterator) # -> 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: - var cbName = genSym(nskProc, prcName & "Continue") + var cbName = genSym(nskProc, prcName & NimAsyncContinueSuffix) var procCb = getAst createCb(retFutureSym, iteratorNameSym, newStrLitNode(prcName), cbName, diff --git a/tests/async/tasync_traceback.nim b/tests/async/tasync_traceback.nim index 02cd9cc05..ac1e2fd8c 100644 --- a/tests/async/tasync_traceback.nim +++ b/tests/async/tasync_traceback.nim @@ -70,17 +70,17 @@ b failure Async traceback: tasync_traceback\.nim\(\d+?\)\s+?tasync_traceback asyncmacro\.nim\(\d+?\)\s+?a - asyncmacro\.nim\(\d+?\)\s+?aContinue + asyncmacro\.nim\(\d+?\)\s+?aNimAsyncContinue ## Resumes an async procedure tasync_traceback\.nim\(\d+?\)\s+?aIter asyncmacro\.nim\(\d+?\)\s+?b - asyncmacro\.nim\(\d+?\)\s+?bContinue + asyncmacro\.nim\(\d+?\)\s+?bNimAsyncContinue ## Resumes an async procedure tasync_traceback\.nim\(\d+?\)\s+?bIter #\[ tasync_traceback\.nim\(\d+?\)\s+?tasync_traceback asyncmacro\.nim\(\d+?\)\s+?a - asyncmacro\.nim\(\d+?\)\s+?aContinue + asyncmacro\.nim\(\d+?\)\s+?aNimAsyncContinue ## Resumes an async procedure tasync_traceback\.nim\(\d+?\)\s+?aIter asyncfutures\.nim\(\d+?\)\s+?read @@ -97,7 +97,7 @@ Async traceback: asyncdispatch\.nim\(\d+?\)\s+?runOnce asyncdispatch\.nim\(\d+?\)\s+?processPendingCallbacks ## Executes pending callbacks - asyncmacro\.nim\(\d+?\)\s+?barContinue + asyncmacro\.nim\(\d+?\)\s+?barNimAsyncContinue ## Resumes an async procedure tasync_traceback\.nim\(\d+?\)\s+?barIter #\[ @@ -108,7 +108,7 @@ Async traceback: asyncdispatch\.nim\(\d+?\)\s+?runOnce asyncdispatch\.nim\(\d+?\)\s+?processPendingCallbacks ## Executes pending callbacks - asyncmacro\.nim\(\d+?\)\s+?fooContinue + asyncmacro\.nim\(\d+?\)\s+?fooNimAsyncContinue ## Resumes an async procedure tasync_traceback\.nim\(\d+?\)\s+?fooIter asyncfutures\.nim\(\d+?\)\s+?read |