[F] 修一些小bug，把目测到的MA2Parser的bug都修了

Author: Starrah

chart/Slide.cs

@@ -78,7 +78,7 @@ private string DebuggerDisplay()
         else if (Head != null) result = Head.DebuggerDisplay();
         else result = Key.ToString();
         if (Head != null && !(Head is Star)) result += "@"; // Tap形状的头
-        else if (Head == null) result += "?"; // 无头
+        else if (Head == null && SharedHeadWith == null) result += "?"; // 无头
 
         var segStart = Key;
         foreach (var s in segments)

parser/MA2Parser.cs

@@ -63,7 +63,7 @@ private void WarnParamsCount(int lineNo, ReadOnlySpan<char> line, Rational? time
             else if (cmd is "FES_MODE" or "BPM_DEF" or "GENERATED_BY" && AssertInHeader(lineNo, line)) {} // 这些不用解析，无事可做
             else if (cmd == "RESOLUTION" && AssertInHeader(lineNo, line)) 
                 RSL = int.Parse(values[1]);
-            else if (cmd == "CLOCK_DEF" && AssertInHeader(lineNo, line))
+            else if (cmd == "CLK_DEF" && AssertInHeader(lineNo, line))
                 chart.ClockCount = int.Parse(values[1]) / (RSL / 4);
             // BPM和MET
             else if (cmd == "BPM" && values.Length == 4 && int.TryParse(values[1], out var bbar) && 
@@ -109,7 +109,7 @@ private void WarnParamsCount(int lineNo, ReadOnlySpan<char> line, Rational? time
                 }
                 else if (cc == "THO" && values.Length >= 8 && int.TryParse(values[4], out len))
                 {
-                    note = new TouchHold(chart, time) { TouchArea = values[4]+key, IsFirework = values[5] == "1", TouchSize = values[6]};
+                    note = new TouchHold(chart, time) { TouchArea = values[5]+key, IsFirework = values[6] == "1", TouchSize = values[7]};
                     var duration = new Duration(note) { Bar = new Rational(len, RSL) };
                     note.Duration = duration;
                     if (values.Length != 8) WarnParamsCount(lineNo, line, time);
@@ -125,7 +125,7 @@ private void WarnParamsCount(int lineNo, ReadOnlySpan<char> line, Rational? time
                         // 查找到前面的星星
                         var a = _slides.GetValueOrDefault((time, key));
                         if (a == null || a.Count == 0) Fail(Locale.MA2CNSlideNoPrevious, lineNo, line);
-                        slide = a[0];
+                        slide = a![0];
                         a.RemoveAt(0); // 移除出来，因为一会会按照新的结束时间加回去
                     }
                     else
@@ -212,8 +212,8 @@ void pair()
         {
             for (int i = 0; i < 8; i++)
             {
-                var pairedTap = taps[i];
-                if (pairedTap == null) continue;
+                if (taps[i] == null || slideLists[i].Count == 0) continue; // 当前时刻、当前键位不是星星和tap都有，所以不配对
+                var pairedTap = taps[i]!;
                 toRemove.Add(pairedTap);
                 for (int j = 0; j < slideLists[i].Count; j++)
                 {
@@ -236,7 +236,7 @@ void pair()
             } 
             else if (note.Time < now) throw Utils.Fail("时间倒流，说明Chart.Sort写错了");
 
-            if (note is Tap tap) taps[tap.Key - 1] ??= tap; // 只有在数组中原本为空的情况下才set。不然不set。这是因为万一有人写宴谱，在同一时刻同一键位上塞了大于一个tap（这显然是无理）怎么办（x）
+            if (note is Tap tap and not Hold) taps[tap.Key - 1] ??= tap; // 只有在数组中原本为空的情况下才set。不然不set。这是因为万一有人写宴谱，在同一时刻同一键位上塞了大于一个tap（这显然是无理）怎么办（x）
             else if (note is Slide slide) slideLists[slide.Key - 1].Add(slide);
         }
         pair(); // 最后一个时刻

tests/自制谱测试.cs

@@ -96,7 +96,7 @@ private static (int, int, string) GetSlideTime(string slide)
     private static bool CompareLine(string exp, string act)
     {
         var result = string.Equals(exp, act, StringComparison.Ordinal);
-        if (!result && exp[..5] == act[..5] && SlideTypeTool.IsSlide(exp))
+        if (!result && exp[..5] == act[..5] && SlideTypeTool.IsSlide(exp[2..5]))
         { // 如果是星星，则允许一定范围的误差。具体而言：
             var (expTime, expLen, expExtra) = GetSlideTime(exp);
             var (actTime, actLen, actExtra) = GetSlideTime(act);

utils/Enum.cs

@@ -97,6 +97,6 @@ public static SlideType FromSimai(string s, int? startKey)
 
     public static bool IsSlide(string MA2Name)
     {
-        return SlideNames.Contains(MA2Name[2..5]);
+        return SlideNames.Contains(MA2Name);
     }
 }

utils/Utils.cs

@@ -1,4 +1,5 @@
 using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Reflection;
 
@@ -20,7 +21,7 @@ public static Exception Fail(string msg = "")
 
     public static void SetLocale(CultureInfo culture) => Locale.Culture = culture;
 
-    public static void Add<K, V>(this Dictionary<K, List<V>> dict, K key, V value)
+    public static void Add<K, V>(this Dictionary<K, List<V>> dict, K key, V value) where K : notnull
     {
         if (!dict.ContainsKey(key)) dict[key] = new();
         dict[key].Add(value);