Skip to content

Commit 374869e

Browse files
committed
[DOT] Revert using generated Trivia (TriviaMatcher).
1 parent 706cbca commit 374869e

File tree

1 file changed

+33
-33
lines changed

1 file changed

+33
-33
lines changed

Parsers/DotParser/DotTerminals.cs

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ public sealed partial class DotTerminals
1515
[Regex(@"\d+")]
1616
public static partial Terminal Number();
1717

18-
//[Regex(@"(\s*(\/\/[^\n]*)|\s+)*")]
19-
//public static partial Terminal Trivia();
20-
public static Terminal Trivia() => _trivia;
18+
[Regex(@"(//[^\n]*(\n|$)|\s)*")]
19+
public static partial Terminal Trivia();
20+
//public static Terminal Trivia() => _trivia;
2121

2222
private sealed record QuotedStringMatcher() : Terminal(Kind: "QuotedString")
2323
{
@@ -56,34 +56,34 @@ public override int TryMatch(string input, int startPos)
5656

5757
private static readonly Terminal _quotedString = new QuotedStringMatcher();
5858

59-
private sealed record TriviaMatcher() : Terminal(Kind: "Trivia")
60-
{
61-
public override int TryMatch(string input, int startPos)
62-
{
63-
var i = startPos;
64-
for (; i < input.Length; i++)
65-
{
66-
var c = input[i];
67-
68-
if (char.IsWhiteSpace(c))
69-
continue;
70-
71-
if (c == '/' && peek() == '/')
72-
{
73-
for (i += 2; i < input.Length && (c = input[i]) != '\n'; i++)
74-
;
75-
i--;
76-
}
77-
else
78-
return i - startPos;
79-
}
80-
81-
return i - startPos;
82-
char peek() => i + 1 < input.Length ? input[i + 1] : '\0';
83-
}
84-
85-
public override string ToString() => @"Trivia";
86-
}
87-
88-
private static readonly Terminal _trivia = new TriviaMatcher();
59+
//private sealed record TriviaMatcher() : Terminal(Kind: "Trivia")
60+
//{
61+
// public override int TryMatch(string input, int startPos)
62+
// {
63+
// var i = startPos;
64+
// for (; i < input.Length; i++)
65+
// {
66+
// var c = input[i];
67+
//
68+
// if (char.IsWhiteSpace(c))
69+
// continue;
70+
//
71+
// if (c == '/' && peek() == '/')
72+
// {
73+
// for (i += 2; i < input.Length && (c = input[i]) != '\n'; i++)
74+
// ;
75+
// i--;
76+
// }
77+
// else
78+
// return i - startPos;
79+
// }
80+
//
81+
// return i - startPos;
82+
// char peek() => i + 1 < input.Length ? input[i + 1] : '\0';
83+
// }
84+
//
85+
// public override string ToString() => @"Trivia";
86+
//}
87+
//
88+
//private static readonly Terminal _trivia = new TriviaMatcher();
8989
}

0 commit comments

Comments
 (0)