Merge pull request #1784 from goblint/semgrep-batenum

Add semgrep rule for `BatEnum`

Author: sim642

.semgrep/batenum.yml

@@ -0,0 +1,28 @@
+rules:
+  - id: batenum-module
+    pattern-either:
+      - pattern: BatEnum.$F
+      - pattern: Enum.$F
+    message: use Seq.$F instead
+    languages: [ocaml]
+    severity: WARNING
+
+  - id: batenum-of_enum
+    patterns:
+      - pattern: $M.of_enum
+      - metavariable-pattern:
+          metavariable: $M
+          pattern-regex: ^[A-Z].*
+    message: use $M.of_seq instead
+    languages: [ocaml]
+    severity: WARNING
+
+  - id: batenum-enum
+    patterns:
+      - pattern: $M.enum
+      - metavariable-pattern:
+          metavariable: $M
+          pattern-regex: ^[A-Z].*
+    message: use $M.to_seq instead
+    languages: [ocaml]
+    severity: WARNING

src/analyses/apron/relationPriv.apron.ml

@@ -727,8 +727,8 @@ struct
         let rel = keep_only_protected_globals ask m' (get_m_with_mutex_inits ask getg m') in (* Could be more precise if mutex_inits invariant is added by disjunction instead of joining abstract values. *)
         let inv =
           RD.invariant rel
-          |> List.enum
-          |> Enum.filter_map (fun (lincons1: Apron.Lincons1.t) ->
+          |> List.to_seq
+          |> Seq.filter_map (fun (lincons1: Apron.Lincons1.t) ->
               (* filter one-vars and exact *)
               (* RD.invariant simplifies two octagon SUPEQ constraints to one EQ, so exact works *)
               if (one_var || GobApron.Lincons1.num_vars lincons1 >= 2) && (exact || Apron.Lincons1.get_typ lincons1 <> EQ) then
@@ -737,7 +737,7 @@ struct
               else
                 None
             )
-          |> Enum.fold (fun acc x -> Invariant.(acc && of_exp x)) Invariant.none
+          |> Seq.fold_left (fun acc x -> Invariant.(acc && of_exp x)) Invariant.none
         in
         if atomic then
           inv

src/analyses/assert.ml

@@ -27,7 +27,7 @@ struct
     let warn warn_fn ?annot msg = if check then
         if get_bool "dbg.regression" then ( (* This only prints unexpected results (with the difference) as indicated by the comment behind the assert (same as used by the regression test script). *)
           let loc = !M.current_loc in
-          let line = List.at (List.of_enum @@ File.lines_of loc.file) (loc.line-1) in
+          let line = List.at (List.of_enum @@ File.lines_of loc.file) (loc.line-1) in (* nosemgrep: batenum-of_enum *)
           let open Str in
           let expected = if string_match (regexp ".+//.*\\(FAIL\\|UNKNOWN\\).*") line 0 then Some (matched_group 1 line) else None in
           if expected <> annot then (

src/analyses/extractPthread.ml

@@ -711,16 +711,13 @@ module Codegen = struct
     let checkStatus =
       "("
       ^ ( String.concat " op2 "
-          @@ List.of_enum
-          @@ (0 --^ thread_count)
-             /@ fun i -> "status[" ^ string_of_int i ^ "] op1 v" )
+            (List.init thread_count (fun i -> "status[" ^ string_of_int i ^ "] op1 v")) )
       ^ ")"
     in
     let allTasks =
       "("
       ^ ( String.concat " && "
-          @@ List.of_enum
-          @@ ((0 --^ thread_count) /@ fun i -> "prop(" ^ string_of_int i ^ ")") )
+            (List.init thread_count (fun i -> "prop(" ^ string_of_int i ^ ")")) )
       ^ ")"
     in
 

src/cdomains/apron/linearTwoVarEqualityDomain.apron.ml

@@ -505,7 +505,8 @@ struct
             | (None,       o1,d1), (None       ,o2,d2)-> lhs, (if Z.(zero = ((o1*d2)-(o2*d1))) then Q.one else Q.zero), Q.zero,                     r1, r2 (* only two equivalence classes: constants with matching values or constants with different values *)
           )
       in
-      let table = List.of_enum @@ EConj.IntMap.values @@ EConj.IntMap.merge joinfunction (snd ad) (snd bd) in
+      let joined = EConj.IntMap.merge joinfunction (snd ad) (snd bd) in
+      let table = joined |> EConj.IntMap.to_seq |> Seq.map snd |> List.of_seq in
       (* compare two variables for grouping depending on affine function parameters a, b and reference variable indices  *)
       let cmp_z (_, ai, bi, t1i, t2i) (_, aj, bj, t1j, t2j) =
         let cmp_ref = Option.compare ~cmp:(fun x y -> Int.compare (snd x) (snd y)) in