Using Util.list_map instead of List.map

Author: Zachary R. Anderson

src/cil.ml

@@ -1454,7 +1454,7 @@ let mkCompInfo
    comp.ckey <- !nextCompinfoKey;
    incr nextCompinfoKey;
    let flds = 
-       List.map (fun (fn, ft, fb, fa, fl) -> 
+       Util.list_map (fun (fn, ft, fb, fa, fl) -> 
           { fcomp = comp;
             ftype = ft;
             fname = fn;
@@ -1471,7 +1471,7 @@ let copyCompInfo (ci: compinfo) (n: string) : compinfo =
                      ckey = !nextCompinfoKey; } in
   incr nextCompinfoKey;
   (* Copy the fields and set the new pointers to parents *)
-  ci'.cfields <- List.map (fun f -> {f with fcomp = ci'}) ci'.cfields;
+  ci'.cfields <- Util.list_map (fun f -> {f with fcomp = ci'}) ci'.cfields;
   ci'
 
 (**** Utility functions ******)
@@ -1558,7 +1558,7 @@ let rec unrollTypeDeep (t: typ) : typ =
               (match args with 
                 None -> None
               | Some argl -> 
-                  Some (List.map (fun (an,at,aa) -> 
+                  Some (Util.list_map (fun (an,at,aa) -> 
                   (an, unrollTypeDeep at, aa)) argl)), 
               isva, 
               addAttributes al a')
@@ -1808,7 +1808,7 @@ let separateStorageModifiers (al: attribute list) =
       (* Put back the declspec. Put it without the leading __ since these will 
        * be added later *)
       let stom' = 
-	List.map (fun (Attr(an, args)) -> 
+	Util.list_map (fun (Attr(an, args)) -> 
           Attr("declspec", [ACons(an, args)])) stom in
       stom', rest
 
@@ -4802,7 +4802,7 @@ let setFormals (f: fundec) (forms: varinfo list) =
     TFun(rt, _, isva, fa) -> 
       f.svar.vtype <- 
          TFun(rt, 
-              Some (List.map (fun a -> (a.vname, a.vtype, a.vattr)) forms), 
+              Some (Util.list_map (fun a -> (a.vname, a.vtype, a.vattr)) forms), 
               isva, fa)
   | _ -> E.s (E.bug "Set formals. %s does not have function type\n"
                 f.svar.vname)
@@ -4838,7 +4838,7 @@ let setFunctionTypeMakeFormals (f: fundec) (t: typ) =
       f.svar.vtype <- t; 
       f.sformals <- [];
 
-      f.sformals <- List.map (fun (n,t,a) -> makeLocal f n t) args;
+      f.sformals <- Util.list_map (fun (n,t,a) -> makeLocal f n t) args;
 
       setFunctionType f t
 
@@ -5667,7 +5667,7 @@ let getGlobInit ?(main_name="main") (fl: file) =
 (* Fold over all globals, including the global initializer *)
 let mapGlobals (fl: file) 
                (doone: global -> global) : unit = 
-  fl.globals <- List.map doone fl.globals;
+  fl.globals <- Util.list_map doone fl.globals;
   (match fl.globinit with
     None -> ()
   | Some g -> begin
@@ -5852,7 +5852,7 @@ let rec typeSigWithAttrs ?(ignoreSign=false) doattr t =
       TSComp (comp.cstruct, comp.cname, doattr (addAttributes comp.cattr a))
   | TFun(rt,args,isva,a) -> 
       TSFun(typeSig rt, 
-            List.map (fun (_, atype, _) -> (typeSig atype)) (argsToList args),
+            Util.list_map (fun (_, atype, _) -> (typeSig atype)) (argsToList args),
             isva, doattr a)
   | TNamed(t, a) -> typeSigAddAttrs (doattr a) (typeSig t.ttype)
   | TBuiltin_va_list al -> TSBase (TBuiltin_va_list (doattr al))      
@@ -6292,7 +6292,7 @@ class copyFunctionVisitor (newname: string) = object (self)
             s.skind <- Goto (sr',l)
         | Switch (e, body, cases, l) -> 
             s.skind <- Switch (e, body, 
-                               List.map (fun cs -> findStmt cs.sid) cases, l)
+                               Util.list_map (fun cs -> findStmt cs.sid) cases, l)
         | _ -> ()
       in
       List.iter patchstmt !patches;
@@ -6454,7 +6454,7 @@ let get_switch_count () =
 let switch_label = ref (-1)
 
 let rec xform_switch_stmt s break_dest cont_dest label_index = begin
-  s.labels <- List.map (fun lab -> match lab with
+  s.labels <- Util.list_map (fun lab -> match lab with
     Label _ -> lab
   | Case(e,l) ->
       let suffix =

src/ext/arithabs.ml

@@ -244,14 +244,14 @@ let fundecToCFGInfo (fdec: fundec) : S.cfgInfo =
   in
   List.iter 
     (fun s -> 
-      ci.S.successors.(s.sid) <- List.map (fun s' -> s'.sid) s.succs;
-      ci.S.predecessors.(s.sid) <- List.map (fun s' -> s'.sid) s.preds;
+      ci.S.successors.(s.sid) <- Util.list_map (fun s' -> s'.sid) s.succs;
+      ci.S.predecessors.(s.sid) <- Util.list_map (fun s' -> s'.sid) s.preds;
       ci.S.blocks.(s.sid) <- begin
         let instrs: (S.reg list * S.reg list) list = 
           match s.skind with 
             Instr il -> 
               (* Each instruction is transformed independently *)
-              List.map (fun i -> 
+              Util.list_map (fun i -> 
                 let vused, vdefs = Usedef.computeUseDefInstr i in 
                 (vsToRegList vdefs, vsToRegList vused)) il
 
@@ -478,7 +478,7 @@ class absPrinterClass (callgraph: CG.callgraph) : cilPrinter =
         let argdoc: doc = 
           (docList ~sep:break (self#pExp ())) 
             ()
-            (args @ (List.map (fun v -> Lval (Var v, NoOffset)) grt))
+            (args @ (Util.list_map (fun v -> Lval (Var v, NoOffset)) grt))
         in 
         dprintf "%a = (%s @[%a@]);"
           (docList 
@@ -556,7 +556,7 @@ class absPrinterClass (callgraph: CG.callgraph) : cilPrinter =
         (* initVarRenameState has already set the state for the phi register *)
         let lhs: string = self#variableUse varRenameState v in 
         let rhs: string list = 
-          List.map
+          Util.list_map
             (fun p -> 
               self#variableUse blockEndData.(p) v)
             cfgi.S.predecessors.(s.sid)
@@ -1060,7 +1060,7 @@ let feature : featureDescr =
       nrNodes := 0;
       IH.iter (fun idx cn -> 
         let cnlistToNodeList (cnl: (string, CG.callnode) H.t) : int list = 
-          List.map 
+          Util.list_map 
             (fun (_, sn) -> 
               try IH.find funidToNodeId sn.CG.cnInfo.vid
               with Not_found -> assert false

src/ext/blockinggraph.ml

@@ -104,7 +104,7 @@ let myTypeSig (t: typ) : typsig =
     | TSArray (base, e, a) ->
         TSArray (removeFunPtrs base, e, a)
     | TSFun (ret, args, v, a) ->
-        TSFun (removeFunPtrs ret, List.map removeFunPtrs args, v, a)
+        TSFun (removeFunPtrs ret, Util.list_map removeFunPtrs args, v, a)
     | _ -> ts
   in
   removeFunPtrs (typeSigWithAttrs (fun _ -> []) t)
@@ -563,7 +563,7 @@ let makeStartNodeLinks () : unit =
 
 let funType (ret_t: typ) (args: (string * typ) list) = 
   TFun(ret_t, 
-      Some (List.map (fun (n,t) -> (n, t, [])) args),
+      Some (Util.list_map (fun (n,t) -> (n, t, [])) args),
       false, [])
 
 class instrumentClass = object

src/ext/canonicalize.ml

@@ -197,7 +197,7 @@ class canonicalizeVisitor = object(self)
 	      match f with 
 		Lval(Mem(fp), off) ->
 		  let counter: int ref = ref 0 in
-		  let newFormals = List.map
+		  let newFormals = Util.list_map
 		      (fun (actual:exp) ->
 			incr counter;
 			let formalName = "a" ^ (string_of_int !counter) in
@@ -223,7 +223,7 @@ class canonicalizeVisitor = object(self)
 				  This should be done in vglob if needed. *)
     | CompoundInit(t, initList) ->
 	let changed: bool ref = ref false in
-	let initList' = List.map
+	let initList' = Util.list_map
 	    (* iterate over the list, adding casts for any expression that
 	       is expected to be an enum type. *)
 	  (function

src/ext/ccl.ml

@@ -1878,7 +1878,7 @@ class outVisitor = object
     match inst with
     | Call (ret, fn, args, attrs) ->
         let newArgs =
-          List.map
+          Util.list_map
             (fun arg ->
                match arg with
                | Lval (Var vi, NoOffset) when Hashtbl.mem mapping vi.vname ->
@@ -1917,8 +1917,8 @@ let analyzeFile (f : file) : unit =
   visitCilFile (new preVisitor) f;
   visitCilFile (new outVisitor) f;
   visitCilFile (new ptrArithVisitor) f;
-  verifiedExps := List.map fst expStats.verified;
-  verifiedArgs := List.map fst argStats.verified;
+  verifiedExps := Util.list_map fst expStats.verified;
+  verifiedArgs := Util.list_map fst argStats.verified;
   ignore (E.log "\nCCL Results:\n  Derefs: %a\n    Args: %a\n\n"
                 d_stats expStats d_stats argStats);
   (*

src/ext/cfg.ml

@@ -137,8 +137,10 @@ and cfgStmt (s: stmt) (next:stmt option) (break:stmt option) (cont:stmt option)
   incr start_id;
   s.sid <- !start_id;
   nodeList := s :: !nodeList; (* Future traversals can be made in linear time. e.g.  *)
-  if s.succs <> [] then
-    E.s (bug "CFG must be cleared before being computed!");
+  if s.succs <> [] then begin
+    (*E.s*)ignore (bug "CFG must be cleared before being computed!");
+	raise (Failure "CFG bug")
+  end;
   let addSucc (n: stmt) =
     if not (List.memq n s.succs) then
       s.succs <- n::s.succs;

src/ext/ciltools.ml

@@ -154,7 +154,7 @@ class callBBVisitor = object
     match s.skind with
       Instr(il) -> begin
 	if (List.length il > 1) then 
-          let list_of_stmts = List.map (fun one_inst -> 
+          let list_of_stmts = Util.list_map (fun one_inst -> 
             mkStmtOneInstr one_inst) il in
           let block = mkBlock list_of_stmts in
 	  s.skind <- Block block;

src/ext/dataslicing.ml

@@ -156,7 +156,7 @@ and sliceType (i : int) (t : typ) : typ =
           if checkRegion i attrs then
             TFun (sliceTypeAll ret,
                   applyOption
-                    (List.map (fun (aname, atype, aattrs) ->
+                    (Util.list_map (fun (aname, atype, aattrs) ->
                                (aname, sliceTypeAll atype, aattrs)))
                     args,
                   va, attrs)
@@ -310,13 +310,13 @@ let sliceInstr (inst : instr) : instr list =
         (fun i rest ->
            if not (isVoidType (sliceType i t)) then
              Call (Some (sliceLval i lv), sliceExp 1 fn,
-                   List.map (sliceExp i) args, l) :: rest
+                   Util.list_map (sliceExp i) args, l) :: rest
            else
              rest)
         []
   | Call (ret, fn, args, l) when isExternalFunction fn ->
       [Call (applyOption (sliceLval 1) ret, sliceExp 1 fn,
-             List.map (sliceExp 1) args, l)]
+             Util.list_map (sliceExp 1) args, l)]
   | Call (ret, fn, args, l) ->
       let ret', set =
         match ret with
@@ -349,14 +349,14 @@ let sliceReturnExp (eo : exp option) (l : location) : stmtkind =
 
 let rec sliceStmtKind (sk : stmtkind) : stmtkind =
   match sk with
-  | Instr instrs -> Instr (List.flatten (List.map sliceInstr instrs))
+  | Instr instrs -> Instr (List.flatten (Util.list_map sliceInstr instrs))
   | Block b -> Block (sliceBlock b)
   | If (e, b1, b2, l) -> If (sliceExp 1 e, sliceBlock b1, sliceBlock b2, l)
   | Break l -> Break l
   | Continue l -> Continue l
   | Return (eo, l) -> sliceReturnExp eo l
   | Switch (e, b, sl, l) -> Switch (sliceExp 1 e, sliceBlock b,
-                                    List.map sliceStmt sl, l)
+                                    Util.list_map sliceStmt sl, l)
   | Loop (b, l, so1, so2) -> Loop (sliceBlock b, l,
                                    applyOption sliceStmt so1,
                                    applyOption sliceStmt so2)
@@ -369,7 +369,7 @@ and sliceStmt (s : stmt) : stmt =
   s
 
 and sliceBlock (b : block) : block =
-  ignore (List.map sliceStmt b.bstmts);
+  ignore (Util.list_map sliceStmt b.bstmts);
   b
 
 let sliceFundec (fd : fundec) (l : location) : unit =

src/ext/inliner.ml

@@ -106,7 +106,7 @@ class copyBodyVisitor     (host: fundec)                (* The host of the
             s.skind <- Goto (sr',l)
         | Switch (e, body, cases, l) -> 
             s.skind <- Switch (e, body, 
-                               List.map (fun cs -> findStmt cs.sid) cases, l)
+                               Util.list_map (fun cs -> findStmt cs.sid) cases, l)
         | _ -> ()
       in
       List.iter patchstmt !patches;
@@ -161,7 +161,7 @@ class copyBodyVisitor     (host: fundec)                (* The host of the
     let postProc (s': stmt) : stmt = 
       (* Rename the labels if necessary *)
       s'.labels <- 
-        List.map (fun lb -> 
+        Util.list_map (fun lb -> 
           match lb with
             Label (n, l, fromsrc) -> Label(replLabel n, l, fromsrc)
           | _ -> lb) s'.labels;

src/ext/logcalls.ml

@@ -141,7 +141,7 @@ let logCalls (f: file) : unit =
         (* Collect expressions that denote the actual arguments *)
         let actargs =
           (* make lvals out of args which pass test below *)
-          (List.map
+          (Util.list_map
             (fun vi -> match unrollType vi.vtype with
               | TComp(cinfo, _) when isFatCharPtr(cinfo) ->
                   (* access the _p field for these *)

src/ext/partial.ml

@@ -419,7 +419,7 @@ object
         Instr il when contains_call il ->
           begin
             let list_of_stmts =
-              List.map (fun one_inst -> mkStmtOneInstr one_inst) il in
+              Util.list_map (fun one_inst -> mkStmtOneInstr one_inst) il in
             let block = mkBlock list_of_stmts in
               ChangeDoChildrenPost
                 (s, (fun _ -> s.skind <- Block block; s))
@@ -603,7 +603,7 @@ struct
             Instr il ->
               let state = ref state in
               let new_il =
-                List.map
+                Util.list_map
                   (fun i ->
                      if debug then
                        ignore (Pretty.printf "Instr %a@!" d_instr i);
@@ -643,7 +643,7 @@ struct
                                              [Call (lo, Lval (Var vi, NoOffset), al', loc)], false
                              with e ->
                                let state'' = S.call_to_unknown_function !state in
-                               let al' = List.map (S.evaluate !state) al in
+                               let al' = Util.list_map (S.evaluate !state) al in
                                  state := state'';
                                  [Call (lo, Lval (Var vi, NoOffset), al', loc)], false
                            in
@@ -656,7 +656,7 @@ struct
                              end;
                              result
                        | Call (lo, f, al, loc) ->
-                           let al' = List.map (S.evaluate !state) al in
+                           let al' = Util.list_map (S.evaluate !state) al in
                              state := S.call_to_unknown_function !state;
                              begin
                                match lo with

src/ext/predabst.ml

@@ -466,7 +466,7 @@ module PredAbst = functor(S:SOLVER) ->
       h'
 
     let hl_combine hl1 hl2 =
-      List.map 
+      Util.list_map 
 	(fun (h1, h2) -> h_combine h1 h2)
 	(List.combine hl1 hl2)
 
@@ -499,17 +499,17 @@ module PredAbst = functor(S:SOLVER) ->
 	    let pl2 = helper e2 in
 	    (* for every pair of things from pl1 and pl2 *)
 	    List.fold_left (fun l (c1,e1) ->
-	      l @ (List.map (fun (c2,e2) ->
+	      l @ (Util.list_map (fun (c2,e2) ->
 		(BinOp(LAnd,c1,c2,intType),BinOp(op,e1,e2,t))) pl2))
 	      [] pl1
 	| UnOp(op, e, t) ->
 	    let pl = helper e in
-	    List.map (fun (c,e) ->
+	    Util.list_map (fun (c,e) ->
 	      (c,UnOp(op,e,t)))
 	      pl
 	| CastE(t, e) ->
 	    let pl = helper e in
-	    List.map (fun (c,e) ->
+	    Util.list_map (fun (c,e) ->
 	      (c,CastE(t,e)))
 	      pl
 	| _ -> raise (E.s "Simplify has not been run\n")
@@ -633,7 +633,7 @@ module PredAbst = functor(S:SOLVER) ->
 	  (* replace the formals in rpreds with the 
 	     expressions given as arguments *)
 	  let rpreds = 
-	    List.map (fun e ->
+	    Util.list_map (fun e ->
 	      List.fold_left2 (fun e vi ae ->
 		substitute ae (* for *) (Var vi, NoOffset) (* in *) e)
 		e fsig.fsFormals el)
@@ -644,7 +644,7 @@ module PredAbst = functor(S:SOLVER) ->
 	    | None, None -> rpreds
 	    | Some lv, Some rvi -> 
 		(* replace fsig.fsReturn in rpreds with Lval(lv) *)
-		List.map (fun e ->
+		Util.list_map (fun e ->
 		  substitute (Lval lv) (* for *) (Var rvi,NoOffset) (* in *) e)
 		  rpreds
 	    | _, _ -> raise (E.s "fsReturn is wrong in handleCallInstr\n")
@@ -764,7 +764,7 @@ module PredAbst = functor(S:SOLVER) ->
 
 	let copy ss = match ss with
 	| ILState hl -> begin
-	    ILState(List.map (fun h -> IH.copy h) hl)
+	    ILState(Util.list_map (fun h -> IH.copy h) hl)
 	end
 	| StmState h -> StmState(IH.copy h)