X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Flambda-delta%2Fbasic_rg%2FbrgOutput.ml;h=662a71988d5a3182579c9ee3bb6b2fd82305f5d3;hb=8049c166a37789d7a1b1ca1c3a1174712bbf87ba;hp=b8fc2d0c2d4ab8a08bbc96797b7c2f057dea66c1;hpb=dcdee4ca839dac671924a95f0ada71faf06a8be4;p=helm.git

diff --git a/helm/software/lambda-delta/basic_rg/brgOutput.ml b/helm/software/lambda-delta/basic_rg/brgOutput.ml
index b8fc2d0c2..662a71988 100644
--- a/helm/software/lambda-delta/basic_rg/brgOutput.ml
+++ b/helm/software/lambda-delta/basic_rg/brgOutput.ml
@@ -11,10 +11,11 @@
 
 module P = Printf
 module F = Format
-module U = NUri
 module C = Cps
+module U = NUri
 module L = Log
 module H = Hierarchy
+module O = Output
 module B = Brg
 
 (* nodes count **************************************************************)
@@ -22,62 +23,88 @@ module B = Brg
 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  : B.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
-   | B.Abst w ->
-      let c = {c with tabsts = succ c.tabsts} in
-      count_term f c w
-   | B.Abbr v -> 
-      let c = {c with tabbrs = succ c.tabbrs} in
-      count_term f c v
-   | B.Void   -> 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 _         -> 
+let rec count_term_binder f c e = function
+   | B.Abst (_, 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; 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 e = function
+   | B.Sort _         -> 
+      f {c with tsorts = succ c.tsorts; nodes = succ c.nodes}
+   | B.LRef (_, i)    -> 
+      let err _ = f {c with tlrefs = succ c.tlrefs; nodes = succ c.nodes} in
+      let f _ = function
+	 | B.Abst _ 
+	 | B.Void _ ->
+	    f {c with tlrefs = succ c.tlrefs; nodes = succ c.nodes}
+	 | B.Abbr _ ->
+	    f {c with tlrefs = succ c.tlrefs; xnodes = succ c.xnodes}
+      in	 
+      B.get err 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) -> 
       let c = {c with tcasts = succ c.tcasts} in
-      let f c = count_term f c t in
-      count_term f c v
+      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} 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 count_obj f c (_, _, b) =
-   count_obj_binder f c b
-
-let count_item f c = function
-   | Some obj -> count_obj f c obj
+      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 (b, t) -> 
+      let f c e = count_term f c e t in
+      let f c = B.push (f c) e b in
+      count_term_binder f c e b
+
+let count_entry 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_lenv w
+   | (_, _, B.Abbr (_, v)) ->  
+      let c = {c with eabbrs = succ c.eabbrs; xnodes = succ c.xnodes} in
+      count_term f c B.empty_lenv v
+   | (_, u, B.Void _)      ->
+      let c = {c with 
+         evoids = succ c.evoids; nodes = succ c.nodes; uris = u :: c.uris
+      } in
+      f c
+
+let count_entity f c = function
+   | Some entry -> count_entry f c entry
    | None     -> f c
 
 let print_counters f c =
@@ -86,6 +113,7 @@ 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:        %7u" items);
    L.warn (P.sprintf "      Declaration items:      %7u" c.eabsts);
@@ -97,88 +125,169 @@ let print_counters f c =
    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 "      Abbreviation items:     %7u" c.tabbrs);
+   L.warn (P.sprintf "    Global Int. Complexity:   %7u" c.nodes);
+   L.warn (P.sprintf "      + Abbreviation nodes:   %7u" nodes);
    f ()
 
-(* reductions count *********************************************************)
+(* supplementary annotation *************************************************)
 
-type reductions = {
-   beta   : int;
-   upsilon: int;
-   tau    : int;
-   ldelta : int;
-   gdelta : int
-}
+let attrs_of_binder f = function
+   | B.Abst (a, _) 
+   | B.Abbr (a, _)
+   | B.Void a      -> f a
 
-let initial_reductions = {
-   beta = 0; upsilon = 0; tau = 0; ldelta = 0; gdelta = 0
-}
+let rec does_not_occur f n r = function
+   | B.Null           -> f true
+   | B.Cons (c, _, b) ->
+      let f n1 r1 =
+         if n1 = n && r1 = r then f false else does_not_occur f n r c
+      in
+      attrs_of_binder (B.name C.err f) b 
 
-let add ?(beta=0) ?(upsilon=0) ?(tau=0) ?(ldelta=0) ?(gdelta=0) r = {
-   beta = r.beta + beta;
-   upsilon = r.upsilon + upsilon;
-   tau = r.tau + tau;
-   ldelta = r.ldelta + ldelta;
-   gdelta = r.gdelta + gdelta
-}
+let rename f c a =
+   let rec aux f c n r =
+      let f = function
+         | true  -> f n r
+	 | false -> aux f c (n ^ "'") r
+      in
+      does_not_occur f n r c
+   in
+   let f n0 r0 =
+      let f n r = if n = n0 && r = r0 then f a else f (B.Name (r, n) :: a) in
+      aux f c n0 r0 
+   in
+   B.name C.err f a
 
-(* context/term pretty printing *********************************************)
+let rename_bind f c = function
+   | B.Abst (a, w) -> let f a = f (B.abst a w) in rename f c a
+   | B.Abbr (a, v) -> let f a = f (B.abbr a v) in rename f c a
+   | B.Void a      -> let f a = f (B.Void a) in rename f c a
 
-let indexes = ref false
+(* lenv/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
+   let f n = function 
+      | true  -> F.fprintf frm "%s" n
+      | false -> F.fprintf frm "^%s" n
    in      
-   B.name f a
+   B.name C.err f a
 
 let rec pp_term c frm = function
-   | 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)           -> 
+   | B.Sort (_, h)             -> 
+      let err _ = F.fprintf frm "@[*%u@]" h in
+      let f s = F.fprintf frm "@[%s@]" s in
+      H.get_sort err f h 
+   | B.LRef (_, i)             -> 
+      let err _ = F.fprintf frm "@[#%u@]" i in
       let f _ = function
-         | Some (a, _) -> F.fprintf frm "@[%a@]" id a
-         | None        -> F.fprintf frm "@[#%u@]" i
+         | B.Abst (a, _) 
+	 | B.Abbr (a, _)
+	 | B.Void a      -> F.fprintf frm "@[%a@]" id a
       in
-      if !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)        ->
+      if !O.indexes then err () else B.get err 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 (a, B.Abst w, t) ->
-      let f cc =
+   | B.Bind (B.Abst (a, w), t) ->
+      let f a cc =
          F.fprintf frm "@[[%a:%a].%a@]" id a (pp_term c) w (pp_term cc) t
       in
-      B.push f c a (B.Abst w)
-   | B.Bind (a, B.Abbr v, t) ->
-      let f cc = 
+      let f a = B.push (f a) c (B.abst a w) in
+      rename f c a
+   | B.Bind (B.Abbr (a, v), t) ->
+      let f a cc = 
          F.fprintf frm "@[[%a=%a].%a@]" id a (pp_term c) v (pp_term cc) t
       in
-      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 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
+      let f a = B.push (f a) c (B.abbr a v) in
+      rename f c a
+   | B.Bind (B.Void a, t)      ->
+      let f a cc = F.fprintf frm "@[[%a].%a@]" id a (pp_term cc) t in
+      let f a = B.push (f a) c (B.Void a) in
+      rename f c a
+
+let pp_lenv frm c =
+   let pp_entry f c = function
+      | B.Abst (a, w) -> 
+         let f a = F.fprintf frm "@,@[%a : %a@]" id a (pp_term c) w; f () in
+         rename f c a
+      | B.Abbr (a, v) -> 
+         let f a = F.fprintf frm "@,@[%a = %a@]" id a (pp_term c) v; f () in
+	 rename f c a
+      | B.Void a      -> 
+         let f a = F.fprintf frm "@,%a" id a; f () in
+	 rename f c a
    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
+   B.rev_iter C.start pp_entry c
 
 let specs = {
-   L.pp_term = pp_term; L.pp_context = pp_context
+   L.pp_term = pp_term; L.pp_lenv = pp_lenv
 }
+
+(* term xml printing ********************************************************)
+
+let id frm a =
+   let f s = function
+      | true  -> F.fprintf frm " name=%S" s
+      | false -> F.fprintf frm " name=%S" ("^" ^ s)
+   in      
+   B.name C.start f a
+
+let rec exp_term c frm = function
+   | B.Sort (a, l)    ->
+      let a =
+         let err _ = a in
+         let f s = B.Name (true, s) :: a in
+	 H.get_sort err f l
+      in
+      F.fprintf frm "<Sort position=%S%a/>" (string_of_int l) id a
+   | B.LRef (a, i)    ->
+      let a = 
+         let err _ = a in
+	 let f n r = B.Name (r, n) :: a in
+	 let f _ b = attrs_of_binder (B.name err f) b in
+         B.get err f c i
+      in
+      F.fprintf frm "<LRef position=%S%a/>" (string_of_int i) id a
+   | B.GRef (a, u)    ->
+      let a = B.Name (true, U.name_of_uri u) :: a in
+      F.fprintf frm "<GRef uri=%S%a/>" (U.string_of_uri u) id a
+   | B.Cast (a, w, t) ->
+      F.fprintf frm "<Cast%a>%a</Cast>@,%a" id a (exp_boxed c) w (exp_term c) t 
+   | B.Appl (a, v, t) ->
+      F.fprintf frm "<Appl%a>%a</Appl>@,%a" id a (exp_boxed c) v (exp_term c) t 
+   | B.Bind (b, t) ->
+      let f b cc = F.fprintf frm "%a@,%a" (exp_bind c) b (exp_term cc) t in 
+      let f b = B.push (f b) c b in
+      rename_bind f c b
+
+and exp_boxed c frm t =
+   F.fprintf frm "@,@[<v3>   %a@]@," (exp_term c) t
+
+and exp_bind c frm = function
+   | B.Abst (a, w) ->
+      F.fprintf frm "<Abst%a>%a</Abst>" id a (exp_boxed c) w
+   | B.Abbr (a, v) ->
+      F.fprintf frm "<Abbr%a/>%a</Abbr>" id a (exp_boxed c) v
+   | B.Void a      ->
+      F.fprintf frm "<Void%a/>" id a
+
+let exp_entry c frm = function
+   | _, u, B.Abst (a, w) -> 
+      let str = U.string_of_uri u in
+      let a = B.Name (true, U.name_of_uri u) :: a in
+      F.fprintf frm "<ABST uri=%S%a>%a</ABST>" str id a (exp_boxed c) w
+   | _, u, B.Abbr (a, v) -> 
+      let str = U.string_of_uri u in
+      let a = B.Name (true, U.name_of_uri u) :: a in
+      F.fprintf frm "<ABBR uri=%S%a>%a</ABBR>" str id a (exp_boxed c) v
+   | _, u, B.Void a      -> 
+      let str = U.string_of_uri u in
+      let a = B.Name (true, U.name_of_uri u) :: a in
+      F.fprintf frm "<VOID uri=%S%a/>" str id a
+
+let export_entry frm entry =
+   F.fprintf frm "@,@[<v3>   %a@]@," (exp_entry B.empty_lenv) entry