修复一些情况下解析错误的问题

Funny-ppt · Jan 25, 2024 · 5722230 · 5722230
1 parent 146a687
commit 5722230
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/InfrastSim/Script/Parser.cs b/InfrastSim/Script/Parser.cs
@@ -14,6 +14,13 @@ private bool Match(TokenType type) {
         return false;
     }
 
+    private bool ConsumeNonContentLines() {
+        while (tokens.Current.Type == TokenType.NewLine || tokens.Current.Type == TokenType.Comment) {
+            tokens.MoveNext();
+        }
+        return tokens.Current.Type != TokenType.Final;
+    }
+
     private Script ParseScript() {
         tokens.Reset();
 
@@ -23,16 +30,14 @@ private Script ParseScript() {
 
         var statements = new List<Statement>();
         while (tokens.Current.Type != TokenType.Final) {
-            statements.Add(ParseStatement());
+            if (ConsumeNonContentLines()) {
+                statements.Add(ParseStatement());
+            }
         }
         return new(statements);
     }
 
     private Statement ParseStatement() {
-        while (tokens.Current.Type == TokenType.NewLine || tokens.Current.Type == TokenType.Comment) {
-            tokens.MoveNext();
-        }
-
         var command = ParseCommand();
         var parameters = new List<Parameter>();
         while (tokens.Current.Type == TokenType.String) {