X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Flambda-delta%2Ftoplevel%2Ftop.ml;h=4c1ee1903bf0e8b6df9566f266344b329686f187;hb=3d23faf2969e2591db93f8bacc61952f3b66e2ca;hp=3fa3c908ce66ccee70ca5c3756167af76323b775;hpb=de66af7241ad8ab71d5857d14570e4662f2488dc;p=helm.git diff --git a/helm/software/lambda-delta/toplevel/top.ml b/helm/software/lambda-delta/toplevel/top.ml index 3fa3c908c..4c1ee1903 100644 --- a/helm/software/lambda-delta/toplevel/top.ml +++ b/helm/software/lambda-delta/toplevel/top.ml @@ -16,23 +16,26 @@ module L = Log module T = Time module H = Hierarchy module O = Output +module Y = Entity +module X = Library module AP = AutProcess module AO = AutOutput +module DA = DrgAut module MA = MetaAut module MO = MetaOutput module ML = MetaLibrary module MBrg = MetaBrg -module G = Library module BrgO = BrgOutput module BrgR = BrgReduction module BrgU = BrgUntrusted module MBag = MetaBag module BagO = BagOutput -module BagR = BagReduction +module BagT = BagType module BagU = BagUntrusted type status = { ast : AP.status; + dst : DA.status; mst : MA.status; ac : AO.counters; mc : MO.counters; @@ -40,36 +43,39 @@ type status = { bagc: BagO.counters } -let initial_status cover = { +let initial_status mk_uri cover = { ac = AO.initial_counters; mc = MO.initial_counters; brgc = BrgO.initial_counters; bagc = BagO.initial_counters; mst = MA.initial_status ~cover (); + dst = DA.initial_status (mk_uri cover); ast = AP.initial_status } -let count count_fun c item = - if !L.level > 2 then count_fun C.start c item else c +let count count_fun c entity = + if !L.level > 2 then count_fun C.start c entity else c -let flush () = L.flush 0; L.flush_err () +let flush_all () = L.flush 0; L.flush_err () let bag_error s msg = - L.error BagO.specs (L.Warn s :: L.Loc :: msg); flush () + L.error BagO.specs (L.Warn s :: L.Loc :: msg); flush_all () let brg_error s msg = - L.error BrgO.specs (L.Warn s :: L.Loc :: msg); flush () + L.error BrgR.specs (L.Warn s :: L.Loc :: msg); flush_all () -let process_item f st = +let process_entity f st = let f ast = f {st with ast = ast} in - AP.process_item f st.ast + AP.process_entity f st.ast (* kernel related ***********************************************************) type kernel = Brg | Bag -type kernel_item = BrgItem of Brg.item - | BagItem of Bag.item +type kernel_entity = BrgEntity of Brg.entity + | BagEntity of Bag.entity + | DrgEntity of Drg.entity + | MetaEntity of Meta.entity let kernel = ref Brg @@ -77,45 +83,94 @@ 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 xlate f st entity = match !kernel, entity with + | Brg, MetaEntity e -> + let f e = f st (BrgEntity e) in Y.xlate f MBrg.brg_of_meta e + | Bag, MetaEntity e -> + let f e = f st (BagEntity e) in Y.xlate f MBag.bag_of_meta e + | _, entity -> f st entity -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 count_entity st = function + | MetaEntity e -> {st with mc = count MO.count_entity st.mc e} + | BrgEntity e -> {st with brgc = count BrgO.count_entity st.brgc e} + | BagEntity e -> {st with bagc = count BagO.count_entity st.bagc e} + | _ -> st -let export_item si g = function - | BrgItem item -> G.export_item BrgO.export_obj si g item - | BagItem _ -> () +let export_entity si g moch = function + | BrgEntity e -> X.old_export_entity BrgO.export_term si g e + | MetaEntity e -> + begin match moch with + | None -> () + | Some och -> ML.write_entity C.start och e + end + | _ -> () let type_check f st si g k = - let f _ = function - | None -> f st None - | Some (i, u, _) -> f st (Some (i, u)) - in + let brg_err msg = brg_error "Type Error" msg; failwith "Interrupted" in + let ok _ (a, u, _) = f st a u in match k with - | BrgItem item -> BrgU.type_check f ~si g item - | BagItem item -> BagU.type_check f ~si g item + | BrgEntity entity -> BrgU.type_check brg_err ok ~si g entity + | BagEntity entity -> BagU.type_check ok ~si g entity + | DrgEntity (a, u, _) + | MetaEntity (a, u, _) -> f st a u + +(****************************************************************************) + +let stage = ref 3 +let moch = ref None +let meta = ref false +let progress = ref false +let preprocess = ref false +let use_cover = ref true +let si = ref false +let cc = ref false +let export = ref false +let graph = ref (H.graph_of_string C.err C.start "Z2") +let old = ref false + +let process_3 f st a u = + if !progress then + let s = U.string_of_uri u in + let err () = L.warn (P.sprintf "%s" s); f st in + let f i = L.warn (P.sprintf "[%u] %s" i s); f st in + Y.mark err f a + else + f st + +let process_2 f st entity = + let st = count_entity st entity in + if !export then export_entity !si !graph !moch entity; + if !stage > 2 then type_check (process_3 f) st !si !graph entity else f st + +let process_1 f st entity = + let st = count_entity st entity in + export_entity !si !graph !moch entity; + if !stage > 1 then xlate (process_2 f) st entity else f st + +let process_0 f st entity = + let f st entity = + if !stage = 0 then f st else + let frr mst = f {st with mst = mst} in + let h mst e = process_1 f {st with mst = mst} (MetaEntity e) in + let err dst = f {st with dst = dst} in + let g dst e = process_1 f {st with dst = dst} (DrgEntity e) in + if !old then MA.meta_of_aut frr h st.mst entity else + DA.drg_of_aut err g st.dst entity + in + let st = {st with ac = count AO.count_entity st.ac entity} in + if !preprocess then process_entity f st entity else f st entity + +let rec process f book st = match book with + | [] -> f st + | entity :: tl -> +(* we exploit tail recursion rather than CPS *) + process f tl (process_0 C.start st entity) (****************************************************************************) let main = try - let version_string = "Helena 0.8.0 M - August 2009" in - let stage = ref 3 in - let moch = ref None in - let meta = ref false in - let progress = ref false in - let process = ref false in - let use_cover = ref true in - let si = ref false in - let export = ref false in - let graph = ref (H.graph_of_string C.err C.start "Z2") in + let version_string = "Helena 0.8.1 M - October 2009" in let set_hierarchy s = let err () = L.warn (P.sprintf "Unknown type hierarchy: %s" s) in let f g = graph := g in @@ -149,61 +204,25 @@ try let book = AutParser.book AutLexer.token lexbuf in close_in ich; if !L.level > 0 then T.utime_stamp "parsed"; - let rec aux st = function - | [] -> st - | item :: tl -> -(* stage 3 *) - let f st = function - | None -> st - | Some (i, u) -> - if !progress then - L.warn (P.sprintf "[%u] %s" i (U.string_of_uri u)); - st - in -(* stage 2 *) - let f st item = - let st = count_item st item in - if !export then export_item !si !graph item; - if !stage > 2 then type_check f st !si !graph item else st - in -(* stage 1 *) - let f st mst item = - let st = {st with - mst = mst; mc = count MO.count_item st.mc item - } in - begin match !moch with - | None -> () - | Some och -> ML.write_item C.start och item - end; - 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 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 - if !process then process_item f st item else f st item - in O.clear_reductions (); let cover = if !use_cover then base_name else "" in - let st = aux (initial_status cover) book in - if !L.level > 0 then T.utime_stamp "processed"; - if !L.level > 2 then AO.print_counters C.start st.ac; - if !L.level > 2 && !process 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 print_counters st; - if !L.level > 2 && !stage > 1 then O.print_reductions () + let f st = + if !L.level > 0 then T.utime_stamp "processed"; + if !L.level > 2 then AO.print_counters C.start st.ac; + if !L.level > 2 && !preprocess 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 print_counters st; + if !L.level > 2 && !stage > 1 then O.print_reductions () + in + process f book (initial_status Drg.mk_uri cover) in let exit () = close !moch; if !L.level > 0 then T.utime_stamp "at exit"; - flush () + flush_all () in let help = - "Usage: helena [ -Vacimpux | -Ss | -hk ] ...\n\n" ^ + "Usage: helena [ -Vcijmopux | -Ss | -hk ] ...\n\n" ^ "Summary levels: 0 just errors (default), 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 (default)\n" @@ -211,32 +230,35 @@ try let help_S = " set summary level (see above)" in let help_V = " show version information" in - let help_a = " analyze source files" in - let help_c = " disable initial segment of URI hierarchy" in + let help_c = " output conversion constraints" in let help_h = " set type hierarchy (default: Z2)" in let help_i = " show local references by index" in + let help_j = " show URI of processed kernel objects" in let help_k = " set kernel version (default: brg)" in let help_m = " output intermediate representation (HAL)" in - let help_p = " activate progress indicator" in - let help_u = " activate sort inclusion" in + let help_o = " use old abstract language instead of drg" in + let help_p = " preprocess Automath source" in + let help_r = " disable initial segment of URI hierarchy" in let help_s = " set translation stage (see above)" in - let help_x = " export kernel objects (XML)" in + let help_u = " activate sort inclusion" in + let help_x = " export kernel entities (XML)" in L.box 0; L.box_err (); - H.set_new_sorts ignore ["Set"; "Prop"]; + H.set_sorts ignore ["Set"; "Prop"] 0; at_exit exit; Arg.parse [ ("-S", Arg.Int set_summary, help_S); ("-V", Arg.Unit print_version, help_V); - ("-a", Arg.Set process, help_a); - ("-c", Arg.Clear use_cover, help_c); + ("-c", Arg.Set cc, help_c); ("-h", Arg.String set_hierarchy, help_h); ("-i", Arg.Set O.indexes, help_i); + ("-j", Arg.Set progress, help_j); ("-k", Arg.String set_kernel, help_k); ("-m", Arg.Set meta, help_m); - ("-p", Arg.Set progress, help_p); - ("-u", Arg.Set si, help_u); + ("-o", Arg.Set old, help_o); + ("-p", Arg.Set preprocess, help_p); + ("-r", Arg.Clear use_cover, help_r); ("-s", Arg.Int set_stage, help_s); + ("-u", Arg.Set si, help_u); ("-x", Arg.Set export, help_x) ] read_file help; -with BagR.TypeError msg -> bag_error "Type Error" msg - | BrgR.TypeError msg -> brg_error "Type Error" msg +with BagT.TypeError msg -> bag_error "Type Error" msg