From 13e5a9ea6ca4eee1d2ff0e7fc9b3c1ceff7a31b4 Mon Sep 17 00:00:00 2001
From: Joseph Turner <turner.d.joseph@gmail.com>
Date: Wed, 8 Apr 2015 16:35:55 +0100
Subject: Fixes matching error #2418

Fixes the split iterator, the main problem was with the incrementation
of 'last'. Last was first incremented to the index of the first
character after the match, but was then incremented again at the
beginning of the while loop. This caused a problem if that character
after the first match, also matched the regular expression.
---
 lib/impure/re.nim | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'lib/impure/re.nim')

diff --git a/lib/impure/re.nim b/lib/impure/re.nim
index c24734f89..93dc4922d 100644
--- a/lib/impure/re.nim
+++ b/lib/impure/re.nim
@@ -373,23 +373,26 @@ iterator split*(s: string, sep: Regex): string =
   ## Results in:
   ##
   ## .. code-block:: nim
+  ##   ""
   ##   "this"
   ##   "is"
   ##   "an"
   ##   "example"
+  ##   ""
   ##
   var
-    first = 0
-    last = 0
+    first = -1
+    last = -1
   while last < len(s):
     var x = matchLen(s, sep, last)
     if x > 0: inc(last, x)
     first = last
+    if x == 0: inc(last)
     while last < len(s):
-      inc(last)
       x = matchLen(s, sep, last)
-      if x > 0: break
-    if first < last:
+      if x >= 0: break
+      inc(last)
+    if first <= last:
       yield substr(s, first, last-1)
 
 proc split*(s: string, sep: Regex): seq[string] =
-- 
cgit 1.4.1-2-gfad0


From 7ee6c72b51e8e0877bc734a30c0498e42f0ca99a Mon Sep 17 00:00:00 2001
From: Joseph Turner <turner.d.joseph@gmail.com>
Date: Wed, 8 Apr 2015 21:58:31 +0100
Subject: Adds test case to is isMainModule block

Adds the test case that originally caused the bug, issue #2418.
---
 lib/impure/re.nim | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'lib/impure/re.nim')

diff --git a/lib/impure/re.nim b/lib/impure/re.nim
index 93dc4922d..ff2b70d2d 100644
--- a/lib/impure/re.nim
+++ b/lib/impure/re.nim
@@ -474,7 +474,12 @@ when isMainModule:
   var accum: seq[string] = @[]
   for word in split("00232this02939is39an22example111", re"\d+"):
     accum.add(word)
-  assert(accum == @["this", "is", "an", "example"])
+  assert(accum == @["", "this", "is", "an", "example", ""])
+
+  accum = @[]
+  for word in split("AAA :   : BBB", re"\s*:\s*"):
+    accum.add(word)
+  assert(accum == @["AAA", "", "BBB"])
 
   for x in findAll("abcdef", re"^{.}", 3):
     assert x == "d"
-- 
cgit 1.4.1-2-gfad0