status-im/nim-chronos
2
0
Fork 0
mirror of https://github.com/status-im/nim-chronos.git synced 2025-02-22 16:08:23 +00:00
Code Issues Projects Releases Wiki Activity

Fix asyncmacro bug which introduces problems after cancellation got supported.

Browse Source
This commit is contained in:
cheatfate 2019-07-19 13:06:32 +03:00
parent c4a99447bd
commit 45f15ca6d7
No known key found for this signature in database
GPG Key ID: 46ADD633A7201F95
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
chronos/asyncmacro2.nim
View File

@ -150,8 +150,7 @@ proc processBody(node, retFutureSym: NimNode,
result.add newNimNode(nnkReturnStmt, node).add(newNilLit()) result.add newNimNode(nnkReturnStmt, node).add(newNilLit())
return # Don't process the children of this return stmt return # Don't process the children of this return stmt
of nnkCommand, nnkCall: of nnkCommand, nnkCall:
if node[0].kind == nnkIdent and if (node[0].eqIdent("await") or node[0].eqIdent("awaitne")):
(node[0].eqIdent("await") or node[0].eqIdent("awaitne")):
case node[1].kind case node[1].kind
of nnkIdent, nnkInfix, nnkDotExpr, nnkCall, nnkCommand: of nnkIdent, nnkInfix, nnkDotExpr, nnkCall, nnkCommand:
# await x # await x
@ -165,7 +164,6 @@ proc processBody(node, retFutureSym: NimNode,
else: else:
error("Invalid node kind in 'await', got: " & $node[1].kind) error("Invalid node kind in 'await', got: " & $node[1].kind)
elif node.len > 1 and node[1].kind == nnkCommand and elif node.len > 1 and node[1].kind == nnkCommand and
node[1][0].kind == nnkIdent and
(node[1][0].eqIdent("await") or node[1][0].eqIdent("awaitne")): (node[1][0].eqIdent("await") or node[1][0].eqIdent("awaitne")):
# foo await x # foo await x
var newCommand = node var newCommand = node
@ -176,8 +174,7 @@ proc processBody(node, retFutureSym: NimNode,
of nnkVarSection, nnkLetSection: of nnkVarSection, nnkLetSection:
case node[0][2].kind case node[0][2].kind
of nnkCommand: of nnkCommand:
if node[0][2][0].kind == nnkIdent and if (node[0][2][0].eqIdent("await") or node[0][2][0].eqIdent("awaitne")):
(node[0][2][0].eqIdent("await") or node[0][2][0].eqIdent("awaitne")):
# var x = await y # var x = await y
var newVarSection = node # TODO: Should this use copyNimNode? var newVarSection = node # TODO: Should this use copyNimNode?
result.createVar("future" & node[0][0].strVal, node[0][2][1], result.createVar("future" & node[0][0].strVal, node[0][2][1],
@ -196,20 +193,21 @@ proc processBody(node, retFutureSym: NimNode,
else: discard else: discard
of nnkDiscardStmt: of nnkDiscardStmt:
# discard await x # discard await x
if node[0].kind == nnkCommand and node[0][0].kind == nnkIdent and if node[0].kind == nnkCommand and
(node[0][0].eqIdent("await") or node[0][0].eqIdent("awaitne")): (node[0][0].eqIdent("await") or node[0][0].eqIdent("awaitne")):
var newDiscard = node var newDiscard = node
result.createVar("futureDiscard_" & $toStrLit(node[0][1]), node[0][1], result.createVar("futureDiscard_" & $toStrLit(node[0][1]), node[0][1],
newDiscard[0], newDiscard, retFutureSym, node, newDiscard[0], newDiscard, retFutureSym, node,
node[0][0].eqIdent("await")) node[0][0].eqIdent("await"))
of RoutineNodes-{nnkTemplateDef}:
# skip all the nested procedure definitions
return node
else: discard else: discard
for i in 0 ..< result.len: for i in 0 ..< result.len:
# We must not transform nested procedures of any form, otherwise # We must not transform nested procedures of any form, otherwise
# `retFutureSym` will be used for all nested procedures as their own # `retFutureSym` will be used for all nested procedures as their own
# `retFuture`. # `retFuture`.
if result[i].kind in {nnkProcDef, nnkMethodDef, nnkDo, nnkLambda}:
continue
result[i] = processBody(result[i], retFutureSym, subTypeIsVoid, result[i] = processBody(result[i], retFutureSym, subTypeIsVoid,
futureVarIdents) futureVarIdents)
@ -355,6 +353,9 @@ proc asyncSingleProc(prc: NimNode): NimNode {.compileTime.} =
#if prcName == "recvLineInto": #if prcName == "recvLineInto":
# echo(toStrLit(result)) # echo(toStrLit(result))
proc await*[T](x: T) =
{.error: "Await only available within {.async.}".}
macro async*(prc: untyped): untyped = macro async*(prc: untyped): untyped =
## Macro which processes async procedures into the appropriate ## Macro which processes async procedures into the appropriate
## iterators and yield statements. ## iterators and yield statements.