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

PFuture[void] now works.

Browse source 
Return types can also be completely ommitted. PFuture[void] will then be
implicitly deduced.
This commit is contained in:
Dominik Picheta 2014-03-15 00:09:33 +00:00
commit de64e8ec22
2 changed files with 65 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

22
tests/async/tasyncawait.nim
View file

@ -14,18 +14,18 @@ const
var clientCount = 0
proc sendMessages(disp: PDispatcher, client: TSocketHandle): PFuture[int] {.async.} =
proc sendMessages(disp: PDispatcher, client: TSocketHandle) {.async.} =
for i in 0 .. <messagesToSend:
discard await disp.send(client, "Message " & $i & "\c\L")
await disp.send(client, "Message " & $i & "\c\L")
proc launchSwarm(disp: PDispatcher, port: TPort): PFuture[int] {.async.} =
proc launchSwarm(disp: PDispatcher, port: TPort) {.async.} =
for i in 0 .. <swarmSize:
var sock = disp.socket()
#disp.register(sock)
discard await disp.connect(sock, "localhost", port)
await disp.connect(sock, "localhost", port)
when true:
discard await sendMessages(disp, sock)
await sendMessages(disp, sock)
disp.close(sock)
else:
# Issue #932: https://github.com/Araq/Nimrod/issues/932
@ -34,7 +34,7 @@ proc launchSwarm(disp: PDispatcher, port: TPort): PFuture[int] {.async.} =
proc () =
disp.close(sock)
proc readMessages(disp: PDispatcher, client: TSocketHandle): PFuture[int] {.async.} =
proc readMessages(disp: PDispatcher, client: TSocketHandle) {.async.} =
while true:
var line = await disp.recvLine(client)
if line == "":
@ -47,16 +47,18 @@ proc readMessages(disp: PDispatcher, client: TSocketHandle): PFuture[int] {.asyn
else:
doAssert false
proc createServer(disp: PDispatcher, port: TPort): PFuture[int] {.async.} =
proc createServer(disp: PDispatcher, port: TPort) {.async.} =
var server = disp.socket()
#disp.register(server)
server.bindAddr(port)
server.listen()
while true:
discard readMessages(disp, await disp.accept(server))
var client = await disp.accept(server)
readMessages(disp, client)
# TODO: Test: readMessages(disp, await disp.accept(server))
discard disp.createServer(TPort(10335))
discard disp.launchSwarm(TPort(10335))
disp.createServer(TPort(10335))
disp.launchSwarm(TPort(10335))
while true:
disp.poll()
if clientCount == swarmSize: break