[F] [SimaiParser] 对1-4[160#2]的正确解析

之前的逻辑实现有问题，看到`context.number()`(2)时，就会忽略`context.asBpm()`部分的内容，导致产生错误的结果。

Author: Starrah

parser/mai/SimaiParser.cs

@@ -520,9 +520,11 @@ public sealed override object VisitSlideDuration(P.SlideDurationContext context)
     {
         var result = new Duration(currNote!);
         Duration? waitTime = null;
-        isRealExactWaitTime = false;
+        isRealExactWaitTime = false; // 是否通过##，指定了绝对的等待时间值
+        Rational? anotherBpm = null; // 是否通过类似 160#8:3，指定了显式的BPM，且和当前的实际BPM不同 
         AlertIfMoreParentheses(context._lp, context._rp);
 
+        // 解析绝对的等待时间
         if (context.waitTime() != null)
         {
             waitTime = new Duration(currNote!)
@@ -531,19 +533,26 @@ public sealed override object VisitSlideDuration(P.SlideDurationContext context)
             };
             isRealExactWaitTime = true;
         }
+        
+        // 解析显式的BPM
+        if (context.asBpm() != null)
+        {
+            var currentBpm = chart.BpmList.Last().Bpm;
+            var bpm = (decimal)VisitNumber(context.asBpm().number());
+            if (bpm != currentBpm)
+            {
+                anotherBpm = (Rational)bpm;
+                if (waitTime == null) // 如果未显式指定绝对的waitTime秒数，则waitTime也要变成该强行指定的bpm下的一拍。不然默认就是currentBpm下的一拍了。
+                    waitTime = new Duration(currNote!) { Seconds = 60 / anotherBpm.Value };
+            }
+        }
+        
         if (context.number() != null) result.Seconds = (Rational)(decimal)VisitNumber(context.number());
         else
         {
             var value = (Rational)VisitBeats(context.beats());
-            if (context.asBpm() == null) result.InvariantBar = value;
-            else
-            {
-                // 根据强行指定的bpm换算为秒数
-                var bpm = (Rational)(decimal)VisitNumber(context.asBpm().number());
-                result.Seconds = value * (240 / bpm);
-                // 如果未显式指定waitTime，则waitTime也要变成强行指定的bpm下的一拍。不然就是音符所在时刻下的一拍了。
-                waitTime ??= new Duration(currNote!) { Seconds = 60 / bpm };
-            }
+            if (anotherBpm == null) result.InvariantBar = value;
+            else result.Seconds = value * (240 / anotherBpm.Value); // 显式指定了bpm的情况，需要根据强行指定的bpm换算为秒数
         }
         return (waitTime, result);
     }

tests/mai/MA2转Simai测试.cs

@@ -38,6 +38,10 @@ private void TestChart(TestInput c)
         var expectedTimeline = SimaiCommaTimeline.Flatten(inote);
         var actualTimeline = SimaiCommaTimeline.Flatten(simai);
         SimaiCommaTimeline.AssertTimelineEqual(expectedTimeline, actualTimeline, chart, _output);
+        
+        // 转出来的simai，重新parse一次、确保没有任何错误
+        var (_, alertsReparsed) = new SimaiParser(strictLevel: SimaiParser.StrictLevelEnum.Strict).Parse(simai);
+        Assert.Empty(alertsReparsed);
     }
 }
 

tests/mai/Simai转MA2测试.cs

@@ -30,10 +30,12 @@ private void TestChart(TestInput input)
         _output.WriteLine(string.Join('\n', alerts));
         _output.WriteLine(string.Join('\n', alerts2));
 
-        Assert.Equal(maidata.ClockCount * 96, TestUtils.TryParseMa2ClkDef(ma2));
-        ma2 = KeepNotesOnly(ma2);
-        expectedMa2 = KeepNotesOnly(expectedMa2);
-        AssertTextEqual(expectedMa2, ma2);
+        Assert.Equal(maidata.ClockCount * 96, TryParseMa2ClkDef(ma2));
+        AssertTextEqual(KeepNotesOnly(expectedMa2), KeepNotesOnly(ma2));
+        
+        // 转出来的MA2，重新parse一次、确保没有任何错误
+        var (_, alertsReparsed) = new MA2Parser().Parse(ma2);
+        Assert.Empty(alertsReparsed);
     }
 
     private static (int, int, string) GetSlideTime(string slide)

tests/mai/testset/片段/星星的各种指定时间方式.yaml

@@ -0,0 +1,14 @@
+simai: "(120){2}1-4[8:3],1-4[160#8:3],1-4[160#2],1-4[3##1.5],1-4[3##8:3],1-4[3##160#8:3],"
+ma2: |
+  NMSTR	0	0	0
+  NMSI_	0	0	0	96	144	3
+  NMSTR	0	192	0
+  NMSI_	0	192	0	72	108	3
+  NMSTR	1	0	0
+  NMSI_	1	0	0	72	384	3
+  NMSTR	1	192	0
+  NMSI_	1	192	0	576	288	3
+  NMSTR	2	0	0
+  NMSI_	2	0	0	576	144	3
+  NMSTR	2	192	0
+  NMSI_	2	192	0	576	108	3