[+] SimaiParser重写完成

Starrah · Starrah · commit 39b33fcbffb7 · 2026-04-23T15:02:11.000+08:00
diff --git a/Program.cs b/Program.cs
@@ -26,6 +26,9 @@ private static int Main(string[] args)
         {
             PrintAlerts(ex.Alerts, "转换失败：");
             Console.Error.WriteLine("转换失败！报错详见如上。您可以通过 https://github.com/MuNet-OSS/MuConvert/issues 反馈问题。");
+#if DEBUG
+            Console.Error.WriteLine(ex);
+#endif
             return 1;
         }
         catch (Exception ex) when (ex is ArgumentException or IOException or UnauthorizedAccessException)
diff --git a/i18n/Locale.Designer.cs b/i18n/Locale.Designer.cs
diff --git a/i18n/Locale.resx b/i18n/Locale.resx
@@ -190,6 +190,9 @@
   <data name="RecoverInlineExtraneousToken" xml:space="preserve">
     <value>Extraneous token: {0} (typo?). Ignored.</value>
   </data>
+  <data name="RecoverInlineExtraneousTokenStrict" xml:space="preserve">
+    <value>Extraneous token: {0} (typo?)</value>
+  </data>
   <data name="RecoverInlineMissingToken" xml:space="preserve">
     <value>Missing token {1} before {0} (typo?). Inserted automatically.</value>
   </data>
diff --git a/i18n/Locale.zh-hans.resx b/i18n/Locale.zh-hans.resx
@@ -190,6 +190,9 @@
   <data name="RecoverInlineExtraneousToken" xml:space="preserve">
     <value>多余的符号: {0} (是不是手滑按错了？)，已忽略该符号。</value>
   </data>
+  <data name="RecoverInlineExtraneousTokenStrict" xml:space="preserve">
+    <value>多余的符号: {0} (是不是手滑按错了？)</value>
+  </data>
   <data name="RecoverInlineMissingToken" xml:space="preserve">
     <value>在 {0} 前似乎缺失了符号 {1} (是不是漏打了？)，已尝试帮您补全。</value>
   </data>
diff --git a/i18n/Locale.zh-hant.resx b/i18n/Locale.zh-hant.resx
@@ -190,6 +190,9 @@
   <data name="RecoverInlineExtraneousToken" xml:space="preserve">
     <value>多餘的符號: {0}（是否手誤？），已忽略該符號。</value>
   </data>
+  <data name="RecoverInlineExtraneousTokenStrict" xml:space="preserve">
+    <value>多餘的符號: {0}（是否手誤？）</value>
+  </data>
   <data name="RecoverInlineMissingToken" xml:space="preserve">
     <value>在 {0} 前似乎缺失了符號 {1}（是否漏打？），已嘗試為您補全。</value>
   </data>
diff --git a/parser/simai/ErrorStrategy.cs b/parser/simai/ErrorStrategy.cs
@@ -3,8 +3,9 @@
 using MuConvert.Antlr;
 using MuConvert.utils;
 using static MuConvert.utils.Alert.LEVEL;
+using L = MuConvert.Antlr.SimaiLexer;
 
-namespace MuConvert.parser;
+namespace MuConvert.parser.simai;
 
 public class ErrorListener(SimaiParser simaiParser): BaseErrorListener, IAntlrErrorListener<int>
 {
@@ -18,14 +19,14 @@ public override void SyntaxError(TextWriter output, IRecognizer recognizer, ITok
             {
                 simaiParser.alerts.Add(new Alert(Warning, 
                     string.Format(Locale.RecoverInlineExtraneousToken, GetTokenErrorDisplay(offendingSymbol)), 
-                    line: line, relevantNote: _contextText(parser.Context)));
+                    line: line, relevantNote: RelevantNote(parser.Context)));
                 return;
             }
             else if (msg.StartsWith("missing"))
             {
                 simaiParser.alerts.Add(new Alert(Warning, 
                     string.Format(Locale.RecoverInlineMissingToken, GetTokenErrorDisplay(offendingSymbol), parser.GetExpectedTokens().ToString(parser.Vocabulary)), 
-                    line: line, relevantNote: _contextText(parser.Context)));
+                    line: line, relevantNote: RelevantNote(parser.Context)));
                 return;
             }
         }
@@ -48,7 +49,7 @@ public override void SyntaxError(TextWriter output, IRecognizer recognizer, ITok
                 message = string.Format(Locale.AntlrUnknownError, msg);
                 break;
         }
-        simaiParser.alerts.Add(new Alert(level, message, line: line, relevantNote: _contextText(parser.Context)));
+        simaiParser.alerts.Add(new Alert(level, message, line: line, relevantNote: RelevantNote(parser.Context)));
     }
 
     // 词法分析的错误报告函数
@@ -73,7 +74,7 @@ public void SyntaxError(TextWriter output, IRecognizer recognizer, int offending
     }
 
     // 从context获得为适合放进relevantNote里的形式
-    private string? _contextText(RuleContext? context)
+    private static string? RelevantNote(RuleContext? context)
     {
         while (true)
         {
@@ -98,26 +99,29 @@ private class _ES : DefaultErrorStrategy
 /**
  * 最宽松的ErrorStrategy，尽全力恢复不让谱面整个垮掉
  */
-public class LaxErrorStrategy : DefaultErrorStrategy
+public class LaxErrorStrategy(SimaiParser simaiParser) : DefaultErrorStrategy
 {
     protected override IToken SingleTokenDeletion(Parser recognizer)
     {
-        if (recognizer.CurrentToken?.Type == SimaiLexer.COMMA) return null!; // 不准删逗号
+        if (recognizer.CurrentToken?.Type == L.COMMA) return null!; // 不准删逗号
         return base.SingleTokenDeletion(recognizer);
     }
 
     private HashSet<int> insertionForbidden = [
-        SimaiLexer.COMMA, SimaiLexer.KEY, SimaiLexer.SLIDE_TYPE, SimaiLexer.TOUCH_AREA, SimaiLexer.INT,
-        SimaiLexer.CHART_END, SimaiLexer.FALSE_EACH, 
-        SimaiLexer.MODIFIER, SimaiLexer.NO_STAR, SimaiLexer.STAR_TO_TAP, SimaiLexer.TAP_TO_STAR
-    ]; // 逗号，和不确定的可能引起歧义的符号，一律不允许补充
+        L.KEY, L.SLIDE_TYPE, L.TOUCH_AREA, L.INT, L.CHART_END, L.FALSE_EACH, 
+        L.MODIFIER, L.NO_STAR, L.STAR_TO_TAP, L.TAP_TO_STAR
+    ]; // 不确定的可能引起歧义的符号，一律不允许补充
+    private HashSet<int> insertCommaOnlyWhen = [_literals["("], _literals["{"]];
     
     protected override IToken GetMissingSymbol(Parser recognizer)
     {
         IToken currentToken = recognizer.CurrentToken;
         
         // 不准插入insertionForbidden里提到的元素
-        var insertionCandidates = GetExpectedTokens(recognizer).ToList().Where(x => !insertionForbidden.Contains(x)).ToList();
+        var insertionCandidates = GetExpectedTokens(recognizer).ToList()
+            .Where(x => !insertionForbidden.Contains(x)) // 上述黑名单中的不准插入
+            .Where(x => x != L.COMMA || insertCommaOnlyWhen.Contains(recognizer.InputStream.LA(1))) // 逗号，只准在后面跟着的是'('或'{'的情况下才准插入
+            .ToList();
         if (insertionCandidates.Count == 0) throw new InputMismatchException(recognizer); // 等价于SingleTokenInsertion返回false的情况，recoverInline失败、转交给上层recover处理
         int minElement = insertionCandidates[0];
         
@@ -129,10 +133,21 @@ protected override IToken GetMissingSymbol(Parser recognizer)
         return this.ConstructToken(((ITokenStream) recognizer.InputStream).TokenSource, minElement, tokenText, current);
     }
 
+    protected override void ReportMissingToken(Parser recognizer)
+    {
+        try
+        { // 如果稍后GetMissingSymbol时将会被拒绝（抛异常），则跳过警告日志的打印，反正会去打印InputMismatch
+            GetMissingSymbol(recognizer);
+            base.ReportMissingToken(recognizer);
+        } 
+        catch (InputMismatchException) {} // ignored 
+    }
+
     private static Dictionary<string, int> _literals = Enumerable.Range(1, SimaiLexer.ruleNames.Length)
-        .ToDictionary(i => SimaiLexer.DefaultVocabulary.GetLiteralName(i), i => i);
+        .Where(i=>SimaiLexer.DefaultVocabulary.GetLiteralName(i) != null)
+        .ToDictionary(i => SimaiLexer.DefaultVocabulary.GetLiteralName(i)[1..^1], i => i);
     private List<int> recoverySetAllowed = [
-        SimaiLexer.COMMA, SimaiLexer.FALSE_EACH, _literals["'/'"], _literals["'('"], _literals["'{'"]
+        L.COMMA, L.FALSE_EACH, _literals["/"], _literals["("], _literals["{"]
     ]; // recover时，为了确保整个吞掉不合法的音符，而不是出现残缺的东西导致parser报错，只准同步到上面这些字符当中
     
     public override void Recover(Parser recognizer, RecognitionException e)
@@ -155,7 +170,7 @@ public override void Recover(Parser recognizer, RecognitionException e)
 /**
  * 允许recoverInline，但是禁止大范围recover。
  */
-public class ModerateErrorStrategy : LaxErrorStrategy
+public class ModerateErrorStrategy(SimaiParser simaiParser) : LaxErrorStrategy(simaiParser)
 {
     private BailErrorStrategy _bail = new();
     
diff --git a/parser/simai/Simai.g4 b/parser/simai/Simai.g4
@@ -47,9 +47,9 @@ FALSE_EACH: '`';
 eachSeparators: '/' | FALSE_EACH+;
 eachNote: eachSeparators note;
 
-bpmTag: '(' number ')';
-absulouteStepTag: '{' '#' number '}';
-metTag: '{' int '}';
+bpmTag: (lp+='(')+ number (rp+=')')+;
+absulouteStepTag: (lp+='{')+ '#' number (rp+='}')+;
+metTag: (lp+='{')+ int (rp+='}')+;
 
 note: slide (sharedHeadSlide)* | tap | KEY+ | hold | touch | touchHold; // tap+是因为，simai允许123这种语法、和1/2/3是等价的，但仅限tap之间。
 
@@ -62,16 +62,16 @@ touch: TOUCH_AREA modifiers;
 
 touchHold: TOUCH_AREA modifiers 'h' modifiers (duration modifiers)?;
 
-duration: '[' (beats | '#' number) ']';
+duration: (lp+='[')+ (beats | '#' number) (rp+=']')+;
 beats: int ':' int;
     
-slideDuration: '[' (
+slideDuration: (lp+='[')+ (
         beats
         | '#' number
         | waitTime '##' asBpm '#' (beats | number)
         | waitTime '##' (beats | number)
         | asBpm '#' (beats | number)
-    ) ']';
+    ) (rp+=']')+;
 waitTime: number;
 asBpm: number;
 
diff --git a/parser/simai/SimaiParser.cs b/parser/simai/SimaiParser.cs
@@ -3,6 +3,7 @@
 using Antlr4.Runtime.Tree;
 using MuConvert.Antlr;
 using MuConvert.chart;
+using MuConvert.parser.simai;
 using MuConvert.utils;
 using Rationals;
 using static MuConvert.utils.Alert.LEVEL;
@@ -77,12 +78,14 @@ private string Preprocess(string text)
         try
         { // 词语法分析
             var inputStream = new AntlrInputStream(text);
-            var lexer = new SimaiLexer(inputStream) { ErrorListeners = { new ErrorListener(this) } };
+            var lexer = new SimaiLexer(inputStream);
+            lexer.RemoveErrorListeners();
+            lexer.AddErrorListener(new ErrorListener(this));
             var tokens = new CommonTokenStream(lexer);
-            var parser = new P(tokens) // MuConvert.Antlr.SimaiParser
-            {
-                ErrorHandler = ErrorStrategy(), ErrorListeners = { new ErrorListener(this) }
-            };
+            
+            var parser = new P(tokens) { ErrorHandler = ErrorStrategy() }; // MuConvert.Antlr.SimaiParser
+            parser.RemoveErrorListeners();
+            parser.AddErrorListener(new ErrorListener(this));
             root = parser.chart();
         }
         catch (Antlr4.Runtime.Misc.ParseCanceledException e)
@@ -116,10 +119,10 @@ private IAntlrErrorStrategy ErrorStrategy()
             case StrictLevelEnum.Strict:
                 return new BailErrorStrategy();
             case StrictLevelEnum.Lax:
-                return new LaxErrorStrategy();
+                return new LaxErrorStrategy(this);
             case StrictLevelEnum.Normal:
             default:
-                return new ModerateErrorStrategy();
+                return new ModerateErrorStrategy(this);
         }
     }
 
@@ -149,6 +152,16 @@ private void AddDefaultBpm()
         chart.BpmList.Add(new BPM(now, defaultStartBpm));
     }
 
+    private static bool SubtreeHasException(ParserRuleContext root)
+    {
+        if (root.exception != null) return true;
+        foreach (var child in root.children ?? Array.Empty<IParseTree>())
+        {
+            if (child is ParserRuleContext pr && SubtreeHasException(pr)) return true;
+        }
+        return false;
+    }
+
     public sealed override object VisitNotations(P.NotationsContext context)
     { // 形如 (120){4}1/1 算作一组notations
         foreach (var child in context.children ?? [])
@@ -178,14 +191,34 @@ public sealed override object VisitNotations(P.NotationsContext context)
         return true;
     }
 
+    private void WarnMoreParentheses(IList<IToken> ps)
+    {
+        if (ps.Count <= 1) return;
+        var extraStr = "'" + string.Join("", ps.Skip(1).Select(x => x.Text)) + "'";
+        if (StrictLevel == StrictLevelEnum.Strict)
+        { // 严格模式，抛异常
+            AddAlert(Error, string.Format(Locale.RecoverInlineExtraneousTokenStrict, extraStr));
+            throw new ConversionException(alerts);
+        }
+        else AddAlert(Warning, string.Format(Locale.RecoverInlineExtraneousToken, extraStr));
+    }
+    
+    private void WarnMoreParentheses(IList<IToken> lp, IList<IToken> rp)
+    {
+        WarnMoreParentheses(lp);
+        WarnMoreParentheses(rp);
+    }
+
     public sealed override object VisitAbsulouteStepTag(P.AbsulouteStepTagContext context)
     {
-        if (context.exception != null) return false; // 如果本节点下有异常，则直接整个吞掉，（避免具体的规则遇到不完整子树、爆出更不可预测的错误）
+        if (SubtreeHasException(context)) return false; // 如果本节点下有异常，则直接整个吞掉，（避免具体的规则遇到不完整子树、爆出更不可预测的错误）
         if (!absoluteTimeStepWarned)
         {
             AddAlert(Warning, string.Format(Locale.AbsoluteStepUsed, context.GetText()), context);
             absoluteTimeStepWarned = true;
         }
+        currContext = context;
+        WarnMoreParentheses(context._lp, context._rp);
         absoluteTimeStep = (decimal)VisitNumber(context.number());
         var currentBpm = chart.BpmList.Last().Bpm;
         step = (Rational)absoluteTimeStep / (240 / (Rational)currentBpm);
@@ -194,8 +227,9 @@ public sealed override object VisitAbsulouteStepTag(P.AbsulouteStepTagContext co
 
     public sealed override object VisitBpmTag(P.BpmTagContext context)
     {
-        if (context.exception != null) return false; // 如果本节点下有异常，则直接整个吞掉，（避免具体的规则遇到不完整子树、爆出更不可预测的错误）
+        if (SubtreeHasException(context)) return false; // 如果本节点下有异常，则直接整个吞掉，（避免具体的规则遇到不完整子树、爆出更不可预测的错误）
         currContext = context;
+        WarnMoreParentheses(context._lp, context._rp);
         var bpm = (decimal)VisitNumber(context.number());
         chart.BpmList.Add(new BPM(now, bpm));
         if (absoluteTimeStep != null)
@@ -207,8 +241,9 @@ public sealed override object VisitBpmTag(P.BpmTagContext context)
 
     public sealed override object VisitMetTag(P.MetTagContext context)
     { // metTag指的是标记分音的tag，如{4}
-        if (context.exception != null) return false; // 如果本节点下有异常，则直接整个吞掉，（避免具体的规则遇到不完整子树、爆出更不可预测的错误）
+        if (SubtreeHasException(context)) return false; // 如果本节点下有异常，则直接整个吞掉，（避免具体的规则遇到不完整子树、爆出更不可预测的错误）
         currContext = context;
+        WarnMoreParentheses(context._lp, context._rp);
         var quaver = int.Parse(context.@int().GetText());
         step = new Rational(1, quaver);
         absoluteTimeStep = null;
@@ -266,7 +301,7 @@ public sealed override object VisitNote(P.NoteContext context)
         // 注：这个函数返回的是List<Note>，因为ANTLR中的NoteContext，虽然大多数时候只对应一个Note，但有时也可能是两个以上！
         // 具体而言，两种情况：1. "1234"这种simai允许的tap多押简略记法（等价于"1/2/3/4"）
         // 2. 同头星星如"1-2[2:1]*-3[2:1]"，它在我们定义的ANTLR语法中是作为一个note节点的！
-        if (context.exception != null) return new List<Note>(); // 如果本节点下有异常，则直接整个吞掉，（避免具体的规则遇到不完整子树、爆出更不可预测的错误）
+        if (SubtreeHasException(context)) return new List<Note>(); // 如果本节点下有异常，则直接整个吞掉，（避免具体的规则遇到不完整子树、爆出更不可预测的错误）
         currContext = context;
         List<Note> result = [];
         foreach (var child in context.children)
@@ -326,7 +361,7 @@ private void ApplyModifiers(P.ModifiersContext[] modifiersList, Note note, bool
                 if (child is not ITerminalNode modifier) throw Utils.Fail("modifiers里面居然不是ITerminalNode");
                 var token = modifier.Symbol;
                 if (token.Text == "b" && note is not Touch) note.IsBreak = true;
-                else if (token.Text == "x" && note is Tap) note.IsEx = false;
+                else if (token.Text == "x" && note is Tap) note.IsEx = true;
                 else if (token.Text == "f" && note is Touch touch) touch.IsFirework = true;
                 else extraModifiers.Add(token);
             }
@@ -372,6 +407,7 @@ public sealed override object VisitDuration(P.DurationContext? context)
             result.InvariantBar = 0;
             return result;
         }
+        WarnMoreParentheses(context._lp, context._rp);
         if (context.beats() != null) result.InvariantBar = (Rational)VisitBeats(context.beats());
         else result.Seconds = (Rational)(decimal)VisitNumber(context.number());        
         return result;
@@ -417,6 +453,7 @@ public sealed override object VisitSlideDuration(P.SlideDurationContext context)
         var result = new Duration(currNote!);
         Duration? waitTime = null;
         isRealExactWaitTime = false;
+        WarnMoreParentheses(context._lp, context._rp);
 
         if (context.waitTime() != null)
         {

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,9 @@ private static int Main(string[] args)`
`26`	`26`	`{`
`27`	`27`	`PrintAlerts(ex.Alerts, "转换失败：");`
`28`	`28`	`Console.Error.WriteLine("转换失败！报错详见如上。您可以通过 https://github.com/MuNet-OSS/MuConvert/issues 反馈问题。");`
	`29`	`+#if DEBUG`
	`30`	`+ Console.Error.WriteLine(ex);`
	`31`	`+#endif`
`29`	`32`	`return 1;`
`30`	`33`	`}`
`31`	`34`	`catch (Exception ex) when (ex is ArgumentException or IOException or UnauthorizedAccessException)`