Skip to content

Speedup ParseError merging #174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kant2002 merged 1 commit into from
Mar 29, 2025
Merged

Speedup ParseError merging #174

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Sources/SynKit/Libraries/Parser/ParseError.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,16 +65,16 @@ private ParseError(IReadOnlyDictionary<string, ParseErrorElement> elements, obje
if (cmp < 0) return second;
if (cmp > 0) return first;
// Both of them got stuck at the same place, merge entries
var elements = first.Elements.Values.ToDictionary(e => e.Context, e => e.Expected.ToHashSet());
var elements = first.Elements.Values.ToDictionary(e => e.Context, e => new ParseErrorElement(e.Expected.ToHashSet(), e.Context));
foreach (var element in second.Elements.Values)
{
if (elements.TryGetValue(element.Context, out var part))
{
foreach (var e in element.Expected) part.Add(e);
foreach (var e in element.Expected) part.Expected.Add(e);
}
else
{
part = element.Expected.ToHashSet();
part = new (element.Expected.ToHashSet(), element.Context);
elements.Add(element.Context, part);
}
}
Expand All @@ -84,7 +84,7 @@ private ParseError(IReadOnlyDictionary<string, ParseErrorElement> elements, obje
// Since position is here now, Got is kind of a utility we have here, we could just aswell have a
// 'reason' for each element
return new(
elements.ToDictionary(kv => kv.Key, kv => new ParseErrorElement(kv.Value, kv.Key)),
elements,
first.Got ?? second.Got,
first.Position);
}
Expand Down
Loading