X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Flambda-delta%2Ftoplevel%2Ftop.ml;h=1774cc991fe297bbf5c185ed0471b6bbeb671600;hb=6f35dd77922431b667f7eb4669ab3fbb6092c343;hp=27f40026e543dc3db1d83fcf3a1b327ea2d57816;hpb=e86383ae4805a526b3acca2ef3c936b3f22daaad;p=helm.git diff --git a/helm/software/lambda-delta/toplevel/top.ml b/helm/software/lambda-delta/toplevel/top.ml index 27f40026e..1774cc991 100644 --- a/helm/software/lambda-delta/toplevel/top.ml +++ b/helm/software/lambda-delta/toplevel/top.ml @@ -9,38 +9,55 @@ \ / This software is distributed as is, NO WARRANTY. V_______________________________________________________________ *) +module P = Printf +module U = NUri +module C = Cps +module L = Log +module H = Hierarchy module AO = AutOutput module MA = MetaAut module MO = MetaOutput -module MBrg = MetaBrg -module BrgO = BrgOutput +module MBag = MetaBag +module BagO = BagOutput +module BagR = BagReduction +module BagU = BagUntrusted type status = { - summary: int; mst : MA.status; ac : AO.counters; mc : MO.counters; - brgc: BrgO.counters + bagc: BagO.counters } -let initial_status summary = { - summary = summary; - ac = AO.initial_counters; - mc = MO.initial_counters; - brgc= BrgO.initial_counters; - mst = MA.initial_status +let initial_status = { + ac = AO.initial_counters; + mc = MO.initial_counters; + bagc = BagO.initial_counters; + mst = MA.initial_status } -let count st count_fun c item = - if st.summary > 2 then count_fun Cps.start c item else c +let count count_fun c item = + if !L.level > 2 then count_fun C.start c item else c + +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 main = - let version_string = "Helena Checker 0.8.0 M - December 2008" in - let summary = ref 0 in - let stage = ref 2 in +try + let version_string = "Helena 0.8.0 M - June 2009" in + let stage = ref 3 in let meta_file = ref None in - let set_summary i = summary := i in - let print_version () = print_endline version_string; exit 0 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 ^ "\n"); exit 0 in let set_stage i = stage := i in let close = function | None -> () @@ -54,52 +71,78 @@ let main = meta_file := Some (och, frm) in let read_file name = - if !summary > 0 then Time.gmtime version_string; - if !summary > 1 then - Printf.printf "Processing file: %s\n" name; flush stdout; - if !summary > 0 then Time.utime_stamp "started"; + if !L.level > 0 then Time.gmtime version_string; + if !L.level > 1 then + L.warn (P.sprintf "Processing file: %s" name); + if !L.level > 0 then Time.utime_stamp "started"; let ich = open_in name in let lexbuf = Lexing.from_channel ich in let book = AutParser.book AutLexer.token lexbuf in close_in ich; - if !summary > 0 then Time.utime_stamp "parsed"; + if !L.level > 0 then Time.utime_stamp "parsed"; let rec aux st = function | [] -> st | item :: tl -> - let st = {st with ac = count st AO.count_item st.ac item} in +(* stage 3 *) + 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 = - {st with brgc = count st BrgO.count_item st.brgc 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 in - let f mst item = +(* stage 1 *) + let f st mst item = let st = {st with - mst = mst; mc = count st MO.count_item st.mc item + mst = mst; mc = count MO.count_item st.mc item } 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 + 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 - let st = aux (initial_status !summary) book in - if !summary > 0 then Time.utime_stamp "processed"; - if !summary > 2 then AO.print_counters Cps.start st.ac; - if !summary > 2 && !stage > 0 then MO.print_counters Cps.start st.mc; - if !summary > 2 && !stage > 1 then BrgO.print_counters Cps.start st.brgc; + let st = aux initial_status 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 && !stage > 0 then MO.print_counters C.start st.mc; + if !L.level > 2 && !stage > 1 then BagO.print_counters C.start st.bagc; + in + let help = + "Usage: helena [ -Vin | -Ss | -m | -h ] ...\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 = "Usage: helena [ -V | -Ss | -m ] ..." in - let help_S = " Set summary level" in - let help_V = " Show version information" in + let help_S = " set summary level" in + let help_V = " show version information" in + let help_h = " set type hierarchy" in + let help_i = " show local references by index" in let help_m = " output intermediate representation" in + let help_n = " activate naive 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); + ("-h", Arg.String set_hierarchy, help_h); + ("-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 !summary > 0 then Time.utime_stamp "at exit" + if !L.level > 0 then Time.utime_stamp "at exit"; + flush () +with BagType.TypeError msg -> bag_error "Type Error" msg