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 BagR = BagReduction
+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 =
if !L.level > 2 then count_fun C.start c item else c
-let flush () = L.flush (); L.flush_err ()
+let flush () = L.flush 0; 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 :: L.Loc :: msg); flush ()
let main =
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 =
- 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 =
+ let f st mst item =
let st = {st with
mst = mst; mc = count MO.count_item st.mc item
} in
| 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
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
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" ^
+ "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"
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 (); L.box_err ();
+ L.box 0; L.box_err ();
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);
- ("-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);
+ ("-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 ()
-with BrgType.TypeError msg -> brg_error "Type Error" msg
+with BagType.TypeError msg -> bag_error "Type Error" msg