Remove redundant code in ifelse handling.

Author: zhenrongliew

src/bloqade/analysis/validation/nocloning/impls.py

@@ -24,68 +24,63 @@ def if_else(
         except Exception:
             cond_validation = Top()
 
-        errors_before_then_keys = set(interp_._validation_errors.keys())
+        errors_before = set(interp_._validation_errors.keys())
 
         with interp_.new_frame(stmt, has_parent_access=True) as then_frame:
             interp_.frame_call_region(then_frame, stmt, stmt.then_body, cond_validation)
             frame.set_values(then_frame.entries.keys(), then_frame.entries.values())
-        then_keys = set(interp_._validation_errors.keys()) - errors_before_then_keys
+
+        then_keys = set(interp_._validation_errors.keys()) - errors_before
         then_errors = interp_.get_validation_errors(keys=then_keys)
 
         then_state = (
             Must(violations=frozenset(err.args[0] for err in then_errors))
-            if bool(then_keys)
+            if then_keys
             else Bottom()
         )
 
         if stmt.else_body:
-            errors_before_else_keys = set(interp_._validation_errors.keys())
+            errors_before_else = set(interp_._validation_errors.keys())
 
             with interp_.new_frame(stmt, has_parent_access=True) as else_frame:
                 interp_.frame_call_region(
                     else_frame, stmt, stmt.else_body, cond_validation
                 )
                 frame.set_values(else_frame.entries.keys(), else_frame.entries.values())
-            else_keys = set(interp_._validation_errors.keys()) - errors_before_else_keys
+
+            else_keys = set(interp_._validation_errors.keys()) - errors_before_else
             else_errors = interp_.get_validation_errors(keys=else_keys)
 
             else_state = (
                 Must(violations=frozenset(err.args[0] for err in else_errors))
-                if bool(else_keys)
+                if else_keys
                 else Bottom()
             )
-
-            merged = then_state.join(else_state)
-
-            if isinstance(merged, May):
-                branch_keys = then_keys | else_keys
-                for k in branch_keys:
-                    interp_._validation_errors.pop(k, None)
-
-                for err in then_errors:
-                    if isinstance(err, QubitValidationError):
-                        potential_err = PotentialQubitValidationError(
-                            err.node, err.gate_name, ", when condition is true"
-                        )
-                        interp_.add_validation_error(err.node, potential_err)
-
-                for err in else_errors:
-                    if isinstance(err, QubitValidationError):
-                        potential_err = PotentialQubitValidationError(
-                            err.node, err.gate_name, ", when condition is false"
-                        )
-                        interp_.add_validation_error(err.node, potential_err)
         else:
-            merged = then_state.join(Bottom())
+            else_state = Bottom()
+            else_keys = set()
+            else_errors = []
+        merged = then_state.join(else_state)
+        all_branch_keys = then_keys | else_keys
+        for k in all_branch_keys:
+            interp_._validation_errors.pop(k, None)
 
-            if isinstance(merged, May):
-                for k in then_keys:
-                    interp_._validation_errors.pop(k, None)
-                for err in then_errors:
-                    if isinstance(err, QubitValidationError):
-                        potential_err = PotentialQubitValidationError(
-                            err.node, err.gate_name, ", when condition is true"
-                        )
-                        interp_.add_validation_error(err.node, potential_err)
+        if isinstance(merged, Must):
+            for err in then_errors + else_errors:
+                if isinstance(err, QubitValidationError):
+                    interp_.add_validation_error(err.node, err)
+        elif isinstance(merged, May):
+            for err in then_errors:
+                if isinstance(err, QubitValidationError):
+                    potential_err = PotentialQubitValidationError(
+                        err.node, err.gate_name, ", when condition is true"
+                    )
+                    interp_.add_validation_error(err.node, potential_err)
 
+            for err in else_errors:
+                if isinstance(err, QubitValidationError):
+                    potential_err = PotentialQubitValidationError(
+                        err.node, err.gate_name, ", when condition is false"
+                    )
+                    interp_.add_validation_error(err.node, potential_err)
         return (merged,)