new kernel basic_ag (with absolute local references)

[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 06df1ab0355073ead0243322302014a2c095431a..1286db0bbd186c0030c07dcd4db0b035ffb553c9 100644 (file)
--- a/helm/software/lambda-delta/toplevel/top.ml
+++ b/helm/software/lambda-delta/toplevel/top.ml
@@ -17,22 +17,22 @@ module H    = Hierarchy
 module AO   = AutOutput
 module MA   = MetaAut
 module MO   = MetaOutput
-module MBrg = MetaBrg
-module BrgO = BrgOutput
-module BrgU = BrgUntrusted
+module MBag = MetaBag
+module BagO = BagOutput
+module BagU = BagUntrusted
 
 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;
-   mst = MA.initial_status
+   ac   = AO.initial_counters;
+   mc   = MO.initial_counters;
+   bagc = BagO.initial_counters;
+   mst  = MA.initial_status
 }
 
 let count count_fun c item =
@@ -40,8 +40,8 @@ let count count_fun c item =
 
 let flush () = L.flush (); L.flush_err ()
 
-let brg_error s msg =
-   L.error BrgO.specs (L.Warn s :: msg); flush () 
+let bag_error s msg =
+   L.error BagO.specs (L.Warn s :: msg); flush () 
 
 let main =
 try 
@@ -90,8 +90,8 @@ try
            in
 (* 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) !H.graph item else st
+              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
            in
 (* stage 1 *)      
            let f mst item = 
@@ -102,7 +102,7 @@ try
                  | None          -> ()
                  | Some (_, frm) -> MO.pp_item C.start frm item
               end;
-              if !stage > 1 then MBrg.brg_of_meta (f st) item else st 
+              if !stage > 1 then MBag.bag_of_meta (f st) item else st 
            in  
 (* stage 0 *)      
             let st = {st with ac = count AO.count_item st.ac item} in
@@ -115,7 +115,7 @@ 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 BrgO.print_counters C.start st.brgc;
+      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" ^
@@ -135,10 +135,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.Set BrgO.indexes, help_i);
+      ("-i", Arg.Set BagO.indexes, help_i);
       ("-m", Arg.String set_meta_file, help_m); 
       ("-s", Arg.Int set_stage, help_s);
    ] read_file help;
    if !L.level > 0 then Time.utime_stamp "at exit";
    flush ()
-with BrgType.TypeError msg -> brg_error "Type Error" msg
+with BagType.TypeError msg -> bag_error "Type Error" msg