Fix TerminalGenerator.cs

Author: VladD2

Parsers/DotParser/DotTerminals.cs

@@ -8,50 +8,14 @@ public sealed partial class DotTerminals
     [Regex(@"[\l_]\w*")]
     public static partial Terminal Identifier();
 
-    //[Regex(@"""[^""]*""")]
-    //public static partial Terminal QuotedString();
-    public static Terminal QuotedString() => _quotedString;
+    [Regex("""
+        "(\\.|[^"])*"
+        """)]
+    public static partial Terminal QuotedString();
 
     [Regex(@"\d+")]
     public static partial Terminal Number();
 
     [Regex(@"(//[^\n]*|\s)*")]
     public static partial Terminal Trivia();
-
-    private sealed record QuotedStringMatcher() : Terminal(Kind: "QuotedString")
-    {
-        public override int TryMatch(string input, int startPos)
-        {
-            if (startPos >= input.Length)
-                return -1;
-
-            var i = startPos;
-            var c = input[i];
-
-            if (c != '\"')
-                return -1;
-
-            for (i++; i < input.Length; i++)
-            {
-                c = input[i];
-
-                if (c == '\\' && peek() != '\0')
-                    i++;
-                else if (c == '\n')
-                    return -1;
-                else if (c == '\"')
-                {
-                    i++;
-                    break;
-                }
-            }
-
-            return i - startPos;
-            char peek() => i + 1 < input.Length ? input[i + 1] : '\0';
-        }
-
-        public override string ToString() => @"QuotedString";
-    }
-
-    private static readonly Terminal _quotedString = new QuotedStringMatcher();
 }

TerminalGenerator/TerminalGenerator.cs

@@ -244,11 +244,13 @@ static string generateTransitionCondition(RegexNode node)
                         RegexChar rc => $"""c == '{EscapeChar(rc.Value)}'  /* {rc} */""",
                         RegexAnyChar => "true /* RegexAnyChar */",
                         NegatedCharClassGroup rcc when rcc.ToString() == $@"[^[\n]]" => $@"c is not '\n' and not '\0' /* {rcc} */",
+                        NegatedCharClassGroup x when x.Classes.Any(x => x is RangesCharClass) => $@"!({string.Join(" && ", x.Classes.Select(generateTransitionCondition))}) && c != '\0'",
                         RangesCharClass rcc => GenerateRangeCondition(rcc),
                         WordCharClass wcc => $"""{(wcc.Negated ? "!" : "")}(char.IsLetterOrDigit(c) || c == '_')""",
                         DigitCharClass dcc => $"""{(dcc.Negated ? "!" : "")}char.IsDigit(c)""",
                         WhitespaceCharClass scc => $"""{(scc.Negated ? "!" : "")}char.IsWhiteSpace(c)""",
                         LetterCharClass lcc => $"""{(lcc.Negated ? "!" : "")}char.IsLetter(c)""",
+                        NegatedCharClassGroup x => $@"false /* {x} ({x.GetType().Name}) {string.Join(" && ", x.Classes.Select(x => $"{x} ({x.GetType().Name})"))} */",
                         _ => $"false /* {node} ({node.GetType().Name}) */"
                     };
                 }

Tests/ParaserTests/Dot/DotTests.cs

@@ -40,14 +40,20 @@ public void QuotedStringMatcherTest()
     {
         var matcher = DotTerminals.QuotedString();
 
+        test(startPos: 1, expectedLen: 16, """
+            ="23\"\n4\r56789"
+            """);
+        test(startPos: 1, expectedLen: 12, """
+             "23\"456789""23\"456789"
+            """);
         test(startPos: 0, expectedLen: -1, "123");
         test(startPos: 0, expectedLen: 10, "\"23456789\"");
         test(startPos: 1, expectedLen: 10, " \"23456789\"");
-        test(startPos: 1, expectedLen: 12, """
-             "23\"456789""23\"456789"
+        test(startPos: 1, expectedLen: -1, """
+             "23456789\
             """);
-        test(startPos: 1, expectedLen: 16, """
-            ="23\"\n4\r56789"
+        test(startPos: 1, expectedLen: -1, """
+             "23456789
             """);
 
         return;