Ensure that "Current" token extension method returns EOF (last token)…

… if attempting to get a token outside the range of the program list
ethanmoffat · Feb 3, 2022 · c47ad1a · c47ad1a
1 parent ca470a6
commit c47ad1a
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/EOBot/Interpreter/Extensions/ProgramStateExtensions.cs b/EOBot/Interpreter/Extensions/ProgramStateExtensions.cs
@@ -19,6 +19,9 @@ public static bool MatchOneOf(this ProgramState input, params BotTokenType[] tok
 
         public static BotToken Current(this ProgramState input)
         {
+            if (input.ExecutionIndex >= input.Program.Count)
+                return input.Program[input.Program.Count - 1];
+
             return input.Program[input.ExecutionIndex];
         }
     }