Skip to content

Next Gen STEP AP242 Native-ish BREP Geometric Modeling Kernel

Make syntax-cache string equality explicit for WASM AOT

Yuechen Lifc73c1d58bd3
diff --git a/Aetheris.Kernel.Firmament.Tests/FirmamentSyntaxCacheTests.cs b/Aetheris.Kernel.Firmament.Tests/FirmamentSyntaxCacheTests.cs
new file mode 100644
index 00000000..484db033
--- /dev/null
+++ b/Aetheris.Kernel.Firmament.Tests/FirmamentSyntaxCacheTests.cs
@@ -0,0 +1,19 @@
+using Aetheris.Kernel.Firmament.FirmamentV2.Syntax;
+
+namespace Aetheris.Kernel.Firmament.Tests;
+
+public sealed class FirmamentSyntaxCacheTests
+{
+ [Fact]
+ public void CacheSharesEqualTextButRetainsOrdinalDocumentAndSourceIdentity()
+ {
+ var directory = new DirectoryInfo(AppContext.BaseDirectory);
+ while (directory is not null && !File.Exists(Path.Combine(directory.FullName, "Aetheris.slnx"))) directory = directory.Parent;
+ Assert.NotNull(directory);
+ var source = File.ReadAllText(Path.Combine(directory.FullName, "fixtures", "Canonical", "Learn", "01-plate.firmament"));
+ var first = FirmamentSyntaxParser.Parse(source, "CacheIdentity.firmament");
+ Assert.Same(first, FirmamentSyntaxParser.Parse(new string(source.ToCharArray()), new string("CacheIdentity.firmament".ToCharArray())));
+ Assert.NotSame(first, FirmamentSyntaxParser.Parse(source, "cacheidentity.firmament"));
+ Assert.NotSame(first, FirmamentSyntaxParser.Parse(source + "\n", "CacheIdentity.firmament"));
+ }
+}
diff --git a/Aetheris.Kernel.Firmament/FirmamentV2/Syntax/FirmamentSyntaxParser.cs b/Aetheris.Kernel.Firmament/FirmamentV2/Syntax/FirmamentSyntaxParser.cs
index e7dd23c1..c82823c4 100644
--- a/Aetheris.Kernel.Firmament/FirmamentV2/Syntax/FirmamentSyntaxParser.cs
+++ b/Aetheris.Kernel.Firmament/FirmamentV2/Syntax/FirmamentSyntaxParser.cs
@@ -25,7 +25,19 @@ public static class FirmamentSyntaxParser
}
private const int ParseCacheCapacity = 256;
- private static readonly Dictionary<(string File, string Source), SyntaxParseResult> ParseCache = new();
+ // Cache identity is ordinal for both strings. An explicit comparer also avoids
+ // ValueTuple<TRef,TRef>.GetHashCode's shared virtual-dispatch path, which can
+ // abort the Mono WASM AOT runtime while tracing a valid IntelliDraft outline.
+ private static readonly Dictionary<(string File, string Source), SyntaxParseResult> ParseCache = new(new ParseCacheKeyComparer());
+
+ private sealed class ParseCacheKeyComparer : IEqualityComparer<(string File, string Source)>
+ {
+ public bool Equals((string File, string Source) x, (string File, string Source) y)
+ => StringComparer.Ordinal.Equals(x.File, y.File) && StringComparer.Ordinal.Equals(x.Source, y.Source);
+
+ public int GetHashCode((string File, string Source) key)
+ => HashCode.Combine(StringComparer.Ordinal.GetHashCode(key.File), StringComparer.Ordinal.GetHashCode(key.Source));
+ }
private sealed class ParseFailure : Exception;
private sealed class Parser