Fix throw when passing -1 from inital parser

This commit is contained in:
Florian Schroedl
2022-01-20 17:00:00 +01:00
parent fd8e0254f0
commit a4dfffdacf
2 changed files with 9 additions and 5 deletions

View File

@@ -19,11 +19,14 @@ proc safeDelete*(str: string, slice: Slice[int]): string =
func findAndDelete*(str: string, chars: set[char], start = 0, last = str.len - 1): string =
## Find the next instance of `chars` from `start`.
## When found delete characters until `last`.
let startChar = str.find(chars, start, last)
if startChar == -1:
str
else:
str.safeDelete(startChar..last)
# Prevent passing negative numbers (e.g.: initial parser)
if start >= 0 and last >= 0:
let startChar = str.find(chars, start, last)
if startChar == -1:
str
else:
str.safeDelete(startChar..last)
else: str
func deleteAfterNewline*(str: string, start = 0): string =
## Delete string after next Newline from `start`.

View File

@@ -20,3 +20,4 @@ suite "utils/str":
let t = "foo\nbar"
check(t.deleteAfterNewline() == "foo")
check(t.deleteAfterNewline(start = 4) == t)
check(t.deleteAfterNewline(start = -1) == t)