DfaInterpreter fix

Author: VladD2

Regex/Regex/Dfa/DfaBuilder.cs

@@ -19,8 +19,7 @@ public DfaState Build(NfaState start)
         var initial = EpsilonClosure([start]);
         log?.Info($"Initial ε-closure: [{string.Join(", ", initial.Select(s => s.Id))}]");
 
-        bool isInitialFinal = initial.Any(s => s.IsFinal) && !IsEmptyPattern(start);
-        var dfaStart = new DfaState(0, isInitialFinal);
+        var dfaStart = new DfaState(0, initial.Any(s => s.IsFinal));
         mapping[initial] = dfaStart;
         queue.Enqueue(initial);
 
@@ -66,12 +65,6 @@ public DfaState Build(NfaState start)
         return dfaStart;
     }
 
-    private bool IsEmptyPattern(NfaState start)
-    {
-        bool isEmpty = start.IsFinal && start.Transitions.Count == 0;
-        log?.Info($"Checking empty pattern: {isEmpty}");
-        return isEmpty;
-    }
 
     private Dictionary<RegexNode, HashSet<NfaState>> GetTransitions(HashSet<NfaState> states)
     {

Regex/Regex/Dfa/DfaInterpreter.cs

@@ -48,6 +48,21 @@ public static int TryMatch(DfaState start, string input, int startPos = 0, Log?
             }
         }
 
+        // Проверяем соответствие конца строки
+        foreach (var transition in current.Transitions)
+        {
+            if (transition.Condition is RegexEndOfLine)
+            {
+                current = transition.Target;
+                if (current.IsFinal)
+                {
+                    maxLen = currentLen;
+                    log?.Info($"End of line matched, updating maxLen to {maxLen}");
+                }
+                break;
+            }
+        }
+
         // Если не было ни одного совпадения, но начальное состояние финальное
         if (maxLen == -1 && start.IsFinal)
         {

Regex/Regex/Dot.cs

@@ -19,7 +19,7 @@ public static void GenerateSvg(string dotFilePath, string outputSvgPath)
     {
         var processStartInfo = new ProcessStartInfo
         {
-            FileName = "dot.exe",
+            FileName = "dot",
             Arguments = $"-Tsvg \"{dotFilePath}\" -o \"{outputSvgPath}\"",
             RedirectStandardOutput = true,
             RedirectStandardError = true,

Tests/RegexTests/RegexTests.cs

@@ -14,7 +14,7 @@ public void Setup()
         Trace.AutoFlush = true;
     }
 
-    [TestMethod]
+    [TestMethod]
     public void DfaConstruction_3()
     {
         var pattern = @"(//[^\n]*(\n|$)|\s)*";
@@ -165,7 +165,7 @@ public void DfaMatching()
     {
         var testCases = new[]
         {
-            //(Start: 0, Pattern: @"(//[^\n]*(\n|$)|\s)*",  Input: "  // Top to Bottom",       Expected: 18),
+            (Start: 0, Pattern: @"(//[^\n]*(\n|$)|\s)*",  Input: "  // Top to Bottom",       Expected: 18),
             (Start: 1, Pattern: @"(//[^\n]*(\n|$)|\s)*",  Input: ";  // Top to Bottom\r\n    n", Expected: 24),
                                                                  //012345678901234567 8 901234567890
                                                                  //          10          20