Multiple match conditions

elamaunt · Jun 4, 2021 · ef9516b · ef9516b
1 parent 9f93d8c
commit ef9516b
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 19 deletions.
diff --git a/src/GDShrapt.Reader.Tests/ParsingTests.cs b/src/GDShrapt.Reader.Tests/ParsingTests.cs
@@ -399,9 +399,14 @@ public void MatchStatementTest()
             Assert.AreEqual("x", matchStatement.Value.ToString());
             Assert.AreEqual(3, matchStatement.Cases.Count);
 
-            Assert.AreEqual("1", matchStatement.Cases[0].Condition.ToString());
-            Assert.AreEqual("2", matchStatement.Cases[1].Condition.ToString());
-            Assert.AreEqual("\"test\"", matchStatement.Cases[2].Condition.ToString());
+            Assert.AreEqual(1, matchStatement.Cases[0].Conditions.Count);
+            Assert.AreEqual("1", matchStatement.Cases[0].Conditions[0].ToString());
+
+            Assert.AreEqual(1, matchStatement.Cases[1].Conditions.Count);
+            Assert.AreEqual("2", matchStatement.Cases[1].Conditions[0].ToString());
+
+            Assert.AreEqual(1, matchStatement.Cases[2].Conditions.Count);
+            Assert.AreEqual("\"test\"", matchStatement.Cases[2].Conditions[0].ToString());
 
             Assert.AreEqual(1, matchStatement.Cases[0].Statements.Count);
             Assert.AreEqual(1, matchStatement.Cases[1].Statements.Count);
@@ -436,11 +441,15 @@ public void MatchStatementTest2()
             Assert.AreEqual("x", matchStatement.Value.ToString());
             Assert.AreEqual(3, matchStatement.Cases.Count);
 
-            Assert.AreEqual("1", matchStatement.Cases[0].Condition.ToString());
-            Assert.AreEqual("2", matchStatement.Cases[1].Condition.ToString());
+            Assert.AreEqual(1, matchStatement.Cases[0].Conditions.Count);
+            Assert.AreEqual("1", matchStatement.Cases[0].Conditions[0].ToString());
+
+            Assert.AreEqual(1, matchStatement.Cases[1].Conditions.Count);
+            Assert.AreEqual("2", matchStatement.Cases[1].Conditions[0].ToString());
 
-            Assert.IsInstanceOfType(matchStatement.Cases[2].Condition, typeof(GDVariableDeclarationExpression));
-            Assert.AreEqual("var new_var", matchStatement.Cases[2].Condition.ToString());
+            Assert.AreEqual(1, matchStatement.Cases[2].Conditions.Count);
+            Assert.IsInstanceOfType(matchStatement.Cases[2].Conditions[0], typeof(GDVariableDeclarationExpression));
+            Assert.AreEqual("var new_var", matchStatement.Cases[2].Conditions[0].ToString());
 
             Assert.AreEqual(1, matchStatement.Cases[0].Statements.Count);
             Assert.AreEqual(1, matchStatement.Cases[1].Statements.Count);

diff --git a/src/GDShrapt.Reader/Declarations/GDMatchCaseDeclaration.cs b/src/GDShrapt.Reader/Declarations/GDMatchCaseDeclaration.cs
@@ -9,7 +9,7 @@ public class GDMatchCaseDeclaration : GDNode
         bool _expressionEnded;
         bool _statementsChecked;
 
-        public GDExpression Condition { get; set; }
+        public List<GDExpression> Conditions { get; } = new List<GDExpression>();
         public List<GDStatement> Statements { get; } = new List<GDStatement>();
 
         internal GDMatchCaseDeclaration(int lineIntendation)
@@ -26,21 +26,16 @@ internal override void HandleChar(char c, GDReadingState state)
             if (IsSpace(c))
                 return;
 
-            if (Condition == null)
+            if (c == ':' || _expressionEnded)
             {
-                state.PushNode(new GDExpressionResolver(expr => Condition = expr));
-                state.PassChar(c);
+                _expressionEnded = true;
                 return;
             }
 
-            if (!_expressionEnded)
-            {
-                if (c != ':')
-                    return;
+            state.PushNode(new GDExpressionResolver(expr => Conditions.Add(expr)));
 
-                _expressionEnded = true;
-                return;
-            }
+            if (c != ',')
+                state.PassChar(c);
         }
 
         internal override void HandleLineFinish(GDReadingState state)
@@ -58,7 +53,7 @@ internal override void HandleLineFinish(GDReadingState state)
 
         public override string ToString()
         {
-            return $@"{Condition}:
+            return $@"{string.Join(", ", Conditions.Select(x => x.ToString()))}:
     {string.Join("\n\t", Statements.Select(x => x.ToString()))}";
         }
     }