Style more consistent, replace capitalization with camel case
This commit is contained in:
elvis
@ -1,7 +1,7 @@
|
||||
module type PrintableType = sig
|
||||
type t
|
||||
val pp : out_channel -> t -> unit
|
||||
val pplist : out_channel -> t list -> unit
|
||||
val pp_list : out_channel -> t list -> unit
|
||||
end
|
||||
|
||||
let globalIdNode = ref 0;
|
||||
@ -33,9 +33,9 @@ type 'a cfginternal = {
|
||||
empty: bool;
|
||||
nodes: NodeSet.t;
|
||||
edges: (Node.t * (Node.t option)) NodeMap.t;
|
||||
reverseEdges: (Node.t list) NodeMap.t;
|
||||
inputVal: int option;
|
||||
inputOutputVar: (string * string) option;
|
||||
reverse_edges: (Node.t list) NodeMap.t;
|
||||
input_val: int option;
|
||||
input_output_var: (string * string) option;
|
||||
initial: Node.t option;
|
||||
terminal: Node.t option;
|
||||
content: 'a list NodeMap.t;
|
||||
@ -48,7 +48,7 @@ module type C = sig
|
||||
val empty : t
|
||||
val merge : t -> t -> Node.t -> Node.t -> t
|
||||
val concat : t -> t -> t
|
||||
val addToLastNode : elt -> t -> t
|
||||
val add_to_last_node : elt -> t -> t
|
||||
|
||||
val pp : out_channel -> t -> unit
|
||||
end
|
||||
@ -61,43 +61,43 @@ module Make (M: PrintableType) = struct
|
||||
{ empty = true;
|
||||
nodes = NodeSet.empty;
|
||||
edges = NodeMap.empty;
|
||||
reverseEdges = NodeMap.empty;
|
||||
inputVal = None;
|
||||
inputOutputVar = None;
|
||||
reverse_edges = NodeMap.empty;
|
||||
input_val = None;
|
||||
input_output_var = None;
|
||||
initial = None;
|
||||
terminal = None;
|
||||
content = NodeMap.empty }
|
||||
|
||||
let merge (cfg1: t) (cfg2: t) (entryNode: Node.t) (exitNode: Node.t) : t =
|
||||
let merge (cfg1: t) (cfg2: t) (entry_node: Node.t) (exit_node: Node.t) : t =
|
||||
match (cfg1.empty, cfg2.empty) with
|
||||
true, _ -> cfg2
|
||||
| _, true -> cfg1
|
||||
| false, false ->
|
||||
let cfg1initial = Option.get cfg1.initial in
|
||||
let cfg2initial = Option.get cfg2.initial in
|
||||
let cfg1terminal = Option.get cfg1.terminal in
|
||||
let cfg2terminal = Option.get cfg2.terminal in
|
||||
let cfg1_initial = Option.get cfg1.initial in
|
||||
let cfg2_initial = Option.get cfg2.initial in
|
||||
let cfg1_terminal = Option.get cfg1.terminal in
|
||||
let cfg2_terminal = Option.get cfg2.terminal in
|
||||
{ empty = false;
|
||||
nodes = NodeSet.union cfg1.nodes cfg2.nodes |>
|
||||
NodeSet.add entryNode |>
|
||||
NodeSet.add exitNode;
|
||||
NodeSet.add entry_node |>
|
||||
NodeSet.add exit_node;
|
||||
edges = NodeMap.union
|
||||
(fun _ -> failwith "Failed merging edges of cfg.")
|
||||
cfg1.edges cfg2.edges |>
|
||||
NodeMap.add entryNode (cfg1initial, Some cfg2initial) |>
|
||||
NodeMap.add cfg1terminal (exitNode, None) |>
|
||||
NodeMap.add cfg2terminal (exitNode, None);
|
||||
reverseEdges = NodeMap.union
|
||||
NodeMap.add entry_node (cfg1_initial, Some cfg2_initial) |>
|
||||
NodeMap.add cfg1_terminal (exit_node, None) |>
|
||||
NodeMap.add cfg2_terminal (exit_node, None);
|
||||
reverse_edges = NodeMap.union
|
||||
(fun _ -> failwith "Failed merging edges of cfg.")
|
||||
cfg1.reverseEdges cfg2.reverseEdges |>
|
||||
NodeMap.add_to_list cfg1initial entryNode |>
|
||||
NodeMap.add_to_list cfg2initial entryNode |>
|
||||
NodeMap.add_to_list exitNode cfg1terminal |>
|
||||
NodeMap.add_to_list exitNode cfg2terminal;
|
||||
inputVal = cfg1.inputVal;
|
||||
inputOutputVar = cfg1.inputOutputVar;
|
||||
initial = Some entryNode;
|
||||
terminal = Some exitNode;
|
||||
cfg1.reverse_edges cfg2.reverse_edges |>
|
||||
NodeMap.add_to_list cfg1_initial entry_node |>
|
||||
NodeMap.add_to_list cfg2_initial entry_node |>
|
||||
NodeMap.add_to_list exit_node cfg1_terminal |>
|
||||
NodeMap.add_to_list exit_node cfg2_terminal;
|
||||
input_val = cfg1.input_val;
|
||||
input_output_var = cfg1.input_output_var;
|
||||
initial = Some entry_node;
|
||||
terminal = Some exit_node;
|
||||
content = NodeMap.union
|
||||
(fun _ -> failwith "Failed merging code of cfg.")
|
||||
cfg1.content cfg2.content
|
||||
@ -108,48 +108,48 @@ module Make (M: PrintableType) = struct
|
||||
true, _ -> cfg2
|
||||
| _, true -> cfg1
|
||||
| false, false ->
|
||||
let cfg1initial = Option.get cfg1.initial in
|
||||
let cfg2initial = Option.get cfg2.initial in
|
||||
let cfg1terminal = Option.get cfg1.terminal in
|
||||
let cfg2terminal = Option.get cfg2.terminal in
|
||||
let cfg1_initial = Option.get cfg1.initial in
|
||||
let cfg2_initial = Option.get cfg2.initial in
|
||||
let cfg1_terminal = Option.get cfg1.terminal in
|
||||
let cfg2_terminal = Option.get cfg2.terminal in
|
||||
{ empty = false;
|
||||
nodes = NodeSet.union cfg1.nodes cfg2.nodes;
|
||||
edges = NodeMap.union
|
||||
(fun _ -> failwith "Failed merging edges of cfg.")
|
||||
cfg1.edges cfg2.edges |>
|
||||
NodeMap.add cfg1terminal (cfg2initial, None);
|
||||
reverseEdges = NodeMap.union
|
||||
NodeMap.add cfg1_terminal (cfg2_initial, None);
|
||||
reverse_edges = NodeMap.union
|
||||
(fun _ -> failwith "Failed merging edges of cfg.")
|
||||
cfg1.reverseEdges cfg2.reverseEdges |>
|
||||
NodeMap.add_to_list cfg2initial cfg1terminal;
|
||||
inputVal = cfg1.inputVal;
|
||||
inputOutputVar = cfg1.inputOutputVar;
|
||||
initial = Some cfg1initial;
|
||||
terminal = Some cfg2terminal;
|
||||
cfg1.reverse_edges cfg2.reverse_edges |>
|
||||
NodeMap.add_to_list cfg2_initial cfg1_terminal;
|
||||
input_val = cfg1.input_val;
|
||||
input_output_var = cfg1.input_output_var;
|
||||
initial = Some cfg1_initial;
|
||||
terminal = Some cfg2_terminal;
|
||||
content = NodeMap.union
|
||||
(fun _ -> failwith "Failed merging code of cfg.")
|
||||
cfg1.content cfg2.content
|
||||
}
|
||||
|
||||
let addToLastNode (newcontent: elt) (cfg: t) : t =
|
||||
let add_to_last_node (new_content: elt) (cfg: t) : t =
|
||||
if cfg.empty then
|
||||
let newnode = Node.create () in
|
||||
let new_node = Node.create () in
|
||||
{ empty = false;
|
||||
nodes = NodeSet.singleton newnode;
|
||||
nodes = NodeSet.singleton new_node;
|
||||
edges = NodeMap.empty;
|
||||
reverseEdges = NodeMap.empty;
|
||||
inputVal = None;
|
||||
inputOutputVar = None;
|
||||
initial = Some newnode;
|
||||
terminal = Some newnode;
|
||||
content = NodeMap.singleton newnode [newcontent]
|
||||
reverse_edges = NodeMap.empty;
|
||||
input_val = None;
|
||||
input_output_var = None;
|
||||
initial = Some new_node;
|
||||
terminal = Some new_node;
|
||||
content = NodeMap.singleton new_node [new_content]
|
||||
}
|
||||
else
|
||||
let prevcfgterminal = Option.get cfg.terminal in
|
||||
let prevcfg_terminal = Option.get cfg.terminal in
|
||||
{ cfg with
|
||||
content = (NodeMap.add_to_list_last
|
||||
prevcfgterminal
|
||||
newcontent
|
||||
prevcfg_terminal
|
||||
new_content
|
||||
cfg.content) }
|
||||
|
||||
let pp (ppf) (c: t) : unit =
|
||||
@ -173,17 +173,17 @@ module Make (M: 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.reverseEdges);
|
||||
) (NodeMap.to_list c.reverse_edges);
|
||||
Printf.fprintf ppf "\n";
|
||||
|
||||
Printf.fprintf ppf "Input Value: ";
|
||||
(match c.inputVal with
|
||||
(match c.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.inputOutputVar with
|
||||
(match c.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";
|
||||
@ -202,7 +202,7 @@ module Make (M: 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.content);
|
||||
Printf.fprintf ppf "\n";
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user