X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fsoftware%2Flambda-delta%2Ftoplevel%2Ftop.ml;h=c1c3538446cb1942a8767d91164fa91d620fd735;hb=0e6bf0ef18e3879a359b2b6f63d600c20102f0ab;hp=3556db37aed72a1ec6f68e66cb4669755d6d7109;hpb=ece36f3adcdf55739b4686168b49506439bff2ba;p=helm.git diff --git a/helm/software/lambda-delta/toplevel/top.ml b/helm/software/lambda-delta/toplevel/top.ml index 3556db37a..c1c353844 100644 --- a/helm/software/lambda-delta/toplevel/top.ml +++ b/helm/software/lambda-delta/toplevel/top.ml @@ -20,10 +20,12 @@ module Y = Entity module X = Library module AP = AutProcess module AO = AutOutput -module DA = DrgAut +module DA = CrgAut module MA = MetaAut module MO = MetaOutput module ML = MetaLibrary +module DO = CrgOutput +module DBrg = CrgBrg module MBrg = MetaBrg module BrgO = BrgOutput module BrgR = BrgReduction @@ -40,22 +42,21 @@ type status = { ac : AO.counters; mc : MO.counters; brgc: BrgO.counters; - bagc: BagO.counters + bagc: BagO.counters; + kst : Y.status } -let initial_status mk_uri cover = { +let initial_status mk_uri cover g expand si = { 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 + ast = AP.initial_status; + kst = Y.initial_status g expand si } -let count count_fun c entity = - if !L.level > 2 then count_fun C.start c entity else c - let flush_all () = L.flush 0; L.flush_err () let bag_error s msg = @@ -64,9 +65,9 @@ let bag_error s msg = let brg_error s msg = L.error BrgR.specs (L.Warn s :: L.Loc :: msg); flush_all () -let process_entity f st = +let process_entity f st entity = let f ast = f {st with ast = ast} in - AP.process_entity f st.ast + AP.process_entity f st.ast entity (* kernel related ***********************************************************) @@ -74,7 +75,7 @@ type kernel = Brg | Bag type kernel_entity = BrgEntity of Brg.entity | BagEntity of Bag.entity - | DrgEntity of Drg.entity + | CrgEntity of Crg.entity | MetaEntity of Meta.entity let kernel = ref Brg @@ -83,36 +84,52 @@ let print_counters st = match !kernel with | Brg -> BrgO.print_counters C.start st.brgc | Bag -> BagO.print_counters C.start st.bagc -let xlate f st entity = match !kernel, entity with +let xlate_entity entity = match !kernel, entity with + | Brg, CrgEntity e -> + let f e = (BrgEntity e) in Y.xlate f DBrg.brg_of_crg e | Brg, MetaEntity e -> - let f e = f st (BrgEntity e) in Y.xlate f MBrg.brg_of_meta e + let f e = (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 f e = (BagEntity e) in Y.xlate f MBag.bag_of_meta e + | _, entity -> entity + +let pp_progress e = + let f a u = + let s = U.string_of_uri u in + let err () = L.warn (P.sprintf "%s" s) in + let f i = L.warn (P.sprintf "[%u] %s" i s) in + Y.mark err f a + in + match e with + | CrgEntity e -> Y.common f e + | BrgEntity e -> Y.common f e + | BagEntity e -> Y.common f e + | MetaEntity e -> Y.common f e 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} + | MetaEntity e -> {st with mc = MO.count_entity C.start st.mc e} + | BrgEntity e -> {st with brgc = BrgO.count_entity C.start st.brgc e} + | BagEntity e -> {st with bagc = BagO.count_entity C.start st.bagc e} | _ -> st let export_entity si g moch = function - | BrgEntity e -> X.old_export_entity BrgO.export_term si g e + | CrgEntity e -> X.export_entity DO.export_term si g e + | BrgEntity e -> X.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 - | _ -> () + | BagEntity _ -> () -let type_check f st si g k = +let type_check st k = let brg_err msg = brg_error "Type Error" msg; failwith "Interrupted" in - let ok _ (a, u, _) = f st a u in + let ok _ _ = st in match k with - | 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 + | BrgEntity entity -> BrgU.type_check brg_err ok st.kst entity + | BagEntity entity -> BagU.type_check ok st.kst entity + | CrgEntity _ + | MetaEntity _ -> st (****************************************************************************) @@ -123,54 +140,48 @@ let progress = ref false let preprocess = ref false let use_cover = ref true let si = ref false +let expand = 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 +let process_2 st entity = + let st = if !L.level > 2 then count_entity st entity else st 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 + if !stage > 2 then type_check st entity else 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_1 st entity = + if !progress then pp_progress entity; + let st = if !L.level > 2 then count_entity st entity else st in + if !export && !stage = 1 then export_entity !si !graph !moch entity; + if !stage > 1 then process_2 st (xlate_entity entity) else st -let process_0 f st entity = +let process_0 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 !stage = 0 then st else + let frr mst = {st with mst = mst} in + let h mst e = process_1 {st with mst = mst} (MetaEntity e) in + let err dst = {st with dst = dst} in + let g dst e = process_1 {st with dst = dst} (CrgEntity e) in if !old then MA.meta_of_aut frr h st.mst entity else - DA.drg_of_aut err g st.dst entity + DA.crg_of_aut err g st.dst entity in - let st = {st with ac = count AO.count_entity st.ac entity} in + let st = + if !L.level > 2 then {st with ac = AO.count_entity C.start st.ac entity} + else st + 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 -> - process f tl (process_0 C.start st entity) -(* process_0 (process f tl) st entity *) (* CPS variant of the above *) +let rec process st = function + | [] -> st + | entity :: tl -> process (process_0 st entity) tl (****************************************************************************) let main = try - let version_string = "Helena 0.8.1 M - October 2009" in + let version_string = "Helena 0.8.1 M - December 2009" in let set_hierarchy s = let err () = L.warn (P.sprintf "Unknown type hierarchy: %s" s) in let f g = graph := g in @@ -205,16 +216,23 @@ try close_in ich; if !L.level > 0 then T.utime_stamp "parsed"; O.clear_reductions (); - let cover = if !use_cover then base_name else "" in - 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 () + let mk_uri = + if !stage < 2 then Crg.mk_uri else + match !kernel with + | Brg -> Brg.mk_uri + | Bag -> Bag.mk_uri in - process f book (initial_status Drg.mk_uri cover) + let cover = if !use_cover then base_name else "" in + let st = initial_status mk_uri cover !graph !expand !si in + let st = process st book in + if !L.level > 0 then T.utime_stamp "processed"; + if !L.level > 2 then begin + AO.print_counters C.start st.ac; + if !preprocess then AO.print_process_counters C.start st.ast; + if !stage > 0 then MO.print_counters C.start st.mc; + if !stage > 1 then print_counters st; + if !stage > 2 then O.print_reductions () + end in let exit () = close !moch; @@ -222,7 +240,7 @@ try flush_all () in let help = - "Usage: helena [ -Vcijmopux | -Ss | -hk ] ...\n\n" ^ + "Usage: helena [ -Vcgijmopux | -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" @@ -231,24 +249,26 @@ try let help_V = " show version information" in let help_c = " output conversion constraints" in + let help_g = " always expand global definitions" 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_o = " use old abstract language instead of drg" in + let help_o = " use old abstract language instead of crg" 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_u = " activate sort inclusion" in let help_x = " export kernel entities (XML)" in L.box 0; L.box_err (); - H.set_sorts ignore ["Set"; "Prop"] 0; + let _ = H.set_sorts ["Set"; "Prop"] 0 in at_exit exit; Arg.parse [ ("-S", Arg.Int set_summary, help_S); ("-V", Arg.Unit print_version, help_V); ("-c", Arg.Set cc, help_c); + ("-g", Arg.Set expand, help_g); ("-h", Arg.String set_hierarchy, help_h); ("-i", Arg.Set O.indexes, help_i); ("-j", Arg.Set progress, help_j);