X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Flambda-delta%2Fbasic_rg%2FbrgOutput.ml;h=aaa559be687f46f0d89a8a1b3de72a00269a8731;hb=347c7d213fd1d106f22acd6fff82a83af14c1bbd;hp=958408303f6e72af13e3aadcb6b43f75e7441ce0;hpb=75620ca64e3038fcbebb51559fdc31b2e8a00f93;p=helm.git

diff --git a/helm/software/lambda-delta/basic_rg/brgOutput.ml b/helm/software/lambda-delta/basic_rg/brgOutput.ml
index 958408303..aaa559be6 100644
--- a/helm/software/lambda-delta/basic_rg/brgOutput.ml
+++ b/helm/software/lambda-delta/basic_rg/brgOutput.ml
@@ -12,67 +12,93 @@
 module P = Printf
 module F = Format
 module U = NUri
-module C = Cps
 module L = Log
 module H = Hierarchy
+module O = Output
 module B = Brg
 
+(* nodes count **************************************************************)
+
 type counters = {
    eabsts: int;
    eabbrs: int;
+   evoids: int;
    tsorts: int;
    tlrefs: int;
    tgrefs: int;
    tcasts: int;
    tappls: int;
    tabsts: int;
-   tabbrs: int
+   tabbrs: int;
+   tvoids: int;
+   uris  : U.uri list;
+   nodes : int;
+   xnodes: int
 }
 
 let initial_counters = {
-   eabsts = 0; eabbrs = 0; tsorts = 0; tlrefs = 0; tgrefs = 0;
-   tcasts = 0; tappls = 0; tabsts = 0; tabbrs = 0
+   eabsts = 0; eabbrs = 0; evoids = 0; 
+   tsorts = 0; tlrefs = 0; tgrefs = 0; tcasts = 0; tappls = 0;
+   tabsts = 0; tabbrs = 0; tvoids = 0;
+   uris = []; nodes = 0; xnodes = 0
 }
 
-let rec count_term_binder f c = function
+let rec count_term_binder f c e = function
    | B.Abst w ->
-      let c = {c with tabsts = succ c.tabsts} in
-      count_term f c w
+      let c = {c with tabsts = succ c.tabsts; nodes = succ c.nodes} in
+      count_term f c e w
    | B.Abbr v -> 
-      let c = {c with tabbrs = succ c.tabbrs} in
-      count_term f c v
-   | B.Void   -> f c
+      let c = {c with tabbrs = succ c.tabbrs; xnodes = succ c.xnodes} in
+      count_term f c e v
+   | B.Void   ->
+      let c = {c with tvoids = succ c.tvoids; xnodes = succ c.xnodes} in   
+      f c
 
-and count_term f c = function
-   | B.Sort _            -> 
-      f {c with tsorts = succ c.tsorts}
-   | B.LRef _            -> 
-      f {c with tlrefs = succ c.tlrefs}
-   | B.GRef _            -> 
+and count_term f c e = function
+   | B.Sort _         -> 
+      f {c with tsorts = succ c.tsorts; nodes = succ c.nodes}
+   | B.LRef (_, i)    -> 
+      let f _ = function
+         | None
+	 | Some (_, B.Abst _) ->
+	    f {c with tlrefs = succ c.tlrefs; nodes = succ c.nodes}
+	 | Some (_, B.Abbr _)
+	 | Some (_, B.Void)   ->
+	    f {c with tlrefs = succ c.tlrefs; xnodes = succ c.xnodes}
+      in	 
+      B.get f e i
+   | B.GRef (_, u)    -> 
+      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
       f {c with tgrefs = succ c.tgrefs}
-   | B.Cast (v, t)       -> 
+   | B.Cast (_, v, t) -> 
       let c = {c with tcasts = succ c.tcasts} in
-      let f c = count_term f c t in
-      count_term f c v
-   | B.Appl (v, t)       -> 
-      let c = {c with tappls = succ c.tappls} in
-      let f c = count_term f c t in
-      count_term f c v
-   | B.Bind (_, b, t) -> 
-      let f c = count_term_binder f c b in
-      count_term f c t
-
-let count_obj_binder f c = function
-   | B.Abst w -> 
-      let c = {c with eabsts = succ c.eabsts} in
-      count_term f c w
-   | B.Abbr v -> 
-      let c = {c with eabbrs = succ c.eabbrs} in
-      count_term f c v
-   | B.Void   -> f c
+      let f c = count_term f c e t in
+      count_term f c e v
+   | B.Appl (_, v, t) -> 
+      let c = {c with tappls = succ c.tappls; nodes = succ c.nodes} in
+      let f c = count_term f c e t in
+      count_term f c e v
+   | B.Bind (a, b, t) -> 
+      let f c e = count_term f c e t in
+      let f c = B.push (f c) e a b in
+      count_term_binder f c e b
 
-let count_obj f c (_, _, b) =
-   count_obj_binder f c b
+let count_obj f c = function
+   | (_, u, B.Abst w) -> 
+      let c = {c with
+         eabsts = succ c.eabsts; nodes = succ c.nodes; uris = u :: c.uris
+      } in
+      count_term f c B.empty_context w
+   | (_, _, B.Abbr v) ->  
+      let c = {c with eabbrs = succ c.eabbrs; xnodes = succ c.xnodes} in
+      count_term f c B.empty_context v
+   | (_, _, B.Void)   ->
+      let c = {c with evoids = succ c.evoids; xnodes = succ c.xnodes} in
+      f c
 
 let count_item f c = function
    | Some obj -> count_obj f c obj
@@ -84,67 +110,78 @@ let print_counters f c =
       c.tabbrs
    in
    let items = c.eabsts + c.eabbrs in
+   let nodes = c.nodes + c.xnodes in
    L.warn (P.sprintf "  Kernel representation summary (basic_rg)");
-   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 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 "      Explicit Cast items:    %6u" c.tcasts);
-   L.warn (P.sprintf "      Application items:      %6u" c.tappls);
-   L.warn (P.sprintf "      Abstraction items:      %6u" c.tabsts);
-   L.warn (P.sprintf "      Abbreviation items:     %6u" c.tabbrs);
+   L.warn (P.sprintf "    Total entry items:        %7u" items);
+   L.warn (P.sprintf "      Declaration items:      %7u" c.eabsts);
+   L.warn (P.sprintf "      Definition items:       %7u" c.eabbrs);
+   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 "      Explicit Cast items:    %7u" c.tcasts);
+   L.warn (P.sprintf "      Application items:      %7u" c.tappls);
+   L.warn (P.sprintf "      Abstraction items:      %7u" c.tabsts);
+   L.warn (P.sprintf "      Abbreviation items:     %7u" c.tabbrs);
+   L.warn (P.sprintf "    Global Int. Complexity:   %7u" c.nodes);
+   L.warn (P.sprintf "      + Abbreviation nodes:   %7u" nodes);
    f ()
 
+(* context/term pretty printing *********************************************)
+
+let id frm a =
+   let f = function
+      | None            -> assert false
+      | Some (true, n)  -> F.fprintf frm "%s" n
+      | Some (false, n) -> F.fprintf frm "^%s" n
+   in      
+   B.name f a
+
 let rec pp_term c frm = function
-   | B.Sort h                 -> 
+   | B.Sort (_, h)           -> 
       let f = function 
          | Some s -> F.fprintf frm "@[%s@]" s
 	 | None   -> F.fprintf frm "@[*%u@]" h
       in
       H.get_sort f h 
-   | B.LRef i                 -> 
-      let f = function
-         | Some (id, _) -> F.fprintf frm "@[%s@]" id
-         | None         -> F.fprintf frm "@[#%u@]" i
+   | B.LRef (_, i)           -> 
+      let f _ = function
+         | Some (a, _) -> F.fprintf frm "@[%a@]" id a
+         | None        -> F.fprintf frm "@[#%u@]" i
       in
-      B.get f c i
-   | B.GRef s                 -> F.fprintf frm "@[$%s@]" (U.string_of_uri s)
-   | B.Cast (u, t)            ->
+      if !O.indexes then f 0 None else B.get f c i
+   | B.GRef (_, s)           -> F.fprintf frm "@[$%s@]" (U.string_of_uri s)
+   | B.Cast (_, u, t)        ->
       F.fprintf frm "@[{%a}.%a@]" (pp_term c) u (pp_term c) t
-   | B.Appl (v, t)            ->
+   | B.Appl (_, v, t)        ->
       F.fprintf frm "@[(%a).%a@]" (pp_term c) v (pp_term c) t
-   | B.Bind (id, B.Abst w, t) ->
+   | B.Bind (a, B.Abst w, t) ->
       let f cc =
-         F.fprintf frm "@[[%s:%a].%a@]" id (pp_term c) w (pp_term cc) t
+         F.fprintf frm "@[[%a:%a].%a@]" id a (pp_term c) w (pp_term cc) t
       in
-      B.push f c id (B.Abst w)
-   | B.Bind (id, B.Abbr v, t) ->
+      B.push f c a (B.Abst w)
+   | B.Bind (a, B.Abbr v, t) ->
       let f cc = 
-         F.fprintf frm "@[[%s=%a].%a@]" id (pp_term c) v (pp_term cc) t
+         F.fprintf frm "@[[%a=%a].%a@]" id a (pp_term c) v (pp_term cc) t
       in
-      B.push f c id (B.Abbr v)
-   | B.Bind (id, B.Void, t)   ->
-      let f cc = F.fprintf frm "@[[%s].%a@]" id (pp_term cc) t in
-      B.push f c id B.Void
+      B.push f c a (B.Abbr v)
+   | B.Bind (a, B.Void, t)   ->
+      let f cc = F.fprintf frm "@[[%a].%a@]" id a (pp_term cc) t in
+      B.push f c a B.Void
 
 let pp_context frm c =
-   let pp_entry f = function
-      | id, B.Abst w -> 
-         F.fprintf frm "%s : %a\n%!" id (pp_term c) w; f ()
-      | id, B.Abbr v -> 
-         F.fprintf frm "%s = %a\n%!" id (pp_term c) v; f ()
-      | id, B.Void   -> 
-         F.fprintf frm "%s\n%!" id; f ()
+   let pp_entry frm = function
+      | a, B.Abst w -> 
+         F.fprintf frm "@,@[%a : %a@]" id a (pp_term c) w
+      | a, B.Abbr v -> 
+         F.fprintf frm "@,@[%a = %a@]" id a (pp_term c) v
+      | a, B.Void   -> 
+         F.fprintf frm "@,%a" id a
    in
-   let f _ es = C.list_iter C.start pp_entry (List.rev es) in
+   let iter map frm l = List.iter (map frm) l in
+   let f es = F.fprintf frm "%a" (iter pp_entry) (List.rev es) in
    B.contents f c
 
-let pp_term frm c t = 
-   F.fprintf frm "%a\n%!" (pp_term c) t
-
 let specs = {
    L.pp_term = pp_term; L.pp_context = pp_context
 }