[FIX] split JUMP into parts, match condition, jump_to_locationname

Week 7 Libraries and More Python/{21. Own programming language, Part 4: Condition clause → [FIXED]21. Own programming language, Part 4: Condition clause}

@@ -7,7 +7,7 @@ in addition to the properties of the previous functions:
 
 JUMP place IF variable==value
 Code execution will continue from the named location after the command if the value of the given variable satisfies the condition. 
-You can assume that the value is a constant value (not another variable). 
+You can assume that the value is a CONSTANT VALUE (not another variable). 
 Also, the program does not need to understand anything other than the equality operator. 
 
 
@@ -16,10 +16,10 @@ Example programs for testing instructions:
 
 Program:
 LET a=13
-JUMP end IF a==13
-INC a 10
-INC a 15
-LABEL end
+JUMP end IF a==13 # if variable matches the condition, JUMP to the 'end' LABEL
+INC a 10          # SKIP THIS LINE if JUMP. It is in between the JUMP and LABEL end lines
+INC a 15          # SKIP THIS LINE if JUMP. It is in between the JUMP and LABEL end lines
+LABEL end         # JUMP here
 PRINT a
 
 Execution of the program returns:
@@ -31,11 +31,14 @@ Execution of the program returns:
 
 Program:
 LET a=27
-LABEL start
+
+LABEL start       # from below
 PRINT a
 INC a 1
-JUMP end IF a==32
-GOTO start
+JUMP end IF a==32 # if variable matches the condition, JUMP to the 'end' LABEL
+
+GOTO start        # SKIP THIS LINE if JUMP. It is in between the JUMP and LABEL end lines. If not JUMPing, go up to 'start' LABEL
+
 LABEL end
 
 Program execution returns:
@@ -52,11 +55,14 @@ Program execution returns:
 Programme:
 LET c=12
 LET d=1
+
 LABEL loop
 PRINT c
 DEC c d
-JUMP continue IF c==1
-GOTO loop
+JUMP continue IF c==1 # if variable matches the condition, JUMP to the 'continue' LABEL
+
+GOTO loop             # SKIP THIS LINE if JUMP. It is in between the JUMP and LABEL end lines. If not JUMPing, go up to 'loop' LABEL
+
 LABEL continue
 
 Program execution returns:
@@ -86,9 +92,6 @@ def execute(code: str) -> str:
     variables = {'a': 0, 'b': 0, 'c': 0, 'd': 0}
     output = []
 
-    ###################
-    # Refactored for this exercise to keep track of line number for LABEL 
-    ###################
     # Split the code into lines and strip whitespace
     lines = [line.strip() for line in code.split('\n')]
     
@@ -108,7 +111,6 @@ def execute(code: str) -> str:
         if not line:
             i += 1
             continue
-        ###################
         
         if line.startswith('LET'):
             _, assignment = line.split(' ', 1)
@@ -165,6 +167,7 @@ def execute(code: str) -> str:
             else:
                 raise ValueError(f"Invalid command format: {line}")
         ##########################################
+        
         ##########################################
         # 20. part 3
         ##########################################
@@ -180,6 +183,35 @@ def execute(code: str) -> str:
                 raise ValueError(f"Undefined label: {location}")
         ##########################################
         
+        ##########################################
+        # 21. part 4
+        ##########################################
+        elif line.startswith('JUMP'):
+            parts = line.split()
+            
+            # eg JUMP end IF a==13 --becomes--> ['JUMP','end','IF','a==13']
+            # Format: JUMP jump_to_locationname IF variable==value
+            jump_to_locationname = parts[1]
+            condition = parts[3]  
+            var, value = condition.split('==')
+            
+            # Check if the variable exists
+            if var not in variables:
+                raise ValueError(f"Undefined variable: {var}")
+            
+            # Check the condition
+            if variables[var] == int(value):
+                # Jump to the specified label
+                if jump_to_locationname in labels:
+                    i = labels[jump_to_locationname]
+                else:
+                    raise ValueError(f"Undefined label: {jump_to_locationname}")
+            else:
+                # Continue to the next line
+                i += 1
+        
+        ##########################################
+        
         else:
             raise ValueError(f"Invalid command: {line}")
             
@@ -200,6 +232,11 @@ INC a 15
 LABEL end
 PRINT a'''
 
+print(execute(eg1))
+13
+
+
+
 
 
 
@@ -212,6 +249,16 @@ JUMP end IF a==32
 GOTO start
 LABEL end'''
 
+print(execute(eg2))
+27
+28
+29
+30
+31
+
+
+
+
 
 
 
@@ -225,6 +272,87 @@ JUMP continue IF c==1
 GOTO loop
 LABEL continue'''
 
+print(execute(eg3))
+12
+11
+10
+9
+8
+7
+6
+5
+4
+3
+2
+
+
+
+
+
+
+
+'''Autograder actual, expected output (53 lines)
+
+Testing code:
+
+LET a=25
+JUMP end IF a==25
+INC a 10
+INC a 15
+LABEL end
+PRINT a
+
+Program outputs:
+25
+
+
+
+
+
 
+Testing code:
+
+LET a=62
+LABEL start
+PRINT a
+INC a 1
+JUMP end IF a==67
+GOTO start
+LABEL end
 
+Program outputs:
+62
+63
+64
+65
+66
+
+
+
+
+
+Testing code:
+LET c=13
+LET d=1
+LABEL loop
+PRINT c
+DEC c d
+JUMP continue IF c==1
+GOTO loop
+LABEL continue
+
+Program outputs:
+13
+12
+11
+10
+9
+8
+7
+6
+5
+4
+3
+2
 
+'''