make more things compile without isNil

This commit is contained in:
Araq
2018-08-22 15:12:02 +02:00
parent 7896903fd0
commit dbd21d670c
3 changed files with 3 additions and 4 deletions

View File

@@ -654,7 +654,7 @@ proc isValid*[A](s: OrderedSet[A]): bool =
## proc saveTarotCards(cards: OrderedSet[int]) =
## assert cards.isValid, "Pass an initialized set!"
## # 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.} =
## Returns the number of keys in `s`.

View File

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

View File

@@ -315,7 +315,7 @@ checkOptions({optFilenames, optReplace}, "filenames", "replace")
if optStdin in options:
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:
replacement = ask("replacement [supports $1, $# notations]: ")