Fix bug in 'if' evaluation where else blocks wouldn't be skipped if t…

…he first 'if' condition was true
ethanmoffat · Feb 7, 2022 · 6bbc99c · 6bbc99c
1 parent 3f3ace5
commit 6bbc99c
Showing 1 changed file with 23 additions and 12 deletions.
diff --git a/EOBot/Interpreter/States/IfEvaluator.cs b/EOBot/Interpreter/States/IfEvaluator.cs
@@ -22,7 +22,13 @@ public override async Task<(EvalResult, string, BotToken)> EvaluateAsync(Program
             if (result == EvalResult.Ok)
             {
                 if (bool.TryParse(token.TokenValue, out var conditionValue) && conditionValue)
-                    return await EvaluateBlockAsync(input);
+                {
+                    var ifRes = await EvaluateBlockAsync(input);
+                    if (ifRes.Item1 == EvalResult.Ok)
+                        SkipElseBlocks(input);
+
+                    return ifRes;
+                }
 
                 SkipBlock(input);
 
@@ -37,17 +43,7 @@ public override async Task<(EvalResult, string, BotToken)> EvaluateAsync(Program
                         return elseIfRes;
                     else if (elseIfRes.Result == EvalResult.Ok)
                     {
-                        while (input.Expect(BotTokenType.NewLine)) ;
-
-                        // skip the rest of the following blocks if evaluated
-                        while (IsElse(input))
-                        {
-                            input.Expect(BotTokenType.Keyword);
-                            SkipBlock(input);
-                            while (input.Expect(BotTokenType.NewLine)) ;
-                        }
-
-                        RestoreLastNewline(input);
+                        SkipElseBlocks(input);
                         return elseIfRes;
                     }
 
@@ -65,5 +61,20 @@ private bool IsElse(ProgramState input)
             var current = input.Current();
             return current.TokenType == BotTokenType.Keyword && current.TokenValue == "else";
         }
+
+        private void SkipElseBlocks(ProgramState input)
+        {
+            while (input.Expect(BotTokenType.NewLine)) ;
+
+            // skip the rest of the following blocks if evaluated
+            while (IsElse(input))
+            {
+                input.Expect(BotTokenType.Keyword);
+                SkipBlock(input);
+                while (input.Expect(BotTokenType.NewLine)) ;
+            }
+
+            RestoreLastNewline(input);
+        }
     }
 }