Impl GetHashCode in value comparer

EPD-Libraries · Feb 4, 2024 · 0de65c1 · 0de65c1
1 parent 913a9c8
commit 0de65c1
Show file tree

Hide file tree

Showing 8 changed files with 86 additions and 30 deletions.
diff --git a/src/BymlLibrary.Runner/Properties/launchSettings.json b/src/BymlLibrary.Runner/Properties/launchSettings.json
@@ -2,7 +2,7 @@
   "profiles": {
     "BymlLibrary.Runner": {
       "commandName": "Project",
-      "commandLineArgs": "\"D:\\bin\\nxe\\(src)-GameDataList.Product.110.byml\" \"D:\\bin\\nxe\\GameDataList.Product.110.byml\" \"D:\\bin\\nxe\\output.yml\""
+      "commandLineArgs": "\"D:\\bin\\Byml-v7\\ActorInfo.product.byml\" \"D:\\bin\\Byml-v7\\(md)-ActorInfo.product.byml\" \"D:\\bin\\Byml-v7\\ActorInfo.product.yml\""
     }
   }
 }
diff --git a/src/BymlLibrary/Byml.cs b/src/BymlLibrary/Byml.cs
@@ -6,6 +6,7 @@
 using Revrs;
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.CompilerServices;
+using static System.Runtime.InteropServices.JavaScript.JSType;
 
 namespace BymlLibrary;
 
@@ -366,9 +367,40 @@ public bool Equals(Byml? x, Byml? y)
             };
         }
 
-        public int GetHashCode([DisallowNull] Byml obj)
+        public int GetHashCode([DisallowNull] Byml byml)
         {
-            throw new NotImplementedException();
+            if (byml.Value is IBymlNode container) {
+                return container.GetValueHash();
+            }
+            else {
+                return byml.Type switch {
+                    BymlNodeType.Binary => GetBinaryNodeHashCode((byml.GetBinary(), null), byml.Type),
+                    BymlNodeType.BinaryAligned => GetBinaryNodeHashCode(byml.GetBinaryAligned(), byml.Type),
+                    _ => GetValueNodeHashCode(byml)
+                };
+            }
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static int GetBinaryNodeHashCode((byte[] data, int? alignment) value, BymlNodeType bymlNodeType)
+        {
+            HashCode hashCode = new();
+            if (value.alignment.HasValue) {
+                hashCode.Add(value.alignment.Value);
+            }
+
+            hashCode.Add(bymlNodeType.GetHashCode());
+            hashCode.AddBytes(value.data);
+            return hashCode.ToHashCode();
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static int GetValueNodeHashCode(Byml byml)
+        {
+            HashCode hashCode = new();
+            hashCode.Add(byml.Type.GetHashCode());
+            hashCode.Add(byml.Value?.GetHashCode());
+            return hashCode.ToHashCode();
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]

diff --git a/src/BymlLibrary/Nodes/Containers/BymlArray.cs b/src/BymlLibrary/Nodes/Containers/BymlArray.cs
@@ -6,6 +6,16 @@ namespace BymlLibrary.Nodes.Containers;
 
 public class BymlArray : List<Byml>, IBymlNode
 {
+    public int GetValueHash()
+    {
+        HashCode hashCode = new();
+        foreach (var node in this) {
+            hashCode.Add(Byml.ValueEqualityComparer.Default.GetHashCode(node));
+        }
+
+        return hashCode.ToHashCode();
+    }
+
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     int IBymlNode.Collect(in BymlWriter writer)
     {

diff --git a/src/BymlLibrary/Nodes/Containers/BymlMap.cs b/src/BymlLibrary/Nodes/Containers/BymlMap.cs
@@ -8,6 +8,17 @@ namespace BymlLibrary.Nodes.Containers;
 
 public class BymlMap : Dictionary<string, Byml>, IBymlNode
 {
+    public int GetValueHash()
+    {
+        HashCode hashCode = new();
+        foreach ((var key, var node) in this) {
+            hashCode.Add(key);
+            hashCode.Add(Byml.ValueEqualityComparer.Default.GetHashCode(node));
+        }
+
+        return hashCode.ToHashCode();
+    }
+
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     int IBymlNode.Collect(in BymlWriter writer)
     {

diff --git a/src/BymlLibrary/Nodes/Containers/HashMap/BymlHashMap32.cs b/src/BymlLibrary/Nodes/Containers/HashMap/BymlHashMap32.cs
@@ -6,6 +6,17 @@ namespace BymlLibrary.Nodes.Containers.HashMap;
 
 public class BymlHashMap32 : SortedDictionary<uint, Byml>, IBymlNode
 {
+    public int GetValueHash()
+    {
+        HashCode hashCode = new();
+        foreach ((var key, var node) in this) {
+            hashCode.Add(key);
+            hashCode.Add(Byml.ValueEqualityComparer.Default.GetHashCode(node));
+        }
+
+        return hashCode.ToHashCode();
+    }
+
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     int IBymlNode.Collect(in BymlWriter writer)
     {

diff --git a/src/BymlLibrary/Nodes/Containers/HashMap/BymlHashMap64.cs b/src/BymlLibrary/Nodes/Containers/HashMap/BymlHashMap64.cs
@@ -6,6 +6,17 @@ namespace BymlLibrary.Nodes.Containers.HashMap;
 
 public class BymlHashMap64 : SortedDictionary<ulong, Byml>, IBymlNode
 {
+    public int GetValueHash()
+    {
+        HashCode hashCode = new();
+        foreach ((var key, var node) in this) {
+            hashCode.Add(key);
+            hashCode.Add(Byml.ValueEqualityComparer.Default.GetHashCode(node));
+        }
+
+        return hashCode.ToHashCode();
+    }
+
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     int IBymlNode.Collect(in BymlWriter writer)
     {

diff --git a/src/BymlLibrary/Nodes/Containers/IBymlNode.cs b/src/BymlLibrary/Nodes/Containers/IBymlNode.cs
@@ -5,6 +5,9 @@ namespace BymlLibrary.Nodes.Containers;
 
 internal interface IBymlNode
 {
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public int GetValueHash();
+
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     internal int Collect(in BymlWriter writer);
 

diff --git a/src/BymlLibrary/Writers/BymlWriter.cs b/src/BymlLibrary/Writers/BymlWriter.cs
@@ -215,25 +215,25 @@ public int Collect(in Byml byml)
         }
         else if (byml.Value is string str) {
             _strings.TryAdd(str, 0);
-            return GetValueNodeHashCode(byml);
+            return Byml.ValueEqualityComparer.GetValueNodeHashCode(byml);
         }
         else if (byml.Value is byte[] data) {
-            int hash = CollectBytes((data, null), byml.Type);
+            int hash = Byml.ValueEqualityComparer.GetBinaryNodeHashCode((data, null), byml.Type);
             _nodeCache[byml] = hash;
             return hash;
         }
         else if (byml.Type == BymlNodeType.BinaryAligned) {
-            int hash = CollectBytes(byml.GetBinaryAligned(), byml.Type);
+            int hash = Byml.ValueEqualityComparer.GetBinaryNodeHashCode(byml.GetBinaryAligned(), byml.Type);
             _nodeCache[byml] = hash;
             return hash;
         }
         else if (byml.Type.IsSpecialValueType()) {
-            int hash = GetValueNodeHashCode(byml);
+            int hash = Byml.ValueEqualityComparer.GetValueNodeHashCode(byml);
             _nodeCache[byml] = hash;
             return hash;
         }
         else {
-            return GetValueNodeHashCode(byml);
+            return Byml.ValueEqualityComparer.GetValueNodeHashCode(byml);
         }
     }
 
@@ -242,26 +242,4 @@ public int Collect(in Byml byml)
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public int GetKeyIndex(string key) => _keys[key];
-
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    private static int CollectBytes((byte[] data, int? alignment) value, BymlNodeType bymlNodeType)
-    {
-        HashCode hashCode = new();
-        if (value.alignment.HasValue) {
-            hashCode.Add(value.alignment.Value);
-        }
-
-        hashCode.Add(bymlNodeType.GetHashCode());
-        hashCode.AddBytes(value.data);
-        return hashCode.ToHashCode();
-    }
-
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    private static int GetValueNodeHashCode(Byml byml)
-    {
-        HashCode hashCode = new();
-        hashCode.Add(byml.Type.GetHashCode());
-        hashCode.Add(byml.Value?.GetHashCode());
-        return hashCode.ToHashCode();
-    }
 }