transitions z count

Author: nitely

src/nregex/dfamacro.nim

@@ -305,15 +305,15 @@ func matchImpl*(
     iPrev = start
   # workaround for VM registry limitation
   const
-    tzLen = regex.transitions.z.len
-    groupTransitionsLen = regex.groupsCount * 2
+    zCount = regex.transitions.zCount
+    zGroupsCount = regex.groupsCount * 2
     noCaptures = mfNoCaptures in flags
   # workaround for https://github.com/nim-lang/Nim/issues/13252
   const
     reFlags = regex.flags
     canSkipTransitionsZ = noCaptures and
-      groupTransitionsLen == tzLen
-    hasTransitionsZ = tzLen > 0 and
+      zGroupsCount == zCount
+    hasTransitionsZ = zCount > 0 and
       not canSkipTransitionsZ
     groupCount {.used.} = regex.groupsCount
     namedGroups {.used.} = regex.namedGroups

src/nregex/dfamatch.nim

@@ -244,8 +244,8 @@ func matchImpl*(
   let
     asciiMode = reAscii in regex.flags
     canSkipTransitionsZ = mfNoCaptures in flags and
-      regex.groupsCount * 2 == regex.transitions.z.len
-    hasTransitionsZ = regex.transitions.z.len > 0 and
+      regex.groupsCount * 2 == regex.transitions.zCount
+    hasTransitionsZ = regex.transitions.zCount > 0 and
       not canSkipTransitionsZ
   var
     smA: Submatches

src/nregex/nfa.nim

@@ -172,6 +172,11 @@ func isTransitionZ(n: Node): bool {.inline.} =
     else:
       false
 
+func countTransitionsZ(nfa: seq[Node]): int =
+  result = 0
+  for n in nfa:
+    result += int(n.isTransitionZ)
+
 func teClosure(
   result: var TeClosure,
   nfa: seq[Node],
@@ -208,6 +213,7 @@ type
     all*: TransitionsAll
     allZ*: TransitionsAll
     z*: ZclosureStates
+    zCount*: int
 
 # XXX do not add char classes transitions \w, \d, etc in ascii mode
 func eRemoval(
@@ -261,6 +267,9 @@ func eRemoval(
         qw.addFirst(qb)
   transitions.all.setLen(statePos)
   transitions.allZ.setLen(statePos)
+  if transitions.z.len == 0:
+    transitions.allZ = @[]
+  transitions.zCount = eNfa.countTransitionsZ
   result = newSeq[Node](statePos)
   for en, nn in statesMap.pairs:
     if nn == -1: