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

make more things compile without isNil

Browse source
This commit is contained in:
Araq 2018-08-22 15:12:02 +02:00
commit dbd21d670c
3 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/pure/collections/sets.nim
View file

@ -654,7 +654,7 @@ proc isValid*[A](s: OrderedSet[A]): bool =
## proc saveTarotCards(cards: OrderedSet[int]) = ## proc saveTarotCards(cards: OrderedSet[int]) =
## assert cards.isValid, "Pass an initialized set!" ## assert cards.isValid, "Pass an initialized set!"
## # Do stuff here, may crash in release builds! ## # Do stuff here, may crash in release builds!
result = not s.data.isNil result = s.data.len > 0
proc len*[A](s: OrderedSet[A]): int {.inline.} = proc len*[A](s: OrderedSet[A]): int {.inline.} =
## Returns the number of keys in `s`. ## Returns the number of keys in `s`.

3
tests/gc/gctest.nim
View file

@ -66,8 +66,7 @@ proc caseTree(lvl: int = 0): PCaseNode =
proc finalizeNode(n: PNode) = proc finalizeNode(n: PNode) =
assert(n != nil) assert(n != nil)
write(stdout, "finalizing: ") write(stdout, "finalizing: ")
if isNil(n.data): writeLine(stdout, "nil!") writeLine(stdout, "not nil")
else: writeLine(stdout, "not nil")
var var
id: int = 1 id: int = 1

2
tools/nimgrep.nim
View file

@ -315,7 +315,7 @@ checkOptions({optFilenames, optReplace}, "filenames", "replace")
if optStdin in options: if optStdin in options:
pattern = ask("pattern [ENTER to exit]: ") pattern = ask("pattern [ENTER to exit]: ")
if isNil(pattern) or pattern.len == 0: quit(0) if pattern.len == 0: quit(0)
if optReplace in options: if optReplace in options:
replacement = ask("replacement [supports $1, $# notations]: ") replacement = ask("replacement [supports $1, $# notations]: ")