Rewrite 'binary_case_statements' auto-fix function

Author: HugoGGuerrier

lkql_checker/share/lkql/binary_case_statements.lkql

@@ -1,10 +1,4 @@
-# Flag a case statement if this statement has only two alternatives, one
-# containing exactly one choice, the other containing exactly one choice
-# or the `OTHERS' choice.
-# This rule has an optional parameter Except_Enums: exclude case statements on
-# enumerated types.
-
-fun to_if_stmt(case_stmt) =
+fun to_if_stmt(case_stmt, ctx) =
     |" This function turns the given "case" statement into a if statement.
     |" Assumes that the "case" has only 2 alternatives.
     {
@@ -16,33 +10,22 @@ fun to_if_stmt(case_stmt) =
         );
         match alts[2].f_choices[1]
         | OthersDesignator =>
-            new IfStmt(
-                f_cond_expr=cond,
-                f_then_stmts=alts[1].f_stmts,
-                f_alternatives=new ElsifStmtPartList(),
-                f_else_part=new ElsePart(alts[2].f_stmts)
+            ctx.create_from_template(
+                "if {} then {} else {} end if;",
+                "if_stmt_rule",
+                [cond, alts[1].f_stmts, alts[2].f_stmts]
             )
         | choice           =>
-            new IfStmt(
-                f_cond_expr=cond,
-                f_then_stmts=alts[1].f_stmts,
-                f_alternatives=new ElsifStmtPartList([
-                    new ElsifStmtPart(
-                        f_cond_expr=new RelationOp(
-                            f_left=case_stmt.f_expr,
-                            f_op=new OpEq(),
-                            f_right=choice
-                        ),
-                        f_stmts=alts[2].f_stmts
-                    )
-                ]),
-                f_else_part=null
+            ctx.create_from_template(
+                "if {} then {} elsif {} = {} then {} end if;",
+                "if_stmt_rule",
+                [cond, alts[1].f_stmts, case_stmt.f_expr, choice, alts[2].f_stmts]
             )
     }
 
 @check(message="CASE statement can be replaced with IF statement",
        category="Style", subcategory="Programming Practice",
-       auto_fix=(n, ctx) => ctx.replace(n, to_if_stmt(n)))
+       auto_fix=(n, ctx) => ctx.replace(n, to_if_stmt(n, ctx)))
 fun binary_case_statements(node, except_enums = false) =
     |" Flag a case statement if this statement has only two alternatives, one
     |" containing exactly one choice, the other containing exactly one choice

testsuite/tests/checks/binary_case_statements/test.out

@@ -31,13 +31,7 @@ Patched "binary_case_statements.adb":
 procedure Main is
    procedure Test (I : Integer);
 begin
-   if 1 =1 then null;
-      else null;
-   end if;if 1 =1 then Test (2);
-      elsif 1 =2 then Test (1);
-   end if;if True =True then null;
-      elsif True =False then null;
-   end if;case 1 is  --  NOFLAG
+   if 1=1 then null;else null;end if;if 1=1 then Test(2);elsif 1=2 then Test(1);end if;if True=True then null;elsif True=False then null;end if;case 1 is  --  NOFLAG
       when 1 | 2 => null;
       when others => null;
    end case;

testsuite/tests/checks/binary_case_statements_enums/test.out

@@ -24,7 +24,5 @@ begin
       when others => null;
    end case;
 
-   if 1 =1 then null;
-      else null;
-   end if;end Paths;
+   if 1=1 then null;else null;end if;end Paths;