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

modified strutils.split

Browse Source
This commit is contained in:
Magnus Jöud
2015-10-14 15:29:27 +02:00
parent 4e8e5af934
commit 755d89e32d
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/pure/strutils.nim
View File

@@ -374,10 +374,9 @@ iterator split*(s: string, seps: set[char] = Whitespace, maxsplit: int = -1): st
var first = last
while last < len(s) and s[last] notin seps: inc(last) # BUGFIX!
if first <= last-1:
if splits == 0:
yield substr(s, first, len(s)-1)
break
if splits == 0: last = len(s)
yield substr(s, first, last-1)
if splits == 0: break
dec(splits)
iterator split*(s: string, sep: char, maxsplit: int = -1): string =
@@ -414,10 +413,9 @@ iterator split*(s: string, sep: char, maxsplit: int = -1): string =
while last <= len(s):
var first = last
while last < len(s) and s[last] != sep: inc(last)
if splits == 0:
yield substr(s, first, len(s)-1)
break
if splits == 0: last = len(s)
yield substr(s, first, last-1)
if splits == 0: break
dec(splits)
inc(last)
@@ -432,10 +430,9 @@ iterator split*(s: string, sep: string, maxsplit: int = -1): string =
var first = last
while last < len(s) and s.substr(last, last + <sep.len) != sep:
inc(last)
if splits == 0:
yield substr(s, first, len(s)-1)
break
if splits == 0: last = len(s)
yield substr(s, first, last-1)
if splits == 0: break
dec(splits)
inc(last, sep.len)