simplify if transform; remove current_rename_subs

program/transformer/if_transformer.py

@@ -41,21 +41,14 @@ def _(self, ifstmt: IfStatem):
                 else And(not_previous, conditions[i])
             )
 
-            # Remember variables which appear in a condition and are assigned within the branch
-            current_rename_subs = {}
+            # Remember variables which appear in a condition and are assigned
+            # within the branch or any previous one
             for assign in branch:
                 if assign.variable in condition_symbols:
-                    if assign.variable in rename_subs:
-                        current_rename_subs[assign.variable] = rename_subs[
-                            assign.variable
-                        ]
-                    else:
-                        current_rename_subs[assign.variable] = get_unique_var(
+                    if assign.variable not in rename_subs:
+                        rename_subs[assign.variable] = get_unique_var(
                             name="old"
                         )
-                        rename_subs[assign.variable] = current_rename_subs[
-                            assign.variable
-                        ]
             extra_condition = current_condition.copy().simplify()
             extra_condition.subs(rename_subs)