lambda-delta:

[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 6cbac04a47b51f0c4de17b7a4254df74ee695ed2..842f02b2d2099c25b0615e301918e3704a0dd992 100644 (file)
--- a/helm/software/lambda-delta/toplevel/top.ml
+++ b/helm/software/lambda-delta/toplevel/top.ml
@@ -14,6 +14,7 @@ module U    = NUri
 module C    = Cps
 module L    = Log
 module H    = Hierarchy
+module O    = Output
 module AO   = AutOutput
 module MA   = MetaAut
 module MO   = MetaOutput
@@ -92,10 +93,6 @@ let type_check f st g = function
       in
       BagU.type_check f g item
 
-let indexes () = match !kernel with
-   | Brg -> BrgO.indexes := true
-   | Bag -> BagO.indexes := true
-
 let si () = match !kernel with
    | Brg -> BrgT.si := true
    | Bag -> BagR.nsi := true
@@ -107,6 +104,7 @@ try
    let version_string = "Helena 0.8.0 M - June 2009" in
    let stage = ref 3 in
    let meta_file = ref None in
+   let progress = ref false in
    let set_hierarchy s = 
       let f = function
          | Some g -> H.graph := g
@@ -150,7 +148,8 @@ try
            let f st = function
               | None        -> st
               | Some (i, u) -> 
-                 Log.warn (P.sprintf "[%u] %s" i (U.string_of_uri u)); 
+                 if !progress then 
+                    Log.warn (P.sprintf "[%u] %s" i (U.string_of_uri u)); 
                  st
            in
 (* stage 2 *)      
@@ -176,14 +175,16 @@ try
            in
            aux st tl
       in 
+      O.clear_reductions ();
       let st = aux initial_status book in
       if !L.level > 0 then Time.utime_stamp "processed";
       if !L.level > 2 then AO.print_counters C.start st.ac;
       if !L.level > 2 && !stage > 0 then MO.print_counters C.start st.mc;
-      if !L.level > 2 && !stage > 1 then print_counters st
+      if !L.level > 2 && !stage > 1 then print_counters st;
+      if !L.level > 2 && !stage > 1 then O.print_reductions ()
    in
    let help = 
-      "Usage: helena [ -Viu | -Ss <number> | -m <file> | -hk <string> ] <file> ...\n\n" ^
+      "Usage: helena [ -Vipu | -Ss <number> | -m <file> | -hk <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"
@@ -194,6 +195,7 @@ try
    let help_i = " show local references by index" in
    let help_k = "<string>  set kernel version" in
    let help_m = "<file>  output intermediate representation" in
+   let help_p = " activate progress indicator" in
    let help_u = " activate sort inclusion" in
    let help_s = "<number>  Set translation stage" in
    L.box 0; L.box_err ();
@@ -202,9 +204,10 @@ try
       ("-S", Arg.Int set_summary, help_S);
       ("-V", Arg.Unit print_version, help_V);
       ("-h", Arg.String set_hierarchy, help_h);
-      ("-i", Arg.Unit indexes, help_i);
+      ("-i", Arg.Set O.indexes, help_i);
       ("-k", Arg.String set_kernel, help_k);
       ("-m", Arg.String set_meta_file, help_m); 
+      ("-p", Arg.Set progress, help_p);
       ("-u", Arg.Unit si, help_u);
       ("-s", Arg.Int set_stage, help_s)
    ] read_file help;