- common/entity: new format for kernel entities

[helm.git] / helm / software / lambda-delta / toplevel / metaBrg.ml

diff --git a/helm/software/lambda-delta/toplevel/metaBrg.ml b/helm/software/lambda-delta/toplevel/metaBrg.ml
index 2fb17262efb7192025066d80a94486d3a9fcd84c..4ee25812e9938840409c97241341d8a85a3f000b 100644 (file)
--- a/helm/software/lambda-delta/toplevel/metaBrg.ml
+++ b/helm/software/lambda-delta/toplevel/metaBrg.ml
@@ -10,6 +10,7 @@
       V_______________________________________________________________ *)
 
 module C = Cps
+module Y = Entity
 module B = Brg
 module M = Meta
 
@@ -31,7 +32,7 @@ let rec xlate_term c f = function
       xlate_term c f v
    | M.Abst (id, w, t)   ->
       let f w = 
-         let a = [B.Name (true, id)] in
+         let a = [Y.Name (id, true)] 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)
@@ -40,7 +41,7 @@ let rec xlate_term c f = function
 
 let xlate_pars f pars =
    let map f (id, w) c =
-      let a = [B.Name (true, id)] in
+      let a = [Y.Name (id, true)] in
       let f w = B.push f c (B.abst a w) in
       xlate_term c f w
    in
@@ -52,20 +53,15 @@ let unwind_to_xlate_term f c t =
    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_entity 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_entity
+let brg_of_meta = xlate_entry