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

Merge branch 'devel' of github.com:Araq/Nim into patch2

Browse source
This commit is contained in:
fowlmouth 2015-03-30 18:24:46 -05:00
commit 7b80a0568f
11 changed files with 128 additions and 194 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/pure/asyncdispatch.nim
View file

@ -1273,7 +1273,7 @@ proc processBody(node, retFutureSym: NimNode,
else: discard
for i in 0 .. <result.len:
result[i] = processBody(result[i], retFutureSym, subTypeIsVoid, tryStmt)
result[i] = processBody(result[i], retFutureSym, subTypeIsVoid, nil)
proc getName(node: NimNode): string {.compileTime.} =
case node.kind
@ -1378,8 +1378,8 @@ macro async*(prc: stmt): stmt {.immediate.} =
result[6] = outerProcBody
#echo(treeRepr(result))
if prc[0].getName == "test3":
echo(toStrLit(result))
#if prc[0].getName == "test":
# echo(toStrLit(result))
proc recvLine*(socket: TAsyncFD): Future[string] {.async.} =
## Reads a line of data from ``socket``. Returned future will complete once