X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Flambda-delta%2Ftoplevel%2Ftop.ml;h=873d5c590fc1a1b6c5b7e90f0ef150361eb4813c;hb=448920d42f3f7886d27477281b22f0c11771d4ed;hp=4c90fcea7e698cac75471cbb3b0d6e4225c78d6f;hpb=ae63e62aaf5659fe6b0e48cc4a4bdcf7b57318ad;p=helm.git diff --git a/helm/software/lambda-delta/toplevel/top.ml b/helm/software/lambda-delta/toplevel/top.ml index 4c90fcea7..873d5c590 100644 --- a/helm/software/lambda-delta/toplevel/top.ml +++ b/helm/software/lambda-delta/toplevel/top.ml @@ -14,26 +14,36 @@ module U = NUri module C = Cps module L = Log module H = Hierarchy +module O = Output +module AP = AutProcess 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 module BagU = BagUntrusted type status = { + ast : AP.status; mst : MA.status; ac : AO.counters; mc : MO.counters; + brgc: BrgO.counters; bagc: BagO.counters } -let initial_status = { +let initial_status cover = { ac = AO.initial_counters; mc = MO.initial_counters; + brgc = BrgO.initial_counters; bagc = BagO.initial_counters; - mst = MA.initial_status + mst = MA.initial_status ~cover (); + ast = AP.initial_status } let count count_fun c item = @@ -42,13 +52,67 @@ let count count_fun c item = let flush () = L.flush 0; L.flush_err () let bag_error s msg = - L.error BagO.specs (L.Warn s :: msg); flush () + 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 () + +let process_item f st = + let f ast = f {st with ast = ast} in + AP.process_item f st.ast + +(* 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 si () = match !kernel with + | Brg -> BrgT.si := true + | Bag -> BagR.nsi := true + +(****************************************************************************) let main = try - let version_string = "Helena Checker 0.8.0 M - December 2008" in + let version_string = "Helena 0.8.0 M - July 2009" in let stage = ref 3 in let meta_file = ref None in + let progress = ref false in + let use_cover = ref true in let set_hierarchy s = let f = function | Some g -> H.graph := g @@ -56,8 +120,13 @@ 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; exit 0 in + let print_version () = L.warn (version_string ^ "\n"); exit 0 in let set_stage i = stage := i in let close = function | None -> () @@ -70,7 +139,6 @@ try Format.pp_set_margin frm max_int; meta_file := Some (och, frm) in - let set_nsi () = BagR.ext := BagR.NSI in let read_file name = if !L.level > 0 then Time.gmtime version_string; if !L.level > 1 then @@ -85,18 +153,20 @@ try | [] -> st | item :: tl -> (* stage 3 *) - let f st _ = function - | None -> st - | Some (i, u, _) -> - Log.warn (P.sprintf "[%u] %s" i (U.string_of_uri u)); st + let f st = function + | None -> st + | Some (i, u) -> + if !progress then + 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 mst item = + let f st mst item = let st = {st with mst = mst; mc = count MO.count_item st.mc item } in @@ -104,45 +174,62 @@ 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 - let st = - if !stage > 0 then MA.meta_of_aut f st.mst item else st + let f st item = + let st = + if !stage > 0 then MA.meta_of_aut (f st) st.mst item else st + in + aux st tl in - aux st tl - in - let st = aux initial_status book in + process_item f st item + in + O.clear_reductions (); + let cover = + if !use_cover then Filename.chop_extension (Filename.basename name) + else "" + in + let st = aux (initial_status cover) 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 then AO.print_process_counters C.start st.ast; 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; + if !L.level > 2 && !stage > 1 then O.print_reductions () in let help = - "Usage: helena [ -Vin | -Ss | -m | -h ] ...\n\n" ^ + "Usage: helena [ -Vcipu | -Ss | -m | -hk ] ...\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 = " set summary level" in let help_V = " show version information" in + let help_c = " disable initial segment of URI hierarchy" in let help_h = " set type hierarchy" in let help_i = " show local references by index" in + let help_k = " set kernel version" in let help_m = " output intermediate representation" in - let help_n = " activate naive sort inclusion" in + let help_p = " activate progress indicator" in + let help_u = " activate sort inclusion" in let help_s = " Set translation stage" in 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); + ("-c", Arg.Clear use_cover, help_c); ("-h", Arg.String set_hierarchy, help_h); - ("-i", Arg.Set BagO.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); - ("-n", Arg.Unit set_nsi, help_n); - ("-s", Arg.Int set_stage, help_s); + ("-p", Arg.Set progress, help_p); + ("-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