[WIP] SimaiParser重写 Part 2

Author: Starrah

parser/simai/ErrorStrategy.cs

@@ -108,7 +108,8 @@ protected override IToken SingleTokenDeletion(Parser recognizer)
 
     private HashSet<int> insertionForbidden = [
         SimaiLexer.COMMA, SimaiLexer.KEY, SimaiLexer.SLIDE_TYPE, SimaiLexer.TOUCH_AREA, SimaiLexer.INT,
-        SimaiLexer.CHART_END, SimaiLexer.MODIFIER, SimaiLexer.FALSE_EACH
+        SimaiLexer.CHART_END, SimaiLexer.FALSE_EACH, 
+        SimaiLexer.MODIFIER, SimaiLexer.NO_STAR, SimaiLexer.STAR_TO_TAP, SimaiLexer.TAP_TO_STAR
     ]; // 逗号，和不确定的可能引起歧义的符号，一律不允许补充
 
     protected override IToken GetMissingSymbol(Parser recognizer)

parser/simai/Simai.g4

@@ -31,8 +31,7 @@ number: int ('.' int)?;
 CHART_END: 'E';// 谱面结束那个E
 
 MODIFIER: [bxf]; // 语法层不去检查modifier和tap/hold的搭配和合理性，都丢给语义层去搞
-
-modifiers: (MODIFIER | TAP_TO_STAR)*;
+modifiers: (MODIFIER | TAP_TO_STAR | STAR_TO_TAP | NO_STAR)*;
 
 // ---------------------------------------------------------------------------
 // 语法
@@ -76,7 +75,7 @@ slideDuration: '[' (
 waitTime: number;
 asBpm: number;
 
-slide: tap (NO_STAR | STAR_TO_TAP)? slideBody;
+slide: tap slideBody;
 sharedHeadSlide: '*' slideBody;
 
 slideBody // 根据Simai文档规定，分为两种情况