X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fsoftware%2Flambda-delta%2Fbasic_rg%2FbrgOutput.ml;h=a9cec439ac06c5aafcc1719828e8f034db432244;hb=2e451dca46e509fd7e7772f3d2e438c189ce10a1;hp=662a71988d5a3182579c9ee3bb6b2fd82305f5d3;hpb=f3cddcf163b36101158ea33b3fad368ac8c62d75;p=helm.git diff --git a/helm/software/lambda-delta/basic_rg/brgOutput.ml b/helm/software/lambda-delta/basic_rg/brgOutput.ml index 662a71988..a9cec439a 100644 --- a/helm/software/lambda-delta/basic_rg/brgOutput.ml +++ b/helm/software/lambda-delta/basic_rg/brgOutput.ml @@ -14,6 +14,8 @@ 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 B = Brg @@ -84,28 +86,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 (b, t) -> - let f c e = count_term f c e t in - let f c = B.push (f c) e b in + let f c = count_term f c (B.push e b) t in count_term_binder f c e b -let count_entry 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_lenv w - | (_, _, B.Abbr (_, v)) -> + | _, _, Y.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 + | _, _, Y.Void -> assert false let print_counters f c = let terms = @@ -143,7 +136,7 @@ let rec does_not_occur f n r = function 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 + attrs_of_binder (Y.name C.err f) b let rename f c a = let rec aux f c n r = @@ -154,10 +147,10 @@ let rename f c a = 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 + let f n r = if n = n0 && r = r0 then f a else f (Y.Name (n, r) :: a) in aux f c n0 r0 in - B.name C.err f a + Y.name C.err f a let rename_bind f c = function | B.Abst (a, w) -> let f a = f (B.abst a w) in rename f c a @@ -166,12 +159,12 @@ let rename_bind f c = function (* lenv/term pretty printing ************************************************) -let id frm a = +let name frm a = let f n = function | true -> F.fprintf frm "%s" n | false -> F.fprintf frm "^%s" n in - B.name C.err f a + Y.name C.err f a let rec pp_term c frm = function | B.Sort (_, h) -> @@ -183,7 +176,7 @@ let rec pp_term c frm = function let f _ = function | B.Abst (a, _) | B.Abbr (a, _) - | B.Void a -> F.fprintf frm "@[%a@]" id a + | B.Void a -> F.fprintf frm "@[%a@]" name a in if !O.indexes then err () else B.get err f c i | B.GRef (_, s) -> @@ -193,32 +186,34 @@ let rec pp_term c frm = function | B.Appl (_, v, t) -> F.fprintf frm "@[(%a).%a@]" (pp_term c) v (pp_term c) t | 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 + let f a = + let cc = B.push c (B.abst a w) in + F.fprintf frm "@[[%a:%a].%a@]" name a (pp_term c) w (pp_term cc) t in - 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 + let f a = + let cc = B.push c (B.abbr a v) in + F.fprintf frm "@[[%a=%a].%a@]" name a (pp_term c) v (pp_term cc) t in - 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 + let f a = + let cc = B.push c (B.Void a) in + F.fprintf frm "@[[%a].%a@]" name a (pp_term cc) t + 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 + let f a = F.fprintf frm "@,@[%a : %a@]" name 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 + let f a = F.fprintf frm "@,@[%a = %a@]" name 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 + let f a = F.fprintf frm "@,%a" name a; f () in rename f c a in B.rev_iter C.start pp_entry c @@ -229,65 +224,50 @@ let specs = { (* 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 +let rec exp_term e t out tab = match t with | B.Sort (a, l) -> let a = let err _ = a in - let f s = B.Name (true, s) :: a in + let f s = Y.Name (s, true) :: a in H.get_sort err f l in - F.fprintf frm "" (string_of_int l) id a + let attrs = [X.position l; X.name a] in + X.tag X.sort attrs out tab | 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 + let f n r = Y.Name (n, r) :: a in + let f _ b = attrs_of_binder (Y.name err f) b in + B.get err f e i in - F.fprintf frm "" (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 "" (U.string_of_uri u) id a - | B.Cast (a, w, t) -> - F.fprintf frm "%a@,%a" id a (exp_boxed c) w (exp_term c) t + 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 "%a@,%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 + let attrs = [] in + X.tag X.appl attrs ~contents:(exp_term e v) out tab; + exp_term e t out tab + | B.Bind (b, t) -> + let b = rename_bind C.start e b in + exp_bind e b out tab; + exp_term (B.push e b) t out tab -and exp_boxed c frm t = - F.fprintf frm "@,@[ %a@]@," (exp_term c) t - -and exp_bind c frm = function +and exp_bind e b out tab = match b with | B.Abst (a, w) -> - F.fprintf frm "%a" id a (exp_boxed c) w + let attrs = [X.name a; X.mark a] in + X.tag X.abst attrs ~contents:(exp_term e w) out tab | B.Abbr (a, v) -> - F.fprintf frm "%a" id a (exp_boxed c) v - | B.Void a -> - F.fprintf frm "" 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 "%a" 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 "%a" 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 "" str id a + let attrs = [X.name a; X.mark a] in + X.tag X.abbr attrs ~contents:(exp_term e v) out tab + | B.Void a -> + let attrs = [X.name a; X.mark a] in + X.tag X.void attrs out tab -let export_entry frm entry = - F.fprintf frm "@,@[ %a@]@," (exp_entry B.empty_lenv) entry +let export_term = exp_term B.empty_lenv