new kernel basic_rg: implements ufficial lambda-delta with de Bruijn indexes

[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 1774cc991fe297bbf5c185ed0471b6bbeb671600..6cbac04a47b51f0c4de17b7a4254df74ee695ed2 100644 (file)
--- a/helm/software/lambda-delta/toplevel/top.ml
+++ b/helm/software/lambda-delta/toplevel/top.ml
@@ -17,6 +17,10 @@ module H    = Hierarchy
 module AO   = AutOutput
 module MA   = MetaAut
 module MO   = MetaOutput
+module MBrg = MetaBrg
+module BrgO = BrgOutput
+module BrgT = BrgType
+module BrgU = BrgUntrusted
 module MBag = MetaBag
 module BagO = BagOutput
 module BagR = BagReduction
@@ -26,12 +30,14 @@ type status = {
    mst : MA.status;
    ac  : AO.counters;
    mc  : MO.counters;
+   brgc: BrgO.counters;
    bagc: BagO.counters
 }
 
 let initial_status = {
    ac   = AO.initial_counters;
    mc   = MO.initial_counters;
+   brgc = BrgO.initial_counters;
    bagc = BagO.initial_counters;
    mst  = MA.initial_status
 }
@@ -44,6 +50,58 @@ let flush () = L.flush 0; L.flush_err ()
 let bag_error s msg =
    L.error BagO.specs (L.Warn s :: L.Loc :: msg); flush () 
 
+let brg_error s msg =
+   L.error BrgO.specs (L.Warn s :: L.Loc :: msg); flush () 
+
+(* kernel related ***********************************************************)
+
+type kernel = Brg | Bag
+
+type kernel_item = BrgItem of Brg.item
+                 | BagItem of Bag.item
+
+let kernel = ref Brg
+
+let print_counters st = match !kernel with
+   | Brg -> BrgO.print_counters C.start st.brgc
+   | Bag -> BagO.print_counters C.start st.bagc
+
+let kernel_of_meta f st item = match !kernel with
+   | Brg -> 
+      let f item = f st (BrgItem item) in
+      MBrg.brg_of_meta f item
+   | Bag -> 
+      let f item = f st (BagItem item) in
+      MBag.bag_of_meta f item  
+
+let count_item st = function
+   | BrgItem item -> {st with brgc = count BrgO.count_item st.brgc item}
+   | BagItem item -> {st with bagc = count BagO.count_item st.bagc item}
+
+let type_check f st g = function
+   | BrgItem item -> 
+      let f _ = function
+         | None -> f st None
+        | Some (i, u, _) -> f st (Some (i, u))
+      in
+      BrgU.type_check f g item
+   | BagItem item -> 
+      let f _ = function
+         | None -> f st None
+        | Some (i, u, _) -> f st (Some (i, u))
+      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
+
+(****************************************************************************)
+
 let main =
 try 
    let version_string = "Helena 0.8.0 M - June 2009" in
@@ -56,6 +114,11 @@ try
       in
       H.graph_of_string f s
    in
+   let set_kernel = function
+      | "brg" -> kernel := Brg
+      | "bag" -> kernel := Bag
+      | s     -> L.warn (P.sprintf "Unknown kernel version: %s" s)
+   in
    let set_summary i = L.level := i in
    let print_version () = L.warn (version_string ^ "\n"); exit 0 in
    let set_stage i = stage := i in
@@ -84,16 +147,16 @@ try
          | []         -> st
         | item :: tl ->
 (* stage 3 *)
-           let f st _ = function
-              | None           -> st
-              | Some (i, u, _) -> 
+           let f st = function
+              | None        -> st
+              | Some (i, u) -> 
                  Log.warn (P.sprintf "[%u] %s" i (U.string_of_uri u)); 
                  st
            in
 (* stage 2 *)      
            let f st item =
-              let st = {st with bagc = count BagO.count_item st.bagc item} in
-              if !stage > 2 then BagU.type_check (f st) !H.graph item else st
+              let st = count_item st item in
+              if !stage > 2 then type_check f st !H.graph item else st
            in
 (* stage 1 *)      
            let f st mst item = 
@@ -104,7 +167,7 @@ try
                  | None          -> ()
                  | Some (_, frm) -> MO.pp_item C.start frm item
               end;
-              if !stage > 1 then MBag.bag_of_meta (f st) item else st 
+              if !stage > 1 then kernel_of_meta f st item else st 
            in  
 (* stage 0 *)      
             let st = {st with ac = count AO.count_item st.ac item} in
@@ -117,10 +180,10 @@ try
       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 BagO.print_counters C.start st.bagc;
+      if !L.level > 2 && !stage > 1 then print_counters st
    in
    let help = 
-      "Usage: helena [ -Vin | -Ss <number> | -m <file> | -h <string> ] <file> ...\n\n" ^
+      "Usage: helena [ -Viu | -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"
@@ -129,8 +192,9 @@ try
    let help_V = " show version information" in   
    let help_h = "<string>  set type hierarchy" in
    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_n = " activate naive sort inclusion" in
+   let help_u = " activate sort inclusion" in
    let help_s = "<number>  Set translation stage" in
    L.box 0; L.box_err ();
    H.set_new_sorts ignore ["Set"; "Prop"];
@@ -138,11 +202,13 @@ try
       ("-S", Arg.Int set_summary, help_S);
       ("-V", Arg.Unit print_version, help_V);
       ("-h", Arg.String set_hierarchy, help_h);
-      ("-i", Arg.Set BagO.indexes, help_i);
+      ("-i", Arg.Unit indexes, help_i);
+      ("-k", Arg.String set_kernel, help_k);
       ("-m", Arg.String set_meta_file, help_m); 
-      ("-n", Arg.Set BagR.nsi, help_n);
+      ("-u", Arg.Unit si, help_u);
       ("-s", Arg.Int set_stage, help_s)
    ] read_file help;
    if !L.level > 0 then Time.utime_stamp "at exit";
    flush ()
 with BagType.TypeError msg -> bag_error "Type Error" msg
+   | BrgT.TypeError msg -> brg_error "Type Error" msg