diff options
| author | Andrey Sobolev <andrey.sobolev@xored.com> | 2015-09-23 10:16:36 +0600 |
|---|---|---|
| committer | Andrey Sobolev <andrey.sobolev@xored.com> | 2015-09-23 10:16:36 +0600 |
| commit | df650823708ecea1fe27d0a0ffd09d95ebc29129 (patch) | |
| tree | feebcd88fd812214140278a98ce3458a93fff639 /lib | |
| parent | 7321fb0c1812754b881ab71e4007a7d57a57ae6c (diff) | |
| parent | 371470e73f2c79f4d9babc86f59b5d580defb050 (diff) | |
| download | Nim-df650823708ecea1fe27d0a0ffd09d95ebc29129.tar.gz | |
Merge remote-tracking branch 'nim-lang/devel' into emscripten-support
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pure/future.nim | 4 | ||||
| -rw-r--r-- | lib/system.nim | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/lib/pure/future.nim b/lib/pure/future.nim index 661afd7b3..4767266e5 100644 --- a/lib/pure/future.nim +++ b/lib/pure/future.nim @@ -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: diff --git a/lib/system.nim b/lib/system.nim index af10f5773..f143b2b46 100644 --- a/lib/system.nim +++ b/lib/system.nim @@ -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): |