Extended is_identity test

[helm.git] / helm / software / lambda-delta / toplevel / top.ml

diff --git a/helm/software/lambda-delta/toplevel/top.ml b/helm/software/lambda-delta/toplevel/top.ml
index 4c90fcea7e698cac75471cbb3b0d6e4225c78d6f..1774cc991fe297bbf5c185ed0471b6bbeb671600 100644 (file)
--- a/helm/software/lambda-delta/toplevel/top.ml
+++ b/helm/software/lambda-delta/toplevel/top.ml
@@ -42,11 +42,11 @@ let count count_fun c item =
 let flush () = L.flush 0; L.flush_err ()
 
 let bag_error s msg =
-   L.error BagO.specs (L.Warn s :: msg); flush () 
+   L.error BagO.specs (L.Warn s :: L.Loc :: msg); flush () 
 
 let main =
 try 
-   let version_string = "Helena Checker 0.8.0 M - December 2008" in
+   let version_string = "Helena 0.8.0 M - June 2009" in
    let stage = ref 3 in
    let meta_file = ref None in
    let set_hierarchy s = 
@@ -57,7 +57,7 @@ try
       H.graph_of_string f s
    in
    let set_summary i = L.level := i in
-   let print_version () = L.warn version_string; exit 0 in
+   let print_version () = L.warn (version_string ^ "\n"); exit 0 in
    let set_stage i = stage := i in
    let close = function
       | None          -> ()
@@ -70,7 +70,6 @@ try
       Format.pp_set_margin frm max_int;
       meta_file := Some (och, frm)
    in
-   let set_nsi () = BagR.ext := BagR.NSI in
    let read_file name =
       if !L.level > 0 then Time.gmtime version_string;      
       if !L.level > 1 then
@@ -88,7 +87,8 @@ try
            let f st _ = function
               | None           -> st
               | Some (i, u, _) -> 
-                 Log.warn (P.sprintf "[%u] %s" i (U.string_of_uri u)); st
+                 Log.warn (P.sprintf "[%u] %s" i (U.string_of_uri u)); 
+                 st
            in
 (* stage 2 *)      
            let f st item =
@@ -96,7 +96,7 @@ try
               if !stage > 2 then BagU.type_check (f st) !H.graph item else st
            in
 (* stage 1 *)      
-           let f mst item = 
+           let f st mst item = 
               let st = {st with
                  mst = mst; mc = count MO.count_item st.mc item
               } in
@@ -109,7 +109,7 @@ try
 (* stage 0 *)      
             let st = {st with ac = count AO.count_item st.ac item} in
            let st =
-              if !stage > 0 then MA.meta_of_aut f st.mst item else st
+              if !stage > 0 then MA.meta_of_aut (f st) st.mst item else st
            in
            aux st tl
       in 
@@ -140,8 +140,8 @@ try
       ("-h", Arg.String set_hierarchy, help_h);
       ("-i", Arg.Set BagO.indexes, help_i);
       ("-m", Arg.String set_meta_file, help_m); 
-      ("-n", Arg.Unit set_nsi, help_n);
-      ("-s", Arg.Int set_stage, help_s);
+      ("-n", Arg.Set BagR.nsi, help_n);
+      ("-s", Arg.Int set_stage, help_s)
    ] read_file help;
    if !L.level > 0 then Time.utime_stamp "at exit";
    flush ()