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

Merge remote-tracking branch 'blaxpirit/master'

Browse source 
* blaxpirit/master:
  Fix last element when splitting with 0-length match

Conflicts:
	test/split.nim
This commit is contained in:
Flaviu Tamas 2015-01-19 07:43:05 -05:00
commit a14a2e7a84
2 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/nre.nim
View file

@ -391,6 +391,7 @@ proc split*(str: string, pattern: Regex, maxSplit = -1): seq[string] =
result = @[] result = @[]
var lastIdx = 0 var lastIdx = 0
var splits = 0 var splits = 0
var bounds: Slice[int]
for match in str.findIter(pattern): for match in str.findIter(pattern):
# upper bound is exclusive, lower is inclusive: # upper bound is exclusive, lower is inclusive:
@ -398,16 +399,12 @@ proc split*(str: string, pattern: Regex, maxSplit = -1): seq[string] =
# 0123456 # 0123456
# ^^^ # ^^^
# (1, 4) # (1, 4)
var bounds = match.matchBounds bounds = match.matchBounds
if lastIdx == 0 and # "12".split("") would be @["", "1", "2"], but
lastIdx == bounds.a and # if we skip an empty first match, it's the correct
bounds.a == bounds.b: # @["1", "2"]
# "12".split("") would be @["", "1", "2"], but if bounds.a < bounds.b or bounds.a > 0:
# if we skip an empty first match, it's the correct
# @["1", "2"]
discard
else:
result.add(str.substr(lastIdx, bounds.a - 1)) result.add(str.substr(lastIdx, bounds.a - 1))
splits += 1 splits += 1
@ -420,10 +417,14 @@ proc split*(str: string, pattern: Regex, maxSplit = -1): seq[string] =
if splits == maxSplit - 1: if splits == maxSplit - 1:
break break
# last match: Each match takes the previous substring, # "12".split("\b") would be @["1", "2", ""], but
# but "1 2".split(/ /) needs to return @["1", "2"]. # if we skip an empty last match, it's the correct
# This handles "2" # @["1", "2"]
result.add(str.substr(lastIdx, str.len - 1)) if bounds.a < bounds.b or bounds.b < str.len:
# last match: Each match takes the previous substring,
# but "1 2".split(/ /) needs to return @["1", "2"].
# This handles "2"
result.add(str.substr(bounds.b, str.len - 1))
proc replace*(str: string, pattern: Regex, proc replace*(str: string, pattern: Regex,
subproc: proc (match: RegexMatch): string): string = subproc: proc (match: RegexMatch): string): string =

7
test/split.nim
View file

@ -3,11 +3,11 @@ include nre
suite "string splitting": suite "string splitting":
test "splitting strings": test "splitting strings":
check("12345".split(re("")) == @["1", "2", "3", "4", "5"])
check("1 2 3 4 5 6 ".split(re" ") == @["1", "2", "3", "4", "5", "6", ""]) check("1 2 3 4 5 6 ".split(re" ") == @["1", "2", "3", "4", "5", "6", ""])
check("1 2 ".split(re(" ")) == @["1", "", "2", "", ""]) check("1 2 ".split(re(" ")) == @["1", "", "2", "", ""])
check("1 2".split(re(" ")) == @["1", "2"]) check("1 2".split(re(" ")) == @["1", "2"])
check("foo".split(re("foo")) == @["", ""]) check("foo".split(re("foo")) == @["", ""])
check("".split(re"foo") == newSeq[string]())
test "captured patterns": test "captured patterns":
check("12".split(re"(\d)") == @["", "1", "", "2", ""]) check("12".split(re"(\d)") == @["", "1", "", "2", ""])
@ -17,6 +17,11 @@ suite "string splitting":
check("123".split(re"", maxsplit = 1) == @["123"]) check("123".split(re"", maxsplit = 1) == @["123"])
check("123".split(re"", maxsplit = -1) == @["1", "2", "3"]) check("123".split(re"", maxsplit = -1) == @["1", "2", "3"])
test "split with 0-length match":
check("12345".split(re("")) == @["1", "2", "3", "4", "5"])
check("".split(re"") == newSeq[string]())
check("word word".split(re"\b") == @["word", " ", "word"])
test "perl split tests": test "perl split tests":
check("forty-two" .split(re"") .join(",") == "f,o,r,t,y,-,t,w,o") check("forty-two" .split(re"") .join(",") == "f,o,r,t,y,-,t,w,o")
check("forty-two" .split(re"", 3) .join(",") == "f,o,rty-two") check("forty-two" .split(re"", 3) .join(",") == "f,o,rty-two")