mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-08-28 17:41:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Andrey Sobolev
2015-09-23 10:16:36 +06:00
parent 7321fb0c18 371470e73f
commit df65082370
10 changed files with 61 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/pure/future.nim
View File

@@ -75,7 +75,7 @@ macro `=>`*(p, b: expr): expr {.immediate.} =
identDefs.add(newEmptyNode())
of nnkIdent:
identDefs.add(c)
identDefs.add(newEmptyNode())
identDefs.add(newIdentNode("auto"))
identDefs.add(newEmptyNode())
of nnkInfix:
if c[0].kind == nnkIdent and c[0].ident == !"->":
@@ -93,7 +93,7 @@ macro `=>`*(p, b: expr): expr {.immediate.} =
of nnkIdent:
var identDefs = newNimNode(nnkIdentDefs)
identDefs.add(p)
identDefs.add(newEmptyNode())
identDefs.add(newIdentNode("auto"))
identDefs.add(newEmptyNode())
params.add(identDefs)
of nnkInfix:

4
lib/system.nim
View File

@@ -2235,7 +2235,9 @@ proc `$`*[T: tuple|object](x: T): string =
firstElement = false
result.add(")")
proc collectionToString[T](x: T, b, e: string): string =
proc collectionToString[T: set | seq](x: T, b, e: string): string =
when x is seq:
if x.isNil: return "nil"
result = b
var firstElement = true
for value in items(x):