X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Flambda-delta%2Ftoplevel%2FmetaOutput.ml;h=21d735d0e187f3f366fc25a475739fa0a84ffeed;hb=28430d599505ac26b51e4887e5196d9b380c898a;hp=03995e15382dc741e02b6a2f1d79c8afeb569a21;hpb=8659e85d49be1ad72622d4d3a73d384b744c3c08;p=helm.git diff --git a/helm/software/lambda-delta/toplevel/metaOutput.ml b/helm/software/lambda-delta/toplevel/metaOutput.ml index 03995e153..21d735d0e 100644 --- a/helm/software/lambda-delta/toplevel/metaOutput.ml +++ b/helm/software/lambda-delta/toplevel/metaOutput.ml @@ -12,7 +12,9 @@ module P = Printf module F = Format module U = NUri +module C = Cps module L = Log +module Y = Entity module M = Meta type counters = { @@ -25,76 +27,94 @@ type counters = { pappls: int; tappls: int; tabsts: int; + uris : U.uri list; + nodes : int; + xnodes: int } let initial_counters = { eabsts = 0; eabbrs = 0; pabsts = 0; pappls = 0; - tsorts = 0; tlrefs = 0; tgrefs = 0; tappls = 0; tabsts = 0 + tsorts = 0; tlrefs = 0; tgrefs = 0; tappls = 0; tabsts = 0; + uris = []; nodes = 0; xnodes = 0 } let rec count_term f c = function | M.Sort _ -> - f {c with tsorts = succ c.tsorts} + f {c with tsorts = succ c.tsorts; nodes = succ c.nodes} | M.LRef _ -> - f {c with tlrefs = succ c.tlrefs} - | M.GRef (_, _, ts) -> + f {c with tlrefs = succ c.tlrefs; nodes = succ c.nodes} + | M.GRef (_, u, ts) -> let c = {c with tgrefs = succ c.tgrefs} in let c = {c with pappls = c.pappls + List.length ts} in + let c = {c with nodes = c.nodes + List.length ts} in + let c = + if Cps.list_mem ~eq:U.eq u c.uris + then {c with nodes = succ c.nodes} + else {c with xnodes = succ c.xnodes} + in Cps.list_fold_left f count_term c ts | M.Appl (v, t) -> - let c = {c with tappls = succ c.tappls} in + let c = {c with tappls = succ c.tappls; nodes = succ c.nodes} in let f c = count_term f c t in count_term f c v | M.Abst (_, w, t) -> - let c = {c with tabsts = succ c.tabsts} in + let c = {c with tabsts = succ c.tabsts; nodes = succ c.nodes} in let f c = count_term f c t in count_term f c w let count_par f c (_, w) = count_term f c w -let count_entry f c = function - | _, pars, _, w, None -> +let count_xterm f c = function + | None -> f c + | Some v -> count_term f c v + +let count_entity f c = function + | _, u, Y.Abst (pars, w, xv) -> let c = {c with eabsts = succ c.eabsts} in let c = {c with pabsts = c.pabsts + List.length pars} in + let c = {c with uris = u :: c.uris; nodes = succ c.nodes + List.length pars} in + let f c = count_xterm f c xv in let f c = count_term f c w in Cps.list_fold_left f count_par c pars - | _, pars, _, w, Some (_, v) -> - let c = {c with eabbrs = succ c.eabbrs} in + | _, _, Y.Abbr (pars, w, xv) -> + let c = {c with eabbrs = succ c.eabbrs; xnodes = succ c.xnodes} in let c = {c with pabsts = c.pabsts + List.length pars} in - let f c = count_term f c v in + let c = {c with nodes = c.nodes + List.length pars} in + let f c = count_xterm f c xv in let f c = count_term f c w in Cps.list_fold_left f count_par c pars - -let count_item f c = function - | Some e -> count_entry f c e - | None -> f c + | _, _, Y.Void -> assert false let print_counters f c = - let terms = c.tsorts + c.tgrefs + c.tgrefs + c.tappls + c.tabsts in + let terms = c.tsorts + c.tlrefs + c.tgrefs + c.tappls + c.tabsts in let pars = c.pabsts + c.pappls in - let items = c.eabsts + c.eabbrs in + let entries = c.eabsts + c.eabbrs in + let nodes = c.nodes + c.xnodes in L.warn (P.sprintf " Intermediate representation summary"); - L.warn (P.sprintf " Total entry items: %6u" items); - L.warn (P.sprintf " Declaration items: %6u" c.eabsts); - L.warn (P.sprintf " Definition items: %6u" c.eabbrs); - L.warn (P.sprintf " Total parameter items: %6u" pars); - L.warn (P.sprintf " Application items: %6u" c.pappls); - L.warn (P.sprintf " Abstraction items: %6u" c.pabsts); - L.warn (P.sprintf " Total term items: %6u" terms); - L.warn (P.sprintf " Sort items: %6u" c.tsorts); - L.warn (P.sprintf " Local reference items: %6u" c.tlrefs); - L.warn (P.sprintf " Global reference items: %6u" c.tgrefs); - L.warn (P.sprintf " Application items: %6u" c.tappls); - L.warn (P.sprintf " Abstraction items: %6u" c.tabsts); + L.warn (P.sprintf " Total entries: %7u" entries); + L.warn (P.sprintf " Declaration items: %7u" c.eabsts); + L.warn (P.sprintf " Definition items: %7u" c.eabbrs); + L.warn (P.sprintf " Total parameter items: %7u" pars); + L.warn (P.sprintf " Application items: %7u" c.pappls); + L.warn (P.sprintf " Abstraction items: %7u" c.pabsts); + L.warn (P.sprintf " Total term items: %7u" terms); + L.warn (P.sprintf " Sort items: %7u" c.tsorts); + L.warn (P.sprintf " Local reference items: %7u" c.tlrefs); + L.warn (P.sprintf " Global reference items: %7u" c.tgrefs); + L.warn (P.sprintf " Application items: %7u" c.tappls); + L.warn (P.sprintf " Abstraction items: %7u" c.tabsts); + L.warn (P.sprintf " Global Int. Complexity: %7u" c.nodes); + L.warn (P.sprintf " + Abbreviation nodes: %7u" nodes); f () let string_of_sort = function | true -> "Type" | false -> "Prop" -let string_of_transparent = function - | true -> "=" - | false -> "~" +let pp_transparent frm a = + let err () = F.fprintf frm "%s" "=" in + let f () = F.fprintf frm "%s" "~" in + Y.priv err f a let pp_list pp opend sep closed frm l = let rec aux frm = function @@ -122,19 +142,21 @@ and pp_term frm = function F.fprintf frm "@[[%s:%a].%a@]" id pp_term w pp_term t let pp_par frm (id, w) = - F.fprintf frm "%s:%a" id pp_term w + F.fprintf frm "%s:%a" id pp_term w let pp_pars = pp_rev_list pp_par "[" "," "]" -let pp_body frm = function - | None -> () - | Some (trans, t) -> - F.fprintf frm "%s%a" (string_of_transparent trans) pp_term t +let pp_body a frm = function + | None -> () + | Some t -> F.fprintf frm "%a%a" pp_transparent a pp_term t -let pp_entry frm (l, pars, uri, u, body) = - F.fprintf frm "@[%u@@%s%a%a:%a@]@\n%!" - l (U.string_of_uri uri) pp_pars pars pp_body body pp_term u +let pp_entity frm = function + | a, uri, Y.Abst (pars, u, body) + | a, uri, Y.Abbr (pars, u, body) -> + F.fprintf frm "@[%u@@%s%a%a:%a@]@\n%!" + (Y.mark C.err C.start a) (U.string_of_uri uri) + pp_pars pars (pp_body a) body pp_term u + | _, _, Y.Void -> assert false -let pp_item f frm = function - | Some entry -> pp_entry frm entry; f () - | None -> f () +let pp_entity f frm entity = + pp_entity frm entity; f ()