- lambdadelta: we removed focalized reduction from snv preservation

[helm.git] / matita / components / binaries / matitadep / matitadep.ml

diff --git a/matita/components/binaries/matitadep/matitadep.ml b/matita/components/binaries/matitadep/matitadep.ml
index fdf5e980fdf594ac4739b59c1d242a0b4c39188f..da82b9fc1e92a7dad19e6fe238f0ca979449d990 100644 (file)
--- a/matita/components/binaries/matitadep/matitadep.ml
+++ b/matita/components/binaries/matitadep/matitadep.ml
@@ -7,6 +7,10 @@ type file = {
 
 let graph = Hashtbl.create 503
 
+let rec purge dname bdeps = match bdeps with
+   | []       -> bdeps
+   | hd :: tl -> if hd = dname then bdeps else purge dname tl 
+
 let add fname =
    if Hashtbl.mem graph fname then () else
    Hashtbl.add graph fname {ddeps = []; rdeps = None}
@@ -18,25 +22,28 @@ let add_ddep fname dname =
 let init fname dname =
    add fname; add dname; add_ddep fname dname 
 
-let rec compute fname file = match file.rdeps with
+let rec compute bdeps fname file = match file.rdeps with
    | Some rdeps -> rdeps
    | None       ->
-      let rdeps = List.fold_left (iter fname) StringSet.empty file.ddeps in
+      let bdeps = fname :: bdeps in
+      let rdeps = List.fold_left (iter fname bdeps) StringSet.empty file.ddeps in
       Hashtbl.replace graph fname {file with rdeps = Some rdeps};
       rdeps
 
-and iter fname rdeps dname =
-   if StringSet.mem dname rdeps then
-      begin Printf.printf "%s: redundant %s\n" fname dname; rdeps end
-   else
+and iter fname bdeps rdeps dname =
+   if StringSet.mem dname rdeps then begin
+      Printf.printf "%s: redundant %s\n" fname dname;
+      rdeps 
+   end else if List.mem dname bdeps then begin
+      let loop = purge dname (List.rev bdeps) in
+      Printf.printf "circular: %s\n" (String.concat " " loop);
+      StringSet.add dname rdeps
+   end else
      let file = Hashtbl.find graph dname in
-     StringSet.add dname (StringSet.union (compute dname file) rdeps)
+     StringSet.add dname (StringSet.union (compute bdeps dname file) rdeps)
 
 let check () = 
-   let iter fname file = 
-      if StringSet.mem fname (compute fname file) then
-         Printf.printf "%s: circular\n" fname 
-   in
+   let iter fname file = ignore (compute [] fname file) in
    Hashtbl.iter iter graph 
 
 let rec read ich =