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

deprecate isNil for strings and seqs

Browse source
This commit is contained in:
Araq 2018-08-08 11:21:56 +02:00
commit de263a43c6
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/system.nim
View file

@ -2321,9 +2321,9 @@ iterator mpairs*(a: var cstring): tuple[key: int, val: var char] {.inline.} =
inc(i) inc(i)
proc isNil*[T](x: seq[T]): bool {.noSideEffect, magic: "IsNil".} proc isNil*[T](x: seq[T]): bool {.noSideEffect, magic: "IsNil", deprecated.}
proc isNil*[T](x: ref T): bool {.noSideEffect, magic: "IsNil".} proc isNil*[T](x: ref T): bool {.noSideEffect, magic: "IsNil".}
proc isNil*(x: string): bool {.noSideEffect, magic: "IsNil".} proc isNil*(x: string): bool {.noSideEffect, magic: "IsNil", deprecated.}
proc isNil*[T](x: ptr T): bool {.noSideEffect, magic: "IsNil".} proc isNil*[T](x: ptr T): bool {.noSideEffect, magic: "IsNil".}
proc isNil*(x: pointer): bool {.noSideEffect, magic: "IsNil".} proc isNil*(x: pointer): bool {.noSideEffect, magic: "IsNil".}
proc isNil*(x: cstring): bool {.noSideEffect, magic: "IsNil".} proc isNil*(x: cstring): bool {.noSideEffect, magic: "IsNil".}
@ -2520,7 +2520,7 @@ proc `$`*[T: tuple|object](x: T): string =
result.add(name) result.add(name)
result.add(": ") result.add(": ")
when compiles($value): when compiles($value):
when compiles(value.isNil): when value isnot string and value isnot seq and compiles(value.isNil):
if value.isNil: result.add "nil" if value.isNil: result.add "nil"
else: result.addQuoted(value) else: result.addQuoted(value)
else: else:
@ -2539,7 +2539,7 @@ proc collectionToString[T](x: T, prefix, separator, suffix: string): string =
else: else:
result.add(separator) result.add(separator)
when compiles(value.isNil): when value isnot string and value isnot seq and compiles(value.isNil):
# this branch should not be necessary # this branch should not be necessary
if value.isNil: if value.isNil:
result.add "nil" result.add "nil"

2
tests/system/tnilconcats.nim
View file

@ -1,5 +1,5 @@
discard """ discard """
output: '''@[nil, nil, nil, nil, nil, nil, nil, "meh"]''' output: '''@["", "", "", "", "", "", "", "meh"]'''
exitcode: "0" exitcode: "0"
""" """