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

Make recvLineInto a proc instead of template

Browse source
This commit is contained in:
def 2015-03-17 18:15:47 +01:00
commit e127ed77b1
2 changed files with 50 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/pure/asynchttpserver.nim
View file

@ -163,7 +163,7 @@ proc processClient(client: AsyncSocket, address: string,
# First line - GET /path HTTP/1.1 # First line - GET /path HTTP/1.1
line.setLen(0) line.setLen(0)
client.recvLineInto(line) # TODO: Timeouts. await client.recvLineInto(addr line) # TODO: Timeouts.
if line == "": if line == "":
client.close() client.close()
return return
@ -189,7 +189,7 @@ proc processClient(client: AsyncSocket, address: string,
while true: while true:
i = 0 i = 0
line.setLen(0) line.setLen(0)
client.recvLineInto(line) await client.recvLineInto(addr line)
if line == "": if line == "":
client.close(); return client.close(); return

98
lib/pure/asyncnet.nim
View file

@ -307,8 +307,8 @@ proc accept*(socket: AsyncSocket,
retFut.complete(future.read.client) retFut.complete(future.read.client)
return retFut return retFut
template recvLineInto*(socket: AsyncSocket, resString: var string, proc recvLineInto*(socket: AsyncSocket, resString: ptr string,
flags = {SocketFlag.SafeDisconn}) = flags = {SocketFlag.SafeDisconn}): Future[void] {.async.} =
## Reads a line of data from ``socket`` into ``resString``. ## Reads a line of data from ``socket`` into ``resString``.
## ##
## If a full line is read ``\r\L`` is not ## If a full line is read ``\r\L`` is not
@ -326,61 +326,59 @@ template recvLineInto*(socket: AsyncSocket, resString: var string,
## **Warning**: ``recvLineInto`` on unbuffered sockets assumes that the ## **Warning**: ``recvLineInto`` on unbuffered sockets assumes that the
## protocol uses ``\r\L`` to delimit a new line. ## protocol uses ``\r\L`` to delimit a new line.
assert SocketFlag.Peek notin flags ## TODO: assert SocketFlag.Peek notin flags ## TODO:
result = newFuture[void]("asyncnet.recvLineInto")
template addNLIfEmpty(): stmt = template addNLIfEmpty(): stmt =
if resString.len == 0: if resString[].len == 0:
resString.add("\c\L") resString[].add("\c\L")
block recvLineInto: if socket.isBuffered:
if socket.isBuffered: if socket.bufLen == 0:
if socket.bufLen == 0: let res = socket.readIntoBuf(flags)
if res == 0:
return
var lastR = false
while true:
if socket.currPos >= socket.bufLen:
let res = socket.readIntoBuf(flags) let res = socket.readIntoBuf(flags)
if res == 0: if res == 0:
break recvLineInto resString[].setLen(0)
return
var lastR = false case socket.buffer[socket.currPos]
while true: of '\r':
if socket.currPos >= socket.bufLen: lastR = true
let res = socket.readIntoBuf(flags) addNLIfEmpty()
if res == 0: of '\L':
resString.setLen(0) addNLIfEmpty()
break recvLineInto
case socket.buffer[socket.currPos]
of '\r':
lastR = true
addNLIfEmpty()
of '\L':
addNLIfEmpty()
socket.currPos.inc()
break recvLineInto
else:
if lastR:
socket.currPos.inc()
break recvLineInto
else:
resString.add socket.buffer[socket.currPos]
socket.currPos.inc() socket.currPos.inc()
else: return
var c = "" else:
while true: if lastR:
let recvFut = recv(socket, 1, flags) socket.currPos.inc()
yield recvFut return
else:
resString[].add socket.buffer[socket.currPos]
socket.currPos.inc()
else:
var c = ""
while true:
let recvFut = recv(socket, 1, flags)
c = recvFut.read()
if c.len == 0:
resString[].setLen(0)
return
if c == "\r":
let recvFut = recv(socket, 1, flags) # Skip \L
c = recvFut.read() c = recvFut.read()
if c.len == 0: assert c == "\L"
resString.setLen(0) addNLIfEmpty()
break recvLineInto return
if c == "\r": elif c == "\L":
let recvFut = recv(socket, 1, flags) # Skip \L addNLIfEmpty()
yield recvFut return
c = recvFut.read() add(resString[], c)
assert c == "\L"
addNLIfEmpty()
break recvLineInto
elif c == "\L":
addNLIfEmpty()
break recvLineInto
add(resString, c)
proc recvLine*(socket: AsyncSocket, proc recvLine*(socket: AsyncSocket,
flags = {SocketFlag.SafeDisconn}): Future[string] {.async.} = flags = {SocketFlag.SafeDisconn}): Future[string] {.async.} =
@ -407,7 +405,7 @@ proc recvLine*(socket: AsyncSocket,
assert SocketFlag.Peek notin flags ## TODO: assert SocketFlag.Peek notin flags ## TODO:
result = "" result = ""
socket.recvLineInto(result, flags) await socket.recvLineInto(addr result, flags)
proc listen*(socket: AsyncSocket, backlog = SOMAXCONN) {.tags: [ReadIOEffect].} = proc listen*(socket: AsyncSocket, backlog = SOMAXCONN) {.tags: [ReadIOEffect].} =
## Marks ``socket`` as accepting connections. ## Marks ``socket`` as accepting connections.