jeltz
/
heptagon
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Dep depends on global, so mv it accordingly

This commit is contained in:
Cédric Pasteur 2010-06-18 11:53:31 +02:00
parent a20b30909c
commit 50a0768a24
1 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
utilities/dep.ml → utilities/global/dep.ml
View File

@ -7,7 +7,6 @@
(* *)
(**************************************************************************)
(* dependences between equations *)
(* $Id$ *)
open Graph
open Ident
@ -17,9 +16,7 @@ sig
type equation
val read: equation -> ident list
val def: ident list -> equation -> ident list
val linear_read : equation -> ident list
val antidep: equation -> bool
val mem_reset : equation -> ident list
end
module Make (Read:READ) =
@ -28,13 +25,13 @@ struct
(* associate a graph node for each name declaration *)
let rec nametograph g var_list is_antidep n_to_graph =
let add_node env x =
if Env.mem x env then
let l = Env.find x env in
Env.add x ((g, is_antidep)::l) env
else
Env.add x [(g, is_antidep)] env
if Env.mem x env then
let l = Env.find x env in
Env.add x ((g, is_antidep)::l) env
else
Env.add x [(g, is_antidep)] env
in
List.fold_left add_node n_to_graph var_list in
List.fold_left add_node n_to_graph var_list in
let rec nametograph_env g var_list node_env =
List.fold_left (fun env x -> Env.add x g env) node_env var_list in
@ -45,18 +42,17 @@ struct
| eq :: eqs ->
let g = make eq in
let node_env = nametograph_env g (Read.def [] eq) node_env in
let n_to_graph = nametograph g (Read.def [] eq) (Read.antidep eq) n_to_graph in
let n_to_graph = nametograph g (Read.linear_read eq) true n_to_graph in
let n_to_graph = nametograph g (Read.mem_reset eq) false n_to_graph in
let n_to_graph = nametograph g (Read.def [] eq)
(Read.antidep eq) n_to_graph in
init_graph eqs (g :: g_list) n_to_graph node_env
in
let rec make_graph g_list names_to_graph =
let attach_one node (g, is_antidep) =
if is_antidep then
add_depends g node
else
add_depends node g
if is_antidep then
add_depends g node
else
add_depends node g
in
let attach node n =
@ -65,16 +61,16 @@ struct
List.iter (attach_one node) l
with
| Not_found -> () in
match g_list with
| [] -> ()
| node :: g_list ->
let names = Read.read (containt node) in
List.iter (attach node) names;
make_graph g_list names_to_graph in
match g_list with
| [] -> ()
| node :: g_list ->
let names = Read.read (containt node) in
List.iter (attach node) names;
make_graph g_list names_to_graph in
let g_list, names_to_graph, node_env = init_graph eqs [] Env.empty Env.empty in
make_graph g_list names_to_graph;
g_list, node_env
make_graph g_list names_to_graph;
g_list, node_env
end