X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Flambda-delta%2Ftoplevel%2Ftop.ml;h=1774cc991fe297bbf5c185ed0471b6bbeb671600;hb=6f35dd77922431b667f7eb4669ab3fbb6092c343;hp=f1cea379dc0db8396a370daa014d4e151332479a;hpb=426005acf6fb05116de5bae20591eefe55a4df00;p=helm.git

diff --git a/helm/software/lambda-delta/toplevel/top.ml b/helm/software/lambda-delta/toplevel/top.ml
index f1cea379d..1774cc991 100644
--- a/helm/software/lambda-delta/toplevel/top.ml
+++ b/helm/software/lambda-delta/toplevel/top.ml
@@ -19,6 +19,7 @@ module MA   = MetaAut
 module MO   = MetaOutput
 module MBag = MetaBag
 module BagO = BagOutput
+module BagR = BagReduction
 module BagU = BagUntrusted
 
 type status = {
@@ -41,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 = 
@@ -56,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          -> ()
@@ -86,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 =
@@ -94,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
@@ -107,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 
@@ -118,7 +120,7 @@ try
       if !L.level > 2 && !stage > 1 then BagO.print_counters C.start st.bagc;
    in
    let help = 
-      "Usage: helena [ -Vi | -Ss <number> | -m <file> | -h <string> ] <file> ...\n\n" ^
+      "Usage: helena [ -Vin | -Ss <number> | -m <file> | -h <string> ] <file> ...\n\n" ^
       "Summary levels: 0 just errors, 1 time stamps, 2 processed file names, \
        3 data information, 4 typing information, 5 reduction information\n\n" ^
        "Stages: 0 parsing, 1 to intermediate, 2 to untrusted, 3 to trusted\n"
@@ -128,6 +130,7 @@ try
    let help_h = "<string>  set type hierarchy" in
    let help_i = " show local references by index" in
    let help_m = "<file>  output intermediate representation" in
+   let help_n = " activate naive sort inclusion" in
    let help_s = "<number>  Set translation stage" in
    L.box 0; L.box_err ();
    H.set_new_sorts ignore ["Set"; "Prop"];
@@ -137,7 +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); 
-      ("-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 ()