From a15d007a02d0414e022d7e3d06aede4ea12ef9df Mon Sep 17 00:00:00 2001
From: 10xJSChad <48174610+10xJSChad@users.noreply.github.com>
Date: Sat, 24 Jul 2021 05:39:52 +0200
Subject: [PATCH] Important change to nested if statements.

---
 interpreter.py | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/interpreter.py b/interpreter.py
index c95067d..11341ee 100644
--- a/interpreter.py
+++ b/interpreter.py
@@ -9,7 +9,7 @@
 funcName = ""
 funcCode = []
 recordCode = False
-skip = False
+skip = 0
 
 #Strips leading spaces
 def stripSpaces(cmd):
@@ -30,12 +30,13 @@ async def parseCommand(cmd):
     cmd = cmd.lower() #Converts the line to lowercase to prepare it for further parsing
     splitCmd = cmd.split(" ") #Splits the string by space to prepare for further parsing
     
-    if splitCmd[0] == "end" and splitCmd[1] == "if" and skip == True: #Checks if the first word in the splitCmd list is "end", then checks if
-        #the second word is "if", marking the end of an if statement.
-        skip = False #Sets the skip variable to false, making the interpreter stop ignoring future lines of BulbScript code.
+    if splitCmd[0] == "if" and skip > 0: #Increments the skip variable, this is needed for nested conditionals to work
+        skip += 1 
+    if splitCmd[0] == "end" and splitCmd[1] == "if" and skip > 0: #Decrements it on an "end if" statement
+        skip -= 1 
         
-    if skip: return
-    
+    if skip > 0: return
+
     if recordCode: funcCode.append(cmd) #Appends lines of BulbScript code to the funcCode list if a function has been declared    
     if splitCmd[0] == "func":
         funcName = splitCmd[1] #Sets the function name to the first word after a space
@@ -94,7 +95,7 @@ async def parseCommand(cmd):
         if splitCmd[0] == "stop":
             return "stop"
         if splitCmd[0] == "if":
-            skip = not (bulbVariables.compareVariable(splitCmd[1], splitCmd[3], splitCmd[2]))     
+            if not (bulbVariables.compareVariable(splitCmd[1], splitCmd[3], splitCmd[2])): skip += 1 
     
 async def parseCode(codeToParse, runOnce=False):
     loop = True
@@ -115,4 +116,4 @@ async def parseCode(codeToParse, runOnce=False):
      
 sys.path.append('/bulbScript_functions')
 sys.path.append('/user_functions')
-asyncio.run(initialize(open("bulbScript_scripts/" + config.loadedScript, "r")))
+asyncio.run(initialize(open("bulbScript_scripts/" + config.loadedScript, "r")))
\ No newline at end of file