mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-07-22 00:41:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

strutils.nim: make removeSuffix robust on empty strings

Browse Source
This commit is contained in:
Andreas Rumpf
2017-03-18 10:42:05 +01:00
parent a20a8e6adb
commit 9f5492becd
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/pure/strutils.nim
View File

@@ -2229,20 +2229,16 @@ proc removeSuffix*(s: var string, chars: set[char] = Newlines) {.
## userInput == "Hello World"
## otherInput.removeSuffix({'!', '?'})
## otherInput == "Hello!?"
if s.len == 0: return
var last = len(s) - 1
if chars == Newlines:
if s[last] == '\10':
last -= 1
if s[last] == '\13':
last -= 1
else:
if s[last] in chars:
last -= 1
s.setLen(last + 1)
proc removeSuffix*(s: var string, c: char) {.
@@ -2263,13 +2259,10 @@ proc removeSuffix*(s: var string, suffix: string) {.
## answers = "yeses"
## answers.removeSuffix("es")
## answers == "yes"
var newLen = s.len
if s.endsWith(suffix):
newLen -= len(suffix)
s.setLen(newLen)
s.setLen(newLen)
when isMainModule:
doAssert align("abc", 4) == " abc"