X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Flambda-delta%2Fbasic_rg%2FbrgOutput.ml;h=70464fde7cbf5cf38ca0910ffcc1d99986d73ff4;hb=a22628e5de37d3ffe9de056d7683f2ebdf7226fb;hp=1aa3f9db7d4ecc0ddda91c04138d7bb9db7c140c;hpb=5780dca4cfcee57e680213186cf3eaae402b6c88;p=helm.git

diff --git a/helm/software/lambda-delta/basic_rg/brgOutput.ml b/helm/software/lambda-delta/basic_rg/brgOutput.ml
index 1aa3f9db7..70464fde7 100644
--- a/helm/software/lambda-delta/basic_rg/brgOutput.ml
+++ b/helm/software/lambda-delta/basic_rg/brgOutput.ml
@@ -11,11 +11,13 @@
 
 module P = Printf
 module F = Format
+module C = Cps
 module U = NUri
 module L = Log
+module Y = Entity
+module X = Library
 module H = Hierarchy
 module O = Output
-module CL = CommonLibrary
 module B = Brg
 
 (* nodes count **************************************************************)
@@ -32,7 +34,7 @@ type counters = {
    tabsts: int;
    tabbrs: int;
    tvoids: int;
-   uris  : U.uri list;
+   uris  : B.uri list;
    nodes : int;
    xnodes: int
 }
@@ -59,15 +61,13 @@ 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 _) ->
+      begin match B.get e i with
+	 | _, _, _, B.Abst _
+	 | _, _, _, B.Void   ->
 	    f {c with tlrefs = succ c.tlrefs; nodes = succ c.nodes}
-	 | Some (_, B.Abbr _)
-	 | Some (_, B.Void)   ->
+	 | _, _, _, B.Abbr _ ->
 	    f {c with tlrefs = succ c.tlrefs; xnodes = succ c.xnodes}
-      in	 
-      B.get f e i
+      end      
    | B.GRef (_, u)    -> 
       let c =    
 	 if Cps.list_mem ~eq:U.eq u c.uris
@@ -84,26 +84,19 @@ and count_term f c e = function
       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
+      let f c = count_term f c (B.push e B.empty a b) t in
       count_term_binder f c e b
 
-let count_obj f c = function
-   | (_, u, B.Abst w) -> 
+let count_entity f c = function
+   | _, u, Y.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) ->  
+      count_term f c B.empty w
+   | _, _, Y.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
-   | None     -> f c
+      count_term f c B.empty v
+   | _, _, Y.Void   -> assert false
 
 let print_counters f c =
    let terms =
@@ -128,110 +121,138 @@ let print_counters f c =
    L.warn (P.sprintf "      + Abbreviation nodes:   %7u" nodes);
    f ()
 
-(* context/term pretty printing *********************************************)
+(* supplementary annotation *************************************************)
+
+let rec does_not_occur f n r = function
+   | B.Null              -> f true
+   | B.Cons (e, _, a, _) ->
+      let f n1 r1 =
+         if n1 = n && r1 = r then f false else does_not_occur f n r e
+      in
+      Y.name C.err f a 
+
+let rename f e a =
+   let rec aux f e n r =
+      let f = function
+         | true  -> f n r
+	 | false -> aux f e (n ^ "'") r
+      in
+      does_not_occur f n r e
+   in
+   let f n0 r0 =
+      let f n r = if n = n0 && r = r0 then f a else f (Y.Name (n, r) :: a) in
+      aux f e n0 r0 
+   in
+   Y.name C.err f a
 
-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
+(* lenv/term pretty printing ************************************************)
+
+let name err frm a =
+   let f n = function 
+      | true  -> F.fprintf frm "%s" n
+      | false -> F.fprintf frm "^%s" n
    in      
-   B.name f a
+   Y.name err f a
 
-let rec pp_term c frm = function
+let rec pp_term e 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 
+      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 f _ = function
-         | Some (a, _) -> F.fprintf frm "@[%a@]" id a
-         | None        -> F.fprintf frm "@[#%u@]" i
-      in
-      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)
+      let err _ = F.fprintf frm "@[#%u@]" i in
+      if !O.indexes then err () else      
+      let _, _, a, b = B.get e i in
+      F.fprintf frm "@[%a@]" (name err) a
+   | 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
+      F.fprintf frm "@[{%a}.%a@]" (pp_term e) u (pp_term e) t
    | B.Appl (_, v, t)        ->
-      F.fprintf frm "@[(%a).%a@]" (pp_term c) v (pp_term c) t
+      F.fprintf frm "@[(%a).%a@]" (pp_term e) v (pp_term e) t
    | B.Bind (a, B.Abst w, t) ->
-      let f cc =
-         F.fprintf frm "@[[%a:%a].%a@]" id a (pp_term c) w (pp_term cc) t
+      let f a =
+         let ee = B.push e B.empty a (B.abst w) in
+	 F.fprintf frm "@[[%a:%a].%a@]" (name C.err) a (pp_term e) w (pp_term ee) t
       in
-      B.push f c a (B.Abst w)
+      rename f e a
    | B.Bind (a, B.Abbr v, t) ->
-      let f cc = 
-         F.fprintf frm "@[[%a=%a].%a@]" id a (pp_term c) v (pp_term cc) t
+      let f a = 
+         let ee = B.push e B.empty a (B.abbr v) in
+	 F.fprintf frm "@[[%a=%a].%a@]" (name C.err) a (pp_term e) v (pp_term ee) t
       in
-      B.push f c a (B.Abbr v)
+      rename f e a
    | 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
-   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 f a = 
+         let ee = B.push e B.empty a B.Void in
+         F.fprintf frm "@[[%a].%a@]" (name C.err) a (pp_term ee) t
+      in
+      rename f e a
+
+let pp_lenv frm e =
+   let pp_entry f e c a b x = f x (*match b with
+      | B.Abst (a, w) -> 
+         let f a = F.fprintf frm "@,@[%a : %a@]" (name C.err) a (pp_term e) w; f a in
+         rename f x a
+      | B.Abbr (a, v) -> 
+         let f a = F.fprintf frm "@,@[%a = %a@]" (name C.err) a (pp_term e) v; f a in
+	 rename f c a
+      | B.Void a      -> 
+         let f a = F.fprintf frm "@,%a" (name C.err) a; f a in
+	 rename f c a
+*)   in
+   B.fold_right ignore pp_entry e B.empty
 
 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 = function
-      | None            -> ()
-      | Some (true, s)  -> F.fprintf frm " name=%S" s
-      | Some (false, n) -> F.fprintf frm " name=%S" ("^" ^ n)
-   in      
-   B.name f a
-
-let rec exp_term frm = function
+let rec exp_term e t out tab = match t with
    | B.Sort (a, l)    ->
-      F.fprintf frm "<Sort position=%S%a/>" (string_of_int l) id a
+      let a =
+         let err _ = a in
+         let f s = Y.Name (s, true) :: a in
+	 H.get_sort err f l
+      in
+      let attrs = [X.position l; X.name a] in
+      X.tag X.sort attrs out tab
    | B.LRef (a, i)    ->
-      F.fprintf frm "<LRef position=%S%a/>" (string_of_int i) id a
-   | B.GRef (a, u)    ->
-      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%a" id a exp_boxed w exp_term t 
+      let a = 
+	 let err _ = a in
+	 let f n r = Y.Name (n, r) :: a in
+         let _, _, a, b = B.get e i in
+	 Y.name err f a
+      in
+      let attrs = [X.position i; X.name a] in
+      X.tag X.lref attrs out tab
+   | B.GRef (a, n)    ->
+      let a = Y.Name (U.name_of_uri n, true) :: a in
+      let attrs = [X.uri n; X.name a] in
+      X.tag X.gref attrs out tab
+   | B.Cast (a, u, t) ->
+      let attrs = [] in
+      X.tag X.cast attrs ~contents:(exp_term e u) out tab;
+      exp_term e t out tab
    | B.Appl (a, v, t) ->
-      F.fprintf frm "<Appl%a/>%a%a" id a exp_boxed v exp_term t 
-   | B.Bind (a, b, t) ->
-      F.fprintf frm "%a%a" (exp_bind a) b exp_term t
+      let attrs = [] in
+      X.tag X.appl attrs ~contents:(exp_term e v) out tab;
+      exp_term e t out tab
+   | B.Bind (a, b, t)    ->
+      let a = rename C.start e a in
+      exp_bind e a b out tab; 
+      exp_term (B.push e B.empty a b) t out tab 
 
-and exp_boxed frm t =
-   F.fprintf frm "@,@[<v3>   %a@]@," exp_term t
-
-and exp_bind a frm = function
+and exp_bind e a b out tab = match b with
    | B.Abst w ->
-      F.fprintf frm "<Abst%a/>%a" id a exp_boxed w
+      let attrs = [X.name a; X.mark a] in
+      X.tag X.abst attrs ~contents:(exp_term e w) out tab
    | B.Abbr v ->
-      F.fprintf frm "<Abbr%a/>%a" id a exp_boxed v
+      let attrs = [X.name a; X.mark a] in
+      X.tag X.abbr attrs ~contents:(exp_term e v) out tab
    | B.Void   ->
-      F.fprintf frm "<Void%a/>" id a
-
-let export_obj frm = function
-   | _, uri, B.Abst w -> 
-      let str = U.string_of_uri uri in
-      F.fprintf frm "%s@,@,<ABST uri=%S>%a</ABST>" 
-         (CL.doctype "ABST") str exp_boxed w
-   | _, uri, B.Abbr v -> 
-      let str = U.string_of_uri uri in
-      F.fprintf frm "%s@,@,<ABBR uri=%S>%a</ABBR>"
-         (CL.doctype "ABBR") str exp_boxed v
-   | _, uri, B.Void   -> 
-      let str = U.string_of_uri uri in
-      F.fprintf frm "%s@,@,<VOID uri=%S/>" 
-         (CL.doctype "VOID") str
+      let attrs = [X.name a; X.mark a] in
+      X.tag X.void attrs out tab
+
+let export_term = exp_term B.empty