module C = Cps
module U = NUri
module L = Log
+module O = Options
+module Y = Entity
+module X = Library
module H = Hierarchy
-module O = Output
module B = Brg
(* nodes count **************************************************************)
| 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 ->
+ begin match B.get e i with
+ | _, _, _, B.Abst _
+ | _, _, _, B.Void ->
f {c with tlrefs = succ c.tlrefs; nodes = succ c.nodes}
- | B.Abbr _ ->
+ | _, _, _, B.Abbr _ ->
f {c with tlrefs = succ c.tlrefs; xnodes = succ c.xnodes}
- in
- B.get err f e i
+ end
| B.GRef (_, u) ->
let c =
if Cps.list_mem ~eq:U.eq u c.uris
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
- | (_, u, B.Void) ->
- let c = {c with
- evoids = succ c.evoids; nodes = succ c.nodes; uris = u :: c.uris
- } 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 =
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
+
+(* lenv/term pretty printing ************************************************)
-let id frm a =
+let name err 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 err f a
-let rec pp_term c frm = function
+let rec pp_term e frm = function
| B.Sort (_, h) ->
- let err () = F.fprintf frm "@[*%u@]" h in
+ let err _ = F.fprintf frm "@[*%u@]" h in
let f s = F.fprintf frm "@[%s@]" s in
- H.get_sort err f h
+ H.string_of_sort err f h
| B.LRef (_, i) ->
- let err i = F.fprintf frm "@[#%u@]" i in
- let f _ a _ = F.fprintf frm "@[%a@]" id a in
- if !O.indexes then err i else B.get err 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 f c a = function
- | B.Abst w ->
- F.fprintf frm "@,@[%a : %a@]" id a (pp_term c) w; f ()
- | B.Abbr v ->
- F.fprintf frm "@,@[%a = %a@]" id a (pp_term c) v; f ()
- | B.Void ->
- F.fprintf frm "@,%a" id a; f ()
- in
- B.rev_iter C.start pp_entry 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 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 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.string_of_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 exp_obj frm = function
- | _, uri, B.Abst w ->
- let str = U.string_of_uri uri in
- F.fprintf frm "<ABST uri=%S/>@,%a" str exp_term w
- | _, uri, B.Abbr v ->
- let str = U.string_of_uri uri in
- F.fprintf frm "<ABBR uri=%S/>@,%a" str exp_term v
- | _, uri, B.Void ->
- let str = U.string_of_uri uri in
- F.fprintf frm "<VOID uri=%S/>" str
-
-let export_obj frm obj =
- F.fprintf frm "@,@[<v3> %a@]@," exp_obj obj
+ let attrs = [X.name a; X.mark a] in
+ X.tag X.void attrs out tab
+
+let export_term = exp_term B.empty
projects / helm.git / blobdiff