X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Flambda-delta%2Ftoplevel%2Ftop.ml;h=1bab9136be2a569e51fd84ddb4e2f6cee8115a57;hb=a22628e5de37d3ffe9de056d7683f2ebdf7226fb;hp=6f7d60e9ca93d35051916c2442bb46bf3424f851;hpb=51beb717ea0a68ae899e73b09cb67ea90b260b27;p=helm.git diff --git a/helm/software/lambda-delta/toplevel/top.ml b/helm/software/lambda-delta/toplevel/top.ml index 6f7d60e9c..1bab9136b 100644 --- a/helm/software/lambda-delta/toplevel/top.ml +++ b/helm/software/lambda-delta/toplevel/top.ml @@ -20,12 +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 = DrgOutput -module DBrg = DrgBrg +module DO = CrgOutput +module DBrg = CrgBrg module MBrg = MetaBrg module BrgO = BrgOutput module BrgR = BrgReduction @@ -55,9 +55,6 @@ let initial_status mk_uri cover = { ast = AP.initial_status } -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 = @@ -66,9 +63,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 ***********************************************************) @@ -76,7 +73,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 @@ -85,14 +82,14 @@ 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 - | Brg, DrgEntity e -> - let f e = f st (BrgEntity e) in Y.xlate f DBrg.brg_of_drg e +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 = @@ -102,19 +99,19 @@ let pp_progress e = Y.mark err f a in match e with - | DrgEntity e -> Y.common f e + | 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 - | DrgEntity e -> X.export_entity DO.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 @@ -123,14 +120,14 @@ let export_entity si g moch = function end | BagEntity _ -> () -let type_check f st si g k = +let type_check st si g 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 ~si g entity + | BagEntity entity -> BagU.type_check ok ~si g entity + | CrgEntity _ + | MetaEntity _ -> st (****************************************************************************) @@ -146,38 +143,36 @@ 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 = - 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 !si !graph entity else st -let process_1 f st entity = +let process_1 st entity = if !progress then pp_progress entity; - let st = count_entity st entity in + 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 xlate (process_2 f) st entity else f st + 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 -> -(* we exploit tail recursion rather than CPS *) - process f tl (process_0 C.start st entity) +let rec process st = function + | [] -> st + | entity :: tl -> process (process_0 st entity) tl (****************************************************************************) @@ -219,21 +214,21 @@ try if !L.level > 0 then T.utime_stamp "parsed"; O.clear_reductions (); let mk_uri = - if !stage < 2 then Drg.mk_uri else + if !stage < 2 then Crg.mk_uri else match !kernel with | Brg -> Brg.mk_uri | Bag -> Bag.mk_uri in 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 () - in - process f book (initial_status mk_uri cover) + let st = process (initial_status mk_uri cover) 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; @@ -255,7 +250,7 @@ try 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