[1.9.2] HashCode取消储存顺序判断

Author: LorisYounger

LinePutScript.sln

@@ -14,6 +14,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.editorconfig = .editorconfig
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Release", "Release", "{DCF4908D-2FC7-4C9B-A90C-FB65BAD88E0F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

LinePutScript/Converter/LPSConvert.cs

@@ -376,8 +376,7 @@ public static string GetObjectString(object? value, ConvertType type = ConvertTy
                 MethodInfo miConstructed = mi.MakeGenericMethod(att.ILineType);
                 object[] args = { value, att?.Name ?? "deflinename" };
                 return Sub.TextReplace(((ILine)miConstructed.Invoke(null, args)).ToString());
-#pragma warning restore CS8600
-#pragma warning restore CS8602
+
             }
             switch (Type)
             {
@@ -406,15 +405,19 @@ public static string GetObjectString(object? value, ConvertType type = ConvertTy
                         sb.Append(',');
                     }
                     return sb.ToString().TrimEnd(',');
+#pragma warning restore CS8600
+#pragma warning restore CS8602
                 case ConvertType.ToDictionary:
                     sb = new StringBuilder();
+#pragma warning disable CS8605 // 取消装箱可能为 null 的值。
                     foreach (DictionaryEntry obj in (IDictionary)value)
                     {
                         sb.Append(Sub.TextReplace(GetObjectString(obj.Key)));
                         sb.Append('=');
                         sb.Append(obj.Value == null ? "" : Sub.TextReplace(GetObjectString(obj.Value)));
                         sb.Append("/n");
                     }
+#pragma warning restore CS8605 // 取消装箱可能为 null 的值。
                     return sb.ToString().TrimEnd('/', 'n');
 
                 default:
@@ -452,9 +455,7 @@ public static string GetObjectString(object? value, ConvertType type = ConvertTy
                     object[] args = { value, linename };
 #pragma warning disable CS8603 // 可能返回 null 引用。
                     return (TLine)miConstructed.Invoke(null, args);
-#pragma warning restore CS8603 // 可能返回 null 引用。
-#pragma warning restore CS8600
-#pragma warning restore CS8602
+
                 case ConvertType.Converter:
                     if (att?.Converter != null)
                         t.Info = ConvertFunction.Convert(att.Converter, value);
@@ -485,14 +486,19 @@ public static string GetObjectString(object? value, ConvertType type = ConvertTy
                     }
                     t.info = sb.ToString().TrimEnd(',');
                     break;
+#pragma warning restore CS8603 // 可能返回 null 引用。
+#pragma warning restore CS8600
+#pragma warning restore CS8602
                 case ConvertType.ToDictionary:
+#pragma warning disable CS8605 // 取消装箱可能为 null 的值。
                     foreach (DictionaryEntry obj in (IDictionary)value)
                     {
                         TLine newt = new TLine();
                         newt.Name = GetObjectString(obj.Key);
                         newt.info = obj.Value == null ? "" : Sub.TextReplace(GetObjectString(obj.Value));
                         t.Add(newt);
                     }
+#pragma warning restore CS8605 // 取消装箱可能为 null 的值。
                     break;
                 default:
                     t.Info = value.ToString() ?? "";

LinePutScript/Core/LinePutScript.Core.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <ImplicitUsings>disable</ImplicitUsings>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <LangVersion>9.0</LangVersion>
     <Nullable>enable</Nullable>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>

LinePutScript/Dictionary/LPS_D.cs

@@ -548,10 +548,9 @@ public override string ToString()
         /// <returns>64位哈希代码</returns>
         public long GetLongHashCode()
         {
-            int id = 2;
             long hash = 0;
             foreach (ILine li in Assemblage.Values)
-                hash += li.GetLongHashCode() * id++;
+                hash += li.GetLongHashCode();
             return hash;
         }
         /// <summary>

LinePutScript/Dictionary/Line_D.cs

@@ -748,11 +748,10 @@ public override void Load(string lps)
         /// <returns>64位哈希代码</returns>
         public override long GetLongHashCode()
         {
-            int id = 5;
             long hash = GetHashCode(Name) * 2 + GetHashCode(info) * 3 + GetHashCode(text) * 4;
             foreach (ISub su in Subs.Values)
             {
-                hash += su.GetLongHashCode() * id++;
+                hash += su.GetLongHashCode();
             }
             return hash;
         }

LinePutScript/Line.cs

@@ -559,11 +559,10 @@ public void ToString(StringBuilder str)
         /// <returns>64位哈希代码</returns>
         public override long GetLongHashCode()
         {
-            int id = 5;
             long hash = GetHashCode(Name) * 2 + GetHashCode(info) * 3 + GetHashCode(text) * 4;
             foreach (ISub su in Subs)
             {
-                hash += su.GetLongHashCode() * id++;
+                hash += su.GetLongHashCode();
             }
             return hash;
         }

LinePutScript/LpsDocument.cs

@@ -580,10 +580,9 @@ public override string ToString()
         /// <returns>64位哈希代码</returns>
         public long GetLongHashCode()
         {
-            int id = 2;
             long hash = 0;
             foreach (ILine li in Assemblage)
-                hash += li.GetLongHashCode() * id++;
+                hash += li.GetLongHashCode();
             return hash;
         }
         /// <summary>