Style more consistent, replace capitalization with camel case
This commit is contained in:
elvis
@ -2,25 +2,25 @@ module type C = sig
|
||||
type elt
|
||||
type internal
|
||||
|
||||
type internalnode = {
|
||||
internalin: internal list;
|
||||
internalout: internal list;
|
||||
internalbetween: (internal list * internal list) list;
|
||||
type internal_node = {
|
||||
internal_in: internal list;
|
||||
internal_out: internal list;
|
||||
internal_between: (internal list * internal list) list;
|
||||
}
|
||||
|
||||
type cfgt = elt Cfg.cfginternal
|
||||
|
||||
type t = {
|
||||
t: cfgt;
|
||||
internalvar: internalnode Cfg.NodeMap.t;
|
||||
internal_var: internal_node Cfg.NodeMap.t;
|
||||
}
|
||||
|
||||
val from_cfg : cfgt -> t
|
||||
val to_cfg : t -> cfgt
|
||||
|
||||
val fixed_point :
|
||||
?init:(elt list -> internalnode) ->
|
||||
?update:(t -> Cfg.Node.t -> internalnode) ->
|
||||
?init : (elt list -> internal_node) ->
|
||||
?update : (t -> Cfg.Node.t -> internal_node) ->
|
||||
t ->
|
||||
t
|
||||
|
||||
@ -31,20 +31,20 @@ module Make (M: Cfg.PrintableType) (I: Cfg.PrintableType) = struct
|
||||
type elt = M.t
|
||||
type internal = I.t
|
||||
|
||||
type internalnode = {
|
||||
internalin: internal list;
|
||||
internalout: internal list;
|
||||
internalbetween: (internal list * internal list) list;
|
||||
type internal_node = {
|
||||
internal_in: internal list;
|
||||
internal_out: internal list;
|
||||
internal_between: (internal list * internal list) list;
|
||||
}
|
||||
|
||||
let compareinternalnode (a:internalnode) (b:internalnode) : bool =
|
||||
match Utility.equality a.internalin b.internalin,
|
||||
Utility.equality a.internalout b.internalout,
|
||||
let compare_internal_node (a:internal_node) (b:internal_node) : bool =
|
||||
match Utility.equality a.internal_in b.internal_in,
|
||||
Utility.equality a.internal_out b.internal_out,
|
||||
(List.fold_left2 (fun acc (ain, aout) (bin, bout)
|
||||
-> acc &&
|
||||
(Utility.equality ain bin) &&
|
||||
(Utility.equality aout bout)
|
||||
) true a.internalbetween b.internalbetween)
|
||||
) true a.internal_between b.internal_between)
|
||||
with
|
||||
| true, true, true -> true
|
||||
| _, _, _ -> false
|
||||
@ -53,19 +53,19 @@ module Make (M: Cfg.PrintableType) (I: Cfg.PrintableType) = struct
|
||||
|
||||
type t = {
|
||||
t: cfgt;
|
||||
internalvar: internalnode Cfg.NodeMap.t;
|
||||
internal_var: internal_node Cfg.NodeMap.t;
|
||||
}
|
||||
|
||||
let compareinternal a b =
|
||||
let compare_internal a b =
|
||||
Cfg.NodeMap.fold
|
||||
(fun node bi acc ->
|
||||
match Cfg.NodeMap.find_opt node a with
|
||||
None -> false
|
||||
| Some ai -> acc && compareinternalnode ai bi
|
||||
| Some ai -> acc && compare_internal_node ai bi
|
||||
) b true
|
||||
|
||||
let from_cfg (cfg: cfgt) : t =
|
||||
{t = cfg; internalvar = Cfg.NodeMap.empty}
|
||||
{t = cfg; internal_var = Cfg.NodeMap.empty}
|
||||
|
||||
let to_cfg ({t; _}: t) : cfgt =
|
||||
t
|
||||
@ -92,17 +92,17 @@ module Make (M: Cfg.PrintableType) (I: Cfg.PrintableType) = struct
|
||||
Printf.fprintf ppf "\t%d -> " n.id;
|
||||
List.iter (fun (x: Node.t) -> Printf.fprintf ppf "%d, " x.id) xs;
|
||||
Printf.fprintf ppf "\n"
|
||||
) (NodeMap.to_list c.t.reverseEdges);
|
||||
) (NodeMap.to_list c.t.reverse_edges);
|
||||
Printf.fprintf ppf "\n";
|
||||
|
||||
Printf.fprintf ppf "Input Value: ";
|
||||
(match c.t.inputVal with
|
||||
(match c.t.input_val with
|
||||
Some i -> Printf.fprintf ppf "%d" i;
|
||||
| None -> Printf.fprintf ppf "None";);
|
||||
Printf.fprintf ppf "\n";
|
||||
|
||||
Printf.fprintf ppf "Input and Output Vars: ";
|
||||
(match c.t.inputOutputVar with
|
||||
(match c.t.input_output_var with
|
||||
Some (i, o) -> Printf.fprintf ppf "(in: %s, out: %s)" i o;
|
||||
| None -> Printf.fprintf ppf "None";);
|
||||
Printf.fprintf ppf "\n";
|
||||
@ -121,35 +121,36 @@ module Make (M: Cfg.PrintableType) (I: Cfg.PrintableType) = struct
|
||||
|
||||
Printf.fprintf ppf "Code:\n";
|
||||
List.iter (fun ((n, stms) : Node.t * elt list) : unit ->
|
||||
Printf.fprintf ppf "\tid %d --> %a\n%!" n.id M.pplist stms
|
||||
Printf.fprintf ppf "\tid %d --> %a\n%!" n.id M.pp_list stms
|
||||
) (NodeMap.to_list c.t.content);
|
||||
Printf.fprintf ppf "\n";
|
||||
|
||||
Printf.fprintf ppf "Analysis structure:\n";
|
||||
List.iter (fun ((n, {internalin; internalout; internalbetween})
|
||||
: (Node.t * internalnode)) : unit ->
|
||||
List.iter (fun ((n, {internal_in; internal_out; internal_between})
|
||||
: (Node.t * internal_node)) : unit ->
|
||||
Printf.fprintf ppf "Node: %d\n" n.id;
|
||||
Printf.fprintf ppf "Internal Input: ";
|
||||
Printf.fprintf ppf "%a\n" I.pplist internalin;
|
||||
Printf.fprintf ppf "%a\n" I.pp_list internal_in;
|
||||
Printf.fprintf ppf "Internal Output: ";
|
||||
Printf.fprintf ppf "%a\n" I.pplist internalout;
|
||||
Printf.fprintf ppf "%a\n" I.pp_list internal_out;
|
||||
Printf.fprintf ppf "Internal Between: ";
|
||||
List.iter (fun (i, o) ->
|
||||
Printf.fprintf ppf "IN: %a;" I.pplist i;
|
||||
Printf.fprintf ppf "OUT: %a;" I.pplist o;) internalbetween;
|
||||
Printf.fprintf ppf "IN: %a;" I.pp_list i;
|
||||
Printf.fprintf ppf "OUT: %a;" I.pp_list o;)
|
||||
internal_between;
|
||||
Printf.fprintf ppf "\n";
|
||||
) (NodeMap.to_list c.internalvar);
|
||||
) (NodeMap.to_list c.internal_var);
|
||||
Printf.fprintf ppf "\n";
|
||||
)
|
||||
|
||||
|
||||
let fixed_point
|
||||
?(init : (elt list -> internalnode) =
|
||||
(fun _ -> {internalin = [];
|
||||
internalout = [];
|
||||
internalbetween = []}))
|
||||
?(update : (t -> Cfg.Node.t -> internalnode) =
|
||||
(fun t n -> Cfg.NodeMap.find n t.internalvar))
|
||||
?(init : (elt list -> internal_node) =
|
||||
(fun _ -> {internal_in = [];
|
||||
internal_out = [];
|
||||
internal_between = []}))
|
||||
?(update : (t -> Cfg.Node.t -> internal_node) =
|
||||
(fun t n -> Cfg.NodeMap.find n t.internal_var))
|
||||
(t: t)
|
||||
: t =
|
||||
(* init function is applied only once to each node content,
|
||||
@ -158,21 +159,21 @@ module Make (M: Cfg.PrintableType) (I: Cfg.PrintableType) = struct
|
||||
update function is applied to the resulting structure until no change is
|
||||
observed with compareinternal function
|
||||
*)
|
||||
let rec helper t =
|
||||
let rec aux t =
|
||||
let newt =
|
||||
{t with
|
||||
internalvar = Cfg.NodeMap.mapi (fun n _ -> update t n) t.internalvar}
|
||||
internal_var = Cfg.NodeMap.mapi (fun n _ -> update t n) t.internal_var}
|
||||
in
|
||||
if compareinternal newt.internalvar t.internalvar
|
||||
if compare_internal newt.internal_var t.internal_var
|
||||
then newt
|
||||
else helper newt
|
||||
else aux newt
|
||||
in
|
||||
|
||||
let content =
|
||||
List.fold_left
|
||||
(fun cfg node -> Cfg.NodeMap.add node {internalin = [];
|
||||
internalout = [];
|
||||
internalbetween = []} cfg)
|
||||
(fun cfg node -> Cfg.NodeMap.add node {internal_in = [];
|
||||
internal_out = [];
|
||||
internal_between = []} cfg)
|
||||
Cfg.NodeMap.empty
|
||||
(Cfg.NodeSet.to_list t.t.nodes)
|
||||
in
|
||||
@ -190,6 +191,6 @@ module Make (M: Cfg.PrintableType) (I: Cfg.PrintableType) = struct
|
||||
content
|
||||
(Cfg.NodeMap.map init code)
|
||||
in
|
||||
helper { t with internalvar = content }
|
||||
aux { t with internal_var = content }
|
||||
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user