findAll fix #13

src/regex.nim

@@ -418,6 +418,9 @@ when canUseMacro:
   ): bool {.inline, raises: [].} =
     findImpl()
 
+template findOneImpl: untyped {.dirty.} =
+  matchImpl(s, pattern, m, {mfFindMatch, mfFindAllMatch}, i)
+
 iterator findAll*(
   s: string,
   pattern: Regex,
@@ -440,7 +443,7 @@ iterator findAll*(
   var c: Rune
   var m: RegexMatch
   while i < len(s):
-    if not find(s, pattern, m, i):
+    if not findOneImpl():
       break
     if i < m.boundaries.b+1:
       i = m.boundaries.b+1

src/regex/nfamatch.nim

@@ -86,6 +86,14 @@ template findMatch: untyped {.dirty.} =
     m.boundaries = smA[0][2]
     return true
 
+func bwRuneAt(s: string, n: int): Rune =
+  ## Take rune ending at ``n``
+  doAssert n > 0
+  var n = n
+  while n > 0 and s[n].ord shr 6 == 0b10:
+    dec n
+  fastRuneAt(s, n, result, false)
+
 func matchImpl*(
   text: string,
   regex: Regex,
@@ -104,6 +112,9 @@ func matchImpl*(
   smA = newSubmatches(regex.nfa.len)
   smB = newSubmatches(regex.nfa.len)
   smA.add((0'i16, -1'i32, start .. start-1))
+  when mfFindAllMatch in flags:
+    if start > 0:
+      cPrev = bwRuneAt(text, start).int32
   while i < len(text):
     fastRuneAt(text, i, c, true)
     when mfShortestMatch in flags:

src/regex/nfatype.nim

@@ -54,6 +54,7 @@ type
     mfShortestMatch
     mfNoCaptures
     mfFindMatch
+    mfFindAllMatch
   MatchFlags* = set[MatchFlag]
   RegexMatch* = object
     ## result from matching operations