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

Merge remote-tracking branch 'nim-lang/devel' into emscripten-support

Browse source
This commit is contained in:
Andrey Sobolev 2015-09-18 20:44:26 +06:00
commit 537aca327a
14 changed files with 150 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/pure/asyncdispatch.nim
View file

@ -992,8 +992,8 @@ else:
proc closeSocket*(sock: AsyncFD) =
let disp = getGlobalDispatcher()
sock.SocketHandle.close()
disp.selector.unregister(sock.SocketHandle)
sock.SocketHandle.close()
proc unregister*(fd: AsyncFD) =
getGlobalDispatcher().selector.unregister(fd.SocketHandle)

2
lib/system.nim
View file

@ -243,7 +243,7 @@ when defined(nimArrIdx):
# :array|openarray|string|seq|cstring|tuple
proc `[]`*[I: Ordinal;T](a: T; i: I): T {.
noSideEffect, magic: "ArrGet".}
proc `[]=`*[I: Ordinal;T,S](a: var T; i: I;
proc `[]=`*[I: Ordinal;T,S](a: T; i: I;
x: S) {.noSideEffect, magic: "ArrPut".}
proc `=`*[T](dest: var T; src: T) {.noSideEffect, magic: "Asgn".}