Fix autotune indentation (PR #772)

Author: sim642

src/analyses/base.ml

@@ -99,14 +99,12 @@ struct
   let add_to_array_map fundec arguments =
     let rec pointedArrayMap = function
       | [] -> VarMap.empty
-      | (info,value)::xs -> (
+      | (info,value)::xs ->
         match value with
-          | `Address t when hasAttribute "goblint_array_domain" info.vattr -> (
-            let possibleVars = PreValueDomain.AD.to_var_may t in
-            List.fold_left (fun map arr -> VarMap.add arr (info.vattr) map) (pointedArrayMap xs) @@ List.filter (fun info -> isArrayType info.vtype) possibleVars
-          )
-          | _ -> pointedArrayMap xs
-      )
+        | `Address t when hasAttribute "goblint_array_domain" info.vattr ->
+          let possibleVars = PreValueDomain.AD.to_var_may t in
+          List.fold_left (fun map arr -> VarMap.add arr (info.vattr) map) (pointedArrayMap xs) @@ List.filter (fun info -> isArrayType info.vtype) possibleVars
+        | _ -> pointedArrayMap xs
     in
     match VarH.find_option array_map fundec.svar with
     | Some _ -> () (*We already have something -> do not change it*)
@@ -129,8 +127,7 @@ struct
     VD.project ask p a value
 
   let project ask p_opt cpa fundec =
-    CPA.mapi (fun varinfo value -> project_val ask (attributes_varinfo varinfo fundec) p_opt value (is_privglob varinfo))
-    cpa
+    CPA.mapi (fun varinfo value -> project_val ask (attributes_varinfo varinfo fundec) p_opt value (is_privglob varinfo)) cpa
 
 
   (**************************************************************************
@@ -2760,8 +2757,8 @@ struct
       (* Projection to Precision of the Caller *)
       let p = PrecisionUtil.int_precision_from_node ()in (* Since f is the fundec of the Callee we have to get the fundec of the current Node instead *)
       let callerFundec = match !MyCFG.current_node with
-      | Some n -> Node.find_fundec n
-      | None -> failwith "callerfundec not found"
+        | Some n -> Node.find_fundec n
+        | None -> failwith "callerfundec not found"
       in
       let return_val = project_val (Analyses.ask_of_ctx ctx) (attributes_varinfo (return_varinfo ()) callerFundec) (Some p) return_val (is_privglob (return_varinfo ())) in
       let cpa' = project (Analyses.ask_of_ctx ctx) (Some p) nst.cpa callerFundec in

src/autoTune.ml

@@ -139,19 +139,18 @@ let notNeccessaryThreadAnalyses = ["deadlock"; "maylocks"; "symb_locks"; "thread
 let reduceThreadAnalyses () =
   let hasThreadCreate () =
     ResettableLazy.force functionCallMaps
-    |> fun (_,x,_) -> x  (*every function that is called*)
-    |> FunctionCallMap.exists
-      (fun var (callers,_) ->
-          let desc = LibraryFunctions.find var in
-          match (functionArgs var) with
-          | None -> false;
-          | Some args ->
-            match desc.special args with
-            | ThreadCreate _ ->
-              print_endline @@ "thread created by " ^ var.vname ^ ", called by:";
-              FunctionSet.iter ( fun c -> print_endline @@ "  " ^ c.vname) callers;
-              true;
-            | _ -> false;
+    |> (fun (_,x,_) -> x)  (*every function that is called*)
+    |> FunctionCallMap.exists (fun var (callers,_) ->
+        let desc = LibraryFunctions.find var in
+        match functionArgs var with
+        | None -> false;
+        | Some args ->
+          match desc.special args with
+          | ThreadCreate _ ->
+            print_endline @@ "thread created by " ^ var.vname ^ ", called by:";
+            FunctionSet.iter ( fun c -> print_endline @@ "  " ^ c.vname) callers;
+            true
+          | _ -> false
       )
   in
   if not @@ hasThreadCreate () then (

src/cdomains/apron/apronDomain.apron.ml

@@ -16,10 +16,10 @@ module M = Messages
     - heterogeneous environments: https://link.springer.com/chapter/10.1007%2F978-3-030-17184-1_26 (Section 4.1) *)
 
 let widening_thresholds_apron = ResettableLazy.from_fun (fun () ->
-  let t = if GobConfig.get_string "ana.apron.threshold_widening_constants" = "comparisons" then WideningThresholds.octagon_thresholds () else WideningThresholds.thresholds_incl_mul2 () in
-  let r = List.map (fun x -> Apron.Scalar.of_mpqf @@ Mpqf.of_mpz @@ Z_mlgmpidl.mpz_of_z x) t in
-  Array.of_list r
-)
+    let t = if GobConfig.get_string "ana.apron.threshold_widening_constants" = "comparisons" then WideningThresholds.octagon_thresholds () else WideningThresholds.thresholds_incl_mul2 () in
+    let r = List.map (fun x -> Apron.Scalar.of_mpqf @@ Mpqf.of_mpz @@ Z_mlgmpidl.mpz_of_z x) t in
+    Array.of_list r
+  )
 
 let reset_lazy () =
   ResettableLazy.reset widening_thresholds_apron