Add support to use an existing DFA stored in external memory

The DFA states are now accessed via a static array pointer, which now
allows an existing DFA stored in external memory to be used directly by
the RegEx engine. For example, a DFA can now be stored in a
`DataSection` block and the RegEx engine uses the DFA directly from
there.

- New function: `FreeDfa()`

- New function: `UseDfaFromMemory()`

- Added example code which uses a DFA stored in a `DataSection` block

Author: SicroAtGit

README.md

@@ -70,11 +70,17 @@ Structure DfaStateStruc
 EndStructure
 ```
 
+```purebasic
+Structure DfaStatesArrayStruc
+  states.DfaStateStruc[0]
+EndStructure
+```
+
 ```purebasic
 Structure RegExEngineStruc
-  List nfaStatesPool.NfaStateStruc()   ; Holds all NFA states
-  *initialNfaState                     ; Pointer to the NFA initial state
-  Array dfaStatesPool.DfaStateStruc(0) ; Holds all DFA states
+  List nfaStatesPool.NfaStateStruc() ; Holds all NFA states
+  *initialNfaState                   ; Pointer to the NFA initial state
+  *dfaStatesPool.DfaStatesArrayStruc ; Holds all DFA states
 EndStructure
 ```
 
@@ -84,11 +90,17 @@ EndStructure
 Creates a new RegEx engine and returns the pointer to the `RegExEngineStruc` structure. If an error occurred (RegEx syntax error or memory could not be allocated) null is returned.
 
 - `CreateDfa(*regExEngine, clearNfa = #True)`<br>
-Creates a DFA in the RegEx engine from the NFA created by `Create()`. `Match()` then always uses the DFA and is much faster. Because the NFA is no longer used after this, it is cleared by default. The clearing can be turned off by setting `clearNfa` to `#False`.
+Creates a DFA in the RegEx engine from the NFA created by `Create()`. `Match()` then always uses the DFA and is much faster. Because the NFA is no longer used after this, it is cleared by default. The clearing can be turned off by setting `clearNfa` to `#False`. On success `#True` is returned, otherwise `#False`.
 
 - `Free(*regExEngine)`<br>
 Frees the memory of the RegEx engine created by the function `Create()`.
 
+- `FreeDfa(*regExEngine)`<br>
+Frees the memory of the DFA created by the function `CreateDfa()`.
+
+- `UseDfaFromMemory(*dfaMemory)`<br>
+Assigns an existing DFA stored in external memory to the RegEx engine. After that the RegEx engine is directly ready to use; no call of `Create()` and `CreateDfa()` is necessary. But the call of `Free()` is still necessary. On success the pointer to `RegExEngineStruc` is returned, otherwise null.
+
 - `Match(*regExEngine, *string)`<br>
 Runs the Regex engine against the string. The function requires the pointer to the string, which can be determined with `@variable$` or `@"text"`. The match search will start from the beginning of the string. If you want to start from a different position, you have to move the pointer of the string, e.g. `*string + SizeOf(Character)` to search from the second character in the string. If a match is found, the character length of the match is returned, otherwise zero.
 

RegExEngine.pbi

@@ -22,10 +22,14 @@ DeclareModule RegEx
     isFinalState.i ; `#True` if the DFA state is a final state, otherwise `#False`
   EndStructure
 
+  Structure DfaStatesArrayStruc
+    states.DfaStateStruc[0]
+  EndStructure
+  
   Structure RegExEngineStruc
-    List nfaStatesPool.NfaStateStruc()   ; Holds all NFA states
-    *initialNfaState                     ; Pointer to the NFA initial state
-    Array dfaStatesPool.DfaStateStruc(0) ; Holds all DFA states
+    List nfaStatesPool.NfaStateStruc() ; Holds all NFA states
+    *initialNfaState                   ; Pointer to the NFA initial state
+    *dfaStatesPool.DfaStatesArrayStruc ; Holds all DFA states
   EndStructure
 
   ; Creates a new RegEx engine and returns the pointer to the
@@ -37,11 +41,21 @@ DeclareModule RegEx
   ; `Match()` then always uses the DFA and is much faster.
   ; Because the NFA is no longer used after this, it is cleared by default.
   ; The clearing can be turned off by setting `clearNfa` to `#False`.
+  ; On success `#True` is returned, otherwise `#False`.
   Declare CreateDfa(*regExEngine, clearNfa = #True)
 
   ; Frees the memory of the RegEx engine created by the function `Create()`.
   Declare Free(*regExEngine)
 
+  ; Frees the memory of the DFA created by the function `CreateDfa()`.
+  Declare FreeDfa(*regExEngine)
+  
+  ; Assigns an existing DFA stored in external memory to the RegEx engine.
+  ; After that the RegEx engine is directly ready to use; no call of `Create()`
+  ; and `CreateDfa()` is necessary. But the call of `Free()` is still necessary.
+  ; On success the pointer to `RegExEngineStruc` is returned, otherwise null.
+  Declare UseDfaFromMemory(*dfaMemory)
+  
   ; Runs the RegEx engine against the string. The function requires the pointer
   ; to the string, which can be determined with `@variable$` or `@"text"`.
   ; The match search will start from the beginning of the string. If you want
@@ -475,6 +489,12 @@ Module RegEx
     Protected.EClosureStruc Dim eClosures(1), NewMap symbols()
     Protected.NfaStateStruc *state
     Protected sizeOfArray, dfaState, result
+    Protected *newMemory
+    
+    *regExEngine\dfaStatesPool = AllocateMemory(SizeOf(DfaStateStruc) << 1)
+    If *regExEngine\dfaStatesPool = 0
+      ProcedureReturn #False
+    EndIf
 
     dfaState = 1
 
@@ -491,7 +511,7 @@ Module RegEx
         *state = eClosures(dfaState)\nfaStates()
         Select *state\symbol
           Case #Symbol_Final
-            *regExEngine\dfaStatesPool(dfaState)\isFinalState = #True
+            *regExEngine\dfaStatesPool\states[dfaState]\isFinalState = #True
           Default
             AddState(*state\nextState1, symbols(Chr(*state\symbol))\nfaStates())
         EndSelect
@@ -500,13 +520,22 @@ Module RegEx
       ForEach symbols()
         result = FindStatesSet(eClosures(), symbols()\nfaStates())
         If result
-          *regExEngine\dfaStatesPool(dfaState)\symbols[Asc(MapKey(symbols()))] = result
+          *regExEngine\dfaStatesPool\states[dfaState]\symbols[Asc(MapKey(symbols()))] = result
         Else
           sizeOfArray = ArraySize(eClosures())
           ReDim eClosures(sizeOfArray + 1)
-          ReDim *regExEngine\dfaStatesPool(sizeOfArray + 1)
+          *newMemory = ReAllocateMemory(*regExEngine\dfaStatesPool,
+                                        MemorySize(*regExEngine\dfaStatesPool) +
+                                        SizeOf(DfaStateStruc))
+          If *newMemory
+            *regExEngine\dfaStatesPool = *newMemory
+          Else
+            FreeMemory(*regExEngine\dfaStatesPool)
+            *regExEngine\dfaStatesPool = 0
+            ProcedureReturn #False
+          EndIf
           CopyList(symbols()\nfaStates(), eClosures(sizeOfArray + 1)\nfaStates())
-          *regExEngine\dfaStatesPool(dfaState)\symbols[Asc(MapKey(symbols()))] = sizeOfArray + 1
+          *regExEngine\dfaStatesPool\states[dfaState]\symbols[Asc(MapKey(symbols()))] = sizeOfArray + 1
         EndIf
       Next
 
@@ -516,12 +545,29 @@ Module RegEx
       *regExEngine\initialNfaState = 0
       ClearList(*regExEngine\nfaStatesPool())
     EndIf
+    
+    ProcedureReturn #True
   EndProcedure
 
   Procedure Free(*regExEngine.RegExEngineStruc)
     FreeStructure(*regExEngine)
   EndProcedure
 
+  Procedure FreeDfa(*regExEngine.RegExEngineStruc)
+    FreeMemory(*regExEngine\dfaStatesPool)
+  EndProcedure
+  
+  Procedure UseDfaFromMemory(*dfaMemory)
+    Protected.RegExEngineStruc *regExEngine
+    
+    *regExEngine = AllocateStructure(RegExEngineStruc)
+    If *regExEngine
+      *regExEngine\dfaStatesPool = *dfaMemory
+    EndIf
+    
+    ProcedureReturn *regExEngine
+  EndProcedure
+  
   Procedure NfaMatch(*regExEngine.RegExEngineStruc, *string.Ascii)
     Protected.NfaStateStruc *state
     Protected matchLength, lastFinalStateMatchLength
@@ -561,15 +607,15 @@ Module RegEx
     ; dfaState '0' is the dead state, so it will be skipped.
 
     Repeat
-      dfaState = *regExEngine\dfaStatesPool(dfaState)\symbols[*string\a]
+      dfaState = *regExEngine\dfaStatesPool\states[dfaState]\symbols[*string\a]
       If dfaState = #State_DfaDeadState
         Break
       EndIf
 
       matchLength + 1
       *string + SizeOf(Ascii)
 
-      If *regExEngine\dfaStatesPool(dfaState)\isFinalState
+      If *regExEngine\dfaStatesPool\states[dfaState]\isFinalState
         lastFinalStateMatchLength = matchLength
       EndIf
     ForEver
@@ -578,7 +624,7 @@ Module RegEx
   EndProcedure
 
   Procedure Match(*regExEngine.RegExEngineStruc, *string.Character)
-    If ArraySize(*regExEngine\dfaStatesPool())
+    If *regExEngine\dfaStatesPool <> 0
       ProcedureReturn DfaMatch(*regExEngine, *string)
     Else
       ProcedureReturn NfaMatch(*regExEngine, *string)

examples/DFA_in_DataSection.pb

@@ -0,0 +1,112 @@
+
+IncludePath ".."
+IncludeFile "RegExEngine.pbi"
+
+Define *regEx = RegEx::UseDfaFromMemory(?dfa)
+
+If *regEx
+  If RegEx::Match(*regEx, @"Test")
+    Debug "Match!"
+  Else
+    Debug "No match!"
+  EndIf
+  RegEx::Free(*regEx)
+Else
+  Debug "Error!"
+EndIf
+
+DataSection
+  dfa:
+  
+  ; Dead state
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,#False
+  
+  ; Symbol 'T'
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,#False
+  Data.i 3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,#False
+  
+  ; Symbol 'e'
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,#False
+  Data.i 5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,#False
+  
+  ; Symbol 's'
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,#False
+  Data.i 7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,#False
+  
+  ; Symbol 't'
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,#False
+  Data.i 9,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,#False
+  
+  ; Final state
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  Data.i 0,0,0,0,0,0,0,0,0,0,0,#True
+EndDataSection

examples/Debug_DFA_table.pb

@@ -16,24 +16,25 @@ RegEx::CreateDfa(*regEx)
 
 Debug "| State               | Symbol | Next state          |"
 Debug "| =================== | ====== | =================== |"
-sizeOfArray = ArraySize(*regEx\dfaStatesPool())
+sizeOfArray = MemorySize(*regEx\dfaStatesPool) / SizeOf(RegEx::DfaStateStruc) - 1
 For i = 1 To sizeOfArray
-  If *regEx\dfaStatesPool(i)\isFinalState
+  If *regEx\dfaStatesPool\states[i]\isFinalState
     Debug "| " + LSet(Str(i) + " (final)", 19) + " | " + Space(6) + " | " +
           Space(19) + " |"
   Else
     Debug "| " + LSet(Str(i), 19) + " | " + Space(6) + " | " + Space(19) + " |"
   EndIf
 
   For i2 = 0 To 255
-    If *regEx\dfaStatesPool(i)\symbols[i2] <> RegEx::#State_DfaDeadState
+    If *regEx\dfaStatesPool\states[i]\symbols[i2] <> RegEx::#State_DfaDeadState
       hex$ = RSet(Hex(i2), 2, "0")
       Debug "| " + Space(19) +
             " | " + LSet(hex$, 6) +
-            " | " + LSet(Str(*regEx\dfaStatesPool(i)\symbols[i2]), 19) + " |"
+            " | " + LSet(Str(*regEx\dfaStatesPool\states[i]\symbols[i2]), 19) + " |"
     EndIf
   Next
   Debug "| ------------------- | ------ | ------------------- |"
 Next
 
+RegEx::FreeDfa(*regEx)
 RegEx::Free(*regEx)

examples/Find_all_matches.pb

@@ -41,4 +41,5 @@ While *string\c
   *string + SizeOf(Character)
 Wend
 
+RegEx::FreeDfa(*regEx)
 RegEx::Free(*regEx)