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

make split with strings as separator faster

Browse source
This commit is contained in:
Andreas Rumpf 2016-06-01 19:34:02 +02:00
commit f125f2e4ce
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/pure/strutils.nim
View file

@ -421,6 +421,11 @@ iterator split*(s: string, sep: char, maxsplit: int = -1): string =
dec(splits) dec(splits)
inc(last) inc(last)
proc substrEq(s: string, a, L: int, x: string): bool =
var i = 0
while i < L and s[a+i] == x[i]: inc i
result = i == L
iterator split*(s: string, sep: string, maxsplit: int = -1): string = iterator split*(s: string, sep: string, maxsplit: int = -1): string =
## Splits the string `s` into substrings using a string separator. ## Splits the string `s` into substrings using a string separator.
## ##
@ -430,7 +435,7 @@ iterator split*(s: string, sep: string, maxsplit: int = -1): string =
if len(s) > 0: if len(s) > 0:
while last <= len(s): while last <= len(s):
var first = last var first = last
while last < len(s) and s.substr(last, last + <sep.len) != sep: while last < len(s) and not s.substrEq(last, sep.len, sep):
inc(last) inc(last)
if splits == 0: last = len(s) if splits == 0: last = len(s)
yield substr(s, first, last-1) yield substr(s, first, last-1)