improved type hierarchy management

[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 b3f65bb84fcb96cce9e703cdeda636886eb25ba8..a2bac561661082a29e39d81b9a701dfacc958f59 100644 (file)
--- a/helm/software/lambda-delta/toplevel/top.ml
+++ b/helm/software/lambda-delta/toplevel/top.ml
@@ -11,7 +11,9 @@
 
 module P    = Printf
 module U    = NUri
+module C    = Cps
 module L    = Log
+module H    = Hierarchy
 module AO   = AutOutput
 module MA   = MetaAut
 module MO   = MetaOutput
@@ -34,7 +36,7 @@ let initial_status = {
 }
 
 let count count_fun c item =
-   if !L.level > 2 then count_fun Cps.start c item else c
+   if !L.level > 2 then count_fun C.start c item else c
 
 let brg_error s msg =
    L.error BrgO.specs (L.Warn s :: msg) 
@@ -44,7 +46,13 @@ try
    let version_string = "Helena Checker 0.8.0 M - December 2008" in
    let stage = ref 3 in
    let meta_file = ref None in
-   let hierarchy = ref (fun h -> h + 2) in
+   let set_hierarchy s = 
+      let f = function
+         | Some g -> H.graph := g
+        | None   -> L.warn (P.sprintf "Unknown type hierarchy: %s" s)
+      in
+      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 set_stage i = stage := i in
@@ -81,7 +89,7 @@ try
 (* stage 2 *)      
            let f st item =
               let st = {st with brgc = count BrgO.count_item st.brgc item} in
-              if !stage > 2 then BrgU.type_check (f st) !hierarchy item else st
+              if !stage > 2 then BrgU.type_check (f st) !H.graph item else st
            in
 (* stage 1 *)      
            let f mst item = 
@@ -90,7 +98,7 @@ try
               } in
               begin match !meta_file with
                  | None          -> ()
-                 | Some (_, frm) -> MO.pp_item Cps.start frm item
+                 | Some (_, frm) -> MO.pp_item C.start frm item
               end;
               if !stage > 1 then MBrg.brg_of_meta (f st) item else st 
            in  
@@ -103,23 +111,26 @@ try
       in 
       let st = aux initial_status book in
       if !L.level > 0 then Time.utime_stamp "processed";
-      if !L.level > 2 then AO.print_counters Cps.start st.ac;
-      if !L.level > 2 && !stage > 0 then MO.print_counters Cps.start st.mc;
-      if !L.level > 2 && !stage > 1 then BrgO.print_counters Cps.start st.brgc;
+      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 BrgO.print_counters C.start st.brgc;
    in
    let help = 
-      "Usage: helena [ -V | -Ss <number> | -m <file> ] <file> ...\n\n" ^
+      "Usage: helena [ -V | -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"
    in
    let help_S = "<number>  Set summary level" in
    let help_V = " Show version information" in   
+   let help_h = "<string>  set type hierarchy" in
    let help_m = "<file>  output intermediate representation" in
    let help_s = "<number>  Set translation stage" in
+   H.set_new_sorts ignore ["Set"; "Prop"];
    Arg.parse [
       ("-S", Arg.Int set_summary, help_S);
       ("-V", Arg.Unit print_version, help_V);
+      ("-h", Arg.String set_hierarchy, help_h);
       ("-m", Arg.String set_meta_file, help_m); 
       ("-s", Arg.Int set_stage, help_s);
    ] read_file help;