V_______________________________________________________________ *)
module C = Cps
+module Y = Entity
module B = Brg
module M = Meta
xlate_term c f v
| M.Abst (id, w, t) ->
let f w =
- let a = [B.Name (true, id)] in
- let f t = f (B.Bind (B.abst a w, t)) in
- let f c = xlate_term c f t in
- B.push f c (B.abst a w)
+ let a = [Y.Name (id, true)] in
+ let f t = f (B.Bind (a, B.Abst w, t)) in
+ xlate_term (B.push c B.empty a (B.Abst w)) f t
in
xlate_term c f w
let xlate_pars f pars =
let map f (id, w) c =
- let a = [B.Name (true, id)] in
- let f w = B.push f c (B.abst a w) in
+ let a = [Y.Name (id, true)] in
+ let f w = f (B.push c B.empty a (B.Abst w)) in
xlate_term c f w
in
- C.list_fold_right f map pars B.empty_context
+ C.list_fold_right f map pars B.empty
let unwind_to_xlate_term f c t =
- let map f t b = f (B.bind b t) in
- let f t = B.fold_left f map t c in
+ let map t a b = B.bind a b t in
+ let f t = f (B.fold_left map t c) in
xlate_term c f t
let xlate_entry f = function
- | e, pars, uri, u, None ->
- let f u = f (e, uri, B.abst [] u) in
+ | pars, u, None ->
let f c = unwind_to_xlate_term f c u in
xlate_pars f pars
- | e, pars, uri, u, Some (_, t) ->
- let f u t = f (e, uri, B.abbr [] (B.Cast ([], u, t))) in
+ | pars, u, Some t ->
+ let f u t = f (B.Cast ([], u, t)) in
let f c u = unwind_to_xlate_term (f u) c t in
let f c = unwind_to_xlate_term (f c) c u in
xlate_pars f pars
-let xlate_item f = function
- | None -> f None
- | Some e -> let f e = f (Some e) in xlate_entry f e
-
(* Interface functions ******************************************************)
-let brg_of_meta = xlate_item
+let brg_of_meta = xlate_entry